From 895980eaa8ddaa9e6259532b70eaa87e629ff2e7 Mon Sep 17 00:00:00 2001 From: Evan Feenstra Date: Fri, 8 May 2020 15:29:38 -0700 Subject: [PATCH] full stack tribes --- api/controllers/chats.ts | 3 +++ api/controllers/messages.ts | 2 +- api/network/receive.ts | 11 +++++++++-- api/network/send.ts | 14 +++++++++++--- api/utils/msg.ts | 25 ++++++++++++++++++------- api/utils/tribes.ts | 1 - dist/api/controllers/chats.js | 2 ++ dist/api/controllers/chats.js.map | 2 +- dist/api/controllers/messages.js | 2 +- dist/api/controllers/messages.js.map | 2 +- dist/api/network/receive.js | 8 ++++++-- dist/api/network/receive.js.map | 2 +- dist/api/network/send.js | 13 ++++++++++--- dist/api/network/send.js.map | 2 +- dist/api/utils/msg.js | 24 +++++++++++++++++------- dist/api/utils/msg.js.map | 2 +- dist/api/utils/tribes.js | 1 - dist/api/utils/tribes.js.map | 2 +- 18 files changed, 84 insertions(+), 34 deletions(-) diff --git a/api/controllers/chats.ts b/api/controllers/chats.ts index 72270c8..5c871c5 100644 --- a/api/controllers/chats.ts +++ b/api/controllers/chats.ts @@ -170,6 +170,7 @@ async function joinTribe(req, res){ let theTribeOwner const owner = await models.Contact.findOne({ where: { isOwner: true } }) + const contactIds = [owner.id] if (tribeOwner) { theTribeOwner = tribeOwner // might already include?? @@ -302,6 +303,8 @@ async function receiveGroupJoin(payload) { contactIds.push(createdContact.id) } } + if(!theSender) return // fail (no contact key?) + await chat.update({ contactIds: JSON.stringify(contactIds) }) var date = new Date() diff --git a/api/controllers/messages.ts b/api/controllers/messages.ts index 2cb889f..3953c42 100644 --- a/api/controllers/messages.ts +++ b/api/controllers/messages.ts @@ -108,7 +108,7 @@ const sendMessage = async (req, res) => { remote_text_map, } = req.body - console.log('[sendMessage]') + console.log('[sendMessage]',remote_text_map) var date = new Date(); date.setMilliseconds(0) diff --git a/api/network/receive.ts b/api/network/receive.ts index c59a0f1..a57dfb3 100644 --- a/api/network/receive.ts +++ b/api/network/receive.ts @@ -15,6 +15,7 @@ const typesToForward=[ ] async function onReceive(payload){ // if tribe, owner must forward to MQTT + console.log("RECEIVED PAYLOAD",payload) const isTribe = payload.chat.type===constants.chat_types.tribe if(isTribe && typesToForward.includes(payload.type)){ const tribeOwnerPubKey = await tribes.verifySignedTimestamp(payload.chat.uuid) @@ -31,12 +32,18 @@ async function onReceive(payload){ } async function forwardMessageToTribe(payload){ + console.log("FORWARD TO TRIBE",payload) const chat = await models.Chat.findOne({where:{uuid:payload.chat.uuid}}) - const sender = await models.Contact.findOne({where:{publicKey:payload.sender.pub_key}}) + //const sender = await models.Contact.findOne({where:{publicKey:payload.sender.pub_key}}) + const owner = await models.Contact.findOne({where:{isOwner:true}}) const type = payload.type const message = payload.message sendMessage({ - chat, sender, type, message, + sender: { + ...owner.dataValues, // ADD IN REAL ALIAS HERE??! + ...payload.sender&&payload.sender.alias && {alias:payload.sender.alias} + }, + chat, type, message, success: ()=>{}, receive: ()=>{} }) diff --git a/api/network/send.ts b/api/network/send.ts index 3af0ba8..5a6fc56 100644 --- a/api/network/send.ts +++ b/api/network/send.ts @@ -13,6 +13,12 @@ export async function sendMessage(params) { const m = newmsg(type, chat, sender, message) let msg = m + console.log(type,message) + if(!sender) { + console.log("NO SENDER?????") + return + } + let contactIds = (typeof chat.contactIds==='string' ? JSON.parse(chat.contactIds) : chat.contactIds) || [] if(contactIds.length===1) { if (contactIds[0]===1) { @@ -23,6 +29,7 @@ export async function sendMessage(params) { let networkType:NetworkType = undefined const isTribe = chat.type===constants.chat_types.tribe + let isTribeOwner = false const chatUUID = chat.uuid if(isTribe) { if(type===constants.message_types.confirmation) { @@ -32,6 +39,7 @@ export async function sendMessage(params) { const tribeOwnerPubKey = await tribes.verifySignedTimestamp(chatUUID) if(sender.publicKey===tribeOwnerPubKey){ console.log('im owner! mqtt!') + isTribeOwner = true networkType = 'mqtt' // broadcast to all // decrypt message.content and message.mediaKey w groupKey msg = await decryptMessage(msg, chat) @@ -46,7 +54,7 @@ export async function sendMessage(params) { let no:any = null console.log('all contactIds',contactIds) await asyncForEach(contactIds, async contactId => { - if (contactId == sender.id) { + if (contactId == 1) { // dont send to self return } @@ -54,7 +62,7 @@ export async function sendMessage(params) { const destkey = contact.publicKey console.log('-> sending to ', contact.id, destkey) - const m = await personalizeMessage(msg, contact) + const m = await personalizeMessage(msg, contact, isTribeOwner) const opts = { dest: destkey, data: m, @@ -104,7 +112,7 @@ export function signAndSend(opts, mqttTopic?:string){ function newmsg(type, chat, sender, message){ const includeGroupKey = type===constants.message_types.group_create || type===constants.message_types.group_invite - const includeAlias = chat.type===constants.chat_types.tribe + const includeAlias = sender && sender.alias && chat.type===constants.chat_types.tribe return { type: type, chat: { diff --git a/api/utils/msg.ts b/api/utils/msg.ts index 765cb97..9f4eba2 100644 --- a/api/utils/msg.ts +++ b/api/utils/msg.ts @@ -4,10 +4,16 @@ import * as path from 'path' import * as rsa from '../crypto/rsa' const constants = require(path.join(__dirname,'../../config/constants.json')) -function addInRemoteText(full:{[k:string]:any}, contactId){ +function addInRemoteText(full:{[k:string]:any}, contactId, isTribe:boolean){ const m = full && full.message if (!(m && m.content)) return full if (!(typeof m.content==='object')) return full + if(isTribe) { + // if just one, send it (for tribe remote_text_map... is there a better way?) + if(Object.values(m.content).length===1) { + return fillmsg(full, {content: Object.values(m.content)[0]}) + } + } return fillmsg(full, {content: m.content[contactId+'']}) } @@ -32,14 +38,16 @@ function removeAllNonAdminMembersIfTribe(full:{[k:string]:any}, destkey){ // return fillchatmsg(full, {members}) } +// THIS IS ONLY FOR TRIBE OWNER // by this time the content and mediaKey are already in message as string -async function encryptTribeBroadcast(full:{[k:string]:any}, contact){ +async function encryptTribeBroadcast(full:{[k:string]:any}, contact, isTribe:boolean, isTribeOwner:boolean){ + if(!isTribeOwner) return full + const chat = full && full.chat const message = full && full.message if (!message || !(chat && chat.type && chat.uuid)) return full - const isTribe = chat.type===constants.chat_types.tribe const obj: {[k:string]:any} = {} - if(isTribe) { // has been previously decrypted + if(isTribe && isTribeOwner) { // has been previously decrypted if(message.content) { const encContent = await rsa.encrypt(contact.contactKey, message.content) obj.content = encContent @@ -117,18 +125,21 @@ async function decryptMessage(full:{[k:string]:any}, chat) { return fillmsg(full, obj) } -async function personalizeMessage(m,contact){ +async function personalizeMessage(m,contact,isTribeOwner:boolean){ const contactId = contact.contactId const destkey = contact.publicKey const cloned = JSON.parse(JSON.stringify(m)) - const msgWithRemoteTxt = addInRemoteText(cloned, contactId) + const chat = cloned && cloned.chat + const isTribe = chat.type&&chat.type===constants.chat_types.tribe + + const msgWithRemoteTxt = addInRemoteText(cloned, contactId, isTribe) const cleanMsg = removeRecipientFromChatMembers(msgWithRemoteTxt, destkey) const cleanerMsg = removeAllNonAdminMembersIfTribe(cleanMsg, destkey) const msgWithMediaKey = addInMediaKey(cleanerMsg, contactId) const msgWithMediaToken = await finishTermsAndReceipt(msgWithMediaKey, destkey) - const encMsg = await encryptTribeBroadcast(msgWithMediaToken, contact) + const encMsg = await encryptTribeBroadcast(msgWithMediaToken, contact, isTribe, isTribeOwner) return encMsg } diff --git a/api/utils/tribes.ts b/api/utils/tribes.ts index e5ca0b4..f397789 100644 --- a/api/utils/tribes.ts +++ b/api/utils/tribes.ts @@ -46,7 +46,6 @@ export function subscribe(topic){ } export function publish(topic,msg){ - console.log("PUBLISH",client,topic,msg) if(client) client.publish(topic,msg) } diff --git a/dist/api/controllers/chats.js b/dist/api/controllers/chats.js index f1dc3ca..42720ae 100644 --- a/dist/api/controllers/chats.js +++ b/dist/api/controllers/chats.js @@ -298,6 +298,8 @@ function receiveGroupJoin(payload) { contactIds.push(createdContact.id); } } + if (!theSender) + return; // fail (no contact key?) yield chat.update({ contactIds: JSON.stringify(contactIds) }); var date = new Date(); date.setMilliseconds(0); diff --git a/dist/api/controllers/chats.js.map b/dist/api/controllers/chats.js.map index 7c29520..41d12ba 100644 --- a/dist/api/controllers/chats.js.map +++ b/dist/api/controllers/chats.js.map @@ -1 +1 @@ -{"version":3,"file":"chats.js","sourceRoot":"","sources":["../../../api/controllers/chats.ts"],"names":[],"mappings":";;;;;;;;;;;AAAA,sCAAkC;AAClC,2CAA0C;AAC1C,sCAA+C;AAC/C,sCAAqC;AACrC,sCAAqC;AACrC,0CAAyC;AACzC,gCAAyC;AACzC,2BAA0B;AAC1B,6BAA4B;AAC5B,qCAAoC;AACpC,0CAAyC;AAEzC,MAAM,SAAS,GAAG,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,EAAC,6BAA6B,CAAC,CAAC,CAAA;AAE7E,SAAe,QAAQ,CAAC,GAAG,EAAE,GAAG;;QAC/B,MAAM,KAAK,GAAG,MAAM,eAAM,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE,KAAK,EAAC,EAAC,OAAO,EAAC,KAAK,EAAC,EAAE,GAAG,EAAE,IAAI,EAAE,CAAC,CAAA;QAC7E,MAAM,CAAC,GAAG,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,SAAS,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,CAAC;QACxD,aAAO,CAAC,GAAG,EAAE,CAAC,CAAC,CAAA;IAChB,CAAC;CAAA;AAudA,4BAAQ;AArdT,SAAe,IAAI,CAAC,GAAG,EAAE,GAAG;;QAC3B,MAAM,MAAM,GAAG,GAAG,CAAC,MAAM,CAAC,SAAS,CAAC,CAAA;QACpC,MAAM,IAAI,GAAG,GAAG,CAAC,MAAM,CAAC,aAAa,CAAC,CAAA;QAEtC,IAAI,CAAC,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE;YACvC,OAAO,aAAO,CAAC,GAAG,EAAE,yBAAyB,CAAC,CAAA;SAC9C;QAED,MAAM,IAAI,GAAG,MAAM,eAAM,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE,KAAK,EAAE,EAAE,EAAE,EAAE,MAAM,EAAE,EAAE,CAAC,CAAA;QAEjE,IAAI,CAAC,IAAI,EAAE;YACV,OAAO,aAAO,CAAC,GAAG,EAAE,gBAAgB,CAAC,CAAA;SACrC;QAED,IAAI,CAAC,MAAM,CAAC,EAAE,OAAO,EAAE,CAAC,IAAI,IAAI,MAAM,CAAC,EAAE,CAAC,CAAA;QAE1C,aAAO,CAAC,GAAG,EAAE,SAAS,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,CAAA;IACzC,CAAC;CAAA;AAocU,oBAAI;AAlcf,+BAA+B;AAC/B,oCAAoC;AACpC,SAAe,eAAe,CAAC,GAAG,EAAE,GAAG;;QACtC,MAAM,EACL,IAAI,EACJ,QAAQ,EACR,SAAS,GAGT,GAAG,GAAG,CAAC,IAAI,CAAA;QACZ,MAAM,WAAW,GAAG,GAAG,CAAC,IAAI,CAAC,WAAW,IAAE,EAAE,CAAA;QAE5C,MAAM,OAAO,GAAyC,EAAE,CAAA,CAAC,2BAA2B;QACpF,MAAM,KAAK,GAAG,MAAM,eAAM,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,KAAK,EAAE,EAAE,OAAO,EAAE,IAAI,EAAE,EAAE,CAAC,CAAA;QAExE,OAAO,CAAC,KAAK,CAAC,SAAS,CAAC,GAAG;YAC1B,GAAG,EAAC,KAAK,CAAC,UAAU,EAAE,KAAK,EAAC,KAAK,CAAC,KAAK;SACvC,CAAA;QACD,MAAM,YAAY,CAAC,WAAW,EAAE,CAAM,GAAG,EAAC,EAAE;YAC3C,MAAM,OAAO,GAAG,MAAM,eAAM,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,KAAK,EAAE,EAAE,EAAE,EAAE,GAAG,EAAE,EAAE,CAAC,CAAA;YACpE,OAAO,CAAC,OAAO,CAAC,SAAS,CAAC,GAAG;gBAC5B,GAAG,EAAE,OAAO,CAAC,UAAU;gBACvB,KAAK,EAAE,OAAO,CAAC,KAAK,IAAE,EAAE;aACxB,CAAA;QACF,CAAC,CAAA,CAAC,CAAA;QAEF,IAAI,UAAU,GAAO,IAAI,CAAA;QACzB,IAAG,QAAQ,EAAC;YACX,UAAU,GAAG,MAAM,qBAAqB,CAAC,KAAK,EAAE,WAAW,EAAE,IAAI,CAAC,CAAA;YAClE,IAAG,SAAS,EAAC;gBACZ,0BAA0B;aAC1B;YACD,8BAA8B;YAC9B,OAAO,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC,IAAI,GAAG,SAAS,CAAC,UAAU,CAAC,KAAK,CAAA;SAC1D;aAAM;YACN,UAAU,GAAG,qBAAqB,CAAC,KAAK,EAAE,WAAW,EAAE,OAAO,EAAE,IAAI,CAAC,CAAA;SACrE;QAED,OAAO,CAAC,WAAW,CAAC;YACnB,IAAI,kCAAO,UAAU,KAAE,OAAO,GAAE;YAChC,MAAM,EAAE,KAAK;YACb,IAAI,EAAE,SAAS,CAAC,aAAa,CAAC,YAAY;YAC1C,OAAO,EAAE,EAAE;YACX,OAAO,EAAE,UAAU,CAAC;gBACnB,aAAO,CAAC,GAAG,EAAE,CAAC,CAAC,CAAA;YAChB,CAAC;YACD,OAAO,EAAE;;oBACR,MAAM,IAAI,GAAG,MAAM,eAAM,CAAC,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,CAAA;oBACjD,IAAG,IAAI,CAAC,IAAI,KAAG,SAAS,CAAC,UAAU,CAAC,KAAK,EAAC,EAAE,iCAAiC;wBAC5E,MAAM,eAAM,CAAC,UAAU,CAAC,MAAM,CAAC;4BAC9B,SAAS,EAAE,KAAK,CAAC,EAAE;4BACnB,MAAM,EAAE,IAAI,CAAC,EAAE;4BACf,IAAI,EAAE,SAAS,CAAC,UAAU,CAAC,KAAK;yBAChC,CAAC,CAAA;qBACF;oBACD,aAAO,CAAC,GAAG,EAAE,SAAS,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,CAAA;gBACzC,CAAC;aAAA;SACD,CAAC,CAAA;IACH,CAAC;CAAA;AAyY4B,0CAAe;AAvY5C,+BAA+B;AAC/B,SAAe,eAAe,CAAC,GAAG,EAAE,GAAG;;QACtC,MAAM,EACL,WAAW,GACX,GAAG,GAAG,CAAC,IAAI,CAAA;QACZ,MAAM,EAAE,EAAE,EAAE,GAAG,GAAG,CAAC,MAAM,CAAA;QAEzB,MAAM,OAAO,GAAyC,EAAE,CAAA,CAAE,2BAA2B;QACrF,MAAM,KAAK,GAAG,MAAM,eAAM,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,KAAK,EAAE,EAAE,OAAO,EAAE,IAAI,EAAE,EAAE,CAAC,CAAA;QACxE,IAAI,IAAI,GAAG,MAAM,eAAM,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE,KAAK,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC,CAAA;QAEvD,MAAM,UAAU,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,UAAU,IAAI,IAAI,CAAC,CAAA;QACtD,qCAAqC;QACrC,OAAO,CAAC,KAAK,CAAC,SAAS,CAAC,GAAG,EAAC,GAAG,EAAC,KAAK,CAAC,UAAU,EAAE,KAAK,EAAC,KAAK,CAAC,KAAK,EAAC,CAAA;QACpE,IAAG,IAAI,CAAC,IAAI,KAAG,SAAS,CAAC,UAAU,CAAC,KAAK,EAAC;YACzC,MAAM,EAAE,GAAG,MAAM,eAAM,CAAC,UAAU,CAAC,OAAO,CAAC,EAAC,KAAK,EAAC,EAAC,SAAS,EAAE,KAAK,CAAC,EAAE,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,EAAC,EAAC,CAAC,CAAA;YAC1F,IAAG,EAAE;gBAAE,OAAO,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC,IAAI,GAAG,EAAE,CAAC,IAAI,CAAA;SAC9C;QACD,MAAM,aAAa,GAAG,UAAU,CAAC,MAAM,CAAC,WAAW,CAAC,CAAA;QACpD,MAAM,YAAY,CAAC,aAAa,EAAE,CAAM,GAAG,EAAC,EAAE;YAC7C,MAAM,OAAO,GAAG,MAAM,eAAM,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,KAAK,EAAE,EAAE,EAAE,EAAE,GAAG,EAAE,EAAE,CAAC,CAAA;YACpE,IAAG,OAAO,EAAE;gBACX,OAAO,CAAC,OAAO,CAAC,SAAS,CAAC,GAAG;oBAC5B,GAAG,EAAE,OAAO,CAAC,UAAU;oBACvB,KAAK,EAAE,OAAO,CAAC,KAAK;iBACpB,CAAA;gBACD,MAAM,MAAM,GAAG,MAAM,eAAM,CAAC,UAAU,CAAC,OAAO,CAAC,EAAC,KAAK,EAAC,EAAC,SAAS,EAAE,KAAK,CAAC,EAAE,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,EAAC,EAAC,CAAC,CAAA;gBAC9F,IAAG,MAAM;oBAAE,OAAO,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,IAAI,GAAG,MAAM,CAAC,IAAI,CAAA;aACxD;QACF,CAAC,CAAA,CAAC,CAAA;QAEF,aAAO,CAAC,GAAG,EAAE,SAAS,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,CAAA;QAExC,OAAO,CAAC,WAAW,CAAC;YACnB,IAAI,kCAAO,IAAI,CAAC,UAAU,KAAE,UAAU,EAAC,WAAW,EAAE,OAAO,GAAE;YAC7D,MAAM,EAAE,KAAK;YACb,IAAI,EAAE,SAAS,CAAC,aAAa,CAAC,YAAY;YAC1C,OAAO,EAAE,EAAE;SACX,CAAC,CAAA;IACH,CAAC;CAAA;AA+VgB,0CAAe;AA7VhC,MAAM,UAAU,GAAG,CAAO,GAAG,EAAE,GAAG,EAAE,EAAE;IACrC,MAAM,EAAE,EAAE,EAAE,GAAG,GAAG,CAAC,MAAM,CAAA;IAEzB,MAAM,KAAK,GAAG,MAAM,eAAM,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,KAAK,EAAE,EAAE,OAAO,EAAE,IAAI,EAAE,EAAE,CAAC,CAAA;IACxE,MAAM,IAAI,GAAG,MAAM,eAAM,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE,KAAK,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC,CAAA;IACzD,OAAO,CAAC,WAAW,CAAC;QACnB,IAAI;QACJ,MAAM,EAAE,KAAK;QACb,OAAO,EAAE,EAAE;QACX,IAAI,EAAE,SAAS,CAAC,aAAa,CAAC,WAAW;KACzC,CAAC,CAAA;IAEF,MAAM,IAAI,CAAC,MAAM,CAAC;QACjB,OAAO,EAAE,IAAI;QACb,IAAI,EAAC,EAAE;QACP,UAAU,EAAC,IAAI;QACf,IAAI,EAAC,EAAE;KACP,CAAC,CAAA;IACF,MAAM,eAAM,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,KAAK,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE,EAAE,CAAC,CAAA;IAEvD,aAAO,CAAC,GAAG,EAAE,EAAE,OAAO,EAAE,EAAE,EAAE,CAAC,CAAA;AAC9B,CAAC,CAAA,CAAA;AA0UA,gCAAU;AAxUX,SAAe,SAAS,CAAC,GAAG,EAAE,GAAG;;QAChC,OAAO,CAAC,GAAG,CAAC,cAAc,CAAC,CAAA;QAC3B,MAAM,EAAE,IAAI,EAAE,SAAS,EAAE,IAAI,EAAE,IAAI,EAAE,GAAG,GAAG,CAAC,IAAI,CAAA;QAChD,MAAM,WAAW,GAAG,MAAM,MAAM,CAAC,qBAAqB,CAAC,IAAI,CAAC,CAAA;QAE5D,MAAM,UAAU,GAAG,MAAM,eAAM,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,KAAK,EAAE,EAAE,SAAS,EAAE,WAAW,EAAE,EAAE,CAAC,CAAA;QAEtF,IAAI,aAAa,CAAA;QACjB,MAAM,KAAK,GAAG,MAAM,eAAM,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,KAAK,EAAE,EAAE,OAAO,EAAE,IAAI,EAAE,EAAE,CAAC,CAAA;QACxE,MAAM,UAAU,GAAG,CAAC,KAAK,CAAC,EAAE,CAAC,CAAA;QAC7B,IAAI,UAAU,EAAE;YACf,aAAa,GAAG,UAAU,CAAA,CAAC,0BAA0B;YACrD,IAAG,CAAC,UAAU,CAAC,QAAQ,CAAC,UAAU,CAAC,EAAE,CAAC;gBAAE,UAAU,CAAC,IAAI,CAAC,UAAU,CAAC,EAAE,CAAC,CAAA;SACtE;aAAM;YACN,MAAM,cAAc,GAAG,MAAM,eAAM,CAAC,OAAO,CAAC,MAAM,CAAC;gBAClD,SAAS,EAAE,WAAW;gBACtB,UAAU,EAAE,EAAE;gBACd,KAAK,EAAE,SAAS;gBAChB,MAAM,EAAE,CAAC;aACT,CAAC,CAAA;YACF,aAAa,GAAG,cAAc,CAAA;YAC9B,UAAU,CAAC,IAAI,CAAC,cAAc,CAAC,EAAE,CAAC,CAAA;SAClC;QACD,IAAI,IAAI,GAAG,IAAI,IAAI,EAAE,CAAA;QACrB,IAAI,CAAC,eAAe,CAAC,CAAC,CAAC,CAAA;QACvB,MAAM,IAAI,GAAG,MAAM,eAAM,CAAC,IAAI,CAAC,MAAM,CAAC;YACrC,IAAI,EAAE,IAAI;YACV,UAAU,EAAE,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC;YACtC,SAAS,EAAE,IAAI;YACf,SAAS,EAAE,IAAI;YACf,IAAI,EAAE,IAAI;YACV,IAAI,EAAE,SAAS,CAAC,UAAU,CAAC,KAAK;YAChC,IAAI,EAAE,IAAI,IAAI,MAAM,CAAC,OAAO,EAAE;YAC9B,QAAQ,EAAE,SAAS;SACnB,CAAC,CAAA;QACF,eAAM,CAAC,UAAU,CAAC,MAAM,CAAC;YACxB,SAAS,EAAE,aAAa,CAAC,EAAE;YAC3B,MAAM,EAAE,IAAI,CAAC,EAAE;YACf,IAAI,EAAE,SAAS,CAAC,UAAU,CAAC,KAAK;YAChC,UAAU,EAAE,IAAI;SAChB,CAAC,CAAA;QAEF,OAAO,CAAC,WAAW,CAAC;YACnB,IAAI,kCACA,IAAI,CAAC,UAAU,KAAE,OAAO,EAAE;oBAC5B,CAAC,KAAK,CAAC,SAAS,CAAC,EAAE;wBAClB,GAAG,EAAE,KAAK,CAAC,UAAU;wBACrB,KAAK,EAAE,KAAK,CAAC,KAAK,IAAE,EAAE;qBACtB;iBACD,GACD;YACD,MAAM,EAAE,KAAK;YACb,OAAO,EAAE,EAAE;YACX,IAAI,EAAE,SAAS,CAAC,aAAa,CAAC,UAAU;SACxC,CAAC,CAAA;IACH,CAAC;CAAA;AAkRA,8BAAS;AAhRV,SAAe,iBAAiB,CAAC,OAAO;;QACvC,OAAO,CAAC,GAAG,CAAC,sBAAsB,CAAC,CAAA;QACnC,MAAM,EAAE,cAAc,EAAE,SAAS,EAAE,SAAS,EAAE,GAAG,MAAM,OAAO,CAAC,kBAAkB,CAAC,OAAO,CAAC,CAAA;QAE1F,MAAM,IAAI,GAAG,MAAM,eAAM,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE,KAAK,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,EAAE,CAAC,CAAA;QACtE,IAAI,CAAC,IAAI;YAAE,OAAM;QAEjB,MAAM,MAAM,GAAG,MAAM,eAAM,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,KAAK,EAAE,EAAE,SAAS,EAAE,cAAc,EAAE,EAAE,CAAC,CAAA;QACrF,IAAI,CAAC,MAAM;YAAE,OAAM;QAEnB,MAAM,aAAa,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,UAAU,IAAI,IAAI,CAAC,CAAA;QACzD,MAAM,UAAU,GAAG,aAAa,CAAC,MAAM,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,KAAK,MAAM,CAAC,EAAE,CAAC,CAAA;QACjE,MAAM,IAAI,CAAC,MAAM,CAAC,EAAE,UAAU,EAAE,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC,EAAE,CAAC,CAAA;QAE7D,IAAG,SAAS,KAAG,SAAS,CAAC,UAAU,CAAC,KAAK,EAAC;YACzC,MAAM,eAAM,CAAC,UAAU,CAAC,OAAO,CAAC,EAAC,KAAK,EAAC,EAAC,MAAM,EAAE,IAAI,CAAC,EAAE,EAAE,SAAS,EAAE,MAAM,CAAC,EAAE,EAAC,EAAC,CAAC,CAAA;SAChF;QAED,IAAI,IAAI,GAAG,IAAI,IAAI,EAAE,CAAC;QACtB,IAAI,CAAC,eAAe,CAAC,CAAC,CAAC,CAAA;QACvB,MAAM,GAAG,GAAG;YACX,MAAM,EAAE,IAAI,CAAC,EAAE;YACf,IAAI,EAAE,SAAS,CAAC,aAAa,CAAC,WAAW;YACzC,MAAM,EAAE,MAAM,CAAC,EAAE;YACjB,IAAI,EAAE,IAAI;YACV,cAAc,EAAE,EAAE;YAClB,oBAAoB,EAAE,EAAE;YACxB,MAAM,EAAE,SAAS,CAAC,QAAQ,CAAC,SAAS;YACpC,SAAS,EAAE,IAAI;YACf,SAAS,EAAE,IAAI;SACf,CAAA;QACD,MAAM,OAAO,GAAG,MAAM,eAAM,CAAC,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,CAAA;QAEhD,MAAM,CAAC,QAAQ,CAAC;YACf,IAAI,EAAE,aAAa;YACnB,QAAQ,EAAE;gBACT,OAAO,EAAE,SAAS,CAAC,aAAa,CAAC,MAAM,CAAC;gBACxC,IAAI,EAAE,SAAS,CAAC,UAAU,CAAC,IAAI,CAAC;gBAChC,OAAO,EAAE,SAAS,CAAC,aAAa,CAAC,OAAO,EAAE,IAAI,CAAC;aAC/C;SACD,CAAC,CAAA;IACH,CAAC;CAAA;AAsOY,8CAAiB;AApO9B,2BAA2B;AAC3B,qCAAqC;AACrC,2BAA2B;AAC3B,0BAA0B;AAC1B,SAAe,gBAAgB,CAAC,OAAO;;QACtC,OAAO,CAAC,GAAG,CAAC,qBAAqB,CAAC,CAAA;QAClC,MAAM,EAAE,cAAc,EAAE,SAAS,EAAE,YAAY,EAAE,SAAS,EAAE,GAAG,MAAM,OAAO,CAAC,kBAAkB,CAAC,OAAO,CAAC,CAAA;QAExG,MAAM,IAAI,GAAG,MAAM,eAAM,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE,KAAK,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,EAAE,CAAC,CAAA;QACtE,IAAI,CAAC,IAAI;YAAE,OAAM;QAEjB,8EAA8E;QAC9E,MAAM,OAAO,GAAG,SAAS,KAAG,SAAS,CAAC,UAAU,CAAC,KAAK,CAAA;QACtD,IAAG,OAAO,EAAE;YACX,MAAM,KAAK,GAAG,MAAM,eAAM,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,KAAK,EAAE,EAAE,OAAO,EAAE,IAAI,EAAE,EAAE,CAAC,CAAA;YACxE,MAAM,mBAAmB,GAAG,MAAM,MAAM,CAAC,qBAAqB,CAAC,SAAS,CAAC,CAAA;YACzE,IAAG,mBAAmB,KAAG,KAAK,CAAC,SAAS,EAAC;gBACxC,OAAM,CAAC,wDAAwD;gBAC/D,yFAAyF;aACzF;SACD;QAED,IAAI,SAAS,GAAQ,IAAI,CAAA;QACzB,MAAM,MAAM,GAAG,MAAM,eAAM,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,KAAK,EAAE,EAAE,SAAS,EAAE,cAAc,EAAE,EAAE,CAAC,CAAA;QACrF,MAAM,UAAU,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,UAAU,IAAI,IAAI,CAAC,CAAA;QACtD,IAAI,MAAM,EAAE;YACX,SAAS,GAAG,MAAM,CAAA,CAAC,0BAA0B;YAC7C,IAAG,CAAC,UAAU,CAAC,QAAQ,CAAC,MAAM,CAAC,EAAE,CAAC;gBAAE,UAAU,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC,CAAA;SAC9D;aAAM;YACN,MAAM,MAAM,GAAG,YAAY,CAAC,cAAc,CAAC,CAAA;YAC3C,IAAG,MAAM,IAAI,MAAM,CAAC,GAAG,EAAE;gBACxB,MAAM,cAAc,GAAG,MAAM,eAAM,CAAC,OAAO,CAAC,MAAM,CAAC;oBAClD,SAAS,EAAE,cAAc;oBACzB,UAAU,EAAE,MAAM,CAAC,GAAG;oBACtB,KAAK,EAAE,MAAM,CAAC,KAAK,IAAE,SAAS;oBAC9B,MAAM,EAAE,CAAC;iBACT,CAAC,CAAA;gBACF,SAAS,GAAG,cAAc,CAAA;gBAC1B,UAAU,CAAC,IAAI,CAAC,cAAc,CAAC,EAAE,CAAC,CAAA;aAClC;SACD;QACD,MAAM,IAAI,CAAC,MAAM,CAAC,EAAE,UAAU,EAAE,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC,EAAE,CAAC,CAAA;QAE7D,IAAI,IAAI,GAAG,IAAI,IAAI,EAAE,CAAA;QACrB,IAAI,CAAC,eAAe,CAAC,CAAC,CAAC,CAAA;QAEvB,IAAG,OAAO,EAAC,EAAE,wBAAwB;YACpC,eAAM,CAAC,UAAU,CAAC,MAAM,CAAC;gBACxB,SAAS,EAAE,SAAS,CAAC,EAAE;gBACvB,MAAM,EAAE,IAAI,CAAC,EAAE;gBACf,IAAI,EAAE,SAAS,CAAC,UAAU,CAAC,MAAM;gBACjC,UAAU,EAAE,IAAI;aAChB,CAAC,CAAA;SACF;QAED,MAAM,GAAG,GAAG;YACX,MAAM,EAAE,IAAI,CAAC,EAAE;YACf,IAAI,EAAE,SAAS,CAAC,aAAa,CAAC,UAAU;YACxC,MAAM,EAAE,SAAS,CAAC,EAAE;YACpB,IAAI,EAAE,IAAI;YACV,cAAc,EAAE,EAAE;YAClB,oBAAoB,EAAE,EAAE;YACxB,MAAM,EAAE,SAAS,CAAC,QAAQ,CAAC,SAAS;YACpC,SAAS,EAAE,IAAI;YACf,SAAS,EAAE,IAAI;SACf,CAAA;QACD,MAAM,OAAO,GAAG,MAAM,eAAM,CAAC,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,CAAA;QAEhD,MAAM,CAAC,QAAQ,CAAC;YACf,IAAI,EAAE,YAAY;YAClB,QAAQ,EAAE;gBACT,OAAO,EAAE,SAAS,CAAC,aAAa,CAAC,SAAS,CAAC;gBAC3C,IAAI,EAAE,SAAS,CAAC,UAAU,CAAC,IAAI,CAAC;gBAChC,OAAO,EAAE,SAAS,CAAC,aAAa,CAAC,OAAO,EAAE,IAAI,CAAC;aAC/C;SACD,CAAC,CAAA;IACH,CAAC;CAAA;AAwJ+B,4CAAgB;AAtJhD,SAAe,kBAAkB,CAAC,SAAiB,EAAE,MAAc;;QAClE,MAAM,mBAAmB,GAAG,MAAM,MAAM,CAAC,qBAAqB,CAAC,SAAS,CAAC,CAAA;QACzE,IAAG,mBAAmB,KAAG,MAAM,EAAC;YAC/B,OAAO,IAAI,CAAA;SACX;QACD,OAAO,KAAK,CAAA;IACb,CAAC;CAAA;AACD,SAAe,0BAA0B,CAAC,OAAO;;QAChD,MAAM,EAAE,cAAc,EAAE,YAAY,EAAE,SAAS,EAAE,SAAS,EAAE,SAAS,EAAE,SAAS,EAAE,QAAQ,EAAE,GAAG,MAAM,OAAO,CAAC,kBAAkB,CAAC,OAAO,CAAC,CAAA;QAExI,kEAAkE;QAClE,MAAM,OAAO,GAAG,SAAS,KAAG,SAAS,CAAC,UAAU,CAAC,KAAK,CAAA;QACtD,IAAG,OAAO,EAAC,EAAE,mCAAmC;YAC/C,MAAM,UAAU,GAAG,MAAM,kBAAkB,CAAC,SAAS,EAAE,cAAc,CAAC,CAAA;YACtE,IAAG,CAAC,UAAU;gBAAE,OAAO,OAAO,CAAC,GAAG,CAAC,kCAAkC,CAAC,CAAA;SACtE;QAED,MAAM,QAAQ,GAAU,EAAE,CAAA;QAC1B,MAAM,WAAW,GAAU,EAAE,CAAA;QAC7B,KAAK,IAAI,CAAC,MAAM,EAAE,MAAM,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,YAAY,CAAC,EAAE;YAC1D,MAAM,OAAO,GAAG,MAAM,eAAM,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,KAAK,EAAE,EAAE,SAAS,EAAE,MAAM,EAAE,EAAE,CAAC,CAAA;YAC9E,IAAI,UAAU,GAAG,KAAK,CAAA;YACtB,IAAI,SAAS,KAAG,SAAS,CAAC,UAAU,CAAC,KAAK,IAAI,MAAM,IAAI,MAAM,CAAC,GAAG,EAAE;gBACnE,UAAU,GAAG,IAAI,CAAA;aACjB;iBAAM,IAAG,OAAO,IAAI,MAAM,IAAI,MAAM,CAAC,IAAI,EAAE;gBAC3C,IAAI,MAAM,CAAC,IAAI,KAAG,SAAS,CAAC,UAAU,CAAC,KAAK,IAAI,MAAM,CAAC,IAAI,KAAG,SAAS,CAAC,UAAU,CAAC,KAAK,IAAI,MAAM,CAAC,IAAI,KAAG,SAAS,CAAC,UAAU,CAAC,GAAG,EAAC;oBAClI,UAAU,GAAG,IAAI,CAAA;iBACjB;aACD;YACD,IAAG,UAAU,EAAC;gBACb,IAAI,CAAC,OAAO,EAAE;oBACb,MAAM,cAAc,GAAG,MAAM,eAAM,CAAC,OAAO,CAAC,MAAM,CAAC;wBAClD,SAAS,EAAE,MAAM;wBACjB,UAAU,EAAE,MAAM,CAAC,GAAG;wBACtB,KAAK,EAAE,MAAM,CAAC,KAAK,IAAE,SAAS;wBAC9B,MAAM,EAAE,CAAC;qBACT,CAAC,CAAA;oBACF,QAAQ,CAAC,IAAI,iCAAK,cAAc,CAAC,UAAU,KAAC,IAAI,EAAC,MAAM,CAAC,IAAI,IAAE,CAAA;oBAC9D,WAAW,CAAC,IAAI,CAAC,cAAc,CAAC,UAAU,CAAC,CAAA;iBAC3C;qBAAM;oBACN,QAAQ,CAAC,IAAI,iCAAK,OAAO,CAAC,UAAU,KAAC,IAAI,EAAC,MAAM,CAAC,IAAI,IAAE,CAAA;iBACvD;aACD;SACD;QACD,MAAM,KAAK,GAAG,MAAM,eAAM,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,KAAK,EAAE,EAAE,OAAO,EAAE,IAAI,EAAE,EAAE,CAAC,CAAA;QACxE,MAAM,UAAU,GAAG,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAA,EAAE,CAAA,CAAC,CAAC,EAAE,CAAC,CAAA;QACxC,IAAG,CAAC,UAAU,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE,CAAC;YAAE,UAAU,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,CAAA;QAC5D,YAAY;QACZ,IAAI,IAAI,GAAG,IAAI,IAAI,EAAE,CAAA;QACrB,IAAI,CAAC,eAAe,CAAC,CAAC,CAAC,CAAA;QACvB,MAAM,IAAI,GAAG,MAAM,eAAM,CAAC,IAAI,CAAC,MAAM,+BACpC,IAAI,EAAE,SAAS,EACf,UAAU,EAAE,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC,EACtC,SAAS,EAAE,IAAI,EACf,SAAS,EAAE,IAAI,EACf,IAAI,EAAE,SAAS,EACf,IAAI,EAAE,SAAS,IAAI,SAAS,CAAC,UAAU,CAAC,KAAK,IAC1C,SAAS,IAAI,EAAE,IAAI,EAAE,SAAS,EAAE,GAChC,QAAQ,IAAI,EAAE,QAAQ,EAAE,QAAQ,EAAE,EACpC,CAAA;QAEF,IAAG,OAAO,EAAC,EAAE,wBAAwB;YACpC,QAAQ,CAAC,OAAO,CAAC,CAAC,CAAA,EAAE;gBACnB,eAAM,CAAC,UAAU,CAAC,MAAM,CAAC;oBACxB,SAAS,EAAE,CAAC,CAAC,EAAE;oBACf,MAAM,EAAE,IAAI,CAAC,EAAE;oBACf,IAAI,EAAE,CAAC,CAAC,IAAI,IAAE,SAAS,CAAC,UAAU,CAAC,MAAM;oBACzC,UAAU,EAAE,IAAI;iBAChB,CAAC,CAAA;YACH,CAAC,CAAC,CAAA;SACF;QAED,MAAM,CAAC,QAAQ,CAAC;YACf,IAAI,EAAE,cAAc;YACpB,QAAQ,EAAE,SAAS,CAAC,aAAa,CAAC,EAAE,WAAW,EAAE,EAAE,IAAI,CAAC;SACxD,CAAC,CAAA;QAEF,sBAAgB,CAAC,IAAI,EAAE,SAAS,EAAE,OAAO,CAAC,CAAA;QAE1C,IAAI,OAAO,CAAC,IAAI,KAAK,SAAS,CAAC,aAAa,CAAC,YAAY,EAAE;YAC1D,MAAM,KAAK,GAAG,MAAM,eAAM,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,KAAK,EAAE,EAAE,OAAO,EAAE,IAAI,EAAE,EAAE,CAAC,CAAA;YACxE,OAAO,CAAC,WAAW,CAAC;gBACnB,IAAI,kCACA,IAAI,CAAC,UAAU,KAAE,OAAO,EAAE;wBAC5B,CAAC,KAAK,CAAC,SAAS,CAAC,EAAE;4BAClB,GAAG,EAAE,KAAK,CAAC,UAAU;4BACrB,KAAK,EAAE,KAAK,CAAC,KAAK,IAAE,EAAE;yBACtB;qBACD,GACD;gBACD,MAAM,EAAE,KAAK;gBACb,OAAO,EAAE,EAAE;gBACX,IAAI,EAAE,SAAS,CAAC,aAAa,CAAC,UAAU;aACxC,CAAC,CAAA;SACF;IACF,CAAC;CAAA;AAsDA,gEAA0B;AApD3B,SAAS,qBAAqB,CAAC,KAAK,EAAE,UAAU,EAAE,OAAO,EAAE,IAAI;IAC9D,IAAI,IAAI,GAAG,IAAI,IAAI,EAAE,CAAA;IACrB,IAAI,CAAC,eAAe,CAAC,CAAC,CAAC,CAAA;IACvB,IAAI,CAAC,CAAC,KAAK,IAAI,OAAO,IAAI,UAAU,IAAI,KAAK,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC,EAAE;QACnE,OAAM;KACN;IAED,MAAM,OAAO,GAAa,EAAE,CAAA;IAC5B,KAAK,IAAI,MAAM,IAAI,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE,EAAE,eAAe;QACzD,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAA;KAC5B;IACD,IAAI,CAAC,CAAC,OAAO,IAAI,OAAO,CAAC,MAAM,CAAC;QAAE,OAAM;IAExC,MAAM,OAAO,GAAG,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,CAAA;IAC/F,MAAM,IAAI,GAAG,GAAG,CAAC,OAAO,CAAC,IAAI,EAAE,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAA;IAC1C,MAAM,aAAa,GAAG,UAAU,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC,MAAM,CAAC,UAAU,CAAC,CAAA;IAChG,OAAO;QACN,IAAI,EAAE,GAAG,IAAI,IAAI,EAAE,CAAC,OAAO,EAAE,IAAI,IAAI,EAAE;QACvC,UAAU,EAAE,IAAI,CAAC,SAAS,CAAC,aAAa,CAAC;QACzC,SAAS,EAAE,IAAI;QACf,SAAS,EAAE,IAAI;QACf,IAAI,EAAE,IAAI;QACV,IAAI,EAAE,SAAS,CAAC,UAAU,CAAC,KAAK;KAChC,CAAA;AACF,CAAC;AAED,SAAe,qBAAqB,CAAC,KAAK,EAAE,UAAU,EAAE,IAAI;;QAC3D,IAAI,IAAI,GAAG,IAAI,IAAI,EAAE,CAAA;QACrB,IAAI,CAAC,eAAe,CAAC,CAAC,CAAC,CAAA;QACvB,IAAI,CAAC,CAAC,KAAK,IAAI,UAAU,IAAI,KAAK,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC,EAAE;YACxD,OAAM;SACN;QAED,+CAA+C;QAC/C,MAAM,IAAI,GAAuB,MAAM,GAAG,CAAC,OAAO,EAAE,CAAA;QACpD,MAAM,SAAS,GAAG,MAAM,MAAM,CAAC,kBAAkB,EAAE,CAAA;QACnD,MAAM,aAAa,GAAG,UAAU,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC,MAAM,CAAC,UAAU,CAAC,CAAA;QAChG,OAAO;YACN,IAAI,EAAE,SAAS;YACf,UAAU,EAAE,IAAI,CAAC,SAAS,CAAC,aAAa,CAAC;YACzC,SAAS,EAAE,IAAI;YACf,SAAS,EAAE,IAAI;YACf,IAAI,EAAE,IAAI;YACV,IAAI,EAAE,SAAS,CAAC,UAAU,CAAC,KAAK;YAChC,QAAQ,EAAE,IAAI,CAAC,MAAM;YACrB,eAAe,EAAE,IAAI,CAAC,OAAO;YAC7B,IAAI,EAAE,MAAM,CAAC,OAAO,EAAE;SACtB,CAAA;IACF,CAAC;CAAA;AAUD,SAAe,YAAY,CAAC,KAAK,EAAE,QAAQ;;QAC1C,KAAK,IAAI,KAAK,GAAG,CAAC,EAAE,KAAK,GAAG,KAAK,CAAC,MAAM,EAAE,KAAK,EAAE,EAAE;YAChD,MAAM,QAAQ,CAAC,KAAK,CAAC,KAAK,CAAC,EAAE,KAAK,EAAE,KAAK,CAAC,CAAC;SAC7C;IACF,CAAC;CAAA"} \ No newline at end of file +{"version":3,"file":"chats.js","sourceRoot":"","sources":["../../../api/controllers/chats.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/dist/api/controllers/messages.js b/dist/api/controllers/messages.js index 4de4edf..68d82ba 100644 --- a/dist/api/controllers/messages.js +++ b/dist/api/controllers/messages.js @@ -98,7 +98,7 @@ const sendMessage = (req, res) => __awaiter(void 0, void 0, void 0, function* () // return failure(res, e.message) // } const { contact_id, text, remote_text, chat_id, remote_text_map, } = req.body; - console.log('[sendMessage]'); + console.log('[sendMessage]', remote_text_map); var date = new Date(); date.setMilliseconds(0); const owner = yield models_1.models.Contact.findOne({ where: { isOwner: true } }); diff --git a/dist/api/controllers/messages.js.map b/dist/api/controllers/messages.js.map index c1a32e4..d46c453 100644 --- a/dist/api/controllers/messages.js.map +++ b/dist/api/controllers/messages.js.map @@ -1 +1 @@ -{"version":3,"file":"messages.js","sourceRoot":"","sources":["../../../api/controllers/messages.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"messages.js","sourceRoot":"","sources":["../../../api/controllers/messages.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/dist/api/network/receive.js b/dist/api/network/receive.js index ace3ded..18e3d7d 100644 --- a/dist/api/network/receive.js +++ b/dist/api/network/receive.js @@ -25,6 +25,7 @@ const typesToForward = [ function onReceive(payload) { return __awaiter(this, void 0, void 0, function* () { // if tribe, owner must forward to MQTT + console.log("RECEIVED PAYLOAD", payload); const isTribe = payload.chat.type === constants.chat_types.tribe; if (isTribe && typesToForward.includes(payload.type)) { const tribeOwnerPubKey = yield tribes.verifySignedTimestamp(payload.chat.uuid); @@ -43,12 +44,15 @@ function onReceive(payload) { } function forwardMessageToTribe(payload) { return __awaiter(this, void 0, void 0, function* () { + console.log("FORWARD TO TRIBE", payload); const chat = yield models_1.models.Chat.findOne({ where: { uuid: payload.chat.uuid } }); - const sender = yield models_1.models.Contact.findOne({ where: { publicKey: payload.sender.pub_key } }); + //const sender = await models.Contact.findOne({where:{publicKey:payload.sender.pub_key}}) + const owner = yield models_1.models.Contact.findOne({ where: { isOwner: true } }); const type = payload.type; const message = payload.message; send_1.sendMessage({ - chat, sender, type, message, + sender: Object.assign(Object.assign({}, owner.dataValues), payload.sender && payload.sender.alias && { alias: payload.sender.alias }), + chat, type, message, success: () => { }, receive: () => { } }); diff --git a/dist/api/network/receive.js.map b/dist/api/network/receive.js.map index de57177..6f07fe8 100644 --- a/dist/api/network/receive.js.map +++ b/dist/api/network/receive.js.map @@ -1 +1 @@ -{"version":3,"file":"receive.js","sourceRoot":"","sources":["../../../api/network/receive.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"receive.js","sourceRoot":"","sources":["../../../api/network/receive.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/dist/api/network/send.js b/dist/api/network/send.js index ed266a8..86ec50b 100644 --- a/dist/api/network/send.js +++ b/dist/api/network/send.js @@ -20,6 +20,11 @@ function sendMessage(params) { const { type, chat, message, sender, amount, success, failure } = params; const m = newmsg(type, chat, sender, message); let msg = m; + console.log(type, message); + if (!sender) { + console.log("NO SENDER?????"); + return; + } let contactIds = (typeof chat.contactIds === 'string' ? JSON.parse(chat.contactIds) : chat.contactIds) || []; if (contactIds.length === 1) { if (contactIds[0] === 1) { @@ -30,6 +35,7 @@ function sendMessage(params) { } let networkType = undefined; const isTribe = chat.type === constants.chat_types.tribe; + let isTribeOwner = false; const chatUUID = chat.uuid; if (isTribe) { if (type === constants.message_types.confirmation) { @@ -39,6 +45,7 @@ function sendMessage(params) { const tribeOwnerPubKey = yield tribes.verifySignedTimestamp(chatUUID); if (sender.publicKey === tribeOwnerPubKey) { console.log('im owner! mqtt!'); + isTribeOwner = true; networkType = 'mqtt'; // broadcast to all // decrypt message.content and message.mediaKey w groupKey msg = yield msg_1.decryptMessage(msg, chat); @@ -53,13 +60,13 @@ function sendMessage(params) { let no = null; console.log('all contactIds', contactIds); yield asyncForEach(contactIds, (contactId) => __awaiter(this, void 0, void 0, function* () { - if (contactId == sender.id) { + if (contactId == 1) { // dont send to self return; } const contact = yield models_1.models.Contact.findOne({ where: { id: contactId } }); const destkey = contact.publicKey; console.log('-> sending to ', contact.id, destkey); - const m = yield msg_1.personalizeMessage(msg, contact); + const m = yield msg_1.personalizeMessage(msg, contact, isTribeOwner); const opts = { dest: destkey, data: m, @@ -116,7 +123,7 @@ function signAndSend(opts, mqttTopic) { exports.signAndSend = signAndSend; function newmsg(type, chat, sender, message) { const includeGroupKey = type === constants.message_types.group_create || type === constants.message_types.group_invite; - const includeAlias = chat.type === constants.chat_types.tribe; + const includeAlias = sender && sender.alias && chat.type === constants.chat_types.tribe; return { type: type, chat: Object.assign(Object.assign(Object.assign(Object.assign(Object.assign({ uuid: chat.uuid }, chat.name && { name: chat.name }), (chat.type || chat.type === 0) && { type: chat.type }), chat.members && { members: chat.members }), (includeGroupKey && chat.groupKey) && { groupKey: chat.groupKey }), (includeGroupKey && chat.host) && { host: chat.host }), diff --git a/dist/api/network/send.js.map b/dist/api/network/send.js.map index 575618e..004c401 100644 --- a/dist/api/network/send.js.map +++ b/dist/api/network/send.js.map @@ -1 +1 @@ -{"version":3,"file":"send.js","sourceRoot":"","sources":["../../../api/network/send.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"send.js","sourceRoot":"","sources":["../../../api/network/send.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/dist/api/utils/msg.js b/dist/api/utils/msg.js index 866e108..08b9b0b 100644 --- a/dist/api/utils/msg.js +++ b/dist/api/utils/msg.js @@ -13,12 +13,18 @@ const ldat_1 = require("./ldat"); const path = require("path"); const rsa = require("../crypto/rsa"); const constants = require(path.join(__dirname, '../../config/constants.json')); -function addInRemoteText(full, contactId) { +function addInRemoteText(full, contactId, isTribe) { const m = full && full.message; if (!(m && m.content)) return full; if (!(typeof m.content === 'object')) return full; + if (isTribe) { + // if just one, send it (for tribe remote_text_map... is there a better way?) + if (Object.values(m.content).length === 1) { + return fillmsg(full, { content: Object.values(m.content)[0] }); + } + } return fillmsg(full, { content: m.content[contactId + ''] }); } function removeRecipientFromChatMembers(full, destkey) { @@ -41,16 +47,18 @@ function removeAllNonAdminMembersIfTribe(full, destkey) { // if(members[destkey]) delete members[destkey] // return fillchatmsg(full, {members}) } +// THIS IS ONLY FOR TRIBE OWNER // by this time the content and mediaKey are already in message as string -function encryptTribeBroadcast(full, contact) { +function encryptTribeBroadcast(full, contact, isTribe, isTribeOwner) { return __awaiter(this, void 0, void 0, function* () { + if (!isTribeOwner) + return full; const chat = full && full.chat; const message = full && full.message; if (!message || !(chat && chat.type && chat.uuid)) return full; - const isTribe = chat.type === constants.chat_types.tribe; const obj = {}; - if (isTribe) { // has been previously decrypted + if (isTribe && isTribeOwner) { // has been previously decrypted if (message.content) { const encContent = yield rsa.encrypt(contact.contactKey, message.content); obj.content = encContent; @@ -132,17 +140,19 @@ function decryptMessage(full, chat) { }); } exports.decryptMessage = decryptMessage; -function personalizeMessage(m, contact) { +function personalizeMessage(m, contact, isTribeOwner) { return __awaiter(this, void 0, void 0, function* () { const contactId = contact.contactId; const destkey = contact.publicKey; const cloned = JSON.parse(JSON.stringify(m)); - const msgWithRemoteTxt = addInRemoteText(cloned, contactId); + const chat = cloned && cloned.chat; + const isTribe = chat.type && chat.type === constants.chat_types.tribe; + const msgWithRemoteTxt = addInRemoteText(cloned, contactId, isTribe); const cleanMsg = removeRecipientFromChatMembers(msgWithRemoteTxt, destkey); const cleanerMsg = removeAllNonAdminMembersIfTribe(cleanMsg, destkey); const msgWithMediaKey = addInMediaKey(cleanerMsg, contactId); const msgWithMediaToken = yield finishTermsAndReceipt(msgWithMediaKey, destkey); - const encMsg = yield encryptTribeBroadcast(msgWithMediaToken, contact); + const encMsg = yield encryptTribeBroadcast(msgWithMediaToken, contact, isTribe, isTribeOwner); return encMsg; }); } diff --git a/dist/api/utils/msg.js.map b/dist/api/utils/msg.js.map index 4a4b628..c48ed1e 100644 --- a/dist/api/utils/msg.js.map +++ b/dist/api/utils/msg.js.map @@ -1 +1 @@ -{"version":3,"file":"msg.js","sourceRoot":"","sources":["../../../api/utils/msg.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"msg.js","sourceRoot":"","sources":["../../../api/utils/msg.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/dist/api/utils/tribes.js b/dist/api/utils/tribes.js index f7113b9..8ddecf7 100644 --- a/dist/api/utils/tribes.js +++ b/dist/api/utils/tribes.js @@ -58,7 +58,6 @@ function subscribe(topic) { } exports.subscribe = subscribe; function publish(topic, msg) { - console.log("PUBLISH", client, topic, msg); if (client) client.publish(topic, msg); } diff --git a/dist/api/utils/tribes.js.map b/dist/api/utils/tribes.js.map index 94e47d1..f46619c 100644 --- a/dist/api/utils/tribes.js.map +++ b/dist/api/utils/tribes.js.map @@ -1 +1 @@ -{"version":3,"file":"tribes.js","sourceRoot":"","sources":["../../../api/utils/tribes.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"tribes.js","sourceRoot":"","sources":["../../../api/utils/tribes.ts"],"names":[],"mappings":"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"} \ No newline at end of file