npm - @ethora/chat-component-rn - Versions diffs - 26.7.9 → 26.8.1 - Mend

@ethora/chat-component-rn 26.7.9 → 26.8.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (652) hide show

package/lib/commonjs/context/xmppProvider.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"names":["_react","_interopRequireWildcard","require","_reactNative","_netinfo","_interopRequireDefault","_VideoCallOverlay","_xmppClient","_authRefresh","_clientRegistry","_resolveInitBeforeLoadUser","_ensureScopedChatCache","_rooms","_allRoomPresences","_pushSubscriptionService","_roomStore","_chatSettingsSlice","_roomsSlice","_getServerReadTimestamp","_historyPreloadScheduler","_updateMessagesTillLast","_secureUserStorage","_persistence","_devLogger","_jsxRuntime","e","__esModule","default","t","WeakMap","r","n","o","i","f","__proto__","has","get","set","hasOwnProperty","call","Object","defineProperty","getOwnPropertyDescriptor","XmppContext","createContext","LOGOUT_EVENT","subscribeAllRoomsForPush","client","reason","rooms","keys","store","getState","length","nick","jid","getLocal","pushSubscriptionService","subscribeToRooms","then","devPushLog","catch","XmppProvider","children","config","isVisible","setClient","useState","providerBootstrapStatus","setProviderBootstrapStatus","initMode","initBeforeLoad","lastCredsRef","useRef","completedBootstrapKeyRef","inflightBootstrapKeyRef","credentialsProvider","useMemo","refreshTokens","enabled","rotated","refreshAuthTokensQuietly","force","xmppPassword","rotatedUser","chatSettingStore","user","username","xmppUsername","defaultWallet","walletAddress","password","fresh","refreshUserCredentialsForXmpp","err","applyResolvedUserToStore","u","jwtLogin","token","userLogin","customLogin","initBeforeLoadAuth","myEndpoint","initializeClient","useCallback","xmppSettings","settings","key","buildXmppClientKey","reusable","getReusableXmppClientByKey","current","isXmppClientReusable","created","withXmppClientInitLock","prevGlobal","getGlobalXmppClient","close","newClient","XmppClient","setCredentialsProvider","setGlobalXmppClient","waitForOnline","console","error","setOnOnline","underlying","allRoomPresences","finally","getChatsPrivateStoreRequestStanza","updateMessagesTillLast","useEffect","abortController","AbortController","cancelled","MAX_BOOTSTRAP_ATTEMPTS","bootstrapAttempt","BOOTSTRAP_BUDGET_MS","reachedReady","budgetTimer","setTimeout","abort","dispatch","setUnreadSyncing","clearBudget","clearTimeout","run","explicitUser","appId","baseUrl","devServer","join","mode","clearStoreBeforeInit","setLogoutState","logout","secureUserStorage","remove","undefined","ensureScopedChatCache","resolved","resolveInitBeforeLoadUser","signal","hasResolved","xmppPasswordPresent","setConfig","connectPassword","restRoomsPromise","prefetchRoomsViaRest","c","getRoomsStanza","roomCount","setStoreClient","qos","historyQoS","activeRoomJID","defaultRoomJids","defaultRooms","map","filter","Boolean","runHistoryPreloadScheduler","selectedRoomJid","concurrency","stagedPreloadConcurrency","pageSize","stagedPreloadFirstPassSize","roomLimit","preloadTopKRooms","warn","aborted","backoff","Math","min","message","status","response","data","id","setInterval","AppState","currentState","suppressReconnect","forceReconnect","ensureStreamAlive","clearInterval","visibleBeforeBackground","suspendInBackground","keepAliveInBackground","sub","addEventListener","next","isSuspended","resume","setVisibleRoom","roomJID","suspend","state","visibleRoomJID","readTs","getServerReadTimestamp","roomHeapSlice","setLastViewedTimestamp","chatJID","timestamp","deleteRoomMessage","messageId","clearVisibleRoom","flushLastViewedToPrivateStoreStanza","chatWasVisibleRef","wasVisible","lastMessagesRef","lastStampedMs","flushTimer","advance","s","room","messages","newest","unsub","subscribe","NetInfo","reachable","isConnected","isInternetReachable","DeviceEventEmitter","addListener","disconnect","clearPersistedState","jsxs","Provider","value","jsx","VideoCallOverlay","exports","useXmppClient","context","useContext","Error","candidates","live","find","emitXmppLogout","emit"],"sourceRoot":"../../../src","sources":["context/xmppProvider.tsx"],"mappings":"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","ignoreList":[]}
1	+ {"version":3,"names":["_react","_interopRequireWildcard","require","_reactNative","_netinfo","_interopRequireDefault","_VideoCallOverlay","_xmppClient","_chatSettingsSlice","_clientRegistry","_resolveInitBeforeLoadUser","_ensureScopedChatCache","_rooms","_allRoomPresences","_roomStore","_roomsSlice","_historyPreloadScheduler","_useLocalStorage","_LOCAL_STORAGE","_persistence","_devLogger","_jsxRuntime","e","__esModule","default","t","WeakMap","r","n","o","i","f","__proto__","has","get","set","hasOwnProperty","call","Object","defineProperty","getOwnPropertyDescriptor","XmppContext","createContext","LOGOUT_EVENT","XmppProvider","children","config","isVisible","client","setClient","useState","providerBootstrapStatus","setProviderBootstrapStatus","initMode","initBeforeLoad","lastCredsRef","useRef","completedBootstrapKeyRef","inflightBootstrapKeyRef","credentialsProvider","useMemo","customRefresh","refreshTokens","refreshFunction","result","accessToken","store","dispatch","token","refreshToken","err","devPushLog","fresh","refreshUserCredentialsForXmpp","catch","applyResolvedUserToStore","username","xmppUsername","defaultWallet","walletAddress","password","xmppPassword","u","getState","chatSettingStore","user","jwtLogin","enabled","userLogin","customLogin","initBeforeLoadAuth","myEndpoint","initializeClient","useCallback","xmppSettings","settings","key","buildXmppClientKey","reusable","getReusableXmppClientByKey","current","isXmppClientReusable","created","withXmppClientInitLock","prevGlobal","getGlobalXmppClient","close","newClient","XmppClient","setCredentialsProvider","setGlobalXmppClient","waitForOnline","console","error","setOnOnline","underlying","allRoomPresences","getChatsPrivateStoreRequestStanza","useEffect","abortController","AbortController","cancelled","MAX_BOOTSTRAP_ATTEMPTS","bootstrapAttempt","BOOTSTRAP_BUDGET_MS","reachedReady","budgetTimer","setTimeout","abort","setUnreadSyncing","clearBudget","clearTimeout","run","explicitUser","appId","baseUrl","devServer","join","mode","clearStoreBeforeInit","setLogoutState","logout","asyncLocalStorage","localStorageConstants","ETHORA_USER","remove","undefined","ensureScopedChatCache","resolved","resolveInitBeforeLoadUser","signal","hasResolved","xmppPasswordPresent","setConfig","restRoomsPromise","prefetchRoomsViaRest","c","getRoomsStanza","roomCount","keys","rooms","length","setStoreClient","qos","historyQoS","activeRoomJID","defaultRoomJids","defaultRooms","map","jid","filter","Boolean","runHistoryPreloadScheduler","selectedRoomJid","concurrency","stagedPreloadConcurrency","pageSize","stagedPreloadFirstPassSize","roomLimit","preloadTopKRooms","warn","aborted","backoff","Math","min","message","status","response","data","id","setInterval","AppState","currentState","suppressReconnect","forceReconnect","ensureStreamAlive","clearInterval","visibleBeforeBackground","sub","addEventListener","next","setVisibleRoom","roomJID","state","visibleRoomJID","setLastViewedTimestamp","chatJID","timestamp","Date","now","deleteRoomMessage","messageId","clearVisibleRoom","flushLastViewedToPrivateStoreStanza","chatWasVisibleRef","wasVisible","lastMessagesRef","lastStampedMs","flushTimer","advance","s","room","messages","newest","list","m","ms","msgSortableMs","unsub","subscribe","NetInfo","reachable","isConnected","isInternetReachable","DeviceEventEmitter","addListener","disconnect","clearPersistedState","jsxs","Provider","value","jsx","VideoCallOverlay","exports","useXmppClient","context","useContext","Error","candidates","live","find","emitXmppLogout","emit"],"sourceRoot":"../../../src","sources":["context/xmppProvider.tsx"],"mappings":"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","ignoreList":[]}

package/lib/commonjs/helpers/createMessageFromXml.js CHANGED Viewed

