@ethora/chat-component-rn 26.8.1 → 26.8.2

package/lib/module/networking/stanzaHandlers.js

@@ -177,7 +177,8 @@ const onMessageHistory = async stanza => {
     // what senderJID would have held — fall back to it. createMessageFromXml
     // already derives a display name from the jid when senderFirstName/
     // senderLastName are absent.
-    const innerFrom = stanza.getChild('result')?.getChild('forwarded')?.getChild('message')?.attrs?.from || stanza.attrs.from;
+    const forwardedMessage = stanza.getChild('result')?.getChild('forwarded')?.getChild('message');
+    const innerFrom = forwardedMessage?.attrs?.from || stanza.attrs.from;
     const senderJID = data?.attrs?.senderJID || innerFrom;
     if (!data?.attrs || !senderJID) {
       // console.log(
@@ -186,35 +187,47 @@ const onMessageHistory = async stanza => {
       // );
       return;
     }
-    // Parse the FULL stanza the same way the realtime path does (and the
-    // web SDK's history path does): the positional call used here before
-    // read only <data> attrs + <body>, so the <translations> payload and
-    // the <translate source> tag never made it onto archived messages.
-    // Since every transcript is MAM-backfilled on room open, that alone
-    // made translation look completely dead — the translations existed on
-    // the wire and were dropped at this exact parse. getDataFromXml also
-    // supplies xmppId (dedupe against the optimistic copy) and the
-    // resource||senderJID-localpart sender id.
-    const parsed = await getDataFromXml(stanza);
-    const {
-      data: pData,
-      id: pId,
-      body: pBody,
-      ...pRest
-    } = parsed ?? {};
-    const mergedData = {
-      ...(pData || data.attrs)
+    const mergedAttrs = {
+      ...data.attrs
     };
-    if (!mergedData.senderJID) {
-      mergedData.senderJID = senderJID;
+    if (!mergedAttrs.senderJID) {
+      mergedAttrs.senderJID = senderJID;
     }
-    const rawMessage = await createMessageFromXml({
-      data: mergedData,
-      id: pId || id,
-      body: pBody ?? (typeof body === 'string' ? body : body?.getText?.() || ''),
-      ...pRest,
-      isDeleted: !!deleted || !!pRest?.deleted
-    });
+    // The forwarded <message>'s own stanza id is our original send id
+    // (what `xmppId` holds on the live/wrapped paths) - capture it so
+    // this MAM-replayed message dedupes against its live echo /
+    // optimistic pending bubble the same way, instead of never carrying
+    // an xmppId at all.
+    if (forwardedMessage?.attrs?.id) {
+      mergedAttrs.xmppId = forwardedMessage.attrs.id;
+    }
+    const positionalMessage = await createMessageFromXml(mergedAttrs, body, id,
+    // Bug #41: pass the resource-bearing occupant `from`
+    // (room@conference/sender-id) here, not the outer envelope's
+    // `stanza.attrs.from` (which has no resource for a MAM result).
+    // createMessageFromXml derives `user.id` from this field's
+    // resource - the same authoritative source getDataFromXml uses
+    // for live messages - so catch-up rows resolve the correct
+    // sender from the very first render instead of needing a later
+    // correction once the "official" history fetch lands.
+    innerFrom, !!deleted);
+
+    // Translations ride on the archived stanza too (<translations> +
+    // <translate source>), but the positional parse above only reads
+    // <data> attrs + <body>, so every MAM-backfilled message lost them -
+    // translation looked dead on every room open. Parse the full stanza
+    // the way the realtime path does and carry ONLY those two fields over,
+    // so sender/xmppId resolution above (bug #41) stays exactly as is.
+    const parsedFull = await getDataFromXml(stanza).catch(() => undefined);
+    const rawMessage = {
+      ...positionalMessage,
+      ...(parsedFull?.translations ? {
+        translations: parsedFull.translations
+      } : {}),
+      ...(parsedFull?.langSource ? {
+        langSource: parsedFull.langSource
+      } : {})
+    };
 
     // Same call-log transform as the realtime path, applied to archived
     // history so calls received while offline still render as log entries.

package/lib/module/networking/stanzaHandlers.js.map

@@ -1 +1 @@
-{"version":3,"names":["store","addRoom","addRoomMessage","deleteRoomMessage","editRoomMessage","setComposing","setCurrentRoom","setRoomRole","createMessageFromXml","getDataFromXml","setDeleteModal","messageNotificationManager","transformCallLogMessage","translateKey","onRealtimeMessage","stanza","getChild","is","attrs","id","body","archived","data","deleted","console","log","toString","senderJID","from","parsed","pData","pId","pBody","pRest","mergedData","rawMessage","isDeleted","message","getState","chatSettingStore","user","xmppUsername","roomJID","split","dispatch","state","currentUserWallet","walletAddress","toLowerCase","senderJIDLower","String","includes","room","rooms","roomName","title","name","locale","config","i18n","langSource","overrides","strings","senderName","senderFirstName","senderLastName","filter","Boolean","join","trim","showNotification","err","warn","onDeleteMessage","stanzaId","by","messageId","isDeleteModal","onEditMessage","replace","text","onMessageHistory","children","xmlns","delay","innerFrom","getText","handleComposing","currentUser","composingUser","norm","s","senderLocal","selfUser","selfXmppUsername","selfWallet","isSelf","chatJID","composingList","push","fullName","pop","composing","onPresenceInRoom","startsWith","role","onChatInvite","client","type","chatId","xEls","getChildren","el","child","chat","presenceInRoomStanza","getRoomsStanza","onGetMembers","onGetRoomInfo","onGetLastMessageArchive","_xmpp","onNewRoomCreated","xmpp","onGetChatRooms","Array","isArray","forEach","result","currentChatRooms","isRoomAlreadyAdded","Object","values","some","element","jid","roomData","usersCnt","Number","users_cnt","messages","isLoading","roomBg","room_background","icon","room_thumbnail","unreadMessages","lastViewedTimestamp","activeRoomJID","error","e","onMessageError","_stanza","onReactionMessage","onReactionHistory","onRoomKicked"],"sourceRoot":"../../../src","sources":["networking/stanzaHandlers.ts"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["store","addRoom","addRoomMessage","deleteRoomMessage","editRoomMessage","setComposing","setCurrentRoom","setRoomRole","createMessageFromXml","getDataFromXml","setDeleteModal","messageNotificationManager","transformCallLogMessage","translateKey","onRealtimeMessage","stanza","getChild","is","attrs","id","body","archived","data","deleted","console","log","toString","senderJID","from","parsed","pData","pId","pBody","pRest","mergedData","rawMessage","isDeleted","message","getState","chatSettingStore","user","xmppUsername","roomJID","split","dispatch","state","currentUserWallet","walletAddress","toLowerCase","senderJIDLower","String","includes","room","rooms","roomName","title","name","locale","config","i18n","langSource","overrides","strings","senderName","senderFirstName","senderLastName","filter","Boolean","join","trim","showNotification","err","warn","onDeleteMessage","stanzaId","by","messageId","isDeleteModal","onEditMessage","replace","text","onMessageHistory","children","xmlns","delay","forwardedMessage","innerFrom","mergedAttrs","xmppId","positionalMessage","parsedFull","catch","undefined","translations","handleComposing","currentUser","composingUser","norm","s","senderLocal","selfUser","selfXmppUsername","selfWallet","isSelf","chatJID","composingList","push","fullName","pop","composing","onPresenceInRoom","startsWith","role","onChatInvite","client","type","chatId","xEls","getChildren","el","child","chat","presenceInRoomStanza","getRoomsStanza","onGetMembers","onGetRoomInfo","onGetLastMessageArchive","_xmpp","onNewRoomCreated","xmpp","onGetChatRooms","Array","isArray","forEach","result","currentChatRooms","isRoomAlreadyAdded","Object","values","some","element","jid","roomData","usersCnt","Number","users_cnt","messages","isLoading","roomBg","room_background","icon","room_thumbnail","unreadMessages","lastViewedTimestamp","activeRoomJID","error","e","onMessageError","_stanza","onReactionMessage","onReactionHistory","onRoomKicked"],"sourceRoot":"../../../src","sources":["networking/stanzaHandlers.ts"],"mappings":"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","ignoreList":[]}

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

@@ -2,6 +2,7 @@
 
 import { getChatsPrivateStoreRequest } from './getChatsPrivateStoreRequest.xmpp';
 import { setChatsPrivateStoreRequest } from './setChatsPrivateStoreRequest.xmpp';
+import { getServerReadTimestamp, isCorruptFutureReadMarker } from '../../helpers/getServerReadTimestamp';
 /**
  * Merge in-memory lastViewedTimestamp values into the server-side
  * private store. Reads current state, overlays per-room updates, writes
@@ -9,8 +10,11 @@ import { setChatsPrivateStoreRequest } from './setChatsPrivateStoreRequest.xmpp'
  * each other's entries.
  *
  * Called on: tab change away from chat, AppState background/inactive,
- * and (with onlyIfNoUnread=true) logout. ChatRoom's own unmount path
- * still uses actionSetTimestampToPrivateStore for the single-room case.
+ * and (with onlyIfNoUnread=true) logout. ChatRoom's own unmount path also
+ * goes through this (via flushLastViewedToPrivateStoreStanza) for the
+ * single-room case - actionSetTimestampToPrivateStore is a separate,
+ * unconditional low-level write primitive kept for direct/external use
+ * and is not part of this merge path.
  */
 export async function flushLastViewedToPrivateStore(client, rooms, opts = {}) {
   if (!client?.client) {
@@ -18,7 +22,9 @@ export async function flushLastViewedToPrivateStore(client, rooms, opts = {}) {
   }
   const {
     visibleRoomJID,
-    onlyIfNoUnread
+    visibleRoomTs,
+    onlyIfNoUnread,
+    heapState
   } = opts;
   const roomList = Object.values(rooms || {});
   if (roomList.length === 0) {
@@ -33,7 +39,6 @@ export async function flushLastViewedToPrivateStore(client, rooms, opts = {}) {
   if (!storeObj || typeof storeObj !== 'object') {
     storeObj = {};
   }
-  const nowMs = Date.now();
   let dirty = false;
   for (const room of roomList) {
     if (!room?.jid) {
@@ -42,14 +47,30 @@ export async function flushLastViewedToPrivateStore(client, rooms, opts = {}) {
     const isVisible = !!visibleRoomJID && room.jid === visibleRoomJID;
     const hasUnread = Number(room.unreadMessages || 0) > 0;
 
-    // For the visible room, persist "now" — read state is driven by
-    // room visibility, not by a sentinel timestamp.
+    // Newest message this room actually has server-side proof of. Used
+    // both as the "read up to now" fallback for the visible room and as
+    // the yardstick for detecting a corrupt (future) stored marker below
+    // - never as a substitute for the device clock (bug #38: a device
+    // with a fast clock previously stamped Date.now() here, and once
+    // that future value reached the server the forward-only check a few
+    // lines down rejected every later correct write, forever).
+    const newestAckedMs = getServerReadTimestamp(room, heapState);
+
+    // For the visible room, persist "read up to the newest message we
+    // know the server has" - read state is driven by room visibility,
+    // not by a sentinel timestamp. The exception is an explicit
+    // `visibleRoomTs`: the caller knows the user only read up to a
+    // certain point (left the room while scrolled up), so stamping
+    // "everything" here would mark genuinely-unread messages as read.
     let ts;
     if (isVisible) {
-      ts = nowMs;
+      ts = typeof visibleRoomTs === 'number' && visibleRoomTs > 0 ? visibleRoomTs : newestAckedMs || undefined;
     } else if (room.lastViewedTimestamp && room.lastViewedTimestamp > 0) {
       ts = room.lastViewedTimestamp;
     }
+
+    // Nothing to anchor a write to (no boundary, no existing marker, no
+    // known messages yet) - skip rather than write a device-clock guess.
     if (!ts) {
       continue;
     }
@@ -58,7 +79,24 @@ export async function flushLastViewedToPrivateStore(client, rooms, opts = {}) {
     }
     const prev = storeObj[room.jid];
     const prevNum = prev != null ? Number(prev) : 0;
-    if (Number.isFinite(prevNum) && prevNum >= ts) {
+    // A currently-stored value that sits well past the newest message we
+    // know this room has is not "fresher" - it's a leftover future
+    // marker (bug #38). Forward-only logic normally protects a fresher
+    // read from being clobbered by a stale fetch, but applied to a
+    // corrupt future value it does the opposite: it permanently blocks
+    // the correct (smaller) value from ever landing. Detect that case
+    // and waive the forward-only check for it specifically; sane values
+    // keep the normal forward-only protection.
+    //
+    // "Well past the newest message we know about" is deliberately NOT
+    // sufficient on its own - see isCorruptFutureReadMarker. THIS device's
+    // copy of the room can simply be stale (history not synced yet this
+    // session), in which case a legitimate marker written by another
+    // device that HAS seen newer messages looks exactly like a corrupt
+    // one, and "healing" it here would push the server marker BACKWARDS
+    // and resurrect already-read messages on every device.
+    const prevLooksCorrupt = isCorruptFutureReadMarker(prevNum, newestAckedMs);
+    if (!prevLooksCorrupt && Number.isFinite(prevNum) && prevNum >= ts) {
       continue;
     }
     storeObj[room.jid] = String(ts);

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

@@ -1 +1 @@
-{"version":3,"names":["getChatsPrivateStoreRequest","setChatsPrivateStoreRequest","flushLastViewedToPrivateStore","client","rooms","opts","visibleRoomJID","onlyIfNoUnread","roomList","Object","values","length","storeObj","nowMs","Date","now","dirty","room","jid","isVisible","hasUnread","Number","unreadMessages","ts","lastViewedTimestamp","prev","prevNum","isFinite","String","JSON","stringify"],"sourceRoot":"../../../../src","sources":["networking/xmpp/flushLastViewedToPrivateStore.ts"],"mappings":";;AAAA,SAASA,2BAA2B,QAAQ,oCAAoC;AAChF,SAASC,2BAA2B,QAAQ,oCAAoC;AAmBhF;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,OAAO,eAAeC,6BAA6BA,CACjDC,MAAW,EACXC,KAAkD,EAClDC,IAAe,GAAG,CAAC,CAAC,EACF;EAClB,IAAI,CAACF,MAAM,EAAEA,MAAM,EAAE;IAAC,OAAO,KAAK;EAAC;EACnC,MAAM;IAAEG,cAAc;IAAEC;EAAe,CAAC,GAAGF,IAAI;EAC/C,MAAMG,QAAQ,GAAGC,MAAM,CAACC,MAAM,CAACN,KAAK,IAAI,CAAC,CAAC,CAAC;EAC3C,IAAII,QAAQ,CAACG,MAAM,KAAK,CAAC,EAAE;IAAC,OAAO,KAAK;EAAC;EAEzC,IAAIC,QAAa,GAAG,IAAI;EACxB,IAAI;IACFA,QAAQ,GAAG,MAAMZ,2BAA2B,CAACG,MAAM,CAACA,MAAM,CAAC;EAC7D,CAAC,CAAC,MAAM;IACNS,QAAQ,GAAG,IAAI;EACjB;EACA,IAAI,CAACA,QAAQ,IAAI,OAAOA,QAAQ,KAAK,QAAQ,EAAE;IAACA,QAAQ,GAAG,CAAC,CAAC;EAAC;EAE9D,MAAMC,KAAK,GAAGC,IAAI,CAACC,GAAG,CAAC,CAAC;EACxB,IAAIC,KAAK,GAAG,KAAK;EAEjB,KAAK,MAAMC,IAAI,IAAIT,QAAQ,EAAE;IAC3B,IAAI,CAACS,IAAI,EAAEC,GAAG,EAAE;MAAC;IAAS;IAC1B,MAAMC,SAAS,GAAG,CAAC,CAACb,cAAc,IAAIW,IAAI,CAACC,GAAG,KAAKZ,cAAc;IACjE,MAAMc,SAAS,GAAGC,MAAM,CAACJ,IAAI,CAACK,cAAc,IAAI,CAAC,CAAC,GAAG,CAAC;;IAEtD;IACA;IACA,IAAIC,EAAsB;IAC1B,IAAIJ,SAAS,EAAE;MACbI,EAAE,GAAGV,KAAK;IACZ,CAAC,MAAM,IAAII,IAAI,CAACO,mBAAmB,IAAIP,IAAI,CAACO,mBAAmB,GAAG,CAAC,EAAE;MACnED,EAAE,GAAGN,IAAI,CAACO,mBAAmB;IAC/B;IAEA,IAAI,CAACD,EAAE,EAAE;MAAC;IAAS;IACnB,IAAIhB,cAAc,IAAIa,SAAS,IAAI,CAACD,SAAS,EAAE;MAAC;IAAS;IAEzD,MAAMM,IAAI,GAAGb,QAAQ,CAACK,IAAI,CAACC,GAAG,CAAC;IAC/B,MAAMQ,OAAO,GAAGD,IAAI,IAAI,IAAI,GAAGJ,MAAM,CAACI,IAAI,CAAC,GAAG,CAAC;IAC/C,IAAIJ,MAAM,CAACM,QAAQ,CAACD,OAAO,CAAC,IAAIA,OAAO,IAAIH,EAAE,EAAE;MAAC;IAAS;IACzDX,QAAQ,CAACK,IAAI,CAACC,GAAG,CAAC,GAAGU,MAAM,CAACL,EAAE,CAAC;IAC/BP,KAAK,GAAG,IAAI;EACd;EAEA,IAAI,CAACA,KAAK,EAAE;IAAC,OAAO,KAAK;EAAC;EAE1B,IAAI;IACF,MAAMf,2BAA2B,CAACE,MAAM,CAACA,MAAM,EAAE0B,IAAI,CAACC,SAAS,CAAClB,QAAQ,CAAC,CAAC;IAC1E,OAAO,IAAI;EACb,CAAC,CAAC,MAAM;IACN,OAAO,KAAK;EACd;AACF","ignoreList":[]}
+{"version":3,"names":["getChatsPrivateStoreRequest","setChatsPrivateStoreRequest","getServerReadTimestamp","isCorruptFutureReadMarker","flushLastViewedToPrivateStore","client","rooms","opts","visibleRoomJID","visibleRoomTs","onlyIfNoUnread","heapState","roomList","Object","values","length","storeObj","dirty","room","jid","isVisible","hasUnread","Number","unreadMessages","newestAckedMs","ts","undefined","lastViewedTimestamp","prev","prevNum","prevLooksCorrupt","isFinite","String","JSON","stringify"],"sourceRoot":"../../../../src","sources":["networking/xmpp/flushLastViewedToPrivateStore.ts"],"mappings":"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","ignoreList":[]}

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

@@ -55,7 +55,14 @@ export const presenceInRoom = async (client, roomJID, delay = 2000) => {
       try {
         await createTimeoutPromise(2000, unsubscribe);
       } catch (err) {
-        reject(err);
+        // The room's reply schedules resolve() `delay` ms later (2000 by
+        // default) — the same length as this timeout, so the timeout used
+        // to win the race and reject a join that had actually succeeded
+        // (allRoomPresences "failed" with undefined on every bootstrap).
+        // Only a join that never got an answer is a failure.
+        if (!settled) {
+          reject(err);
+        }
       }
     })();
   });

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;QACZnB,MAAM,CAACmB,GAAG,CAAC;MACb;IACF,CAAC,EAAE,CAAC;EACN,CAAC,CAAC;AACJ,CAAC","ignoreList":[]}
+{"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":[]}

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

@@ -2,8 +2,9 @@
 
 import { xml } from '@xmpp/client';
 import { createTimeoutPromise } from './createTimeoutPromise.xmpp';
+let subscribeIdCounter = 0;
 export async function subscribeToRoomMessages(client, roomJID, userNick) {
-  const id = `newSubscription:${Date.now().toString()}`;
+  const id = `newSubscription:${Date.now().toString(36)}-${(++subscribeIdCounter).toString(36)}`;
   let stanzaHandler;
   const unsubscribe = () => {
     if (stanzaHandler) {
@@ -27,6 +28,9 @@ export async function subscribeToRoomMessages(client, roomJID, userNick) {
         if (stanza.attrs.type === 'result') {
           finish(resolve, true);
         } else if (stanza.attrs.type === 'error') {
+          const errorEl = typeof stanza.getChild === 'function' ? stanza.getChild('error') : null;
+          const condition = errorEl?.children?.find(c => c?.name && c.name !== 'text');
+          console.warn('[PushService] MucSub subscribe error for', roomJID, condition?.name ?? 'unknown');
           finish(resolve, false);
         }
       }

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

@@ -1 +1 @@
-{"version":3,"names":["xml","createTimeoutPromise","subscribeToRoomMessages","client","roomJID","userNick","id","Date","now","toString","stanzaHandler","unsubscribe","off","Promise","resolve","reject","settled","finish","cb","value","setTimeout","stanza","is","attrs","type","on","nick","jid","getLocal","subscribeStanza","to","xmlns","node","send","error","console","catch"],"sourceRoot":"../../../../src","sources":["networking/xmpp/subscribeToRoomMessages.xmpp.ts"],"mappings":";;AAAA,SAAiBA,GAAG,QAAQ,cAAc;AAE1C,SAASC,oBAAoB,QAAQ,6BAA6B;AAElE,OAAO,eAAeC,uBAAuBA,CAC3CC,MAAc,EACdC,OAAe,EACfC,QAAiB,EACC;EAClB,MAAMC,EAAE,GAAG,mBAAmBC,IAAI,CAACC,GAAG,CAAC,CAAC,CAACC,QAAQ,CAAC,CAAC,EAAE;EACrD,IAAIC,aAAwC;EAE5C,MAAMC,WAAW,GAAGA,CAAA,KAAM;IACxB,IAAID,aAAa,EAAE;MACjBP,MAAM,CAACS,GAAG,CAAC,QAAQ,EAAEF,aAAa,CAAC;IACrC;EACF,CAAC;EAED,OAAO,IAAIG,OAAO,CAAC,CAACC,OAAO,EAAEC,MAAM,KAAK;IACtC,IAAIC,OAAO,GAAG,KAAK;IAEnB,MAAMC,MAAM,GAAGA,CAACC,EAAyB,EAAEC,KAAW,KAAK;MACzD,IAAIH,OAAO,EAAE;QAAC;MAAO;MACrBA,OAAO,GAAG,IAAI;MACdI,UAAU,CAAC,MAAM;QACfT,WAAW,CAAC,CAAC;QACbO,EAAE,CAACC,KAAK,CAAC;MACX,CAAC,EAAE,GAAG,CAAC;IACT,CAAC;IAEDT,aAAa,GAAIW,MAAe,IAAK;MACnC,IAAIA,MAAM,CAACC,EAAE,CAAC,IAAI,CAAC,IAAID,MAAM,CAACE,KAAK,CAACjB,EAAE,KAAKA,EAAE,EAAE;QAC7C,IAAIe,MAAM,CAACE,KAAK,CAACC,IAAI,KAAK,QAAQ,EAAE;UAClCP,MAAM,CAACH,OAAO,EAAE,IAAI,CAAC;QACvB,CAAC,MAAM,IAAIO,MAAM,CAACE,KAAK,CAACC,IAAI,KAAK,OAAO,EAAE;UACxCP,MAAM,CAACH,OAAO,EAAE,KAAK,CAAC;QACxB;MACF;IACF,CAAC;IAEDX,MAAM,CAACsB,EAAE,CAAC,QAAQ,EAAEf,aAAa,CAAC;IAElC,MAAMgB,IAAI,GAAGrB,QAAQ,IAAIF,MAAM,CAACwB,GAAG,EAAEC,QAAQ,CAAC,CAAC,IAAI,EAAE;IAErD,MAAMC,eAAe,GAAG7B,GAAG,CACzB,IAAI,EACJ;MACE8B,EAAE,EAAE1B,OAAO;MACXoB,IAAI,EAAE,KAAK;MACXlB,EAAE,EAAEA;IACN,CAAC,EACDN,GAAG,CACD,WAAW,EACX;MAAE+B,KAAK,EAAE,mBAAmB;MAAEL,IAAI,EAAEA;IAAK,CAAC,EAC1C1B,GAAG,CAAC,OAAO,EAAE;MAAEgC,IAAI,EAAE;IAAiC,CAAC,CACzD,CACF,CAAC;IAED,IAAI;MACF7B,MAAM,CAAC8B,IAAI,CAACJ,eAAe,CAAC;IAC9B,CAAC,CAAC,OAAOK,KAAK,EAAE;MACdvB,WAAW,CAAC,CAAC;MACbwB,OAAO,CAACD,KAAK,CAAC,iCAAiC,EAAEA,KAAK,CAAC;MACvDnB,MAAM,CAACmB,KAAK,CAAC;MACb;IACF;IAEAjC,oBAAoB,CAAC,IAAI,EAAEU,WAAW,CAAC,CAACyB,KAAK,CAAC,MAAM;MAClD,IAAI,CAACpB,OAAO,EAAE;QACZC,MAAM,CAACF,MAAM,EAAE,KAAK,CAAC;MACvB;IACF,CAAC,CAAC;EACJ,CAAC,CAAC;AACJ","ignoreList":[]}
+{"version":3,"names":["xml","createTimeoutPromise","subscribeIdCounter","subscribeToRoomMessages","client","roomJID","userNick","id","Date","now","toString","stanzaHandler","unsubscribe","off","Promise","resolve","reject","settled","finish","cb","value","setTimeout","stanza","is","attrs","type","errorEl","getChild","condition","children","find","c","name","console","warn","on","nick","jid","getLocal","subscribeStanza","to","xmlns","node","send","error","catch"],"sourceRoot":"../../../../src","sources":["networking/xmpp/subscribeToRoomMessages.xmpp.ts"],"mappings":"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","ignoreList":[]}

package/lib/module/networking/xmppClient.js

@@ -28,6 +28,7 @@ import { normalizeRoomJid } from '../helpers/normalizeRoomJid';
 import { store } from '../roomStore';
 import { applyPrivateStoreMarkers } from '../roomStore/roomsSlice';
 import { clearOutboundSends, enqueueOutboundSend, flushOutboundSends } from './outboundQueue';
+import { getServerReadTimestamp, isCorruptFutureReadMarker } from '../helpers/getServerReadTimestamp';
 
 // Canonical production XMPP WSS endpoint (standard wss/443, no port suffix).
 const DEFAULT_DEV_SERVER = 'xmpp.chat.ethora.com';
@@ -74,6 +75,12 @@ function isNotAuthorizedError(err) {
   const message = (err?.message || err?.text || '').toString();
   return /not-authorized|SASLError/i.test(message);
 }
+/**
+ * Floor between two credential rotations driven by reconnects. Well under
+ * the XMPP password's one-hour life, but high enough that a link flapping
+ * every few seconds rotates once, not thirty times.
+ */
+const CREDENTIALS_REFRESH_MIN_INTERVAL_MS = 60_000;
 export class XmppClient {
   host = '';
   service = '';
@@ -107,6 +114,12 @@ export class XmppClient {
   // derived XMPP password after idle). Triggers the credentialsProvider
   // refresh path in reconnect().
   lastAuthError = null;
+  /**
+   * When the credentials currently held were last (re)minted. Drives the
+   * throttle in `reconnect()` so a flapping connection can't rotate the
+   * session once per flap.
+   */
+  credentialsRefreshedAt = 0;
   credentialsProvider = null;
   credentialsRefreshInFlight = null;
   // Fired by the provider on every 'online' so it can re-join MUC rooms
@@ -299,6 +312,7 @@ export class XmppClient {
     }
   }
   initializeClient() {
+    this.clientAlreadyStopped = false;
     try {
       const devServer = this.devServer || DEFAULT_DEV_SERVER;
       const url = `wss://${devServer}/ws`;
@@ -654,14 +668,29 @@ export class XmppClient {
     this.reconnecting = true;
     console.log('Attempting to reconnect xmpp client...');
     try {
-      // If the last failure was a SASL `not-authorized` (typically a stale
-      // JWT-derived XMPP password after idle), try to fetch fresh creds
-      // before retrying. Without this, reconnect retries with the same
-      // stale password forever and the user has to kill the app.
-      if (this.lastAuthError === 'not-authorized' && this.credentialsProvider) {
+      // Re-mint credentials BEFORE reconnecting.
+      //
+      // This deliberately no longer waits for a SASL `not-authorized`.
+      // The XMPP password expires after an hour, and an expiry does NOT
+      // drop an established connection — authentication happens once, at
+      // bind. So by the time anything disconnects us (a network blip, a
+      // sleeping device, a server restart) the password we still hold may
+      // well be dead, and we have no way to know. Reconnecting with it
+      // burns a guaranteed-failed bind plus a backoff delay before the
+      // old `lastAuthError` path could even start recovering.
+      //
+      // Throttled, because reconnects are not rare: a flapping link would
+      // otherwise rotate the whole session (access + refresh + file token
+      // + XMPP password) once per flap. A SASL failure bypasses the
+      // throttle — there the credentials are known bad.
+      const authFailed = this.lastAuthError === 'not-authorized';
+      const staleCreds = Date.now() - this.credentialsRefreshedAt >= CREDENTIALS_REFRESH_MIN_INTERVAL_MS;
+      if (this.credentialsProvider && (authFailed || staleCreds)) {
         try {
           await this.refreshCredentialsOnce();
         } catch (err) {
+          // Offline is the common case here — reconnect with what we
+          // have and let the next attempt try again.
           console.warn('XMPP credential refresh failed; reconnecting with cached creds', err);
         }
       }
@@ -672,7 +701,10 @@ export class XmppClient {
       // `this.client` still points at the old client — i.e. before
       // initializeClient() reassigns it.
       const old = this.client;
-      if (old) {
+      if (old && this.clientAlreadyStopped) {
+        this.detachEventListeners();
+        this.clientAlreadyStopped = false;
+      } else if (old) {
         this.detachEventListeners();
         // NEVER await a bare stop(): on a half-dead socket (the exact case
         // we're reconnecting for) @xmpp/client's stop() can hang forever
@@ -687,6 +719,9 @@ export class XmppClient {
         await withTimeout(old.stop(), STOP_TIMEOUT_MS);
       }
       this.initializeClient();
+      if (this.suspendedForBackground) {
+        await this.stopClientQuietly();
+      }
     } finally {
       this.reconnecting = false;
     }
@@ -718,6 +753,7 @@ export class XmppClient {
           // creds really are stale we simply get not-authorized again and
           // retry, which is the confirmed-good 26.5.7 behaviour.
           this.updateCredentials(fresh.username, fresh.password);
+          this.credentialsRefreshedAt = Date.now();
           this.lastAuthError = null;
         }
       } finally {
@@ -726,6 +762,53 @@ export class XmppClient {
     })();
     return this.credentialsRefreshInFlight;
   }
+  suspendedForBackground = false;
+  clientAlreadyStopped = false;
+  async stopClientQuietly() {
+    const c = this.client;
+    if (c) {
+      const sock = c.socket;
+      if (sock && typeof sock.end === 'function') {
+        try {
+          sock.end();
+        } catch {}
+        try {
+          if (c.status !== 'offline') c._status?.('offline');
+        } catch {}
+      } else {
+        await withTimeout(Promise.resolve(c.stop()).catch(() => undefined), STOP_TIMEOUT_MS);
+      }
+      this.clientAlreadyStopped = true;
+    }
+    this.status = 'offline';
+    this.presencesReady = false;
+  }
+  async suspend() {
+    if (this.suspendedForBackground) {
+      return;
+    }
+    this.suspendedForBackground = true;
+    this.suppressReconnect = true;
+    if (this.reconnectTimer) {
+      clearTimeout(this.reconnectTimer);
+      this.reconnectTimer = null;
+    }
+    await this.stopClientQuietly();
+    console.log('XMPP suspended (background).');
+  }
+
+  /** Back in the foreground: allow reconnects again and reconnect at once. */
+  resume() {
+    if (!this.suspendedForBackground) {
+      return;
+    }
+    this.suspendedForBackground = false;
+    this.suppressReconnect = false;
+    this.forceReconnect();
+  }
+  get isSuspended() {
+    return this.suspendedForBackground;
+  }
   async disconnect(options) {
     if (options?.suppressReconnect) {
       this.suppressReconnect = true;
@@ -862,9 +945,35 @@ export class XmppClient {
       // `getChatsPrivateStoreRequest` directly and intentionally skip this.
       if (markers && typeof markers === 'object') {
         const normalized = {};
+        const roomsState = store.getState().rooms?.rooms || {};
+        const heapState = store.getState().roomHeapSlice;
         for (const jid of Object.keys(markers)) {
           const n = Number(markers[jid]);
-          if (jid && Number.isFinite(n) && n > 0) {
+          if (!jid || !Number.isFinite(n) || n <= 0) {
+            continue;
+          }
+          // Defensive clamp (bug #38): a marker written while some
+          // device's clock was ahead can land in the future relative to
+          // the newest message the server actually has for this room.
+          // The redux merge (applyPrivateStoreMarkers) and the
+          // server-side merge (flushLastViewedToPrivateStore) both treat
+          // "newer" as "better", so an uncorrected future value would
+          // block every later correct write forever - useUnread() would
+          // report 0 for that room on every cold start. When we already
+          // know this room's messages locally, clamp an implausible
+          // marker down to the newest one we actually have instead of
+          // trusting the server value verbatim.
+          //
+          // "Implausible" needs BOTH "past the newest message we know
+          // about" AND "past real time" (isCorruptFutureReadMarker):
+          // this device's cache for a room is routinely stale, and
+          // clamping on staleness alone would drag a perfectly good
+          // marker written by another device backwards.
+          const room = roomsState[jid];
+          const newestKnownMs = room ? getServerReadTimestamp(room, heapState) : 0;
+          if (isCorruptFutureReadMarker(n, newestKnownMs)) {
+            normalized[jid] = newestKnownMs;
+          } else {
             normalized[jid] = n;
           }
         }
@@ -895,7 +1004,14 @@ export class XmppClient {
       return false;
     }
     try {
-      return await flushLastViewedToPrivateStore(this, rooms, opts);
+      // Auto-inject the pending/failed-send heap so every caller gets
+      // getServerReadTimestamp's exclusion of optimistic messages for
+      // free, without needing to reach into the redux store themselves.
+      const heapState = store.getState().roomHeapSlice;
+      return await flushLastViewedToPrivateStore(this, rooms, {
+        ...opts,
+        heapState
+      });
     } catch {
       return false;
     }