@ethora/chat-component-rn 26.8.1 → 26.8.3

package/lib/commonjs/helpers/historyPreloadScheduler.js

@@ -13,6 +13,13 @@ const DEFAULT_CONCURRENCY = 3;
 // `mergeHistoryIntoCache` rarely has to fall back to clear-and-replace.
 const DEFAULT_PAGE_SIZE = 20;
 const DEFAULT_RETRY_LIMIT = 2;
+// When the first page is entirely unread (every fetched message is newer
+// than `lastViewedTimestamp`), the true unread count could be far bigger
+// than `pageSize` — `useUnread()` only ever sees what's been loaded. Page
+// further back, up to this many extra fetches, until we either find the
+// boundary or give up (`unreadCapped` then stays true so callers at least
+// know the count is a floor, not exact). Customer-reported #34.
+const MAX_UNREAD_CATCHUP_PAGES = 8;
 const sleep = ms => new Promise(resolve => setTimeout(resolve, ms));
 const messageTimestamp = m => {
   if (!m) {
@@ -184,11 +191,67 @@ const runHistoryPreloadScheduler = async options => {
               throw new Error('history_timeout');
             }
             const nextRoom = _roomStore.store.getState().rooms.rooms[item.jid];
-            const unreadCapped = computeUnreadCapped(nextRoom, fetchedMessages || [], pageSize);
+            let combined = fetchedMessages || [];
+            const lastViewed = Number(nextRoom?.lastViewedTimestamp) || 0;
+
+            // The first page was entirely unread — keep paging older until
+            // we find a message at/before `lastViewedTimestamp` (the true
+            // boundary) or run out of catch-up budget, so the count isn't
+            // silently truncated at `pageSize`.
+            if (lastViewed > 0 && computeUnreadCapped(nextRoom, combined, pageSize)) {
+              let lastPageLen = combined.length;
+              let extraPages = 0;
+              while (extraPages < MAX_UNREAD_CATCHUP_PAGES && lastPageLen >= pageSize && !signal?.aborted) {
+                const oldestId = combined.reduce((min, m) => {
+                  const idNum = Number(m?.id);
+                  if (!Number.isFinite(idNum)) {
+                    return min;
+                  }
+                  return min === null || idNum < min ? idNum : min;
+                }, null);
+                if (oldestId === null) {
+                  break;
+                }
+                let older;
+                try {
+                  older = await client.getHistoryStanza(item.jid, pageSize, oldestId, undefined, {
+                    coalesceRoom: true,
+                    skipIfPreloaded: !forceReload,
+                    source: 'background'
+                  });
+                } catch {
+                  break;
+                }
+                if (!older || !older.length) {
+                  break;
+                }
+                combined = [...older, ...combined];
+                lastPageLen = older.length;
+                extraPages++;
+                const oldestTs = combined.reduce((minTs, m) => {
+                  const ts = messageTimestamp(m);
+                  return ts > 0 ? Math.min(minTs, ts) : minTs;
+                }, Number.MAX_SAFE_INTEGER);
+                if (oldestTs !== Number.MAX_SAFE_INTEGER && oldestTs <= lastViewed) {
+                  break;
+                }
+              }
+            }
+
+            // `mergeHistoryIntoCache` (roomsSlice) caps whatever we dispatch
+            // here to the newest RUNTIME_MESSAGE_LIMIT messages before it
+            // ever reaches `unreadMiddleware` — so a catch-up fetch that
+            // pulled the true boundary can still have it silently dropped
+            // by that cap, leaving a falsely-confident `unreadCapped:false`
+            // (bug #34's failure mode again, just one layer downstream).
+            // Simulate that cap here so the flag reflects what will
+            // actually survive, not just what this fetch retrieved.
+            const simulatedStored = combined.length > _roomsSlice.RUNTIME_MESSAGE_LIMIT ? combined.slice(-_roomsSlice.RUNTIME_MESSAGE_LIMIT) : combined;
+            const unreadCapped = computeUnreadCapped(nextRoom, simulatedStored, pageSize);
             _roomStore.store.dispatch((0, _roomsSlice.applyRoomsPreloadBatch)({
               rooms: [{
                 jid: item.jid,
-                messages: fetchedMessages || [],
+                messages: combined,
                 unreadCapped,
                 historyPreloadState: 'done'
               }]

package/lib/commonjs/helpers/historyPreloadScheduler.js.map

@@ -1 +1 @@
-{"version":3,"names":["_reactNative","require","_roomStore","_roomsSlice","DEFAULT_CONCURRENCY","DEFAULT_PAGE_SIZE","DEFAULT_RETRY_LIMIT","sleep","ms","Promise","resolve","setTimeout","messageTimestamp","m","t","timestamp","Number","isFinite","id","getRoomLastActivityScore","room","messages","length","reduce","max","Math","computeUnreadCapped","pageSize","historyComplete","countable","filter","msg","pending","lastViewed","lastViewedTimestamp","oldestTs","minTs","ts","min","MAX_SAFE_INTEGER","getRoomPriority","jid","_room","selectedRoomJid","defaultRoomJids","has","shouldPauseForVisibility","AppState","currentState","runHistoryPreloadScheduler","options","client","signal","concurrency","retryLimit","roomLimit","forceReload","aborted","store","dispatch","setUnreadSyncing","state","getState","rooms","defaultSet","Set","sortedQueue","Object","entries","map","priority","activityScore","attempts","readyAt","Date","now","sort","a","b","localeCompare","queue","slice","inFlightByRoom","Map","consecutiveErrorCount","isActiveRoomGateOpen","readyItems","item","batch","preBatchPreloadStateByJid","historyPreloadState","applyRoomsPreloadBatch","all","queueIndex","findIndex","queued","splice","task","currentRoom","preState","get","fetchedMessages","getHistoryStanza","undefined","coalesceRoom","skipIfPreloaded","source","Error","nextRoom","unreadCapped","retries","canRetry","jitter","floor","random","backoff","push","set","finally","delete","r","exports","_default","default"],"sourceRoot":"../../../src","sources":["helpers/historyPreloadScheduler.ts"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["_reactNative","require","_roomStore","_roomsSlice","DEFAULT_CONCURRENCY","DEFAULT_PAGE_SIZE","DEFAULT_RETRY_LIMIT","MAX_UNREAD_CATCHUP_PAGES","sleep","ms","Promise","resolve","setTimeout","messageTimestamp","m","t","timestamp","Number","isFinite","id","getRoomLastActivityScore","room","messages","length","reduce","max","Math","computeUnreadCapped","pageSize","historyComplete","countable","filter","msg","pending","lastViewed","lastViewedTimestamp","oldestTs","minTs","ts","min","MAX_SAFE_INTEGER","getRoomPriority","jid","_room","selectedRoomJid","defaultRoomJids","has","shouldPauseForVisibility","AppState","currentState","runHistoryPreloadScheduler","options","client","signal","concurrency","retryLimit","roomLimit","forceReload","aborted","store","dispatch","setUnreadSyncing","state","getState","rooms","defaultSet","Set","sortedQueue","Object","entries","map","priority","activityScore","attempts","readyAt","Date","now","sort","a","b","localeCompare","queue","slice","inFlightByRoom","Map","consecutiveErrorCount","isActiveRoomGateOpen","readyItems","item","batch","preBatchPreloadStateByJid","historyPreloadState","applyRoomsPreloadBatch","all","queueIndex","findIndex","queued","splice","task","currentRoom","preState","get","fetchedMessages","getHistoryStanza","undefined","coalesceRoom","skipIfPreloaded","source","Error","nextRoom","combined","lastPageLen","extraPages","oldestId","idNum","older","simulatedStored","RUNTIME_MESSAGE_LIMIT","unreadCapped","retries","canRetry","jitter","floor","random","backoff","push","set","finally","delete","r","exports","_default","default"],"sourceRoot":"../../../src","sources":["helpers/historyPreloadScheduler.ts"],"mappings":"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","ignoreList":[]}

package/lib/commonjs/helpers/initXmppRooms.js

@@ -5,9 +5,9 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 var _roomsSlice = require("../roomStore/roomsSlice");
-var _updatedChatLastTimestamps = require("./updatedChatLastTimestamps");
 var _initRoomsPresence = require("./initRoomsPresence");
 var _roomStore = require("../roomStore");
+var _authRefresh = require("../networking/authRefresh");
 const initXmppRooms = async (user, config, xmmpClient, rooms, roomJID) => {
   if (roomJID) {
     _roomStore.store.dispatch((0, _roomsSlice.setCurrentRoom)({
@@ -43,16 +43,22 @@ const initXmppRooms = async (user, config, xmmpClient, rooms, roomJID) => {
         console.log(res);
       }
 
-      //@ts-ignore
-      const roomTimestampObject = await xmmpClient.getChatsPrivateStoreRequestStanza();
-      (0, _updatedChatLastTimestamps.updatedChatLastTimestamps)(roomTimestampObject, _roomStore.store.dispatch);
+      // getChatsPrivateStoreRequestStanza hydrates redux itself
+      // (dispatch(applyPrivateStoreMarkers(...)) internally, clamped +
+      // forward-only) - do not also apply the raw return value here. That
+      // used to double-dispatch via updatedChatLastTimestamps' unconditional
+      // setLastViewedTimestamp, which has neither the forward-only guard
+      // nor the future-marker clamp, so it could silently re-clobber a
+      // value the clamp had just corrected (bug #38).
+      await xmmpClient.getChatsPrivateStoreRequestStanza();
     } else {
-      //@ts-ignore
-      const roomTimestampObject = await xmmpClient.getChatsPrivateStoreRequestStanza();
-      (0, _updatedChatLastTimestamps.updatedChatLastTimestamps)(roomTimestampObject, _roomStore.store.dispatch);
+      await xmmpClient.getChatsPrivateStoreRequestStanza();
     }
     if (config?.refreshTokens?.enabled) {
-      config?.refreshTokens?.refreshFunction?.();
+      // Was a bare call to the consumer-supplied refreshFunction, i.e. a
+      // rotation completely outside the SDK's lock. Routed through the
+      // one rotation point, which calls that same function internally.
+      (0, _authRefresh.refreshAuthTokensQuietly)();
     }
   } catch (error) {
     console.error(error);

package/lib/commonjs/helpers/initXmppRooms.js.map

@@ -1 +1 @@
-{"version":3,"names":["_roomsSlice","require","_updatedChatLastTimestamps","_initRoomsPresence","_roomStore","initXmppRooms","user","config","xmmpClient","rooms","roomJID","store","dispatch","setCurrentRoom","defaultWallet","walletAddress","console","log","Object","keys","length","initRoomsPresence","newArch","res","getRoomsStanza","roomTimestampObject","getChatsPrivateStoreRequestStanza","updatedChatLastTimestamps","refreshTokens","enabled","refreshFunction","error","setIsLoading","loading","_default","exports","default"],"sourceRoot":"../../../src","sources":["helpers/initXmppRooms.tsx"],"mappings":";;;;;;AAAA,IAAAA,WAAA,GAAAC,OAAA;AACA,IAAAC,0BAAA,GAAAD,OAAA;AACA,IAAAE,kBAAA,GAAAF,OAAA;AAGA,IAAAG,UAAA,GAAAH,OAAA;AAEA,MAAMI,aAAa,GAAG,MAAAA,CACpBC,IAAU,EACVC,MAAe,EACfC,UAAsB,EACtBC,KAAgC,EAChCC,OAAgB,KACb;EACH,IAAIA,OAAO,EAAE;IACXC,gBAAK,CAACC,QAAQ,CAAC,IAAAC,0BAAc,EAAC;MAAEH,OAAO,EAAEA;IAAQ,CAAC,CAAC,CAAC;EACtD;EAEA,IAAI;IACF,IAAI,CAACJ,IAAI,CAACQ,aAAa,IAAI,CAACR,IAAI,CAACQ,aAAa,CAACC,aAAa,EAAE;MAC5DC,OAAO,CAACC,GAAG,CAAC,gBAAgB,CAAC;MAC7B;IACF;IAEA,IAAI,CAACT,UAAU,EAAE;MACfQ,OAAO,CAACC,GAAG,CAAC,iCAAiC,CAAC;MAE9C,IAAIR,KAAK,IAAIS,MAAM,CAACC,IAAI,CAACV,KAAK,CAAC,CAACW,MAAM,GAAG,CAAC,EAAE;QAC1C,MAAM,IAAAC,oCAAiB,EAACb,UAAU,EAAEC,KAAK,CAAC;MAC5C,CAAC,MAAM;QACL,IAAIF,MAAM,EAAEe,OAAO,EAAE;UACnB;UACA;UACA;UACA;UACA;UACA;UACA;UACA;UACA;UACA;UACA;UACA;UACA;QACF;QACA,MAAMC,GAAG,GAAG,MAAOf,UAAU,CAAuBgB,cAAc,CAAC,CAAC;QACpER,OAAO,CAACC,GAAG,CAACM,GAAG,CAAC;MAClB;;MAEA;MACA,MAAME,mBAAqD,GACzD,MAAOjB,UAAU,CAAuBkB,iCAAiC,CAAC,CAAC;MAC7E,IAAAC,oDAAyB,EAACF,mBAAmB,EAAEd,gBAAK,CAACC,QAAQ,CAAC;IAChE,CAAC,MAAM;MACL;MACA,MAAMa,mBAAqD,GACzD,MAAMjB,UAAU,CAACkB,iCAAiC,CAAC,CAAC;MACtD,IAAAC,oDAAyB,EAACF,mBAAmB,EAAEd,gBAAK,CAACC,QAAQ,CAAC;IAChE;IAEA,IAAIL,MAAM,EAAEqB,aAAa,EAAEC,OAAO,EAAE;MAClCtB,MAAM,EAAEqB,aAAa,EAAEE,eAAe,GAAG,CAAC;IAC5C;EACF,CAAC,CAAC,OAAOC,KAAK,EAAE;IACdf,OAAO,CAACe,KAAK,CAACA,KAAK,CAAC;EACtB,CAAC,SAAS;IACRpB,gBAAK,CAACC,QAAQ,CAAC,IAAAoB,wBAAY,EAAC;MAAEC,OAAO,EAAE;IAAM,CAAC,CAAC,CAAC;EAClD;AACF,CAAC;AAAC,IAAAC,QAAA,GAAAC,OAAA,CAAAC,OAAA,GAEa/B,aAAa","ignoreList":[]}
+{"version":3,"names":["_roomsSlice","require","_initRoomsPresence","_roomStore","_authRefresh","initXmppRooms","user","config","xmmpClient","rooms","roomJID","store","dispatch","setCurrentRoom","defaultWallet","walletAddress","console","log","Object","keys","length","initRoomsPresence","newArch","res","getRoomsStanza","getChatsPrivateStoreRequestStanza","refreshTokens","enabled","refreshAuthTokensQuietly","error","setIsLoading","loading","_default","exports","default"],"sourceRoot":"../../../src","sources":["helpers/initXmppRooms.tsx"],"mappings":";;;;;;AAAA,IAAAA,WAAA,GAAAC,OAAA;AACA,IAAAC,kBAAA,GAAAD,OAAA;AAGA,IAAAE,UAAA,GAAAF,OAAA;AACA,IAAAG,YAAA,GAAAH,OAAA;AAEA,MAAMI,aAAa,GAAG,MAAAA,CACpBC,IAAU,EACVC,MAAe,EACfC,UAAsB,EACtBC,KAAgC,EAChCC,OAAgB,KACb;EACH,IAAIA,OAAO,EAAE;IACXC,gBAAK,CAACC,QAAQ,CAAC,IAAAC,0BAAc,EAAC;MAAEH,OAAO,EAAEA;IAAQ,CAAC,CAAC,CAAC;EACtD;EAEA,IAAI;IACF,IAAI,CAACJ,IAAI,CAACQ,aAAa,IAAI,CAACR,IAAI,CAACQ,aAAa,CAACC,aAAa,EAAE;MAC5DC,OAAO,CAACC,GAAG,CAAC,gBAAgB,CAAC;MAC7B;IACF;IAEA,IAAI,CAACT,UAAU,EAAE;MACfQ,OAAO,CAACC,GAAG,CAAC,iCAAiC,CAAC;MAE9C,IAAIR,KAAK,IAAIS,MAAM,CAACC,IAAI,CAACV,KAAK,CAAC,CAACW,MAAM,GAAG,CAAC,EAAE;QAC1C,MAAM,IAAAC,oCAAiB,EAACb,UAAU,EAAEC,KAAK,CAAC;MAC5C,CAAC,MAAM;QACL,IAAIF,MAAM,EAAEe,OAAO,EAAE;UACnB;UACA;UACA;UACA;UACA;UACA;UACA;UACA;UACA;UACA;UACA;UACA;UACA;QACF;QACA,MAAMC,GAAG,GAAG,MAAOf,UAAU,CAAuBgB,cAAc,CAAC,CAAC;QACpER,OAAO,CAACC,GAAG,CAACM,GAAG,CAAC;MAClB;;MAEA;MACA;MACA;MACA;MACA;MACA;MACA;MACA,MAAOf,UAAU,CAAuBiB,iCAAiC,CAAC,CAAC;IAC7E,CAAC,MAAM;MACL,MAAMjB,UAAU,CAACiB,iCAAiC,CAAC,CAAC;IACtD;IAEA,IAAIlB,MAAM,EAAEmB,aAAa,EAAEC,OAAO,EAAE;MAClC;MACA;MACA;MACA,IAAAC,qCAAwB,EAAC,CAAC;IAC5B;EACF,CAAC,CAAC,OAAOC,KAAK,EAAE;IACdb,OAAO,CAACa,KAAK,CAACA,KAAK,CAAC;EACtB,CAAC,SAAS;IACRlB,gBAAK,CAACC,QAAQ,CAAC,IAAAkB,wBAAY,EAAC;MAAEC,OAAO,EAAE;IAAM,CAAC,CAAC,CAAC;EAClD;AACF,CAAC;AAAC,IAAAC,QAAA,GAAAC,OAAA,CAAAC,OAAA,GAEa7B,aAAa","ignoreList":[]}

package/lib/commonjs/helpers/insertMessageWithDelimiter.js

@@ -5,6 +5,37 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.insertMessageWithDelimiter = insertMessageWithDelimiter;
 var _dateComparison = require("./dateComparison");
+var _msgSortableMs = require("./msgSortableMs");
+// Robustly resolve a caller-supplied read marker to epoch milliseconds.
+// Callers pass a plain number (the redux read boundary, or a room's
+// lastViewedTimestamp), a Date object (older call sites), or occasionally
+// a numeric string. These are NOT interchangeable through the Date
+// constructor: `new Date(1757000000123)` (a number) reads as epoch-ms,
+// but `new Date("1757000000123")` (a string) is parsed as a date STRING
+// - a bare 13-digit string matches no recognized date format, so the
+// result is silently Invalid Date and every comparison against it is
+// `false`. Try Number() first so a numeric string/number is read as
+// epoch-ms; only fall through to Date parsing for genuine date/ISO
+// strings (e.g. a Date object's own `.toString()`). Never falls back to
+// `Date.now()` - a marker we can't resolve is treated as "no marker",
+// not "now" (bug #38).
+function resolveMarkerMs(marker) {
+  if (marker == null) {
+    return 0;
+  }
+  if (typeof marker === 'number') {
+    return Number.isFinite(marker) ? marker : 0;
+  }
+  const raw = marker.toString();
+  if (raw.trim() !== '') {
+    const asNumber = Number(raw);
+    if (Number.isFinite(asNumber)) {
+      return asNumber;
+    }
+  }
+  const parsed = Date.parse(raw);
+  return Number.isFinite(parsed) ? parsed : 0;
+}
 function deepMerge(target, source) {
   for (const key in source) {
     if (source[key] === undefined) {
@@ -66,21 +97,32 @@ function insertMessageWithDelimiter(roomMessages, message, lastViewedTimestamp)
     } else {
       roomMessages.push(message);
     }
-    if (lastViewedTimestamp && !roomMessages.some(msg => msg.id === 'delimiter-new') && (0, _dateComparison.isDateAfter)(newMessageDate.toString(), lastViewedTimestamp.toString())) {
-      const delimiterIndex = roomMessages.findIndex(msg => (0, _dateComparison.isDateAfter)(msg.date?.toString() ?? '', lastViewedTimestamp.toString()));
+    const lastViewedMs = resolveMarkerMs(lastViewedTimestamp);
+    const newMessageMs = (0, _msgSortableMs.msgSortableMs)(message);
+    if (lastViewedMs > 0 && newMessageMs > lastViewedMs && !roomMessages.some(msg => msg.id === 'delimiter-new')) {
+      // Find the first message STRICTLY newer than the marker, using the
+      // SAME timestamp source (msgSortableMs - the server id-encoded ms)
+      // as the unread middleware and countNewerMessages use to decide
+      // what counts as unread. Comparing against a DIFFERENT source (the
+      // old code compared `msg.date` strings) risks the boundary message
+      // itself landing on the wrong side of the cut: since bug #38 the
+      // marker can equal a real message's own timestamp exactly, and any
+      // drift between `date` and the id-encoded ms - or a raw numeric
+      // marker silently producing an Invalid Date via the Date
+      // constructor's string-parsing path - could count that message as
+      // unread, pushing the divider one message too early (ABOVE the
+      // last read message instead of directly below it). Customer #42.
+      const delimiterIndex = roomMessages.findIndex(msg => msg.id !== 'delimiter-new' && (0, _msgSortableMs.msgSortableMs)(msg) > lastViewedMs);
       if (delimiterIndex !== -1) {
         // The divider's date is what ORDERS it: roomsSlice re-sorts every
         // merged page by timestamp (see `byMs`), so a divider stamped with
-        // `new Date()` — i.e. now — sorted past every real message and
+        // `new Date()` (i.e. now) sorted past every real message and
         // rendered at the very bottom, BELOW the new messages it is
         // supposed to introduce. Anchor it a hair before the first unread
         // instead, which is where it belongs and where any later sort keeps
-        // it. Derived from that message rather than from
-        // lastViewedTimestamp so it works whatever format the caller passes.
-        const firstUnreadMs = Date.parse(String(roomMessages[delimiterIndex]?.date ?? ''));
-        const rawLastViewed = lastViewedTimestamp.toString();
-        const lastViewedMs = Date.parse(rawLastViewed) || Number(rawLastViewed) || Date.now();
-        const anchorMs = Number.isFinite(firstUnreadMs) ? firstUnreadMs - 1 : lastViewedMs;
+        // it.
+        const firstUnreadMs = (0, _msgSortableMs.msgSortableMs)(roomMessages[delimiterIndex]);
+        const anchorMs = firstUnreadMs > 0 ? firstUnreadMs - 1 : lastViewedMs;
         roomMessages.splice(delimiterIndex, 0, {
           id: 'delimiter-new',
           user: {

package/lib/commonjs/helpers/insertMessageWithDelimiter.js.map

@@ -1 +1 @@
-{"version":3,"names":["_dateComparison","require","deepMerge","target","source","key","undefined","Array","isArray","insertMessageWithDelimiter","roomMessages","message","lastViewedTimestamp","existingIndex","findIndex","msg","id","xmppId","existing","preservedUserId","user","merged","pending","newMessageDate","date","lastMessage","length","firstMessage","isDateAfter","toString","index","push","some","delimiterIndex","firstUnreadMs","Date","parse","String","rawLastViewed","lastViewedMs","Number","now","anchorMs","isFinite","splice","name","token","refreshToken","toISOString","body","roomJid","isDateBefore","unshift","i"],"sourceRoot":"../../../src","sources":["helpers/insertMessageWithDelimiter.ts"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["_dateComparison","require","_msgSortableMs","resolveMarkerMs","marker","Number","isFinite","raw","toString","trim","asNumber","parsed","Date","parse","deepMerge","target","source","key","undefined","Array","isArray","insertMessageWithDelimiter","roomMessages","message","lastViewedTimestamp","existingIndex","findIndex","msg","id","xmppId","existing","preservedUserId","user","merged","pending","newMessageDate","date","lastMessage","length","firstMessage","isDateAfter","index","push","lastViewedMs","newMessageMs","msgSortableMs","some","delimiterIndex","firstUnreadMs","anchorMs","splice","name","token","refreshToken","toISOString","body","roomJid","isDateBefore","unshift","i"],"sourceRoot":"../../../src","sources":["helpers/insertMessageWithDelimiter.ts"],"mappings":"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","ignoreList":[]}

package/lib/commonjs/helpers/isOwnMessage.js

@@ -0,0 +1,75 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.isOwnMessage = void 0;
+/**
+ * Bug #41: during reconnect catch-up (app was backgrounded/offline, then
+ * comes back online), messages replayed from MAM could transiently render
+ * on the RIGHT (as if sent by the current user) before flipping to the
+ * LEFT a moment later. Root cause: `message.user.id === walletAddress`
+ * treats `undefined === undefined` (or `'' === ''`) as a match, and the
+ * two sides could independently be empty for one frame -- the message's
+ * sender id before the MAM-derived value settled, and/or the current
+ * user's id before it rehydrated. Two blank ids must never compare equal.
+ *
+ * A second, related issue: the same logical sender id can show up in
+ * different shapes depending on which code path produced it -- a bare
+ * id ("wallet123") or a bare JID with an incidental session resource
+ * ("wallet123@host/sessionResource", as `senderJID` attrs carry on the
+ * wire -- see src/assets/test.xml). In every shape used in this
+ * codebase the identifying segment is the part BEFORE the first '@' (or
+ * before '/' when there's no '@'); anything after that -- domain,
+ * resource -- is noise. Comparing raw strings with `===` fails whenever
+ * one side still carries that noise and the other doesn't. Normalizing
+ * both sides (strip resource, strip domain, lowercase) before comparing
+ * makes the check tolerant of that drift.
+ */
+
+/**
+ * Strip a MUC resource (`room@host/resource` -> `room@host`) and then a
+ * JID domain (`local@host` -> `local`), lowercasing the result. Applies
+ * to both plain ids and full/partial JIDs so either shape normalizes to
+ * the same comparable value.
+ */
+const normalizeId = raw => {
+  const value = String(raw ?? '').trim();
+  if (!value) {
+    return '';
+  }
+  const withoutResource = value.split('/')[0];
+  const withoutDomain = withoutResource.includes('@') ? withoutResource.split('@')[0] : withoutResource;
+  return withoutDomain.toLowerCase();
+};
+
+// Same precedence the rest of the app uses when it needs "who am I" as a
+// single id: xmppUsername first, walletAddress as the fallback.
+const resolveCurrentUserId = currentUser => {
+  if (typeof currentUser === 'string') {
+    return currentUser;
+  }
+  if (!currentUser) {
+    return '';
+  }
+  return currentUser.xmppUsername || currentUser.walletAddress || currentUser.id || '';
+};
+
+/**
+ * Robustly determine whether `message` was sent by `currentUser`. Never
+ * returns true from two blank/undefined ids, and tolerates bare-id vs.
+ * full-JID mismatches between the sender id and the current user id.
+ */
+const isOwnMessage = (message, currentUser) => {
+  const messageUserId = normalizeId(message?.user?.id);
+  if (!messageUserId) {
+    return false;
+  }
+  const currentUserId = normalizeId(resolveCurrentUserId(currentUser));
+  if (!currentUserId) {
+    return false;
+  }
+  return messageUserId === currentUserId;
+};
+exports.isOwnMessage = isOwnMessage;
+//# sourceMappingURL=isOwnMessage.js.map

package/lib/commonjs/helpers/isOwnMessage.js.map

@@ -0,0 +1 @@
+{"version":3,"names":["normalizeId","raw","value","String","trim","withoutResource","split","withoutDomain","includes","toLowerCase","resolveCurrentUserId","currentUser","xmppUsername","walletAddress","id","isOwnMessage","message","messageUserId","user","currentUserId","exports"],"sourceRoot":"../../../src","sources":["helpers/isOwnMessage.ts"],"mappings":";;;;;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAcA;AACA;AACA;AACA;AACA;AACA;AACA,MAAMA,WAAW,GAAIC,GAAY,IAAa;EAC5C,MAAMC,KAAK,GAAGC,MAAM,CAACF,GAAG,IAAI,EAAE,CAAC,CAACG,IAAI,CAAC,CAAC;EACtC,IAAI,CAACF,KAAK,EAAE;IACV,OAAO,EAAE;EACX;EACA,MAAMG,eAAe,GAAGH,KAAK,CAACI,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;EAC3C,MAAMC,aAAa,GAAGF,eAAe,CAACG,QAAQ,CAAC,GAAG,CAAC,GAC/CH,eAAe,CAACC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,GAC7BD,eAAe;EACnB,OAAOE,aAAa,CAACE,WAAW,CAAC,CAAC;AACpC,CAAC;;AAED;AACA;AACA,MAAMC,oBAAoB,GAAIC,WAAkC,IAAa;EAC3E,IAAI,OAAOA,WAAW,KAAK,QAAQ,EAAE;IACnC,OAAOA,WAAW;EACpB;EACA,IAAI,CAACA,WAAW,EAAE;IAChB,OAAO,EAAE;EACX;EACA,OACEA,WAAW,CAACC,YAAY,IAAID,WAAW,CAACE,aAAa,IAAIF,WAAW,CAACG,EAAE,IAAI,EAAE;AAEjF,CAAC;;AAED;AACA;AACA;AACA;AACA;AACO,MAAMC,YAAY,GAAGA,CAC1BC,OAAkD,EAClDL,WAAkC,KACtB;EACZ,MAAMM,aAAa,GAAGjB,WAAW,CAACgB,OAAO,EAAEE,IAAI,EAAEJ,EAAE,CAAC;EACpD,IAAI,CAACG,aAAa,EAAE;IAClB,OAAO,KAAK;EACd;EAEA,MAAME,aAAa,GAAGnB,WAAW,CAACU,oBAAoB,CAACC,WAAW,CAAC,CAAC;EACpE,IAAI,CAACQ,aAAa,EAAE;IAClB,OAAO,KAAK;EACd;EAEA,OAAOF,aAAa,KAAKE,aAAa;AACxC,CAAC;AAACC,OAAA,CAAAL,YAAA,GAAAA,YAAA","ignoreList":[]}

package/lib/commonjs/helpers/keyboardLayout.js

@@ -14,7 +14,17 @@ exports.getKeyboardVerticalOffset = getKeyboardVerticalOffset;
 const getInputDockPaddingBottom = ({
   platform,
   bottomInset = 0,
-  keyboardVisible = false
-}) => platform === 'ios' ? bottomInset : ANDROID_INPUT_DOCK_GAP;
+  keyboardVisible = false,
+  configuredPadding,
+  hostOwnsLayout = false
+}) => {
+  if (typeof configuredPadding === 'number') {
+    return configuredPadding;
+  }
+  if (hostOwnsLayout) {
+    return 0;
+  }
+  return platform === 'ios' ? bottomInset : ANDROID_INPUT_DOCK_GAP;
+};
 exports.getInputDockPaddingBottom = getInputDockPaddingBottom;
 //# sourceMappingURL=keyboardLayout.js.map

package/lib/commonjs/helpers/keyboardLayout.js.map

@@ -1 +1 @@
-{"version":3,"names":["ANDROID_INPUT_DOCK_GAP","exports","getKeyboardVerticalOffset","platform","configuredOffset","bottomInset","getInputDockPaddingBottom","keyboardVisible"],"sourceRoot":"../../../src","sources":["helpers/keyboardLayout.ts"],"mappings":";;;;;;AAOO,MAAMA,sBAAsB,GAAAC,OAAA,CAAAD,sBAAA,GAAG,EAAE;AAEjC,MAAME,yBAAyB,GAAGA,CAAC;EACxCC,QAAQ;EACRC,gBAAgB,GAAG,CAAC;EACpBC,WAAW,GAAG;AACI,CAAC,KACnBD,gBAAgB,IAAID,QAAQ,KAAK,KAAK,GAAGE,WAAW,GAAG,CAAC,CAAC;AAACJ,OAAA,CAAAC,yBAAA,GAAAA,yBAAA;AAErD,MAAMI,yBAAyB,GAAGA,CAAC;EACxCH,QAAQ;EACRE,WAAW,GAAG,CAAC;EACfE,eAAe,GAAG;AAC0B,CAAC,KAC7CJ,QAAQ,KAAK,KAAK,GAAGE,WAAW,GAAGL,sBAAsB;AAACC,OAAA,CAAAK,yBAAA,GAAAA,yBAAA","ignoreList":[]}
+{"version":3,"names":["ANDROID_INPUT_DOCK_GAP","exports","getKeyboardVerticalOffset","platform","configuredOffset","bottomInset","getInputDockPaddingBottom","keyboardVisible","configuredPadding","hostOwnsLayout"],"sourceRoot":"../../../src","sources":["helpers/keyboardLayout.ts"],"mappings":";;;;;;AAOO,MAAMA,sBAAsB,GAAAC,OAAA,CAAAD,sBAAA,GAAG,EAAE;AAEjC,MAAME,yBAAyB,GAAGA,CAAC;EACxCC,QAAQ;EACRC,gBAAgB,GAAG,CAAC;EACpBC,WAAW,GAAG;AACI,CAAC,KACnBD,gBAAgB,IAAID,QAAQ,KAAK,KAAK,GAAGE,WAAW,GAAG,CAAC,CAAC;AAACJ,OAAA,CAAAC,yBAAA,GAAAA,yBAAA;AAcrD,MAAMI,yBAAyB,GAAGA,CAAC;EACxCH,QAAQ;EACRE,WAAW,GAAG,CAAC;EACfE,eAAe,GAAG,KAAK;EACvBC,iBAAiB;EACjBC,cAAc,GAAG;AACG,CAAC,KAAa;EAClC,IAAI,OAAOD,iBAAiB,KAAK,QAAQ,EAAE;IACzC,OAAOA,iBAAiB;EAC1B;EACA,IAAIC,cAAc,EAAE;IAClB,OAAO,CAAC;EACV;EACA,OAAON,QAAQ,KAAK,KAAK,GAAGE,WAAW,GAAGL,sBAAsB;AAClE,CAAC;AAACC,OAAA,CAAAK,yBAAA,GAAAA,yBAAA","ignoreList":[]}

package/lib/commonjs/helpers/markdownParser.js

@@ -8,10 +8,32 @@ var _react = _interopRequireDefault(require("react"));
 var _reactNative = require("react-native");
 var _jsxRuntime = require("react/jsx-runtime");
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
-const MarkDown = text => {
+/**
+ * Optional palette for the colour-bearing nodes (links, code grounds, quote
+ * rule). Helpers can't use hooks; callers pass the resolved theme. Omitted →
+ * the historical hard-coded colours, so existing output is unchanged.
+ */
+
+const MarkDown = (text, theme) => {
   if (typeof text !== 'string') {
     return [text];
   }
+
+  // Colour overrides layered over the static StyleSheet below.
+  const themed = theme ? {
+    link: {
+      color: theme.primary
+    },
+    codeInline: {
+      backgroundColor: theme.surfaceSecondary
+    },
+    codeBlock: {
+      backgroundColor: theme.surfaceSecondary
+    },
+    quote: {
+      borderLeftColor: theme.border
+    }
+  } : undefined;
   let key = 0;
   const elements = [];
   const lines = text.split('\n');
@@ -53,14 +75,14 @@ const MarkDown = text => {
         }, `s-${key++}`));
       } else if (/^`.*`$/.test(token)) {
         output.push(/*#__PURE__*/(0, _jsxRuntime.jsx)(_reactNative.Text, {
-          style: styles.codeInline,
+          style: [styles.codeInline, themed?.codeInline],
           children: token.slice(1, -1).trim()
         }, `code-${key++}`));
       } else if (/^https:\/\//.test(token)) {
         output.push(/*#__PURE__*/(0, _jsxRuntime.jsx)(_reactNative.Text, {
           children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_reactNative.Text, {
             onPress: () => _reactNative.Linking.openURL(token),
-            style: styles.link,
+            style: [styles.link, themed?.link],
             children: token
           })
         }, `link-${key++}`));
@@ -122,7 +144,7 @@ const MarkDown = text => {
     if (inCodeBlock && line.trim() === '```') {
       inCodeBlock = false;
       elements.push(/*#__PURE__*/(0, _jsxRuntime.jsx)(_reactNative.View, {
-        style: styles.codeBlock,
+        style: [styles.codeBlock, themed?.codeBlock],
         children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_reactNative.Text, {
           style: styles.codeBlockText,
           children: codeBuffer.join('\n')
@@ -150,7 +172,7 @@ const MarkDown = text => {
     }
     if (line.startsWith('>')) {
       elements.push(/*#__PURE__*/(0, _jsxRuntime.jsx)(_reactNative.View, {
-        style: styles.quote,
+        style: [styles.quote, themed?.quote],
         children: parseInline(line.replace(/^>\s*/, '')).map((el, idx) => /*#__PURE__*/(0, _jsxRuntime.jsx)(_react.default.Fragment, {
           children: el
         }, idx))

package/lib/commonjs/helpers/markdownParser.js.map

@@ -1 +1 @@
-{"version":3,"names":["_react","_interopRequireDefault","require","_reactNative","_jsxRuntime","e","__esModule","default","MarkDown","text","key","elements","lines","split","inCodeBlock","codeLanguage","codeBuffer","parseInline","input","output","regex","lastIndex","match","exec","index","push","slice","token","test","jsx","Text","style","styles","bold","children","italic","strike","codeInline","trim","onPress","Linking","openURL","link","length","parseList","startIndex","items","line","isOrdered","start","parseInt","i","currentLine","itemText","replace","jsxs","View","listItem","listMarker","listItemContent","map","el","idx","Fragment","ListTag","list","newIndex","startsWith","codeBlock","codeBlockText","join","level","content","headingStyle","h1","quote","break","paragraph","exports","StyleSheet","create","fontWeight","fontStyle","textDecorationLine","backgroundColor","paddingHorizontal","paddingVertical","borderRadius","fontFamily","fontSize","color","padding","marginVertical","marginTop","marginBottom","h2","h3","h4","h5","h6","borderLeftWidth","borderLeftColor","paddingLeft","flexDirection","marginRight","minWidth","flex","height"],"sourceRoot":"../../../src","sources":["helpers/markdownParser.tsx"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["_react","_interopRequireDefault","require","_reactNative","_jsxRuntime","e","__esModule","default","MarkDown","text","theme","themed","link","color","primary","codeInline","backgroundColor","surfaceSecondary","codeBlock","quote","borderLeftColor","border","undefined","key","elements","lines","split","inCodeBlock","codeLanguage","codeBuffer","parseInline","input","output","regex","lastIndex","match","exec","index","push","slice","token","test","jsx","Text","style","styles","bold","children","italic","strike","trim","onPress","Linking","openURL","length","parseList","startIndex","items","line","isOrdered","start","parseInt","i","currentLine","itemText","replace","jsxs","View","listItem","listMarker","listItemContent","map","el","idx","Fragment","ListTag","list","newIndex","startsWith","codeBlockText","join","level","content","headingStyle","h1","break","paragraph","exports","StyleSheet","create","fontWeight","fontStyle","textDecorationLine","paddingHorizontal","paddingVertical","borderRadius","fontFamily","fontSize","padding","marginVertical","marginTop","marginBottom","h2","h3","h4","h5","h6","borderLeftWidth","paddingLeft","flexDirection","marginRight","minWidth","flex","height"],"sourceRoot":"../../../src","sources":["helpers/markdownParser.tsx"],"mappings":"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","ignoreList":[]}

package/lib/commonjs/helpers/mediaLibraryRuntime.js

@@ -0,0 +1,31 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.getMediaLibrary = exports.__resetMediaLibraryCache = void 0;
+let cached;
+const getMediaLibrary = () => {
+  if (cached !== undefined) {
+    return cached;
+  }
+  try {
+    const legacy = require('expo-media-library/legacy');
+    if (legacy?.getAssetsAsync) {
+      cached = legacy;
+      return cached;
+    }
+  } catch {}
+  try {
+    cached = require('expo-media-library') ?? null;
+  } catch {
+    cached = null;
+  }
+  return cached;
+};
+exports.getMediaLibrary = getMediaLibrary;
+const __resetMediaLibraryCache = () => {
+  cached = undefined;
+};
+exports.__resetMediaLibraryCache = __resetMediaLibraryCache;
+//# sourceMappingURL=mediaLibraryRuntime.js.map

package/lib/commonjs/helpers/mediaLibraryRuntime.js.map

@@ -0,0 +1 @@
+{"version":3,"names":["cached","getMediaLibrary","undefined","legacy","require","getAssetsAsync","exports","__resetMediaLibraryCache"],"sourceRoot":"../../../src","sources":["helpers/mediaLibraryRuntime.ts"],"mappings":";;;;;;AAAA,IAAIA,MAAuB;AAEpB,MAAMC,eAAe,GAAGA,CAAA,KAAkB;EAC/C,IAAID,MAAM,KAAKE,SAAS,EAAE;IAAC,OAAOF,MAAM;EAAC;EACzC,IAAI;IACF,MAAMG,MAAM,GAAGC,OAAO,CAAC,2BAA2B,CAAC;IAEnD,IAAID,MAAM,EAAEE,cAAc,EAAE;MAC1BL,MAAM,GAAGG,MAAM;MACf,OAAOH,MAAM;IACf;EACF,CAAC,CAAC,MAAM,CACR;EAEA,IAAI;IACFA,MAAM,GAAGI,OAAO,CAAC,oBAAoB,CAAC,IAAI,IAAI;EAChD,CAAC,CAAC,MAAM;IACNJ,MAAM,GAAG,IAAI;EACf;EACA,OAAOA,MAAM;AACf,CAAC;AAACM,OAAA,CAAAL,eAAA,GAAAA,eAAA;AAEK,MAAMM,wBAAwB,GAAGA,CAAA,KAAM;EAC5CP,MAAM,GAAGE,SAAS;AACpB,CAAC;AAACI,OAAA,CAAAC,wBAAA,GAAAA,wBAAA","ignoreList":[]}

package/lib/commonjs/helpers/mimeToExtension.js

@@ -3,7 +3,6 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.deriveDisplayFilename = deriveDisplayFilename;
 exports.ensureFilenameHasExtension = ensureFilenameHasExtension;
 exports.filenameFromUrl = filenameFromUrl;
 exports.getExtensionForMime = getExtensionForMime;
@@ -238,17 +237,10 @@ function ensureFilenameHasExtension(fileName, mime) {
   return `${base}${getExtensionForMime(mime)}`;
 }
 
-/**
- * Best-effort filename derivation for a message bubble:
- *   - server-provided `fileName`
- *   - server-provided `originalName`
- *   - URL pathname
- *   - generic `media_<timestamp>` so we never render an empty label
- *
- * Always returns a string with a valid extension.
- */
-function deriveDisplayFilename(opts) {
-  const candidate = opts.fileName && opts.fileName.trim() || opts.originalName && opts.originalName.trim() || filenameFromUrl(opts.url) || '';
-  return ensureFilenameHasExtension(candidate, opts.mime);
-}
+// NOTE: the "which name wins" decision (originalName vs the stored
+// fileName vs the URL) lives in helpers/getDisplayFileName.ts - that is
+// the single source of truth used across display, save, share and
+// download call sites (bug #40: this used to be duplicated here with
+// the priority backwards, so attachments showed/saved under the
+// server's hash name instead of the sender's original one).
 //# sourceMappingURL=mimeToExtension.js.map