@ethora/chat-component-rn 26.8.5 → 26.8.7

package/lib/module/networking/xmpp/getHistory.xmpp.js

@@ -2,9 +2,9 @@
 
 import { xml } from '@xmpp/client';
 import { createTimeoutPromise } from './createTimeoutPromise.xmpp';
-import { getDataFromXml } from '../../helpers/getDataFromXml';
-import { createMessageFromXml } from '../../helpers/createMessageFromXml';
-export const getHistory = async (client, chatJID, max, before, otherId) => {
+import { beginMamQuery, cancelMamQuery } from './mamRouter';
+let historyIdCounter = 0;
+export const getHistory = async (client, chatJID, max, before, otherId, options) => {
   if (typeof chatJID !== 'string') {
     return;
   }
@@ -16,81 +16,36 @@ export const getHistory = async (client, chatJID, max, before, otherId) => {
     const host = service.match(/wss?:\/\/([^:/]+)/)?.[1] || 'xmpp.chat.ethora.com';
     return `${chatJID}@conference.${host}`;
   })();
-  const id = otherId ?? `get-history:${Date.now().toString()}`;
-  let stanzaHdlrPointer;
-  const unsubscribe = () => {
-    client.off('stanza', stanzaHdlrPointer);
-  };
-  const responsePromise = new Promise((resolve, reject) => {
-    let messages = [];
-    stanzaHdlrPointer = async stanza => {
-      const result = stanza.getChild('result');
-      if (stanza.is('message') && stanza.attrs.from && stanza.attrs.from.startsWith(fixedChatJid) && result) {
-        const messageEl = result.getChild('forwarded')?.getChild('message');
-        messages.push(messageEl);
-      }
-      if (stanza.is('iq') && stanza.attrs.id === id && stanza.attrs.type === 'result') {
-        let mainMessages = [];
-        for (const msg of messages) {
-          const reactions = msg?.getChild('reactions');
-          const text = msg.getChild('body')?.getText();
-          if (text || reactions) {
-            const result = await getDataFromXml(msg);
-            if (!result) {
-              return;
-            }
-            const {
-              data,
-              id,
-              body,
-              ...rest
-            } = result;
-            if (!data) {
-              console.log('No data in stanza');
-              return;
-            }
-            const message = await createMessageFromXml({
-              data,
-              id,
-              body: body || '',
-              ...rest
-            });
-            mainMessages.push(message);
-          }
-        }
-        resolve(mainMessages);
-      }
-      if (stanza.is('iq') && stanza.attrs.id === id && stanza.attrs.type === 'error') {
-        reject();
-      }
-    };
-    client?.on('stanza', stanzaHdlrPointer);
-    const message = xml('iq', {
-      type: 'set',
-      to: fixedChatJid,
-      id: id
-    }, xml('query', {
-      xmlns: 'urn:xmpp:mam:2'
-    }, xml('set', {
-      xmlns: 'http://jabber.org/protocol/rsm'
-    }, xml('max', {}, max.toString()), before ? xml('before', {}, before.toString()) : xml('before'))));
-    client?.send(message).catch(err => console.log('err on load', err));
-  });
+  const id = otherId ?? `get-history:${Date.now().toString(36)}-${(++historyIdCounter).toString(36)}`;
+  const page = beginMamQuery(id, fixedChatJid, !options?.selfApplied);
+  const message = xml('iq', {
+    type: 'set',
+    to: fixedChatJid,
+    id: id
+  }, xml('query', {
+    xmlns: 'urn:xmpp:mam:2',
+    queryid: id
+  }, xml('set', {
+    xmlns: 'http://jabber.org/protocol/rsm'
+  }, xml('max', {}, max.toString()), before ? xml('before', {}, before.toString()) : xml('before'))));
+  client?.send(message).catch(err => console.log('err on load', err));
   const timeoutPromise = createTimeoutPromise(10000);
   try {
-    // @ts-ignore
-    const res = await Promise.race([responsePromise, timeoutPromise]);
-    return res === null ? [] : res;
+    const res = await Promise.race([page, timeoutPromise]);
+    if (res === null) {
+      const partial = cancelMamQuery(id);
+      if (typeof __DEV__ !== 'undefined' && __DEV__) {
+        console.log(`[mam] history request for ${fixedChatJid} timed out after 10s (${partial.length} results arrived)`);
+      }
+      return partial;
+    }
+    return res;
   } catch (e) {
-    // MAM rejects with no value when an iq error returns; the timeout
-    // path resolves with null instead of throwing. Either is expected
-    // for a room with no history yet — only log if `e` is meaningful.
-    if (e !== undefined) {
-      console.log('=-> error in', fixedChatJid, e);
+    const partial = cancelMamQuery(id);
+    if (typeof __DEV__ !== 'undefined' && __DEV__ && e === undefined) {
+      console.log(`[mam] history request for ${fixedChatJid} got no closing iq within 10s (${partial.length} results arrived)`);
     }
-    return [];
-  } finally {
-    unsubscribe();
+    return partial;
   }
 };
 //# sourceMappingURL=getHistory.xmpp.js.map

package/lib/module/networking/xmpp/getHistory.xmpp.js.map

@@ -1 +1 @@
-{"version":3,"names":["xml","createTimeoutPromise","getDataFromXml","createMessageFromXml","getHistory","client","chatJID","max","before","otherId","fixedChatJid","includes","service","options","host","match","id","Date","now","toString","stanzaHdlrPointer","unsubscribe","off","responsePromise","Promise","resolve","reject","messages","stanza","result","getChild","is","attrs","from","startsWith","messageEl","push","type","mainMessages","msg","reactions","text","getText","data","body","rest","console","log","message","on","to","xmlns","send","catch","err","timeoutPromise","res","race","e","undefined"],"sourceRoot":"../../../../src","sources":["networking/xmpp/getHistory.xmpp.ts"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["xml","createTimeoutPromise","beginMamQuery","cancelMamQuery","historyIdCounter","getHistory","client","chatJID","max","before","otherId","options","fixedChatJid","includes","service","host","match","id","Date","now","toString","page","selfApplied","message","type","to","xmlns","queryid","send","catch","err","console","log","timeoutPromise","res","Promise","race","partial","__DEV__","length","e","undefined"],"sourceRoot":"../../../../src","sources":["networking/xmpp/getHistory.xmpp.ts"],"mappings":"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","ignoreList":[]}

package/lib/module/networking/xmpp/handleStanzas.xmpp.js

@@ -1,7 +1,10 @@
 "use strict";
 
+import { routeMamIq } from './mamRouter';
 import { onDeleteMessage, onEditMessage, onRealtimeMessage, onMessageHistory, onGetLastMessageArchive, handleComposing, onChatInvite, onPresenceInRoom, onGetChatRooms, onGetMembers, onGetRoomInfo, onNewRoomCreated, onReactionMessage, onReactionHistory, onRoomKicked, onMessageError } from '../stanzaHandlers';
 import { onCallTokenMessage } from '../callTokenStanza';
+import { accountDomain, isE2eeEnabled } from '../../e2ee';
+import { decryptStanzaInPlace, encryptedCarrier, rewriteEncryptedStanza } from '../../e2ee/stanza';
 
 /**
  * Unwrap a mucsub event wrapper so the chat handlers see the real inner
@@ -26,7 +29,40 @@ const unwrapMucsubMessage = stanza => {
   const inner = stanza?.getChild?.('event', 'http://jabber.org/protocol/pubsub#event')?.getChild?.('items')?.getChild?.('item')?.getChild?.('message');
   return inner || stanza;
 };
+let held = 0;
+let queue = Promise.resolve();
 export function handleStanza(stanza, xmppWs) {
+  if (!isE2eeEnabled()) {
+    dispatchStanza(stanza, xmppWs);
+    return;
+  }
+  const carrier = stanza?.name === 'message' ? encryptedCarrier(stanza) : undefined;
+  if (!carrier && held === 0) {
+    dispatchStanza(stanza, xmppWs);
+    return;
+  }
+  held++;
+  queue = queue.then(async () => {
+    try {
+      if (carrier) {
+        const outcome = await decryptStanzaInPlace(stanza, accountDomain(xmppWs.client));
+        if (outcome === 'drop') {
+          return;
+        }
+      }
+      dispatchStanza(stanza, xmppWs);
+    } catch (err) {
+      console.warn('OMEMO: failed to handle stanza', err);
+    } finally {
+      held--;
+    }
+  });
+}
+export const __resetStanzaQueueForTests = () => {
+  held = 0;
+  queue = Promise.resolve();
+};
+function dispatchStanza(stanza, xmppWs) {
   if (stanza?.attrs?.type === 'headline') {
     return;
   }
@@ -39,6 +75,9 @@ export function handleStanza(stanza, xmppWs) {
   if (stanza?.name === 'message' && onCallTokenMessage(stanza)) {
     return;
   }
+  if (stanza?.name === 'message' && rewriteEncryptedStanza(stanza) === 'drop') {
+    return;
+  }
   switch (stanza.name) {
     case 'message':
       {
@@ -60,6 +99,9 @@ export function handleStanza(stanza, xmppWs) {
       onPresenceInRoom(stanza);
       break;
     case 'iq':
+      if (routeMamIq(stanza)) {
+        break;
+      }
       onGetChatRooms(stanza, xmppWs);
       onRealtimeMessage(stanza);
       onPresenceInRoom(stanza);

package/lib/module/networking/xmpp/handleStanzas.xmpp.js.map

@@ -1 +1 @@
-{"version":3,"names":["onDeleteMessage","onEditMessage","onRealtimeMessage","onMessageHistory","onGetLastMessageArchive","handleComposing","onChatInvite","onPresenceInRoom","onGetChatRooms","onGetMembers","onGetRoomInfo","onNewRoomCreated","onReactionMessage","onReactionHistory","onRoomKicked","onMessageError","onCallTokenMessage","unwrapMucsubMessage","stanza","inner","getChild","handleStanza","xmppWs","attrs","type","name","unwrapped","username","console","log"],"sourceRoot":"../../../../src","sources":["networking/xmpp/handleStanzas.xmpp.ts"],"mappings":";;AACA,SACEA,eAAe,EACfC,aAAa,EACbC,iBAAiB,EACjBC,gBAAgB,EAChBC,uBAAuB,EACvBC,eAAe,EACfC,YAAY,EACZC,gBAAgB,EAChBC,cAAc,EACdC,YAAY,EACZC,aAAa,EACbC,gBAAgB,EAChBC,iBAAiB,EACjBC,iBAAiB,EACjBC,YAAY,EACZC,cAAc,QACT,mBAAmB;AAE1B,SAASC,kBAAkB,QAAQ,oBAAoB;;AAEvD;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,MAAMC,mBAAmB,GAAIC,MAAe,IAAc;EACxD,MAAMC,KAAK,GAAID,MAAM,EACjBE,QAAQ,GAAG,OAAO,EAAE,yCAAyC,CAAC,EAC9DA,QAAQ,GAAG,OAAO,CAAC,EACnBA,QAAQ,GAAG,MAAM,CAAC,EAClBA,QAAQ,GAAG,SAAS,CAAC;EACzB,OAAQD,KAAK,IAAgBD,MAAM;AACrC,CAAC;AAED,OAAO,SAASG,YAAYA,CAACH,MAAe,EAAEI,MAAkB,EAAE;EAChE,IAAIJ,MAAM,EAAEK,KAAK,EAAEC,IAAI,KAAK,UAAU,EAAE;IAAC;EAAO;;EAEhD;EACA;EACA;EACA;EACA;EACA,IAAIN,MAAM,EAAEO,IAAI,KAAK,SAAS,IAAIT,kBAAkB,CAACE,MAAM,CAAC,EAAE;IAC5D;EACF;EAEA,QAAQA,MAAM,CAACO,IAAI;IACjB,KAAK,SAAS;MAAE;QACd,MAAMC,SAAS,GAAGT,mBAAmB,CAACC,MAAM,CAAC;QAC7CH,cAAc,CAACW,SAAS,EAAEJ,MAAM,CAAC;QACjCV,iBAAiB,CAACc,SAAS,CAAC;QAC5Bb,iBAAiB,CAACa,SAAS,CAAC;QAC5B1B,eAAe,CAAC0B,SAAS,CAAC;QAC1BzB,aAAa,CAACyB,SAAS,CAAC;QACxBpB,YAAY,CAACoB,SAAS,EAAEJ,MAAM,CAAC;QAC/BpB,iBAAiB,CAACwB,SAAS,CAAC;QAC5BvB,gBAAgB,CAACuB,SAAS,CAAC;QAC3BrB,eAAe,CAACqB,SAAS,EAAEJ,MAAM,CAACK,QAAQ,CAAC;QAC3CpB,gBAAgB,CAACmB,SAAS,CAAC;QAC3B;MACF;IACA,KAAK,UAAU;MACbZ,YAAY,CAACI,MAAM,CAAC;MACpBX,gBAAgB,CAACW,MAAM,CAAC;MACxB;IACF,KAAK,IAAI;MACPV,cAAc,CAACU,MAAM,EAAEI,MAAM,CAAC;MAC9BpB,iBAAiB,CAACgB,MAAM,CAAC;MACzBX,gBAAgB,CAACW,MAAM,CAAC;MACxBT,YAAY,CAACS,MAAM,CAAC;MACpBR,aAAa,CAACQ,MAAM,CAAC;MACrBd,uBAAuB,CAACc,MAAM,EAAEI,MAAM,CAAC;MACvC;IACF,KAAK,aAAa;MAChBX,gBAAgB,CAACO,MAAM,EAAEI,MAAM,CAAC;MAChC;IACF;MACEM,OAAO,CAACC,GAAG,CAAC,wBAAwB,EAAEX,MAAM,CAACO,IAAI,CAAC;EACtD;AACF","ignoreList":[]}
+{"version":3,"names":["routeMamIq","onDeleteMessage","onEditMessage","onRealtimeMessage","onMessageHistory","onGetLastMessageArchive","handleComposing","onChatInvite","onPresenceInRoom","onGetChatRooms","onGetMembers","onGetRoomInfo","onNewRoomCreated","onReactionMessage","onReactionHistory","onRoomKicked","onMessageError","onCallTokenMessage","accountDomain","isE2eeEnabled","decryptStanzaInPlace","encryptedCarrier","rewriteEncryptedStanza","unwrapMucsubMessage","stanza","inner","getChild","held","queue","Promise","resolve","handleStanza","xmppWs","dispatchStanza","carrier","name","undefined","then","outcome","client","err","console","warn","__resetStanzaQueueForTests","attrs","type","unwrapped","username","log"],"sourceRoot":"../../../../src","sources":["networking/xmpp/handleStanzas.xmpp.ts"],"mappings":"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","ignoreList":[]}

package/lib/module/networking/xmpp/mamRouter.js

@@ -0,0 +1,175 @@
+"use strict";
+
+import { store } from '../../roomStore';
+import { addRoomMessages, setReactions } from '../../roomStore/roomsSlice';
+import { applyMamReactions } from '../../helpers/mamReactions';
+const pending = new Map();
+const flush = query => {
+  // Every step is guarded: a failure in one (a middleware throwing on a
+  // reaction, say) used to escape `settle` before the waiting request was
+  // resolved — the page was lost and the room stayed empty until opened.
+  let deferred = [];
+  try {
+    // Reactions ride in the archive as their own entries: fold them onto
+    // the page's messages first, so they are stored together.
+    deferred = applyMamReactions(query.messages, query.reactions);
+  } catch (e) {
+    console.warn('[mam] applying reactions to a page failed', e);
+  }
+  if (query.apply && query.messages.length > 0) {
+    try {
+      store.dispatch(addRoomMessages({
+        roomJID: query.roomJID,
+        messages: query.messages
+      }));
+    } catch (e) {
+      console.warn('[mam] applying a history page failed', e);
+    }
+  }
+  for (const reaction of deferred) {
+    try {
+      store.dispatch(setReactions({
+        roomJID: reaction.roomJID || query.roomJID,
+        messageId: reaction.messageId,
+        from: reaction.from,
+        reactions: reaction.emoji,
+        data: reaction.data,
+        latestReactionTimestamp: reaction.ts
+      }));
+    } catch (e) {
+      console.warn('[mam] applying a reaction failed', e);
+    }
+  }
+};
+export const beginMamQuery = (queryId, roomJID, apply = true) => new Promise((resolve, reject) => {
+  pending.set(queryId, {
+    roomJID,
+    apply,
+    messages: [],
+    reactions: [],
+    inflight: 0,
+    closed: null,
+    resolve,
+    reject
+  });
+});
+
+/**
+ * Give up waiting (timeout). Whatever arrived is still applied — a late
+ * page is better than a lost one — and handed back.
+ */
+export const cancelMamQuery = queryId => {
+  const query = pending.get(queryId);
+  if (!query) {
+    return [];
+  }
+  pending.delete(queryId);
+  flush(query);
+  query.resolve(query.messages);
+  return query.messages;
+};
+const bareLower = jid => String(jid || '').split('/')[0].toLowerCase();
+
+// By the echoed `queryid` when the server provides one; otherwise by the
+// room the result came from — the oldest still-open query for that room.
+// (Results are per room anyway: a query only ever asks one archive.)
+const queryOf = stanza => {
+  const queryId = stanza?.getChild?.('result')?.attrs?.queryid;
+  const byId = queryId ? pending.get(queryId) : undefined;
+  if (byId) {
+    return byId;
+  }
+  const room = bareLower(stanza?.attrs?.from);
+  if (!room) {
+    return undefined;
+  }
+  for (const query of pending.values()) {
+    if (!query.closed && bareLower(query.roomJID) === room) {
+      return query;
+    }
+  }
+  return undefined;
+};
+const settle = (queryId, query) => {
+  if (pending.get(queryId) === query) {
+    pending.delete(queryId);
+  }
+  try {
+    flush(query);
+  } finally {
+    // The waiting request is always answered, whatever happened above.
+    if (query.closed?.error) {
+      query.reject(new Error('mam query error'));
+    } else {
+      query.resolve(query.messages);
+    }
+  }
+};
+const settleIfDone = query => {
+  if (!query.closed || query.inflight > 0) {
+    return;
+  }
+  const entry = [...pending.entries()].find(([, q]) => q === query);
+  settle(entry ? entry[0] : '', query);
+};
+
+/**
+ * Claim a result for its pending query — synchronously, the moment the
+ * stanza arrives — so the router knows a parse is outstanding. Returns
+ * true when a pending query owns it (the caller must then always follow
+ * up with `collectMamMessage`, even when the parse yields nothing).
+ */
+export const claimMamResult = stanza => {
+  const query = queryOf(stanza);
+  if (!query) {
+    return false;
+  }
+  query.inflight += 1;
+  return true;
+};
+
+/** The parsed result of a claimed stanza (undefined: dropped). */
+export const collectMamReaction = (stanza, reaction) => {
+  const query = queryOf(stanza);
+  if (!query) {
+    return false;
+  }
+  query.reactions.push(reaction);
+  return true;
+};
+export const collectMamMessage = (stanza, message) => {
+  const query = queryOf(stanza);
+  if (!query) {
+    return false;
+  }
+  if (message) {
+    query.messages.push(message);
+  }
+  query.inflight = Math.max(0, query.inflight - 1);
+  settleIfDone(query);
+  return true;
+};
+
+/** The query's closing iq; true when it belonged to a pending query. */
+export const routeMamIq = stanza => {
+  if (!stanza?.is?.('iq')) {
+    return false;
+  }
+  const query = pending.get(stanza.attrs?.id);
+  if (!query) {
+    return false;
+  }
+  query.closed = {
+    error: stanza.attrs.type === 'error'
+  };
+  // Results that are still being parsed settle the page when they land;
+  // until then the query stays registered so they can find it.
+  if (query.inflight === 0) {
+    settle(stanza.attrs.id, query);
+  }
+  return true;
+};
+
+/** Test hook. */
+export const __resetMamRouter = () => pending.clear();
+//# sourceMappingURL=mamRouter.js.map

package/lib/module/networking/xmpp/mamRouter.js.map

@@ -0,0 +1 @@
+{"version":3,"names":["store","addRoomMessages","setReactions","applyMamReactions","pending","Map","flush","query","deferred","messages","reactions","e","console","warn","apply","length","dispatch","roomJID","reaction","messageId","from","emoji","data","latestReactionTimestamp","ts","beginMamQuery","queryId","Promise","resolve","reject","set","inflight","closed","cancelMamQuery","get","delete","bareLower","jid","String","split","toLowerCase","queryOf","stanza","getChild","attrs","queryid","byId","undefined","room","values","settle","error","Error","settleIfDone","entry","entries","find","q","claimMamResult","collectMamReaction","push","collectMamMessage","message","Math","max","routeMamIq","is","id","type","__resetMamRouter","clear"],"sourceRoot":"../../../../src","sources":["networking/xmpp/mamRouter.ts"],"mappings":"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","ignoreList":[]}

package/lib/module/networking/xmpp/presenceInRoom.xmpp.js

@@ -4,7 +4,36 @@ import { xml } from '@xmpp/client';
 import { createTimeoutPromise } from './createTimeoutPromise.xmpp';
 let presenceIdCounter = 0;
 const nextPresenceId = () => `presenceInRoom-${Date.now().toString(36)}-${(++presenceIdCounter).toString(36)}`;
-export const presenceInRoom = async (client, roomJID, delay = 2000) => {
+const joinedByClient = new WeakMap();
+const joinedRooms = client => {
+  let map = joinedByClient.get(client);
+  if (!map) {
+    map = new Map();
+    joinedByClient.set(client, map);
+    const forget = () => joinedByClient.get(client)?.clear();
+    client.on('disconnect', forget);
+    client.on('offline', forget);
+  }
+  return map;
+};
+export const __forgetJoinedRooms = client => joinedByClient.get(client)?.clear();
+export const presenceInRoom = (client, roomJID, delay = 0) => {
+  const joined = joinedRooms(client);
+  const existing = joined.get(roomJID);
+  if (existing) {
+    return existing;
+  }
+  const join = joinRoom(client, roomJID, delay);
+  joined.set(roomJID, join);
+  // A failed join is not a join: let the next caller try again.
+  join.catch(() => {
+    if (joined.get(roomJID) === join) {
+      joined.delete(roomJID);
+    }
+  });
+  return join;
+};
+const joinRoom = async (client, roomJID, delay) => {
   let stanzaHandler;
   const unsubscribe = () => client.off('stanza', stanzaHandler);
   const stanzaId = nextPresenceId();
@@ -21,6 +50,11 @@ export const presenceInRoom = async (client, roomJID, delay = 2000) => {
         return;
       }
       settled = true;
+      if (delay <= 0) {
+        unsubscribe();
+        cb(value);
+        return;
+      }
       setTimeout(() => {
         unsubscribe();
         cb(value);
@@ -38,7 +72,9 @@ export const presenceInRoom = async (client, roomJID, delay = 2000) => {
       id: stanzaId
     }, xml('x', {
       xmlns: 'http://jabber.org/protocol/muc'
-    }));
+    }, xml('history', {
+      maxstanzas: '0'
+    })));
 
     // Side-effects sequence: send the presence (handles its own
     // failure → reject), then wait the timeout (also handles its own

package/lib/module/networking/xmpp/presenceInRoom.xmpp.js.map

@@ -1 +1 @@
-{"version":3,"names":["xml","createTimeoutPromise","presenceIdCounter","nextPresenceId","Date","now","toString","presenceInRoom","client","roomJID","delay","stanzaHandler","unsubscribe","off","stanzaId","Promise","resolve","reject","settled","finish","cb","value","setTimeout","stanza","is","attrs","id","from","startsWith","on","presence","jid","to","getLocal","xmlns","send","err"],"sourceRoot":"../../../../src","sources":["networking/xmpp/presenceInRoom.xmpp.ts"],"mappings":";;AAAA,SAAiBA,GAAG,QAAQ,cAAc;AAC1C,SAASC,oBAAoB,QAAQ,6BAA6B;AAGlE,IAAIC,iBAAiB,GAAG,CAAC;AACzB,MAAMC,cAAc,GAAGA,CAAA,KACrB,kBAAkBC,IAAI,CAACC,GAAG,CAAC,CAAC,CAACC,QAAQ,CAAC,EAAE,CAAC,IAAI,CAAC,EAAEJ,iBAAiB,EAAEI,QAAQ,CAAC,EAAE,CAAC,EAAE;AAEnF,OAAO,MAAMC,cAAc,GAAG,MAAAA,CAC5BC,MAAc,EACdC,OAAe,EACfC,KAAK,GAAG,IAAI,KACS;EACrB,IAAIC,aAAwC;EAC5C,MAAMC,WAAW,GAAGA,CAAA,KAAMJ,MAAM,CAACK,GAAG,CAAC,QAAQ,EAAEF,aAAa,CAAC;EAC7D,MAAMG,QAAQ,GAAGX,cAAc,CAAC,CAAC;;EAEjC;EACA;EACA;EACA;EACA;EACA,OAAO,IAAIY,OAAO,CAAU,CAACC,OAAO,EAAEC,MAAM,KAAK;IAC/C,IAAIC,OAAO,GAAG,KAAK;IAEnB,MAAMC,MAAM,GAAGA,CAACC,EAAyB,EAAEC,KAAW,KAAK;MACzD,IAAIH,OAAO,EAAE;QAAC;MAAO;MACrBA,OAAO,GAAG,IAAI;MAEdI,UAAU,CAAC,MAAM;QACfV,WAAW,CAAC,CAAC;QACbQ,EAAE,CAACC,KAAK,CAAC;MACX,CAAC,EAAEX,KAAK,CAAC;IACX,CAAC;IAEDC,aAAa,GAAIY,MAAM,IAAK;MAC1B,IACEA,MAAM,CAACC,EAAE,CAAC,UAAU,CAAC,IACrBD,MAAM,CAACE,KAAK,CAACC,EAAE,KAAKZ,QAAQ,IAC5BS,MAAM,CAACE,KAAK,CAACE,IAAI,EAAEC,UAAU,CAACnB,OAAO,CAAC,EACtC;QACAU,MAAM,CAACH,OAAO,EAAEO,MAAM,CAAC;MACzB;IACF,CAAC;IAEDf,MAAM,CAACqB,EAAE,CAAC,QAAQ,EAAElB,aAAa,CAAC;IAElC,MAAMmB,QAAQ,GAAG9B,GAAG,CAClB,UAAU,EACV;MACE2B,IAAI,EAAEnB,MAAM,CAACuB,GAAG,EAAEzB,QAAQ,CAAC,CAAC;MAC5B0B,EAAE,EAAE,GAAGvB,OAAO,IAAID,MAAM,CAACuB,GAAG,EAAEE,QAAQ,CAAC,CAAC,EAAE;MAC1CP,EAAE,EAAEZ;IACN,CAAC,EACDd,GAAG,CAAC,GAAG,EAAE;MAAEkC,KAAK,EAAE;IAAiC,CAAC,CACtD,CAAC;;IAED;IACA;IACA;IACA;IACA,CAAC,YAAY;MACX,IAAI;QACF,MAAM1B,MAAM,CAAC2B,IAAI,CAACL,QAAQ,CAAC;MAC7B,CAAC,CAAC,OAAOM,GAAG,EAAE;QACZxB,WAAW,CAAC,CAAC;QACbK,MAAM,CAACmB,GAAG,CAAC;QACX;MACF;MACA,IAAI;QACF,MAAMnC,oBAAoB,CAAC,IAAI,EAAEW,WAAW,CAAC;MAC/C,CAAC,CAAC,OAAOwB,GAAG,EAAE;QACZ;QACA;QACA;QACA;QACA;QACA,IAAI,CAAClB,OAAO,EAAE;UAACD,MAAM,CAACmB,GAAG,CAAC;QAAC;MAC7B;IACF,CAAC,EAAE,CAAC;EACN,CAAC,CAAC;AACJ,CAAC","ignoreList":[]}
+{"version":3,"names":["xml","createTimeoutPromise","presenceIdCounter","nextPresenceId","Date","now","toString","joinedByClient","WeakMap","joinedRooms","client","map","get","Map","set","forget","clear","on","__forgetJoinedRooms","presenceInRoom","roomJID","delay","joined","existing","join","joinRoom","catch","delete","stanzaHandler","unsubscribe","off","stanzaId","Promise","resolve","reject","settled","finish","cb","value","setTimeout","stanza","is","attrs","id","from","startsWith","presence","jid","to","getLocal","xmlns","maxstanzas","send","err"],"sourceRoot":"../../../../src","sources":["networking/xmpp/presenceInRoom.xmpp.ts"],"mappings":"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","ignoreList":[]}

package/lib/module/networking/xmpp/sendMediaMessage.xmpp.js

@@ -1,6 +1,7 @@
 "use strict";
 
 import { xml } from '@xmpp/client';
+import { sendSealedMedia, shouldEncrypt } from '../../e2ee/send';
 
 // Monotonic counter — see sendTextMessage for the rationale (avoids
 // Date.now() id collisions on <1ms-apart sends).
@@ -63,14 +64,26 @@ export function sendMediaMessage(client, roomJID, data, customId, devServer) {
     roomJid: data?.roomJid,
     push: 'true'
   };
+  const keys = data?.e2eeKeys;
+  if (keys?.length) {
+    dataToSend.clientEncrypted = 'true';
+  }
+  const hints = xml('store', {
+    xmlns: 'urn:xmpp:hints'
+  });
+  if (keys?.length && shouldEncrypt(roomJID)) {
+    sendSealedMedia(client, roomJID, id, xml('body', {}, JSON.stringify({
+      v: 1,
+      keys
+    })), [xml('data', dataToSend), hints]);
+    return id;
+  }
   const message = xml('message', {
     id: id,
     type: 'groupchat',
     from: client.jid?.toString(),
     to: roomJID
-  }, xml('body', {}, 'media'), xml('store', {
-    xmlns: 'urn:xmpp:hints'
-  }), xml('data', dataToSend));
+  }, xml('body', {}, 'media'), hints, xml('data', dataToSend));
   try {
     const sendResult = client.send(message);
     if (sendResult && typeof sendResult.then === 'function') {

package/lib/module/networking/xmpp/sendMediaMessage.xmpp.js.map

@@ -1 +1 @@
-{"version":3,"names":["xml","_sendMediaSeq","toServiceXmlns","devServer","client","clientService","options","service","test","ds","trim","includes","replace","sendMediaMessage","roomJID","data","customId","id","Date","now","dataToSend","xmlns","senderJID","jid","toString","senderFirstName","firstName","senderLastName","lastName","senderWalletAddress","walletAddress","isSystemMessage","tokenAmount","receiverMessageId","mucname","chatName","photoURL","userAvatar","isMediafile","createdAt","expiresAt","fileName","isVisible","location","locationPreview","mimetype","originalName","ownerKey","size","duration","updatedAt","userId","waveForm","attachmentId","isReply","showInChannel","mainMessage","roomJid","push","message","type","from","to","sendResult","send","then","console","log","catch","err","error"],"sourceRoot":"../../../../src","sources":["networking/xmpp/sendMediaMessage.xmpp.ts"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["xml","sendSealedMedia","shouldEncrypt","_sendMediaSeq","toServiceXmlns","devServer","client","clientService","options","service","test","ds","trim","includes","replace","sendMediaMessage","roomJID","data","customId","id","Date","now","dataToSend","xmlns","senderJID","jid","toString","senderFirstName","firstName","senderLastName","lastName","senderWalletAddress","walletAddress","isSystemMessage","tokenAmount","receiverMessageId","mucname","chatName","photoURL","userAvatar","isMediafile","createdAt","expiresAt","fileName","isVisible","location","locationPreview","mimetype","originalName","ownerKey","size","duration","updatedAt","userId","waveForm","attachmentId","isReply","showInChannel","mainMessage","roomJid","push","keys","e2eeKeys","length","clientEncrypted","hints","JSON","stringify","v","message","type","from","to","sendResult","send","then","console","log","catch","err","error"],"sourceRoot":"../../../../src","sources":["networking/xmpp/sendMediaMessage.xmpp.ts"],"mappings":"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","ignoreList":[]}

package/lib/module/networking/xmpp/sendTextMessage.xmpp.js

@@ -1,6 +1,7 @@
 "use strict";
 
 import { xml } from '@xmpp/client';
+import { sendEncrypted, shouldEncrypt } from '../../e2ee/send';
 
 // Local monotonic counter — see comment in id construction below.
 let _sendTextSeq = 0;
@@ -42,11 +43,7 @@ export const sendTextMessage = (client, roomJID, firstName, lastName, photo, wal
   const id = customId ? customId : isReply ? `send-reply-message-${Date.now()}-${_sendTextSeq = _sendTextSeq + 1 >>> 0}` : `send-text-message-${Date.now()}-${_sendTextSeq = _sendTextSeq + 1 >>> 0}`;
   try {
     const dataXmlns = toServiceXmlns(devServer, client);
-    const message = xml('message', {
-      to: roomJID,
-      type: 'groupchat',
-      id: id
-    }, xml('data', {
+    const data = xml('data', {
       xmlns: dataXmlns,
       senderFirstName: firstName,
       senderLastName: lastName,
@@ -63,7 +60,17 @@ export const sendTextMessage = (client, roomJID, firstName, lastName, photo, wal
       isReply: isReply || false,
       mainMessage: mainMessage || '',
       push: 'true'
-    }), xml('body', {}, userMessage));
+    });
+    const body = xml('body', {}, userMessage);
+    const message = xml('message', {
+      to: roomJID,
+      type: 'groupchat',
+      id: id
+    }, data, body);
+    if (shouldEncrypt(roomJID)) {
+      sendEncrypted(client, roomJID, id, data, body, message);
+      return;
+    }
     const sendResult = client.send(message);
     if (sendResult && typeof sendResult.then === 'function') {
       sendResult.then(() => console.log('client.send resolved', {

package/lib/module/networking/xmpp/sendTextMessage.xmpp.js.map

@@ -1 +1 @@
-{"version":3,"names":["xml","_sendTextSeq","toServiceXmlns","devServer","client","clientService","options","service","test","ds","trim","includes","replace","sendTextMessage","roomJID","firstName","lastName","photo","walletAddress","userMessage","notDisplayedValue","isReply","showInChannel","mainMessage","customId","id","Date","now","dataXmlns","message","to","type","xmlns","senderFirstName","senderLastName","fullName","photoURL","senderJID","jid","toString","senderWalletAddress","roomJid","isSystemMessage","tokenAmount","quickReplies","push","sendResult","send","then","console","log","catch","err","error","name","stack"],"sourceRoot":"../../../../src","sources":["networking/xmpp/sendTextMessage.xmpp.ts"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["xml","sendEncrypted","shouldEncrypt","_sendTextSeq","toServiceXmlns","devServer","client","clientService","options","service","test","ds","trim","includes","replace","sendTextMessage","roomJID","firstName","lastName","photo","walletAddress","userMessage","notDisplayedValue","isReply","showInChannel","mainMessage","customId","id","Date","now","dataXmlns","data","xmlns","senderFirstName","senderLastName","fullName","photoURL","senderJID","jid","toString","senderWalletAddress","roomJid","isSystemMessage","tokenAmount","quickReplies","push","body","message","to","type","sendResult","send","then","console","log","catch","err","error","name","stack"],"sourceRoot":"../../../../src","sources":["networking/xmpp/sendTextMessage.xmpp.ts"],"mappings":"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","ignoreList":[]}