@ethora/chat-component-rn 26.9.1 → 26.10.1

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

@@ -1,51 +1,334 @@
 "use strict";
 
 import { xml } from '@xmpp/client';
-import { createTimeoutPromise } from './createTimeoutPromise.xmpp';
-import { beginMamQuery, cancelMamQuery } from './mamRouter';
-let historyIdCounter = 0;
-export const getHistory = async (client, chatJID, max, before, otherId, options) => {
-  if (typeof chatJID !== 'string') {
-    return;
+import { store } from '../../roomStore';
+import { getDataFromXml } from '../../helpers/getDataFromXml';
+import { createMessageFromXml } from '../../helpers/createMessageFromXml';
+import { transformCallLogMessage } from '../../helpers/callLogMessage';
+import { applyMamReactions, extractReaction } from '../../helpers/mamReactions';
+import { getBooleanFromString } from '../../helpers/getBooleanFromString';
+import { getNumberFromString } from '../../helpers/getNumberFromString';
+import { WINDOW_QUERY_PREFIX } from './mamQueryIds';
+import { beginMamQuery, cancelMamQuery, replayArchivedReaction } from './mamRouter';
+import { applyHistoryPageCursor, snapshotRoomHistory } from './historyCursor';
+
+/** Where a page is read from. Nothing set means the latest page. */
+
+/** One archive page together with what the server's `<fin>` said about it. */
+
+const DEFAULT_TIMEOUT_MS = 10000;
+const WINDOW_TIMEOUT_MS = 8000;
+let querySeq = 0;
+const nextQueryId = prefix => {
+  querySeq = (querySeq + 1) % 1_000_000;
+  return `${prefix}${Date.now().toString()}:${querySeq}`;
+};
+
+/**
+ * If a caller passes a bare local-part (no `@host`), pick a default conference
+ * based on the client's actual service URL, never leak a hard-coded dev domain.
+ */
+const toConferenceJid = (client, chatJID) => chatJID.includes('@') ? chatJID : (() => {
+  const service = client?.options?.service || '';
+  const host = service.match(/wss?:\/\/([^:/]+)/)?.[1] || 'xmpp.chat.ethora.com';
+  return `${chatJID}@conference.${host}`;
+})();
+const emptyPage = (roomJid, ok = false) => ({
+  ok,
+  messages: [],
+  complete: false,
+  first: null,
+  last: null,
+  count: null,
+  received: 0,
+  finSeen: false,
+  roomJid
+});
+const warnRowSkipped = error => {
+  // One row the parser cannot handle must not cost the whole page.
+  console.log('history row skipped', error);
+};
+const parseRows = async (rows, roomJid) => {
+  const parsed = [];
+  // Reaction stanzas carry <reactions> but no body: they update their target
+  // message and are not rendered as messages of their own.
+  const reactionStanzas = [];
+  for (const msg of rows) {
+    try {
+      if (msg?.getChild('reactions')) {
+        reactionStanzas.push(msg);
+        continue;
+      }
+      const text = msg.getChild('body')?.getText();
+      if (!text) continue;
+      const result = await getDataFromXml(msg);
+      if (!result) continue;
+      const {
+        data,
+        id,
+        body,
+        ...rest
+      } = result;
+      if (!data) continue;
+      const raw = await createMessageFromXml({
+        data,
+        id,
+        body: body || '',
+        ...rest
+      });
+      // Server `call-state` archives become friendly call-log entries, the
+      // way the live path turns them.
+      parsed.push(transformCallLogMessage(raw, store.getState().chatSettingStore.user?.xmppUsername || ''));
+    } catch (error) {
+      warnRowSkipped(error);
+    }
+  }
+
+  // Reactions whose target is in this page are merged onto it; the rest are
+  // replayed into the store (the target may be in an earlier page or live).
+  const reactions = [];
+  for (const stanza of reactionStanzas) {
+    try {
+      const reaction = extractReaction(stanza, roomJid);
+      if (reaction) reactions.push(reaction);
+    } catch (error) {
+      warnRowSkipped(error);
+    }
   }
-  // If a caller passes a bare local-part (no `@host`), pick a default
-  // conference based on the client's actual service URL — never leak a
-  // hard-coded dev domain.
-  const fixedChatJid = chatJID.includes('@') ? chatJID : (() => {
-    const service = client?.options?.service || '';
-    const host = service.match(/wss?:\/\/([^:/]+)/)?.[1] || 'xmpp.chat.ethora.com';
-    return `${chatJID}@conference.${host}`;
-  })();
-  const id = otherId ?? `get-history:${Date.now().toString(36)}-${(++historyIdCounter).toString(36)}`;
-  const page = beginMamQuery(id, fixedChatJid, !options?.selfApplied);
-  const message = xml('iq', {
+  const deferred = applyMamReactions(parsed, reactions);
+  for (const reaction of deferred) {
+    // A store failure on one reaction must not fail the whole archive page.
+    try {
+      replayArchivedReaction(reaction, roomJid);
+    } catch (error) {
+      warnRowSkipped(error);
+    }
+  }
+  return parsed;
+};
+const buildMamQuery = (to, id, max, cursor) => {
+  const timeFilter = cursor.start || cursor.end;
+  return xml('iq', {
     type: 'set',
-    to: fixedChatJid,
-    id: id
+    to,
+    id
   }, xml('query', {
     xmlns: 'urn:xmpp:mam:2',
     queryid: id
-  }, xml('set', {
+  }, timeFilter ? xml('x', {
+    xmlns: 'jabber:x:data',
+    type: 'submit'
+  }, xml('field', {
+    var: 'FORM_TYPE',
+    type: 'hidden'
+  }, xml('value', {}, 'urn:xmpp:mam:2')), cursor.start ? xml('field', {
+    var: 'start'
+  }, xml('value', {}, cursor.start)) : null, cursor.end ? xml('field', {
+    var: 'end'
+  }, xml('value', {}, cursor.end)) : null) : null, 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);
+  }, xml('max', {}, max.toString()), cursor.after !== undefined ? xml('after', {}, String(cursor.after)) : cursor.before ? xml('before', {}, cursor.before.toString()) : timeFilter ? null : xml('before'))));
+};
+
+/**
+ * One MAM page, read and parsed, with the RSM bounds of the answer. Always
+ * settles: a timeout or an iq error gives `ok: false` and no messages. It
+ * stores nothing (reactions aside); the callers decide what a page means.
+ */
+export const fetchHistoryPage = async (client, chatJID, max, options = {}) => {
+  const roomJid = typeof chatJID === 'string' ? toConferenceJid(client, chatJID) : '';
+  if (!roomJid) return emptyPage('');
+  const isWindow = options.window === true || options.after !== undefined || !!options.start || !!options.end;
+  const id = options.id ?? nextQueryId(isWindow ? WINDOW_QUERY_PREFIX : 'get-history:');
+  const timeoutMs = options.timeoutMs ?? (isWindow ? WINDOW_TIMEOUT_MS : DEFAULT_TIMEOUT_MS);
+  let stanzaHdlr;
+  let timer;
   try {
-    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 await new Promise(resolve => {
+      const rows = [];
+      let received = 0;
+      let settled = false;
+      const settle = page => {
+        if (settled) return;
+        settled = true;
+        resolve(page);
+      };
+      stanzaHdlr = async stanza => {
+        try {
+          if (stanza?.is?.('message') && stanza.attrs?.from) {
+            const result = stanza.getChild('result');
+            if (result) {
+              const queryId = result.attrs?.queryid;
+              // Our own queries echo their id: results of a sibling request
+              // for the same room (another page, a window) are not ours.
+              const mine = queryId ? queryId === id : String(stanza.attrs.from).startsWith(roomJid);
+              if (mine) {
+                received += 1;
+                const row = result.getChild('forwarded')?.getChild('message');
+                if (row) rows.push(row);
+              }
+            }
+          }
+          if (stanza?.is?.('iq') && stanza.attrs?.id === id && stanza.attrs?.type === 'result') {
+            const fin = stanza.getChild('fin');
+            const set = fin?.getChild?.('set');
+            const first = set?.getChildText?.('first');
+            const last = set?.getChildText?.('last');
+            const count = set?.getChildText?.('count');
+            const messages = await parseRows(rows, roomJid);
+            settle({
+              ok: true,
+              messages,
+              complete: getBooleanFromString(fin?.attrs?.complete) === true,
+              first: first ? getNumberFromString(first) : null,
+              last: last ? getNumberFromString(last) : null,
+              count: count ? getNumberFromString(count) : null,
+              received,
+              finSeen: !!fin,
+              roomJid
+            });
+          }
+          if (stanza?.is?.('iq') && stanza.attrs?.id === id && stanza.attrs?.type === 'error') {
+            // No history yet in a fresh room answers with an error: expected.
+            settle(emptyPage(roomJid));
+          }
+        } catch (error) {
+          warnRowSkipped(error);
+          settle(emptyPage(roomJid));
+        }
+      };
+      client?.on('stanza', stanzaHdlr);
+      timer = setTimeout(() => settle(emptyPage(roomJid)), timeoutMs);
+      Promise.resolve(client?.send(buildMamQuery(roomJid, id, max, options))).catch(err => {
+        console.log('err on load', err);
+      });
+    });
+  } finally {
+    if (timer) clearTimeout(timer);
+    if (stanzaHdlr) client?.off('stanza', stanzaHdlr);
+  }
+};
+
+/**
+ * A live page: the global stanza handlers parse its rows and the MAM router
+ * batches them into the store (one dispatch per page, capped), so a page is
+ * parsed once. This only watches the wire for what the router does not
+ * keep: the `<fin>` bounds and how many results arrived.
+ */
+const fetchLiveHistoryPage = async (client, chatJID, max, options) => {
+  const roomJid = toConferenceJid(client, chatJID);
+  const id = options.id ?? nextQueryId('get-history:');
+  const timeoutMs = options.timeoutMs ?? DEFAULT_TIMEOUT_MS;
+  const page = emptyPage(roomJid);
+  let received = 0;
+  const watcher = stanza => {
+    try {
+      if (stanza?.is?.('message')) {
+        const result = stanza.getChild('result');
+        if (result && result.attrs?.queryid === id) received += 1;
+        return;
+      }
+      if (stanza?.is?.('iq') && stanza.attrs?.id === id) {
+        if (stanza.attrs?.type === 'error') {
+          page.finSeen = false;
+          return;
+        }
+        const fin = stanza.getChild('fin');
+        const set = fin?.getChild?.('set');
+        const first = set?.getChildText?.('first');
+        const last = set?.getChildText?.('last');
+        const count = set?.getChildText?.('count');
+        page.finSeen = !!fin;
+        page.complete = getBooleanFromString(fin?.attrs?.complete) === true;
+        page.first = first ? getNumberFromString(first) : null;
+        page.last = last ? getNumberFromString(last) : null;
+        page.count = count ? getNumberFromString(count) : null;
       }
-      return partial;
+    } catch (error) {
+      warnRowSkipped(error);
     }
-    return res;
-  } catch (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)`);
+  };
+  client?.on('stanza', watcher);
+  let timer;
+  try {
+    const routed = beginMamQuery(id, roomJid, !options.selfApplied);
+    Promise.resolve(client?.send(buildMamQuery(roomJid, id, max, options))).catch(err => {
+      console.log('err on load', err);
+    });
+    const timeout = new Promise(resolve => {
+      timer = setTimeout(() => resolve(null), timeoutMs);
+    });
+    try {
+      const messages = await Promise.race([routed, timeout]);
+      if (messages === null) {
+        // Whatever arrived is still applied by the router and handed back.
+        page.messages = cancelMamQuery(id);
+        page.received = received;
+        return {
+          ...page,
+          ok: false,
+          finSeen: false
+        };
+      }
+      page.messages = messages;
+      page.received = received;
+      page.ok = true;
+      return page;
+    } catch {
+      // The iq error of a fresh room with no history: expected.
+      page.messages = cancelMamQuery(id);
+      page.received = received;
+      return {
+        ...page,
+        ok: false,
+        finSeen: false
+      };
     }
-    return partial;
+  } finally {
+    if (timer) clearTimeout(timer);
+    client?.off('stanza', watcher);
+  }
+};
+
+/**
+ * One page of the room's live history: like fetchHistoryPage, and when the
+ * page feeds the live list (the latest page, or the one before a cursor) the
+ * room's paging cursor follows the server's `<fin>`. A page read by `after`,
+ * a time filter or flagged `window` is an isolated query and writes nothing
+ * (its rows are read by its own listener, never routed into the live list).
+ */
+export const getHistoryPage = async (client, chatJID, max, options = {}) => {
+  if (typeof chatJID !== 'string') return emptyPage('');
+  const isolated = options.window === true || options.after !== undefined || !!options.start || !!options.end;
+  if (isolated) {
+    return fetchHistoryPage(client, chatJID, max, {
+      ...options,
+      window: true
+    });
+  }
+  const snapshot = snapshotRoomHistory(toConferenceJid(client, chatJID));
+  const page = await fetchLiveHistoryPage(client, chatJID, max, options);
+  if (page.ok) {
+    try {
+      applyHistoryPageCursor(page, {
+        before: options.before,
+        max
+      }, snapshot);
+    } catch (error) {
+      warnRowSkipped(error);
+    }
+  }
+  return page;
+};
+export const getHistory = async (client, chatJID, max, before, otherId, options) => {
+  if (typeof chatJID !== 'string') {
+    return;
   }
+  const page = await getHistoryPage(client, chatJID, max, {
+    before,
+    id: otherId,
+    selfApplied: options?.selfApplied
+  });
+  return page.messages;
 };
 //# sourceMappingURL=getHistory.xmpp.js.map

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

@@ -1 +1 @@
-{"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":[]}
+{"version":3,"names":["xml","store","getDataFromXml","createMessageFromXml","transformCallLogMessage","applyMamReactions","extractReaction","getBooleanFromString","getNumberFromString","WINDOW_QUERY_PREFIX","beginMamQuery","cancelMamQuery","replayArchivedReaction","applyHistoryPageCursor","snapshotRoomHistory","DEFAULT_TIMEOUT_MS","WINDOW_TIMEOUT_MS","querySeq","nextQueryId","prefix","Date","now","toString","toConferenceJid","client","chatJID","includes","service","options","host","match","emptyPage","roomJid","ok","messages","complete","first","last","count","received","finSeen","warnRowSkipped","error","console","log","parseRows","rows","parsed","reactionStanzas","msg","getChild","push","text","getText","result","data","id","body","rest","raw","getState","chatSettingStore","user","xmppUsername","reactions","stanza","reaction","deferred","buildMamQuery","to","max","cursor","timeFilter","start","end","type","xmlns","queryid","var","after","undefined","String","before","fetchHistoryPage","isWindow","window","timeoutMs","stanzaHdlr","timer","Promise","resolve","settled","settle","page","is","attrs","from","queryId","mine","startsWith","row","fin","set","getChildText","on","setTimeout","send","catch","err","clearTimeout","off","fetchLiveHistoryPage","watcher","routed","selfApplied","timeout","race","getHistoryPage","isolated","snapshot","getHistory","otherId"],"sourceRoot":"../../../../src","sources":["networking/xmpp/getHistory.xmpp.ts"],"mappings":"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","ignoreList":[]}

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

@@ -3,6 +3,7 @@
 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 { onEthoraEvent } from '../ethoraEvents';
 import { accountDomain, isE2eeEnabled } from '../../e2ee';
 import { decryptStanzaInPlace, encryptedCarrier, rewriteEncryptedStanza } from '../../e2ee/stanza';
 
@@ -63,6 +64,12 @@ export const __resetStanzaQueueForTests = () => {
   queue = Promise.resolve();
 };
 function dispatchStanza(stanza, xmppWs) {
+  // `<ethora-event>` server pushes ride on headline messages (also inside a
+  // mucsub wrapper). Handled (or silently ignored when untrusted) before the
+  // headline early return; never throws.
+  if (stanza?.name === 'message') {
+    onEthoraEvent(stanza, xmppWs);
+  }
   if (stanza?.attrs?.type === 'headline') {
     return;
   }

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

@@ -1 +1 @@
-{"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":[]}
+{"version":3,"names":["routeMamIq","onDeleteMessage","onEditMessage","onRealtimeMessage","onMessageHistory","onGetLastMessageArchive","handleComposing","onChatInvite","onPresenceInRoom","onGetChatRooms","onGetMembers","onGetRoomInfo","onNewRoomCreated","onReactionMessage","onReactionHistory","onRoomKicked","onMessageError","onCallTokenMessage","onEthoraEvent","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":";;AACA,SAASA,UAAU,QAAQ,aAAa;AACxC,SACEC,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;AACvD,SAASC,aAAa,QAAQ,iBAAiB;AAC/C,SAASC,aAAa,EAAEC,aAAa,QAAQ,YAAY;AACzD,SACEC,oBAAoB,EACpBC,gBAAgB,EAChBC,sBAAsB,QACjB,mBAAmB;;AAE1B;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,IAAIG,IAAI,GAAG,CAAC;AACZ,IAAIC,KAAoB,GAAGC,OAAO,CAACC,OAAO,CAAC,CAAC;AAE5C,OAAO,SAASC,YAAYA,CAACP,MAAe,EAAEQ,MAAkB,EAAE;EAChE,IAAI,CAACb,aAAa,CAAC,CAAC,EAAE;IACpBc,cAAc,CAACT,MAAM,EAAEQ,MAAM,CAAC;IAC9B;EACF;EACA,MAAME,OAAO,GACXV,MAAM,EAAEW,IAAI,KAAK,SAAS,GAAGd,gBAAgB,CAACG,MAAM,CAAC,GAAGY,SAAS;EACnE,IAAI,CAACF,OAAO,IAAIP,IAAI,KAAK,CAAC,EAAE;IAC1BM,cAAc,CAACT,MAAM,EAAEQ,MAAM,CAAC;IAC9B;EACF;EAEAL,IAAI,EAAE;EACNC,KAAK,GAAGA,KAAK,CAACS,IAAI,CAAC,YAAY;IAC7B,IAAI;MACF,IAAIH,OAAO,EAAE;QACX,MAAMI,OAAO,GAAG,MAAMlB,oBAAoB,CACxCI,MAAM,EACNN,aAAa,CAACc,MAAM,CAACO,MAAM,CAC7B,CAAC;QACD,IAAID,OAAO,KAAK,MAAM,EAAE;UAAC;QAAO;MAClC;MACAL,cAAc,CAACT,MAAM,EAAEQ,MAAM,CAAC;IAChC,CAAC,CAAC,OAAOQ,GAAG,EAAE;MACZC,OAAO,CAACC,IAAI,CAAC,gCAAgC,EAAEF,GAAG,CAAC;IACrD,CAAC,SAAS;MACRb,IAAI,EAAE;IACR;EACF,CAAC,CAAC;AACJ;AAEA,OAAO,MAAMgB,0BAA0B,GAAGA,CAAA,KAAY;EACpDhB,IAAI,GAAG,CAAC;EACRC,KAAK,GAAGC,OAAO,CAACC,OAAO,CAAC,CAAC;AAC3B,CAAC;AAED,SAASG,cAAcA,CAACT,MAAe,EAAEQ,MAAkB,EAAE;EAC3D;EACA;EACA;EACA,IAAIR,MAAM,EAAEW,IAAI,KAAK,SAAS,EAAE;IAC9BlB,aAAa,CAACO,MAAM,EAAEQ,MAAa,CAAC;EACtC;EAEA,IAAIR,MAAM,EAAEoB,KAAK,EAAEC,IAAI,KAAK,UAAU,EAAE;IAAC;EAAO;;EAEhD;EACA;EACA;EACA;EACA;EACA,IAAIrB,MAAM,EAAEW,IAAI,KAAK,SAAS,IAAInB,kBAAkB,CAACQ,MAAM,CAAC,EAAE;IAC5D;EACF;EAEA,IAAIA,MAAM,EAAEW,IAAI,KAAK,SAAS,IAAIb,sBAAsB,CAACE,MAAM,CAAC,KAAK,MAAM,EAAE;IAC3E;EACF;EAEA,QAAQA,MAAM,CAACW,IAAI;IACjB,KAAK,SAAS;MAAE;QACd,MAAMW,SAAS,GAAGvB,mBAAmB,CAACC,MAAM,CAAC;QAC7CT,cAAc,CAAC+B,SAAS,EAAEd,MAAM,CAAC;QACjCpB,iBAAiB,CAACkC,SAAS,CAAC;QAC5BjC,iBAAiB,CAACiC,SAAS,CAAC;QAC5B9C,eAAe,CAAC8C,SAAS,CAAC;QAC1B7C,aAAa,CAAC6C,SAAS,CAAC;QACxBxC,YAAY,CAACwC,SAAS,EAAEd,MAAM,CAAC;QAC/B9B,iBAAiB,CAAC4C,SAAS,CAAC;QAC5B3C,gBAAgB,CAAC2C,SAAS,CAAC;QAC3BzC,eAAe,CAACyC,SAAS,EAAEd,MAAM,CAACe,QAAQ,CAAC;QAC3CxC,gBAAgB,CAACuC,SAAS,CAAC;QAC3B;MACF;IACA,KAAK,UAAU;MACbhC,YAAY,CAACU,MAAM,CAAC;MACpBjB,gBAAgB,CAACiB,MAAM,CAAC;MACxB;IACF,KAAK,IAAI;MACP,IAAIzB,UAAU,CAACyB,MAAM,CAAC,EAAE;QAAC;MAAM;MAC/BhB,cAAc,CAACgB,MAAM,EAAEQ,MAAM,CAAC;MAC9B9B,iBAAiB,CAACsB,MAAM,CAAC;MACzBjB,gBAAgB,CAACiB,MAAM,CAAC;MACxBf,YAAY,CAACe,MAAM,CAAC;MACpBd,aAAa,CAACc,MAAM,CAAC;MACrBpB,uBAAuB,CAACoB,MAAM,EAAEQ,MAAM,CAAC;MACvC;IACF,KAAK,aAAa;MAChBrB,gBAAgB,CAACa,MAAM,EAAEQ,MAAM,CAAC;MAChC;IACF;MACES,OAAO,CAACO,GAAG,CAAC,wBAAwB,EAAExB,MAAM,CAACW,IAAI,CAAC;EACtD;AACF","ignoreList":[]}

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

@@ -0,0 +1,95 @@
+"use strict";
+
+import { store } from '../../roomStore';
+import { updateRoom } from '../../roomStore/roomsSlice';
+/** Archive ids are microsecond stamps (16 digits today); anything below this is not one. */
+const MIN_ARCHIVE_ID = 1e14;
+export const isArchiveCursor = value => typeof value === 'number' && Number.isFinite(value) && value > MIN_ARCHIVE_ID;
+
+/** What the room held when a page was requested (a page answers later, and the live handler fills the room meanwhile). */
+
+export const snapshotRoomHistory = roomJid => {
+  const messages = store.getState().rooms.rooms?.[roomJid]?.messages || [];
+  let newestId = 0;
+  let hadMessages = false;
+  for (const message of messages) {
+    if (!message || message.id === 'delimiter-new' || message.pending) continue;
+    // Client-only call-log fallbacks never exist on the server.
+    if (String(message.id || '').startsWith('calllog-')) continue;
+    hadMessages = true;
+    const id = Number(message.id);
+    if (isArchiveCursor(id) && id > newestId) newestId = id;
+  }
+  return {
+    hadMessages,
+    newestId
+  };
+};
+/**
+ * Write the SERVER's paging cursor after a page that feeds the live list:
+ * room.messageStats.firstMessageTimestamp is the oldest archive id of the
+ * contiguous history (`<fin><set><first>`), room.historyComplete is the fin's
+ * `complete` flag. Windowed queries never come here.
+ *
+ *  - an older page (before set) moves the cursor back, never forward;
+ *  - a LATEST page must not raise an older cursor when the room already had
+ *    messages (a late answer would send the loader back to a page it holds);
+ *  - a full latest page that starts after everything cached leaves a hole, so
+ *    the cursor restarts at the page's oldest id and the room is not complete.
+ */
+export const applyHistoryPageCursor = (page, request, snapshot) => {
+  if (!page.finSeen || !page.roomJid) return;
+  const room = store.getState().rooms.rooms?.[page.roomJid];
+  if (!room) return;
+  const isLatest = request.before === undefined;
+  const known = room.messageStats;
+  const knownCursor = isArchiveCursor(known?.firstMessageTimestamp) ? known?.firstMessageTimestamp : undefined;
+  let cursor;
+  let complete;
+  if (page.first !== null) {
+    if (!isLatest) {
+      cursor = knownCursor !== undefined ? Math.min(knownCursor, page.first) : page.first;
+      complete = page.complete;
+    } else {
+      const gap = snapshot.newestId > 0 && page.received >= request.max && page.first > snapshot.newestId;
+      if (gap) {
+        cursor = page.first;
+        complete = false;
+      } else {
+        const keepOlder = snapshot.hadMessages && knownCursor !== undefined && knownCursor < page.first;
+        cursor = keepOlder ? knownCursor : page.first;
+        // A latest page proves completeness only when the whole archive fit.
+        if (page.complete) complete = true;
+      }
+    }
+  } else if (!isLatest) {
+    // An older page with nothing in it: the archive has nothing further back.
+    complete = page.complete;
+  } else if (page.complete) {
+    complete = true;
+  }
+  const updates = {};
+  if (typeof complete === 'boolean' && room.historyComplete !== complete) {
+    updates.historyComplete = complete;
+  }
+  const nextFirst = cursor ?? known?.firstMessageTimestamp;
+  const nextLast = isLatest && page.last !== null ? page.last : known?.lastMessageTimestamp;
+  if (cursor !== undefined && cursor !== known?.firstMessageTimestamp || nextLast !== known?.lastMessageTimestamp) {
+    updates.messageStats = {
+      ...(known || {}),
+      ...(nextFirst !== undefined ? {
+        firstMessageTimestamp: nextFirst
+      } : {}),
+      ...(nextLast !== undefined ? {
+        lastMessageTimestamp: nextLast
+      } : {})
+    };
+  }
+  if (Object.keys(updates).length) {
+    store.dispatch(updateRoom({
+      jid: page.roomJid,
+      updates
+    }));
+  }
+};
+//# sourceMappingURL=historyCursor.js.map

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

@@ -0,0 +1 @@
+{"version":3,"names":["store","updateRoom","MIN_ARCHIVE_ID","isArchiveCursor","value","Number","isFinite","snapshotRoomHistory","roomJid","messages","getState","rooms","newestId","hadMessages","message","id","pending","String","startsWith","applyHistoryPageCursor","page","request","snapshot","finSeen","room","isLatest","before","undefined","known","messageStats","knownCursor","firstMessageTimestamp","cursor","complete","first","Math","min","gap","received","max","keepOlder","updates","historyComplete","nextFirst","nextLast","last","lastMessageTimestamp","Object","keys","length","dispatch","jid"],"sourceRoot":"../../../../src","sources":["networking/xmpp/historyCursor.ts"],"mappings":"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","ignoreList":[]}

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

@@ -0,0 +1,12 @@
+"use strict";
+
+/**
+ * MAM query ids. A windowed query (a page around a jump target, a time
+ * lookup) is answered through the same wire as the live history, and the
+ * global stanza handlers see every `<result>` of it. They tell the two apart
+ * by the query id: anything tagged with this prefix belongs to the caller that
+ * asked and must never reach the live message list.
+ */
+export const WINDOW_QUERY_PREFIX = 'window:';
+export const isWindowQueryId = queryId => typeof queryId === 'string' && queryId.startsWith(WINDOW_QUERY_PREFIX);
+//# sourceMappingURL=mamQueryIds.js.map

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

@@ -0,0 +1 @@
+{"version":3,"names":["WINDOW_QUERY_PREFIX","isWindowQueryId","queryId","startsWith"],"sourceRoot":"../../../../src","sources":["networking/xmpp/mamQueryIds.ts"],"mappings":";;AAAA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,OAAO,MAAMA,mBAAmB,GAAG,SAAS;AAE5C,OAAO,MAAMC,eAAe,GAAIC,OAAgB,IAC9C,OAAOA,OAAO,KAAK,QAAQ,IAAIA,OAAO,CAACC,UAAU,CAACH,mBAAmB,CAAC","ignoreList":[]}

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

@@ -3,6 +3,27 @@
 import { store } from '../../roomStore';
 import { addRoomMessages, setReactions } from '../../roomStore/roomsSlice';
 import { applyMamReactions } from '../../helpers/mamReactions';
+/**
+ * Replay an archived reaction into the store. Flagged `fromHistory` so
+ * reactionsMiddleware leaves the room preview alone: a replay must not turn
+ * the last real message into an emoji. (setReactions has no prepare(), so
+ * the flag is added by hand.)
+ */
+export const replayArchivedReaction = (reaction, fallbackRoomJID = '') => {
+  store.dispatch({
+    ...setReactions({
+      roomJID: reaction.roomJID || fallbackRoomJID,
+      messageId: reaction.messageId,
+      from: reaction.from,
+      reactions: reaction.emoji,
+      data: reaction.data,
+      latestReactionTimestamp: reaction.ts
+    }),
+    meta: {
+      fromHistory: true
+    }
+  });
+};
 const pending = new Map();
 const flush = query => {
   // Every step is guarded: a failure in one (a middleware throwing on a
@@ -28,14 +49,7 @@ const flush = query => {
   }
   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
-      }));
+      replayArchivedReaction(reaction, query.roomJID);
     } catch (e) {
       console.warn('[mam] applying a reaction failed', e);
     }