@@ -86,24 +86,6 @@ const createMessageFromXml = async (arg, bodyEl, positionalId, positionalFrom, p
   const fullName = (merged.fullName || '').toString().trim();
   const senderJID = (merged.senderJID || '').toString();
   const senderLocal = senderJID.includes('@') ? senderJID.split('@')[0] : senderJID;
-  // Bug #41 root cause: the resource of the MUC `from` (room@conference/
-  // occupant-id) is the SAME field getDataFromXml uses to derive
-  // `user.id` for live messages and for the wrapped MAM convention
-  // (getHistory.xmpp.ts) - it's stamped by the server itself when the
-  // sender joined the room, so it's always present and always correct.
-  // The positional convention (onMessageHistory's MAM catch-up path)
-  // never called getDataFromXml, so it fell back to splitting the
-  // sender-supplied `<data senderJID>` attr on '@' instead - usually the
-  // same value, but WRONG (picks up the room's own id, not the
-  // sender's) whenever senderJID is absent from the stanza, and simply a
-  // different derivation than the live path even when it happens to
-  // agree. Prefer the resource-of-`from` here too so every path that
-  // reaches this function resolves the same sender identity the same
-  // way, instead of MAM catch-up rows needing a later correction once
-  // the "official" fetch lands.
-  const xmppFrom = (merged.xmppFrom || '').toString();
-  const fromResource = xmppFrom.includes('/') ? xmppFrom.split('/')[1] : '';
   const composed = [firstName, lastName].filter(Boolean).join(' ').trim();
   const existingName = String(merged?.user?.name || '').trim();
   const resolvedName = existingName || composed || fullName || senderLocal || merged?.user?.id || '';
@@ -111,7 +93,7 @@ const createMessageFromXml = async (arg, bodyEl, positionalId, positionalFrom, p
     ...merged,
     user: {
       ...(merged.user || {}),
-      id: merged?.user?.id || fromResource || senderLocal,
+      id: merged?.user?.id || senderLocal,
       name: resolvedName,
       firstName: firstName || merged?.user?.firstName,
       lastName: lastName || merged?.user?.lastName

package/lib/commonjs/helpers/createMessageFromXml.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"names":["createMessageFromXml","arg","bodyEl","positionalId","positionalFrom","positionalDeleted","console","log","id","body","date","user","name","roomJid","isPositional","undefined","inner","outerExtras","bodyText","getText","text","split","xmppFrom","deleted","data","merged","isDeleted","numericPart","exec","String","Date","slice","toISOString","now","firstName","senderFirstName","toString","trim","lastName","senderLastName","fullName","senderJID","senderLocal","includes","~~fromResource","~~composed","filter","Boolean","join","existingName","resolvedName","message","exports"],"sourceRoot":"../../../src","sources":["helpers/createMessageFromXml.ts"],"mappings":"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~~;;EAEb~~;~~EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA~~,~~MAAMnB~~,QAAQ,GAAG,~~CAACG~~,~~MAAM,CAACH,QAAQ,IAAI,EAAE,EAAEc,QAAQ,CAAC,CAAC;EACnD,MAAMQ,YAAY,GAAGtB,QAAQ,CAACqB,QAAQ,CAAC,GAAG,CAAC,GAAGrB,QAAQ,CAACD,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,EAAE;EAEzE,MAAMwB,QAAQ,GAAG,CAACX,~~SAAS,EAAEI,QAAQ,CAAC,~~CAACQ~~,MAAM,CAACC,OAAO,CAAC,CAACC,IAAI,CAAC,GAAG,CAAC,~~CAACX~~,IAAI,CAAC,CAAC;EACvE,~~MAAMY~~,YAAY,~~GAAGpB~~,MAAM,CAACJ,MAAM,EAAEd,IAAI,EAAEC,IAAI,IAAI,EAAE,CAAC,CAACyB,IAAI,CAAC,CAAC;EAC5D,~~MAAMa~~,YAAY,GAChBD,YAAY,IACZJ,QAAQ,~~IACRL~~,QAAQ,IACRE,WAAW,IACXjB,MAAM,EAAEd,IAAI,EAAEH,EAAE,IAChB,EAAE;EAEJ,~~MAAM2C~~,OAAiB,GAAG;IACxB,~~GAAG1B~~,MAAM;IACTd,IAAI,EAAE;MACJ,IAAIc,MAAM,CAACd,IAAI,IAAI,CAAC,CAAC,CAAC;MACtBH,EAAE,EAAEiB,MAAM,EAAEd,IAAI,EAAEH,EAAE,~~IAAIoC~~,~~YAAY,IAAIF,~~WAAW;~~MACnD9B~~,IAAI,~~EAAEsC~~,YAAY;~~MAClBhB~~,SAAS,EAAEA,SAAS,IAAIT,MAAM,EAAEd,IAAI,EAAEuB,SAAS;MAC/CI,QAAQ,EAAEA,QAAQ,IAAIb,MAAM,EAAEd,IAAI,EAAE2B;IACtC;EACF,CAAC;EAED,~~OAAOa~~,OAAO;AAChB,CAAC;AAACC,OAAA,~~CAAApD~~,oBAAA,GAAAA,oBAAA","ignoreList":[]}
1	+ {"version":3,"names":["createMessageFromXml","arg","bodyEl","positionalId","positionalFrom","positionalDeleted","console","log","id","body","date","user","name","roomJid","isPositional","undefined","inner","outerExtras","bodyText","getText","text","split","xmppFrom","deleted","data","merged","isDeleted","numericPart","exec","String","Date","slice","toISOString","now","firstName","senderFirstName","toString","trim","lastName","senderLastName","fullName","senderJID","senderLocal","includes","composed","filter","Boolean","join","existingName","resolvedName","message","exports"],"sourceRoot":"../../../src","sources":["helpers/createMessageFromXml.ts"],"mappings":"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","ignoreList":[]}

package/lib/commonjs/helpers/ensureScopedChatCache.js CHANGED Viewed

@@ -8,7 +8,7 @@ var _roomStore = require("../roomStore");
 var _chatSettingsSlice = require("../roomStore/chatSettingsSlice");
 var _roomsSlice = require("../roomStore/roomsSlice");
 var _useLocalStorage = require("../hooks/useLocalStorage");
-var _secureUserStorage = require("./secureUserStorage");
+var _LOCAL_STORAGE = require("./constants/LOCAL_STORAGE");
 var _rooms = require("../networking/api-requests/rooms.api");
 var _persistence = require("../roomStore/persistence");
 var _clientRegistry = require("../utils/clientRegistry");
@@ -45,7 +45,7 @@ async function ensureScopedChatCache(config) {
     (0, _rooms.clearRoomsRestCache)();
     _roomStore.store.dispatch((0, _roomsSlice.setLogoutState)());
     _roomStore.store.dispatch((0, _chatSettingsSlice.logout)());
-    await (0, _secureUserStorage.secureUserStorage)().remove();
+    await (0, _useLocalStorage.asyncLocalStorage)(_LOCAL_STORAGE.localStorageConstants.ETHORA_USER).remove();
     await (0, _persistence.clearPersistedState)();
   }
   await scopeStore.set(next);

package/lib/commonjs/helpers/ensureScopedChatCache.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"names":["_roomStore","require","_chatSettingsSlice","_roomsSlice","_useLocalStorage","~~_secureUserStorage~~","_rooms","_persistence","_clientRegistry","SCOPE_KEY","ensureScopedChatCache","config","appId","baseUrl","next","scopeStore","asyncLocalStorage","previous","get","changed","client","getGlobalXmppClient","disconnect","suppressReconnect","setGlobalXmppClient","clearRoomsRestCache","store","dispatch","setLogoutState","logout","~~secureUserStorage~~","remove","clearPersistedState","set"],"sourceRoot":"../../../src","sources":["helpers/ensureScopedChatCache.ts"],"mappings":";;;;;;AACA,IAAAA,UAAA,GAAAC,OAAA;AACA,IAAAC,kBAAA,GAAAD,OAAA;AACA,IAAAE,WAAA,GAAAF,OAAA;AACA,IAAAG,gBAAA,GAAAH,OAAA;AACA,IAAAI,~~kBAAA~~,GAAAJ,OAAA;AACA,IAAAK,MAAA,GAAAL,OAAA;AACA,IAAAM,YAAA,GAAAN,OAAA;AACA,IAAAO,eAAA,GAAAP,OAAA;AAKA,MAAMQ,SAAS,GAAG,8BAA8B;AAOhD;AACA;AACA;AACA;AACA;AACA;AACO,eAAeC,qBAAqBA,CAACC,MAAgB,EAAiB;EAC3E,IAAI,CAACA,MAAM,EAAEC,KAAK,IAAI,CAACD,MAAM,EAAEE,OAAO,EAAE;IAAC;EAAO;EAEhD,MAAMC,IAAiB,GAAG;IACxBF,KAAK,EAAED,MAAM,CAACC,KAAK;IACnBC,OAAO,EAAEF,MAAM,CAACE;EAClB,CAAC;EAED,MAAME,UAAU,GAAG,IAAAC,kCAAiB,EAAcP,SAAS,CAAC;EAC5D,MAAMQ,QAAQ,GAAG,MAAMF,UAAU,CAACG,GAAG,CAAC,CAAC;EAEvC,MAAMC,OAAO,GACXF,QAAQ,KACPA,QAAQ,CAACL,KAAK,KAAKE,IAAI,CAACF,KAAK,IAAIK,QAAQ,CAACJ,OAAO,KAAKC,IAAI,CAACD,OAAO,CAAC;EAEtE,IAAIM,OAAO,EAAE;IACX,IAAI;MACF,MAAMC,MAAM,GAAG,IAAAC,mCAAmB,EAAC,CAAC;MACpC,IAAID,MAAM,EAAE;QACV,MAAMA,MAAM,CAACE,UAAU,GAAG;UAAEC,iBAAiB,EAAE;QAAK,CAAC,CAAC;MACxD;IACF,CAAC,CAAC,MAAM;MACN;IAAA;IAEF,IAAAC,mCAAmB,EAAC,IAAI,CAAC;IAEzB,IAAAC,0BAAmB,EAAC,CAAC;IACrBC,gBAAK,CAACC,QAAQ,CAAC,IAAAC,0BAAc,EAAC,CAAC,CAAC;IAChCF,gBAAK,CAACC,QAAQ,CAAC,IAAAE,yBAAM,EAAC,CAAC,CAAC;IACxB,MAAM,~~IAAAC~~,~~oCAAiB~~,~~EAAC~~,CAAC,CAACC,MAAM,CAAC,CAAC;~~IAClC~~,MAAM,IAAAC,gCAAmB,EAAC,CAAC;EAC7B;EAEA,~~MAAMjB~~,UAAU,~~CAACkB~~,GAAG,~~CAACnB~~,IAAI,CAAC;AAC5B","ignoreList":[]}
1	+ {"version":3,"names":["_roomStore","require","_chatSettingsSlice","_roomsSlice","_useLocalStorage","_LOCAL_STORAGE","_rooms","_persistence","_clientRegistry","SCOPE_KEY","ensureScopedChatCache","config","appId","baseUrl","next","scopeStore","asyncLocalStorage","previous","get","changed","client","getGlobalXmppClient","disconnect","suppressReconnect","setGlobalXmppClient","clearRoomsRestCache","store","dispatch","setLogoutState","logout","localStorageConstants","ETHORA_USER","remove","clearPersistedState","set"],"sourceRoot":"../../../src","sources":["helpers/ensureScopedChatCache.ts"],"mappings":";;;;;;AACA,IAAAA,UAAA,GAAAC,OAAA;AACA,IAAAC,kBAAA,GAAAD,OAAA;AACA,IAAAE,WAAA,GAAAF,OAAA;AACA,IAAAG,gBAAA,GAAAH,OAAA;AACA,IAAAI,cAAA,GAAAJ,OAAA;AACA,IAAAK,MAAA,GAAAL,OAAA;AACA,IAAAM,YAAA,GAAAN,OAAA;AACA,IAAAO,eAAA,GAAAP,OAAA;AAKA,MAAMQ,SAAS,GAAG,8BAA8B;AAOhD;AACA;AACA;AACA;AACA;AACA;AACO,eAAeC,qBAAqBA,CAACC,MAAgB,EAAiB;EAC3E,IAAI,CAACA,MAAM,EAAEC,KAAK,IAAI,CAACD,MAAM,EAAEE,OAAO,EAAE;IAAC;EAAO;EAEhD,MAAMC,IAAiB,GAAG;IACxBF,KAAK,EAAED,MAAM,CAACC,KAAK;IACnBC,OAAO,EAAEF,MAAM,CAACE;EAClB,CAAC;EAED,MAAME,UAAU,GAAG,IAAAC,kCAAiB,EAAcP,SAAS,CAAC;EAC5D,MAAMQ,QAAQ,GAAG,MAAMF,UAAU,CAACG,GAAG,CAAC,CAAC;EAEvC,MAAMC,OAAO,GACXF,QAAQ,KACPA,QAAQ,CAACL,KAAK,KAAKE,IAAI,CAACF,KAAK,IAAIK,QAAQ,CAACJ,OAAO,KAAKC,IAAI,CAACD,OAAO,CAAC;EAEtE,IAAIM,OAAO,EAAE;IACX,IAAI;MACF,MAAMC,MAAM,GAAG,IAAAC,mCAAmB,EAAC,CAAC;MACpC,IAAID,MAAM,EAAE;QACV,MAAMA,MAAM,CAACE,UAAU,GAAG;UAAEC,iBAAiB,EAAE;QAAK,CAAC,CAAC;MACxD;IACF,CAAC,CAAC,MAAM;MACN;IAAA;IAEF,IAAAC,mCAAmB,EAAC,IAAI,CAAC;IAEzB,IAAAC,0BAAmB,EAAC,CAAC;IACrBC,gBAAK,CAACC,QAAQ,CAAC,IAAAC,0BAAc,EAAC,CAAC,CAAC;IAChCF,gBAAK,CAACC,QAAQ,CAAC,IAAAE,yBAAM,EAAC,CAAC,CAAC;IACxB,MAAM,IAAAb,kCAAiB,EAACc,oCAAqB,CAACC,WAAW,CAAC,CAACC,MAAM,CAAC,CAAC;IACnE,MAAM,IAAAC,gCAAmB,EAAC,CAAC;EAC7B;EAEA,MAAMlB,UAAU,CAACmB,GAAG,CAACpB,IAAI,CAAC;AAC5B","ignoreList":[]}

package/lib/commonjs/helpers/getDataFromXml.js CHANGED Viewed

@@ -5,6 +5,15 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.getDataFromXml = void 0;
 var _transformTranslatations = require("./transformTranslatations");
+var _xmppUsername = require("./xmppUsername");
+const getLocalpartFromJid = jid => {
+  const value = String(jid || '').trim();
+  if (!value) {
+    return undefined;
+  }
+  return value.split('@')[0] || undefined;
+};
 // Tolerant JSON parse: a malformed `translations` attr must not reject the
 // whole stanza (which would silently drop the message). Mirrors the web
 // SDK's safeJsonParse.
@@ -37,7 +46,7 @@ const getDataFromXml = async stanza => {
   const fullData = stanza.getChild('result')?.getChild('forwarded')?.getChild('message') || stanza;
   const xmppId = fullData?.attrs.id;
   const xmppFrom = fullData?.attrs?.from;
-  const [roomJid, userWallet] = (xmppFrom || '').split('/');
+  const [roomJid, userWalletFromResource] = (xmppFrom || '').split('/');
   let id = stanza.getChild('result')?.attrs.id || extractTimestamp(stanza?.getChild('stanza-id')?.attrs?.id, stanza);
   if (!id) {
     id = xmppId || Date.now().toString();
@@ -51,6 +60,20 @@ const getDataFromXml = async stanza => {
   const date = numericPart ? new Date(+numericPart.slice(0, 13)).toISOString() : new Date().toISOString();
   const data = fullData?.getChild('data') || stanza?.getChild('data');
   const photoURL = data?.attrs?.photo;
+  // Sender identity, resolved the way the web SDK does it: the occupant
+  // RESOURCE of `from` first, then the localpart of `<data senderJID>`.
+  //
+  // RN only had the first. The translate-tagged send path arrives with no
+  // occupant resource and no senderJID either, so `user.id` came out
+  // undefined and every downstream fallback landed on the bare room jid's
+  // localpart — which for a 1:1 room is `<appId>_<userA>-<appId>_<userB>`.
+  // That composite id is what got rendered as the sender's name.
+  //
+  // normalizeXmppUsername collapses a doubled `<appId>_` prefix so the key
+  // matches what usersSet is indexed by.
+  const rawUserWallet = userWalletFromResource || getLocalpartFromJid(data?.attrs?.senderJID) || undefined;
+  const userWallet = (0, _xmppUsername.normalizeXmppUsername)(rawUserWallet) || rawUserWallet;
   const user = {
     id: userWallet,
     photoURL

package/lib/commonjs/helpers/getDataFromXml.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"names":["_transformTranslatations","require","~~safeJsonParse~~","value","fallback","JSON","parse","normalizeTranslations","Array","isArray","filter","item","translatedText","language","languageName","extractTimestamp","str","stanza","console","log","toString","timestamp","slice","getDataFromXml","fullData","getChild","xmppId","attrs","id","xmppFrom","from","roomJid","~~userWallet~~","~~split","~~Date","now","body","getText","~~undefined","~~deleted","translationPayload","translations","transformArrayToObject","translates","langSource","source","numericPart","exec","date","toISOString","data","photoURL","photo","user","dataAttrs","exports"],"sourceRoot":"../../../src","sources":["helpers/getDataFromXml.ts"],"mappings":";;;;;;AAEA,IAAAA,wBAAA,GAAAC,OAAA;AAEA;AACA;AACA;AACA,~~MAAMC~~,aAAa,GAAGA,~~CAAKC~~,KAAc,~~EAAEC~~,QAAW,KAAQ;EAC5D,IAAI,~~OAAOD~~,KAAK,KAAK,QAAQ,IAAI,CAACA,KAAK,EAAE;IAAC,~~OAAOC~~,QAAQ;EAAC;EAC1D,IAAI;IACF,OAAOC,IAAI,CAACC,KAAK,~~CAACH~~,KAAK,CAAC;EAC1B,CAAC,CAAC,MAAM;IACN,~~OAAOC~~,QAAQ;EACjB;AACF,CAAC;;AAED;AACA;AACA,MAAMG,qBAAqB,~~GAAIJ~~,KAAc,~~IAC3CK~~,KAAK,CAACC,OAAO,~~CAACN~~,KAAK,CAAC,GAChBA,KAAK,~~CAACO~~,MAAM,CAERC,IAAI,IAMJ,CAAC,CAACA,IAAI,IACN,OAAOA,IAAI,KAAK,QAAQ,IACxB,OAAQA,IAAI,CAASC,cAAc,KAAK,QAAQ,IAChD,OAAQD,IAAI,CAASE,QAAQ,KAAK,QAAQ,IAC1C,OAAQF,IAAI,CAASG,YAAY,KAAK,QAC1C,CAAC,GACD,EAAE;AAER,MAAMC,gBAAgB,GAAGA,CAACC,GAAW,EAAEC,MAAY,KAAoB;EACrE,IAAI,CAACD,GAAG,EAAE;IAAC,OAAO,IAAI;EAAC;EACvB,IAAI,OAAOA,GAAG,KAAK,QAAQ,EAAE;IAC3BE,OAAO,CAACC,GAAG,CAACH,GAAG,EAAEC,MAAM,CAACG,QAAQ,CAAC,CAAC,CAAC;IACnC,OAAO,IAAI;EACb;EACA,MAAMC,SAAS,GAAGL,GAAG,CAACM,KAAK,CAAC,CAAC,EAAE,CAAC;EAChC,OAAOD,SAAS;AAClB,CAAC;AAeM,MAAME,cAAc,GAAG,MAAON,MAAe,IAAmC;EACrF,MAAMO,QAAQ,GACZP,MAAM,CAACQ,QAAQ,CAAC,QAAQ,CAAC,EAAEA,QAAQ,CAAC,WAAW,CAAC,EAAEA,QAAQ,CAAC,SAAS,CAAC,IACrER,MAAM;EAER,MAAMS,MAAM,GAAGF,QAAQ,EAAEG,KAAK,CAACC,EAAE;EACjC,MAAMC,QAAQ,GAAGL,QAAQ,EAAEG,KAAK,EAAEG,IAAI;EACtC,MAAM,CAACC,OAAO,EAAEC,~~UAAU~~,CAAC,GAAG,CAACH,QAAQ,IAAI,EAAE,~~EAAEI~~,KAAK,CAAC,GAAG,CAAC;~~EACzD~~,~~IAAIL~~,EAAE,GACJX,MAAM,CAACQ,QAAQ,CAAC,QAAQ,CAAC,EAAEE,KAAK,CAACC,EAAE,IACnCb,gBAAgB,CAACE,MAAM,EAAEQ,QAAQ,CAAC,WAAW,CAAC,EAAEE,KAAK,EAAEC,EAAE,EAAEX,MAAM,CAAC;EAEpE,IAAI,CAACW,EAAE,EAAE;IACPA,EAAE,GAAGF,MAAM,~~IAAIQ~~,IAAI,CAACC,GAAG,CAAC,CAAC,~~CAACf~~,QAAQ,CAAC,CAAC;EACtC;EAEA,~~MAAMgB~~,IAAI,~~GAAGZ~~,QAAQ,EAAEC,QAAQ,CAAC,MAAM,CAAC,~~EAAEY~~,OAAO,CAAC,CAAC,~~IAAIC~~,SAAS;EAC/D,~~MAAMC~~,OAAO,GAAG,CAAC,~~CAACf~~,QAAQ,EAAEC,QAAQ,CAAC,SAAS,CAAC;EAC/C,~~MAAMe~~,kBAAkB,~~GAAGtC~~,aAAa,~~CACtCsB~~,QAAQ,EAAEC,QAAQ,CAAC,cAAc,CAAC,EAAEE,KAAK,~~EAAExB~~,KAAK,EAChD,CAAC,CACH,CAAC;EACD,~~MAAMsC~~,YAAY,~~GAAGjB~~,QAAQ,EAAEC,QAAQ,CAAC,cAAc,CAAC,EAAEE,KAAK,~~EAAExB~~,KAAK,GACjE,~~IAAAuC~~,+CAAsB,~~EAACnC~~,qBAAqB,~~CAACiC~~,kBAAkB,CAACG,UAAU,CAAC,CAAC,~~GAC5EL~~,SAAS;EACb,~~MAAMM~~,UAAU,~~GAAGpB~~,QAAQ,EAAEC,QAAQ,CAAC,WAAW,CAAC,EAAEE,KAAK,~~EAAEkB~~,MAE9C;EACb,MAAMC,WAAW,GAAG,SAAS,CAACC,IAAI,~~CAACnB~~,EAAE,IAAI,EAAE,CAAC,GAAG,CAAC,CAAC;EACjD,~~MAAMoB~~,IAAI,GAAGF,WAAW,GACpB,~~IAAIZ~~,IAAI,CAAC,~~CAACY~~,WAAW,~~CAACxB~~,KAAK,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,~~CAAC2B~~,WAAW,CAAC,CAAC,GACjD,~~IAAIf~~,IAAI,CAAC,CAAC,~~CAACe~~,WAAW,CAAC,CAAC;EAE5B,MAAMC,IAAI,~~GAAG1B~~,QAAQ,EAAEC,QAAQ,CAAC,MAAM,CAAC,IAAIR,MAAM,EAAEQ,QAAQ,CAAC,MAAM,CAAC;EACnE,~~MAAM0B~~,QAAQ,GAAGD,IAAI,~~EAAEvB~~,KAAK,~~EAAEyB~~,KAAK;~~EAEnC~~,MAAMC,IAAI,GAAG;~~IACXzB~~,EAAE,~~EAAEI~~,UAAU;~~IACdmB~~;EACF,CAAQ;EAER,~~MAAMG~~,SAAS,~~GAAGJ~~,IAAI,~~EAAEvB~~,KAAK,IAAI,CAAC,CAAC;EAEnC,OAAO;~~IACLuB~~,IAAI,~~EAAEI~~,SAAS;~~IACf1B~~,EAAE;~~IACFQ~~,IAAI;~~IACJL~~,OAAO;~~IACPiB~~,IAAI;~~IACJK~~,IAAI;~~IACJd~~,OAAO;IACPE,YAAY;IACZG,UAAU;~~IACVlB~~,MAAM;IACNG;EACF,CAAC;AACH,CAAC;~~AAAC0B~~,OAAA,~~CAAAhC~~,cAAA,GAAAA,cAAA","ignoreList":[]}
1	+ {"version":3,"names":["_transformTranslatations","require","_xmppUsername","getLocalpartFromJid","jid","value","String","trim","undefined","split","safeJsonParse","fallback","JSON","parse","normalizeTranslations","Array","isArray","filter","item","translatedText","language","languageName","extractTimestamp","str","stanza","console","log","toString","timestamp","slice","getDataFromXml","fullData","getChild","xmppId","attrs","id","xmppFrom","from","roomJid","userWalletFromResource","Date","now","body","getText","deleted","translationPayload","translations","transformArrayToObject","translates","langSource","source","numericPart","exec","date","toISOString","data","photoURL","photo","rawUserWallet","senderJID","userWallet","normalizeXmppUsername","user","dataAttrs","exports"],"sourceRoot":"../../../src","sources":["helpers/getDataFromXml.ts"],"mappings":"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","ignoreList":[]}

package/lib/commonjs/helpers/historyPreloadScheduler.js CHANGED Viewed

@@ -13,13 +13,6 @@ 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) {
@@ -191,67 +184,11 @@ const runHistoryPreloadScheduler = async options => {
               throw new Error('history_timeout');
             }
             const nextRoom = _roomStore.store.getState().rooms.rooms[item.jid];
-            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);
+            const unreadCapped = computeUnreadCapped(nextRoom, fetchedMessages || [], pageSize);
             _roomStore.store.dispatch((0, _roomsSlice.applyRoomsPreloadBatch)({
               rooms: [{
                 jid: item.jid,
-                messages: combined,
+                messages: fetchedMessages || [],
                 unreadCapped,
                 historyPreloadState: 'done'
               }]

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

	@@ -1 +1 @@
1	- {"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":[]}
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":";;;;;;AAAA,IAAAA,YAAA,GAAAC,OAAA;AAEA,IAAAC,UAAA,GAAAD,OAAA;AACA,IAAAE,WAAA,GAAAF,OAAA;AAuBA,MAAMG,mBAAmB,GAAG,CAAC;AAC7B;AACA;AACA;AACA,MAAMC,iBAAiB,GAAG,EAAE;AAC5B,MAAMC,mBAAmB,GAAG,CAAC;AAE7B,MAAMC,KAAK,GAAIC,EAAU,IAAK,IAAIC,OAAO,CAAEC,OAAO,IAAKC,UAAU,CAACD,OAAO,EAAEF,EAAE,CAAC,CAAC;AAE/E,MAAMI,gBAAgB,GAAIC,CAAW,IAAa;EAChD,IAAI,CAACA,CAAC,EAAE;IAAC,OAAO,CAAC;EAAC;EAClB,MAAMC,CAAC,GAAID,CAAC,CAASE,SAAS;EAC9B,IAAIC,MAAM,CAACC,QAAQ,CAACH,CAAC,CAAC,IAAIA,CAAC,GAAG,CAAC,EAAE;IAAC,OAAOE,MAAM,CAACF,CAAC,CAAC;EAAC;EACnD,MAAMI,EAAE,GAAGF,MAAM,CAACH,CAAC,CAACK,EAAE,CAAC;EACvB,IAAIF,MAAM,CAACC,QAAQ,CAACC,EAAE,CAAC,IAAIA,EAAE,GAAG,CAAC,EAAE;IAAC,OAAOA,EAAE;EAAC;EAC9C,OAAO,CAAC;AACV,CAAC;AAED,MAAMC,wBAAwB,GAAIC,IAAW,IAAa;EACxD,IAAI,CAACA,IAAI,EAAEC,QAAQ,EAAEC,MAAM,EAAE;IAAC,OAAO,CAAC;EAAC;EACvC,OAAOF,IAAI,CAACC,QAAQ,CAACE,MAAM,CAAC,CAACC,GAAG,EAAEX,CAAC,KAAKY,IAAI,CAACD,GAAG,CAACA,GAAG,EAAEZ,gBAAgB,CAACC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;AAChF,CAAC;AAED,MAAMa,mBAAmB,GAAGA,CAC1BN,IAAW,EACXC,QAAoB,EACpBM,QAAgB,KACJ;EACZ,IAAI,CAACP,IAAI,EAAE;IAAC,OAAO,KAAK;EAAC;EACzB,IAAI,CAACC,QAAQ,IAAIA,QAAQ,CAACC,MAAM,GAAGK,QAAQ,EAAE;IAAC,OAAO,KAAK;EAAC;EAC3D,IAAIP,IAAI,CAACQ,eAAe,KAAK,IAAI,EAAE;IAAC,OAAO,KAAK;EAAC;EAEjD,MAAMC,SAAS,GAAGR,QAAQ,CAACS,MAAM,CAC9BC,GAAG,IAAK,CAAC,CAACA,GAAG,IAAIA,GAAG,CAACb,EAAE,KAAK,eAAe,IAAI,CAACa,GAAG,CAACC,OACvD,CAAC;EACD,IAAIH,SAAS,CAACP,MAAM,GAAGK,QAAQ,EAAE;IAAC,OAAO,KAAK;EAAC;EAE/C,MAAMM,UAAU,GAAGjB,MAAM,CAACI,IAAI,CAACc,mBAAmB,CAAC,IAAI,CAAC;EACxD,IAAID,UAAU,IAAI,CAAC,EAAE;IAAC,OAAO,IAAI;EAAC;EAElC,MAAME,QAAQ,GAAGN,SAAS,CAACN,MAAM,CAAS,CAACa,KAAK,EAAEvB,CAAC,KAAK;IACtD,MAAMwB,EAAE,GAAGzB,gBAAgB,CAACC,CAAC,CAAC;IAC9B,IAAI,CAACG,MAAM,CAACC,QAAQ,CAACoB,EAAE,CAAC,IAAIA,EAAE,IAAI,CAAC,EAAE;MAAC,OAAOD,KAAK;IAAC;IACnD,OAAOX,IAAI,CAACa,GAAG,CAACF,KAAK,EAAEC,EAAE,CAAC;EAC5B,CAAC,EAAErB,MAAM,CAACuB,gBAAgB,CAAC;EAC3B,IAAI,CAACvB,MAAM,CAACC,QAAQ,CAACkB,QAAQ,CAAC,IAAIA,QAAQ,KAAKnB,MAAM,CAACuB,gBAAgB,EACpE;IAAC,OAAO,KAAK;EAAC;EAChB,OAAOJ,QAAQ,GAAGF,UAAU;AAC9B,CAAC;AAED,MAAMO,eAAe,GAAGA,CACtBC,GAAW,EACXC,KAAY,EACZC,eAA8B,EAC9BC,eAA4B,KACjB;EACX,IAAID,eAAe,IAAIA,eAAe,KAAKF,GAAG,EAAE;IAAC,OAAO,CAAC;EAAC;EAC1D,IAAIG,eAAe,CAACC,GAAG,CAACJ,GAAG,CAAC,EAAE;IAAC,OAAO,CAAC;EAAC;EACxC,OAAO,CAAC;AACV,CAAC;AAED,MAAMK,wBAAwB,GAAGA,CAAA,KAAe;EAC9C,OAAOC,qBAAQ,CAACC,YAAY,KAAK,QAAQ;AAC3C,CAAC;;AAED;AACA;AACA;AACA;AACA;AACA;AACO,MAAMC,0BAA0B,GAAG,MACxCC,OAAuC,IACrB;EAClB,MAAM;IACJC,MAAM;IACNC,MAAM;IACNC,WAAW,GAAGjD,mBAAmB;IACjCuB,QAAQ,GAAGtB,iBAAiB;IAC5BiD,UAAU,GAAGhD,mBAAmB;IAChCiD,SAAS;IACTZ,eAAe,GAAG,IAAI;IACtBC,eAAe,GAAG,EAAE;IACpBY,WAAW,GAAG;EAChB,CAAC,GAAGN,OAAO;EAEX,IAAIE,MAAM,EAAEK,OAAO,EAAE;IAAC;EAAO;EAE7BC,gBAAK,CAACC,QAAQ,CAAC,IAAAC,4BAAgB,EAAC,IAAI,CAAC,CAAC;EACtC,IAAI;IAEJ,MAAMC,KAAK,GAAGH,gBAAK,CAACI,QAAQ,CAAC,CAAC;IAC9B,MAAMC,KAAK,GAAIF,KAAK,CAACE,KAAK,CAACA,KAAK,IAAI,CAAC,CAA2B;IAChE,MAAMC,UAAU,GAAG,IAAIC,GAAG,CAACrB,eAAe,CAAC;IAE3C,MAAMsB,WAAwB,GAAGC,MAAM,CAACC,OAAO,CAACL,KAAK,CAAC,CACnDM,GAAG,CAAC,CAAC,CAAC5B,GAAG,EAAErB,IAAI,CAAkB,MAAM;MACtCqB,GAAG;MACH6B,QAAQ,EAAE9B,eAAe,CAACC,GAAG,EAAErB,IAAI,EAAEuB,eAAe,EAAEqB,UAAU,CAAC;MACjEO,aAAa,EAAEpD,wBAAwB,CAACC,IAAI,CAAC;MAC7CoD,QAAQ,EAAE,CAAC;MACXC,OAAO,EAAEC,IAAI,CAACC,GAAG,CAAC;IACpB,CAAC,CAAC,CAAC,CACFC,IAAI,CAAC,CAACC,CAAC,EAAEC,CAAC,KAAK;MACd,IAAID,CAAC,CAACP,QAAQ,KAAKQ,CAAC,CAACR,QAAQ,EAAE;QAAC,OAAOO,CAAC,CAACP,QAAQ,GAAGQ,CAAC,CAACR,QAAQ;MAAC;MAC/D,IAAIO,CAAC,CAACN,aAAa,KAAKO,CAAC,CAACP,aAAa,EAAE;QACvC,OAAOO,CAAC,CAACP,aAAa,GAAGM,CAAC,CAACN,aAAa;MAC1C;MACA,OAAOM,CAAC,CAACpC,GAAG,CAACsC,aAAa,CAACD,CAAC,CAACrC,GAAG,CAAC;IACnC,CAAC,CAAC;IAEJ,MAAMuC,KAAkB,GACtBzB,SAAS,IAAIA,SAAS,GAAG,CAAC,GACtBW,WAAW,CAACe,KAAK,CAAC,CAAC,EAAE1B,SAAS,CAAC,GAC/BW,WAAW;IAEjB,MAAMgB,cAAc,GAAG,IAAIC,GAAG,CAAwB,CAAC;IACvD,IAAIC,qBAAqB,GAAG,CAAC;IAE7B,OAAOJ,KAAK,CAAC1D,MAAM,GAAG,CAAC,EAAE;MACvB,IAAI8B,MAAM,EAAEK,OAAO,EAAE;QAAC;MAAO;MAE7B,IAAI,CAACN,MAAM,CAACkC,oBAAoB,CAAC,CAAC,EAAE;QAClC,MAAM9E,KAAK,CAAC,EAAE,CAAC;QACf;MACF;MACA,IAAIuC,wBAAwB,CAAC,CAAC,EAAE;QAC9B,MAAMvC,KAAK,CAAC,GAAG,CAAC;QAChB;MACF;MAEA,MAAMoE,GAAG,GAAGD,IAAI,CAACC,GAAG,CAAC,CAAC;MACtB,MAAMW,UAAU,GAAGN,KAAK,CAAClD,MAAM,CAC5ByD,IAAI,IAAKA,IAAI,CAACd,OAAO,IAAIE,GAAG,IAAI,CAACO,cAAc,CAACrC,GAAG,CAAC0C,IAAI,CAAC9C,GAAG,CAC/D,CAAC;MACD,IAAI6C,UAAU,CAAChE,MAAM,KAAK,CAAC,EAAE;QAC3B,MAAMf,KAAK,CAAC,EAAE,CAAC;QACf;MACF;MAEA,MAAMiF,KAAK,GAAGF,UAAU,CAACL,KAAK,CAAC,CAAC,EAAExD,IAAI,CAACD,GAAG,CAAC,CAAC,EAAE6B,WAAW,CAAC,CAAC;;MAE3D;MACA;MACA;MACA;MACA;MACA;MACA,MAAMoC,yBAAyB,GAAG,IAAIN,GAAG,CACvCK,KAAK,CAACnB,GAAG,CAAEkB,IAAI,IAAK,CAClBA,IAAI,CAAC9C,GAAG,EACRiB,gBAAK,CAACI,QAAQ,CAAC,CAAC,CAACC,KAAK,CAACA,KAAK,CAACwB,IAAI,CAAC9C,GAAG,CAAC,EAAEiD,mBAAmB,CAC5D,CACH,CAAC;MAEDhC,gBAAK,CAACC,QAAQ,CACZ,IAAAgC,kCAAsB,EAAC;QACrB5B,KAAK,EAAEyB,KAAK,CAACnB,GAAG,CAAEkB,IAAI,KAAM;UAC1B9C,GAAG,EAAE8C,IAAI,CAAC9C,GAAG;UACbiD,mBAAmB,EAAE;QACvB,CAAC,CAAC;MACJ,CAAC,CACH,CAAC;MAED,MAAMjF,OAAO,CAACmF,GAAG,CACfJ,KAAK,CAACnB,GAAG,CAAC,MAAOkB,IAAI,IAAK;QACxB,MAAMM,UAAU,GAAGb,KAAK,CAACc,SAAS,CAAEC,MAAM,IAAKA,MAAM,CAACtD,GAAG,KAAK8C,IAAI,CAAC9C,GAAG,CAAC;QACvE,IAAIoD,UAAU,KAAK,CAAC,CAAC,EAAE;UAACb,KAAK,CAACgB,MAAM,CAACH,UAAU,EAAE,CAAC,CAAC;QAAC;QAEpD,MAAMI,IAAI,GAAG,CAAC,YAAY;UACxB,MAAMC,WAAW,GAAGxC,gBAAK,CAACI,QAAQ,CAAC,CAAC,CAACC,KAAK,CAACA,KAAK,CAACwB,IAAI,CAAC9C,GAAG,CAAC;UAC1D,MAAM0D,QAAQ,GAAGV,yBAAyB,CAACW,GAAG,CAACb,IAAI,CAAC9C,GAAG,CAAC;UACxD,IACE,CAACyD,WAAW,IACX,CAAC1C,WAAW,IAAI2C,QAAQ,KAAK,MAAO,EACrC;YACAzC,gBAAK,CAACC,QAAQ,CACZ,IAAAgC,kCAAsB,EAAC;cACrB5B,KAAK,EAAE,CAAC;gBAAEtB,GAAG,EAAE8C,IAAI,CAAC9C,GAAG;gBAAEiD,mBAAmB,EAAE;cAAO,CAAC;YACxD,CAAC,CACH,CAAC;YACD;UACF;UAEA,IAAI;YACF,MAAMW,eAAe,GAAG,MAAMlD,MAAM,CAACmD,gBAAgB,CACnDf,IAAI,CAAC9C,GAAG,EACRd,QAAQ,EACR4E,SAAS,EACTA,SAAS,EACT;cACEC,YAAY,EAAE,IAAI;cAClBC,eAAe,EAAE,CAACjD,WAAW;cAC7BkD,MAAM,EAAE;YACV,CACF,CAAC;YACD,IAAItD,MAAM,EAAEK,OAAO,EAAE;cAAC;YAAO;YAC7B,IAAI,OAAO4C,eAAe,KAAK,WAAW,EAAE;cAC1C,MAAM,IAAIM,KAAK,CAAC,iBAAiB,CAAC;YACpC;YAEA,MAAMC,QAAQ,GAAGlD,gBAAK,CAACI,QAAQ,CAAC,CAAC,CAACC,KAAK,CAACA,KAAK,CAACwB,IAAI,CAAC9C,GAAG,CAAC;YACvD,MAAMoE,YAAY,GAAGnF,mBAAmB,CACtCkF,QAAQ,EACRP,eAAe,IAAI,EAAE,EACrB1E,QACF,CAAC;YAED+B,gBAAK,CAACC,QAAQ,CACZ,IAAAgC,kCAAsB,EAAC;cACrB5B,KAAK,EAAE,CACL;gBACEtB,GAAG,EAAE8C,IAAI,CAAC9C,GAAG;gBACbpB,QAAQ,EAAEgF,eAAe,IAAI,EAAE;gBAC/BQ,YAAY;gBACZnB,mBAAmB,EAAE;cACvB,CAAC;YAEL,CAAC,CACH,CAAC;YACDN,qBAAqB,GAAG,CAAC;UAC3B,CAAC,CAAC,MAAM;YACN,MAAM0B,OAAO,GAAGvB,IAAI,CAACf,QAAQ,GAAG,CAAC;YACjC,MAAMuC,QAAQ,GAAGD,OAAO,IAAIxD,UAAU;YACtC,IAAIyD,QAAQ,EAAE;cACZ,MAAMC,MAAM,GAAGvF,IAAI,CAACwF,KAAK,CAACxF,IAAI,CAACyF,MAAM,CAAC,CAAC,GAAG,GAAG,CAAC;cAC9C,MAAMC,OAAO,GAAG1F,IAAI,CAACa,GAAG,CAAC,IAAI,EAAE,GAAG,GAAG,CAAC,IAAIiD,IAAI,CAACf,QAAQ,CAAC,GAAGwC,MAAM;cACjEhC,KAAK,CAACoC,IAAI,CAAC;gBACT,GAAG7B,IAAI;gBACPf,QAAQ,EAAEsC,OAAO;gBACjBrC,OAAO,EAAEC,IAAI,CAACC,GAAG,CAAC,CAAC,GAAGwC;cACxB,CAAC,CAAC;YACJ,CAAC,MAAM;cACLzD,gBAAK,CAACC,QAAQ,CACZ,IAAAgC,kCAAsB,EAAC;gBACrB5B,KAAK,EAAE,CAAC;kBAAEtB,GAAG,EAAE8C,IAAI,CAAC9C,GAAG;kBAAEiD,mBAAmB,EAAE;gBAAQ,CAAC;cACzD,CAAC,CACH,CAAC;YACH;YACAN,qBAAqB,IAAI,CAAC;YAC1B,IAAIA,qBAAqB,IAAI,CAAC,EAAE;cAC9B,MAAM7E,KAAK,CAAC,GAAG,CAAC;cAChB6E,qBAAqB,GAAG,CAAC;YAC3B;UACF;QACF,CAAC,EAAE,CAAC;QAEJF,cAAc,CAACmC,GAAG,CAAC9B,IAAI,CAAC9C,GAAG,EAAEwD,IAAI,CAAC;QAClC,MAAMA,IAAI,CAACqB,OAAO,CAAC,MAAMpC,cAAc,CAACqC,MAAM,CAAChC,IAAI,CAAC9C,GAAG,CAAC,CAAC;MAC3D,CAAC,CACH,CAAC;;MAED;MACA,MAAM,IAAIhC,OAAO,CAAE+G,CAAC,IAAK7G,UAAU,CAAC6G,CAAC,EAAE,CAAC,CAAC,CAAC;IAC5C;EACA,CAAC,SAAS;IACR9D,gBAAK,CAACC,QAAQ,CAAC,IAAAC,4BAAgB,EAAC,KAAK,CAAC,CAAC;EACzC;AACF,CAAC;AAAC6D,OAAA,CAAAxE,0BAAA,GAAAA,0BAAA;AAAA,IAAAyE,QAAA,GAAAD,OAAA,CAAAE,OAAA,GAEa1E,0BAA0B","ignoreList":[]}

package/lib/commonjs/helpers/initXmppRooms.js CHANGED Viewed

@@ -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,22 +43,16 @@ const initXmppRooms = async (user, config, xmmpClient, rooms, roomJID) => {
         console.log(res);
       }
-      // 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();
+      //@ts-ignore
+      const roomTimestampObject = await xmmpClient.getChatsPrivateStoreRequestStanza();
+      (0, _updatedChatLastTimestamps.updatedChatLastTimestamps)(roomTimestampObject, _roomStore.store.dispatch);
     } else {
-      await xmmpClient.getChatsPrivateStoreRequestStanza();
+      //@ts-ignore
+      const roomTimestampObject = await xmmpClient.getChatsPrivateStoreRequestStanza();
+      (0, _updatedChatLastTimestamps.updatedChatLastTimestamps)(roomTimestampObject, _roomStore.store.dispatch);
     }
     if (config?.refreshTokens?.enabled) {
-      // 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)();
+      config?.refreshTokens?.refreshFunction?.();
     }
   } catch (error) {
     console.error(error);

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

	@@ -1 +1 @@
1	- {"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":[]}
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":[]}

package/lib/commonjs/helpers/insertMessageWithDelimiter.js CHANGED Viewed

@@ -7,6 +7,19 @@ exports.insertMessageWithDelimiter = insertMessageWithDelimiter;
 var _dateComparison = require("./dateComparison");
 function deepMerge(target, source) {
   for (const key in source) {
+    if (source[key] === undefined) {
+      // `for...in` visits a key even when its value is `undefined` — every
+      // stanza parser (getDataFromXml/createMessageFromXml) returns an
+      // object literal with `translations` always present, explicitly
+      // `undefined` whenever the wire message didn't carry a
+      // <translations> element. Without this guard, merging THAT message
+      // over an existing row would blow away a translation the row
+      // already had (e.g. a MAM/live echo of a message arriving without
+      // its translation re-attached) — a real message flips from
+      // translated back to original text for no reason. Absence on the
+      // incoming side must mean "leave it alone", never "clear it".
+      continue;
+    }
     if (source[key] && typeof source[key] === 'object' && !Array.isArray(source[key])) {
       target[key] = deepMerge(target[key] || {}, source[key]);
     } else {

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

	@@ -1 +1 @@
1	- {"version":3,"names":["_dateComparison","require","deepMerge","target","source","key","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","~~undefined","~~token","refreshToken","toISOString","body","roomJid","isDateBefore","unshift","i"],"sourceRoot":"../../../src","sources":["helpers/insertMessageWithDelimiter.ts"],"mappings":";;;;;;AACA,IAAAA,eAAA,GAAAC,OAAA;AAEA,SAASC,SAASA,CAACC,MAAW,EAAEC,MAAW,EAAO;EAChD,KAAK,MAAMC,GAAG,IAAID,MAAM,EAAE;IACxB,~~IACEA~~,MAAM,CAACC,GAAG,CAAC,IACX,OAAOD,MAAM,CAACC,GAAG,CAAC,KAAK,QAAQ,IAC/B,~~CAACC~~,KAAK,CAACC,OAAO,~~CAACH~~,MAAM,CAACC,GAAG,CAAC,CAAC,EAC3B;MACAF,MAAM,CAACE,GAAG,CAAC,GAAGH,SAAS,CAACC,MAAM,CAACE,GAAG,CAAC,IAAI,CAAC,CAAC,EAAED,MAAM,CAACC,GAAG,CAAC,CAAC;IACzD,CAAC,MAAM;MACLF,MAAM,CAACE,GAAG,CAAC,GAAGD,MAAM,CAACC,GAAG,CAAC;IAC3B;EACF;EACA,OAAOF,MAAM;AACf;AAEO,~~SAASK~~,0BAA0BA,CACxCC,YAAiC,EACjCC,OAAiB,EACjBC,mBAAsD,EACtD;EACA,MAAMC,aAAa,GAAGH,YAAY,CAACI,SAAS,CACzCC,GAAG,IACFA,GAAG,CAACC,EAAE,KAAKL,OAAO,CAACK,EAAE,IACpBL,OAAO,CAACM,MAAM,IAAIF,GAAG,CAACC,EAAE,KAAKL,OAAO,CAACM,MAAO,IAC5CF,GAAG,CAACE,MAAM,IAAIF,GAAG,CAACE,MAAM,KAAKN,OAAO,CAACK,EAC1C,CAAC;EAED,IAAIH,aAAa,KAAK,CAAC,CAAC,EAAE;IACxB,MAAMK,QAAQ,GAAGR,YAAY,CAACG,aAAa,CAAC;IAC5C;IACA;IACA;IACA;IACA;IACA;IACA;IACA,MAAMM,eAAe,GAClBD,QAAQ,EAAUE,IAAI,EAAEJ,EAAE,IAAKL,OAAO,EAAUS,IAAI,EAAEJ,EAAE;IAC3D,MAAMK,MAAM,~~GAAGlB~~,SAAS,CAAC;MAAE,~~GAAGe~~;IAAS,CAAC,EAAE;MAAE,GAAGP,OAAO;MAAEW,OAAO,EAAE;IAAM,CAAC,CAAC;IACzE,IAAID,MAAM,CAACD,IAAI,IAAID,eAAe,EAAE;MAClCE,MAAM,CAACD,IAAI,CAACJ,EAAE,GAAGG,eAAe;IAClC;IACAT,YAAY,CAACG,aAAa,CAAC,GAAGQ,MAAM;IACpC;EACF;EAEA,MAAME,cAAc,GAAGZ,OAAO,CAACa,IAAI;EACnC,MAAMC,WAAW,GAAGf,YAAY,CAACA,YAAY,CAACgB,MAAM,GAAG,CAAC,CAAC;EACzD,MAAMC,YAAY,GAAGjB,YAAY,CAAC,CAAC,CAAC;EAEpC,IAAI,IAAAkB,2BAAW,EAACL,cAAc,CAACM,QAAQ,CAAC,CAAC,EAAEJ,WAAW,EAAED,IAAI,EAAEK,QAAQ,CAAC,CAAC,IAAI,EAAE,CAAC,EAAE;IAC/E,MAAMC,KAAK,GAAGpB,YAAY,CAACI,SAAS,CACjCC,GAAG,IAAKA,GAAG,CAACC,EAAE,KAAKL,OAAO,CAACM,MAAM,IAAIF,GAAG,CAACC,EAAE,KAAKL,OAAO,CAACK,EAC3D,CAAC;IAED,IAAIc,KAAK,KAAK,CAAC,CAAC,EAAE;MAChBpB,YAAY,CAACoB,KAAK,CAAC,GAAG;QAAE,GAAGnB,OAAO;QAAEK,EAAE,EAAEL,OAAO,CAACK,EAAE;QAAEM,OAAO,EAAE;MAAM,CAAC;IACtE,CAAC,MAAM;MACLZ,YAAY,CAACqB,IAAI,CAACpB,OAAO,CAAC;IAC5B;IAEA,IACEC,mBAAmB,IACnB,CAACF,YAAY,CAACsB,IAAI,CAAEjB,GAAG,IAAKA,GAAG,CAACC,EAAE,KAAK,eAAe,CAAC,IACvD,IAAAY,2BAAW,EAACL,cAAc,CAACM,QAAQ,CAAC,CAAC,EAAEjB,mBAAmB,CAACiB,QAAQ,CAAC,CAAC,CAAC,EACtE;MACA,MAAMI,cAAc,GAAGvB,YAAY,CAACI,SAAS,CAAEC,GAAG,IAChD,IAAAa,2BAAW,EAACb,GAAG,CAACS,IAAI,EAAEK,QAAQ,CAAC,CAAC,IAAI,EAAE,EAAEjB,mBAAmB,CAACiB,QAAQ,CAAC,CAAC,CACxE,CAAC;MAED,IAAII,cAAc,KAAK,CAAC,CAAC,EAAE;QACzB;QACA;QACA;QACA;QACA;QACA;QACA;QACA;QACA,MAAMC,aAAa,GAAGC,IAAI,CAACC,KAAK,CAC9BC,MAAM,CAAC3B,YAAY,CAACuB,cAAc,CAAC,EAAET,IAAI,IAAI,EAAE,CACjD,CAAC;QACD,MAAMc,aAAa,GAAG1B,mBAAmB,CAACiB,QAAQ,CAAC,CAAC;QACpD,MAAMU,YAAY,GAChBJ,IAAI,CAACC,KAAK,CAACE,aAAa,CAAC,IAAIE,MAAM,CAACF,aAAa,CAAC,IAAIH,IAAI,CAACM,GAAG,CAAC,CAAC;QAClE,MAAMC,QAAQ,GAAGF,MAAM,CAACG,QAAQ,CAACT,aAAa,CAAC,GAC3CA,aAAa,GAAG,CAAC,GACjBK,YAAY;QAEhB7B,YAAY,CAACkC,MAAM,CAACX,cAAc,EAAE,CAAC,EAAE;UACrCjB,EAAE,EAAE,eAAe;UACnBI,IAAI,EAAE;YACJJ,EAAE,EAAE,QAAQ;YACZ6B,IAAI,~~EAAEC~~,SAAS;~~YACfC~~,KAAK,EAAE,EAAE;YACTC,YAAY,EAAE;UAChB,CAAC;~~UACDxB~~,IAAI,EAAE,IAAIW,IAAI,CAACO,QAAQ,CAAC,~~CAACO~~,WAAW,CAAC,CAAC;UACtCC,IAAI,EAAE,cAAc;UACpBC,OAAO,EAAE;QACX,CAAC,CAAC;MACJ;IACA;EACJ,CAAC,MAAM,IACL,IAAAC,4BAAY,~~EAAC7B~~,cAAc,CAACM,QAAQ,CAAC,CAAC,EAAEF,YAAY,EAAEH,IAAI,EAAEK,QAAQ,CAAC,CAAC,IAAI,EAAE,CAAC,EAC7E;IACAnB,YAAY,~~CAAC2C~~,OAAO,~~CAAC1C~~,OAAO,CAAC;EAC/B,CAAC,MAAM;IACL,KAAK,~~IAAI2C~~,CAAC,GAAG,CAAC,EAAEA,CAAC,~~GAAG5C~~,YAAY,CAACgB,MAAM,~~EAAE4B~~,CAAC,EAAE,EAAE;MAC5C,IACE,IAAAF,4BAAY,~~EAAC7B~~,cAAc,CAACM,QAAQ,CAAC,CAAC,EAAEnB,YAAY,~~CAAC4C~~,CAAC,CAAC,~~CAAC9B~~,IAAI,EAAEK,QAAQ,CAAC,CAAC,IAAI,EAAE,CAAC,EAC/E;QACAnB,YAAY,CAACkC,MAAM,~~CAACU~~,CAAC,EAAE,CAAC,~~EAAE3C~~,OAAO,CAAC;QAClC;MACF;IACF;EACF;AACF","ignoreList":[]}
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":[]}

package/lib/commonjs/helpers/isUnresolvedSenderId.js CHANGED Viewed

@@ -20,7 +20,12 @@ exports.isUnresolvedSenderId = void 0;
  * matches. A raw objectId on its own is matched too, since some senders
  * carry only that half.
  */
-const ETHORA_ID = /^[0-9a-f]{24}(_[0-9a-f]{24})?$/i;
+const ETHORA_ID_PART = '[0-9a-f]{24}(?:_[0-9a-f]{24})?';
+// A private (1:1) room's own id is two of those joined by a hyphen —
+// `<appId>_<userA>-<appId>_<userB>` — and that is what a message whose
+// `from` carries no occupant resource resolves to. Matched as well, so a
+// bubble is never captioned with a room id.
+const ETHORA_ID = new RegExp(`^${ETHORA_ID_PART}(?:-${ETHORA_ID_PART})?$`, 'i');
 const isUnresolvedSenderId = name => {
   const trimmed = String(name || '').trim();
   if (!trimmed) {

package/lib/commonjs/helpers/isUnresolvedSenderId.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"names":["ETHORA_ID","isUnresolvedSenderId","name","trimmed","String","trim","test","exports"],"sourceRoot":"../../../src","sources":["helpers/isUnresolvedSenderId.ts"],"mappings":";;;;;;AAAA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,MAAMA,~~SAAS~~,GAAG,~~iCAAiC~~;~~AAE5C~~,MAAMC,oBAAoB,GAAIC,IAAa,IAAc;EAC9D,MAAMC,OAAO,GAAGC,MAAM,CAACF,IAAI,IAAI,EAAE,CAAC,CAACG,IAAI,CAAC,CAAC;EACzC,IAAI,CAACF,OAAO,EAAE;IACZ,OAAO,IAAI;EACb;EACA,~~OAAOH~~,SAAS,~~CAACM~~,IAAI,CAACH,OAAO,CAAC;AAChC,CAAC;AAACI,OAAA,CAAAN,oBAAA,GAAAA,oBAAA","ignoreList":[]}
1	+ {"version":3,"names":["ETHORA_ID_PART","ETHORA_ID","RegExp","isUnresolvedSenderId","name","trimmed","String","trim","test","exports"],"sourceRoot":"../../../src","sources":["helpers/isUnresolvedSenderId.ts"],"mappings":";;;;;;AAAA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,MAAMA,cAAc,GAAG,gCAAgC;AACvD;AACA;AACA;AACA;AACA,MAAMC,SAAS,GAAG,IAAIC,MAAM,CAC1B,IAAIF,cAAc,OAAOA,cAAc,KAAK,EAC5C,GACF,CAAC;AAEM,MAAMG,oBAAoB,GAAIC,IAAa,IAAc;EAC9D,MAAMC,OAAO,GAAGC,MAAM,CAACF,IAAI,IAAI,EAAE,CAAC,CAACG,IAAI,CAAC,CAAC;EACzC,IAAI,CAACF,OAAO,EAAE;IACZ,OAAO,IAAI;EACb;EACA,OAAOJ,SAAS,CAACO,IAAI,CAACH,OAAO,CAAC;AAChC,CAAC;AAACI,OAAA,CAAAN,oBAAA,GAAAA,oBAAA","ignoreList":[]}

package/lib/commonjs/helpers/mimeToExtension.js CHANGED Viewed

@@ -3,6 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
+exports.deriveDisplayFilename = deriveDisplayFilename;
 exports.ensureFilenameHasExtension = ensureFilenameHasExtension;
 exports.filenameFromUrl = filenameFromUrl;
 exports.getExtensionForMime = getExtensionForMime;
@@ -237,10 +238,17 @@ function ensureFilenameHasExtension(fileName, mime) {
   return `${base}${getExtensionForMime(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).
+/**
+ * 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);
+}
 //# sourceMappingURL=mimeToExtension.js.map