@ethora/chat-component-rn 26.5.7 → 26.5.10

package/lib/commonjs/context/xmppProvider.js

@@ -8,6 +8,7 @@ exports.emitXmppLogout = emitXmppLogout;
 exports.useXmppClient = void 0;
 var _react = _interopRequireWildcard(require("react"));
 var _reactNative = require("react-native");
+var _netinfo = _interopRequireDefault(require("@react-native-community/netinfo"));
 var _xmppClient = _interopRequireDefault(require("../networking/xmppClient"));
 var _chatSettingsSlice = require("../roomStore/chatSettingsSlice");
 var _clientRegistry = require("../utils/clientRegistry");
@@ -29,11 +30,11 @@ const XmppContext = /*#__PURE__*/(0, _react.createContext)(null);
 const LOGOUT_EVENT = 'ethora-xmpp-logout';
 const XmppProvider = ({
   children,
-  config
+  config,
+  isVisible
 }) => {
   const [client, setClient] = (0, _react.useState)(null);
   const [providerBootstrapStatus, setProviderBootstrapStatus] = (0, _react.useState)('idle');
-  const [reconnectAttempts, setReconnectAttempts] = (0, _react.useState)(0);
 
   // Track which "init mode" this provider runs in. When config.initBeforeLoad
   // is true, the provider owns bootstrap and ChatWrapper just waits.
@@ -129,6 +130,12 @@ const XmppProvider = ({
     // 3. Otherwise create a new client under the init lock to dedup
     //    concurrent calls for the same key.
     const created = await (0, _clientRegistry.withXmppClientInitLock)(key, async () => {
+      const prevGlobal = (0, _clientRegistry.getGlobalXmppClient)();
+      if (prevGlobal) {
+        try {
+          await prevGlobal.close();
+        } catch {}
+      }
       const newClient = new _xmppClient.default(username, password, settings);
       // Wire up the credentialsProvider so SASL `not-authorized`
       // after idle triggers a refresh chain (jwtLogin →
@@ -147,13 +154,30 @@ const XmppProvider = ({
     // Reused clients (steps 1+2 above) also need the provider — config
     // may have changed since the singleton was created.
     created.setCredentialsProvider(credentialsProvider);
+
+    // Re-join MUC rooms on every 'online'. After a reconnect the new
+    // XMPP stream isn't a member of any room, so a sent message gets a
+    // local double-tick but never reaches the room (bug #21). Re-sending
+    // presence on reconnect fixes delivery. On the very first connect
+    // the room list isn't loaded yet so this joins nothing — the
+    // bootstrap's own allRoomPresences handles that pass.
+    created.setOnOnline(() => {
+      const underlying = created.client;
+      if (!underlying) {
+        return;
+      }
+      (0, _allRoomPresences.allRoomPresences)(underlying).catch(e => (0, _devLogger.pushLog)('warn', 'reconnect: allRoomPresences re-join failed', e));
+      // Also refresh the private store so unread / lastViewed markers
+      // are accurate after a long reconnect — the MUC re-join above only
+      // restores delivery, not unread state. Idempotent on first connect.
+      created.getChatsPrivateStoreRequestStanza().catch(e => (0, _devLogger.pushLog)('warn', 'reconnect: privateStore refresh failed', e));
+    });
     setClient(created);
     lastCredsRef.current = {
       username,
       password,
       settings
     };
-    setReconnectAttempts(0);
     return created;
   }, [client, config?.xmppSettings, credentialsProvider]);
 
@@ -167,6 +191,32 @@ const XmppProvider = ({
     }
     const abortController = new AbortController();
     let cancelled = false;
+    // Auto-retry a TRANSIENT bootstrap failure a few times with backoff
+    // before surfacing the error modal — a flaky network at launch should
+    // self-heal, not dead-end the user on a Retry button. (Bad-creds
+    // failures resolve to null below and fail fast — they never reach the
+    // catch, so they aren't retried.)
+    const MAX_BOOTSTRAP_ATTEMPTS = 3;
+    let bootstrapAttempt = 0;
+    // Overall time budget: if we never reach 'ready' (a step hangs), abort
+    // the in-flight work and fail so the loader can't spin forever.
+    const BOOTSTRAP_BUDGET_MS = 45000;
+    let reachedReady = false;
+    let budgetTimer = setTimeout(() => {
+      if (cancelled || reachedReady) {
+        return;
+      }
+      (0, _devLogger.pushLog)('warn', 'initBeforeLoad: time budget exceeded → failed');
+      abortController.abort();
+      inflightBootstrapKeyRef.current = '';
+      setProviderBootstrapStatus('failed');
+    }, BOOTSTRAP_BUDGET_MS);
+    const clearBudget = () => {
+      if (budgetTimer) {
+        clearTimeout(budgetTimer);
+        budgetTimer = null;
+      }
+    };
     const run = async () => {
       // Stable bootstrap key — re-run only when these change.
       const explicitUser = config?.userLogin?.enabled ? config?.userLogin?.user : null;
@@ -260,6 +310,8 @@ const XmppProvider = ({
         _roomStore.store.dispatch((0, _chatSettingsSlice.setStoreClient)(c));
         completedBootstrapKeyRef.current = key;
         inflightBootstrapKeyRef.current = '';
+        reachedReady = true;
+        clearBudget();
         setProviderBootstrapStatus('ready');
         (0, _devLogger.pushLog)('rn', 'initBeforeLoad: READY');
 
@@ -277,21 +329,40 @@ const XmppProvider = ({
           roomLimit: qos?.preloadTopKRooms
         }).catch(err => console.warn('History preload scheduler failed', err));
       } catch (error) {
-        if (cancelled) {
+        if (cancelled || abortController.signal.aborted) {
+          return;
+        }
+        bootstrapAttempt += 1;
+        // Throws here are transient (network / XMPP connect). A bad-creds
+        // failure resolves to null above and fails fast without throwing,
+        // so it never reaches this catch. Retry with backoff before the
+        // modal; release the in-flight key so the recursive run() isn't
+        // short-circuited by its own guard.
+        if (bootstrapAttempt < MAX_BOOTSTRAP_ATTEMPTS) {
+          const backoff = Math.min(8000, 1000 * 2 ** (bootstrapAttempt - 1));
+          (0, _devLogger.pushLog)('rn', `initBeforeLoad: attempt ${bootstrapAttempt} failed (${error?.message}); retrying in ${backoff}ms`);
+          inflightBootstrapKeyRef.current = '';
+          setTimeout(() => {
+            if (!cancelled && !abortController.signal.aborted) {
+              run();
+            }
+          }, backoff);
           return;
         }
-        (0, _devLogger.pushLog)('error', 'initBeforeLoad: bootstrap threw', {
+        (0, _devLogger.pushLog)('error', 'initBeforeLoad: bootstrap threw (giving up)', {
           message: error?.message,
           status: error?.response?.status,
           data: error?.response?.data
         });
         inflightBootstrapKeyRef.current = '';
+        clearBudget();
         setProviderBootstrapStatus('failed');
       }
     };
     run();
     return () => {
       cancelled = true;
+      clearBudget();
       abortController.abort();
       // Re-running this effect (deps changed or unmount) must release the
       // in-flight bootstrap key so the next render isn't permanently
@@ -310,34 +381,34 @@ const XmppProvider = ({
   }, [config?.initBeforeLoad, config?.appId, config?.baseUrl, config?.userLogin?.enabled, config?.userLogin?.user?.defaultWallet?.walletAddress, config?.userLogin?.user?.xmppUsername, config?.userLogin?.user?.token, config?.jwtLogin?.enabled, config?.jwtLogin?.token, config?.xmppSettings?.devServer]);
 
   // -----------------------------------------------------------
-  // Reconnect / reinit on disconnect
+  // Reconnect watchdog. The client now owns reconnection (onDisconnect →
+  // scheduleReconnect with uncapped, clamped backoff; a connect 'error'
+  // reschedules too). This is the single provider-side safety net for the
+  // states the event-driven triggers miss: a stuck 'connecting', a connect
+  // 'error', or a server-side outage where NetInfo never reported the
+  // device offline. While foregrounded, if we're not provably online and
+  // not suppressed, force a reconnect (debounced inside forceReconnect).
+  //
+  // Replaces the old status-keyed reconnect effect, which keyed on
+  // `client.status` — a mutated class field React does NOT track — so on a
+  // silent socket drop it frequently never re-ran (and its 3-attempts-then-
+  // full-reinit path was effectively dead).
   // -----------------------------------------------------------
   (0, _react.useEffect)(() => {
     if (!client) {
       return;
     }
-    if (client.status !== 'offline') {
-      return;
-    }
-    if (reconnectAttempts < 3) {
-      console.log(`xmpp reconnect attempt ${reconnectAttempts + 1}`);
-      client.scheduleReconnect();
-      setReconnectAttempts(prev => prev + 1);
-      return;
-    }
-
-    // After 3 failed reconnects, drop the client and re-init from scratch.
-    if (lastCredsRef.current) {
-      const {
-        username,
-        password,
-        settings
-      } = lastCredsRef.current;
-      (0, _clientRegistry.setGlobalXmppClient)(null);
-      setClient(null);
-      initializeClient(username, password, settings).catch(err => console.error('Full reinit failed:', err));
-    }
-  }, [client, client?.status, reconnectAttempts, initializeClient]);
+    const id = setInterval(() => {
+      if (_reactNative.AppState.currentState !== 'active') {
+        return;
+      }
+      if (client.status !== 'online' && !client.suppressReconnect) {
+        (0, _devLogger.pushLog)('rn', `watchdog: client ${client.status} → forceReconnect`);
+        client.forceReconnect();
+      }
+    }, 30000);
+    return () => clearInterval(id);
+  }, [client]);
 
   // -----------------------------------------------------------
   // AppState → background: flush lastViewedTimestamp into the
@@ -352,26 +423,158 @@ const XmppProvider = ({
   // entry, or when this build has `disableLastRead`.
   // -----------------------------------------------------------
   (0, _react.useEffect)(() => {
+    // Remembers the room that was visible when we backgrounded so it can
+    // be re-marked visible on return. Lives in the effect closure (one per
+    // client) — persists across the listener's many invocations.
+    let visibleBeforeBackground = null;
     const sub = _reactNative.AppState.addEventListener('change', next => {
+      const c = client;
       if (next === 'active') {
+        // Returned to foreground. If the socket died while backgrounded
+        // (iOS suspends the WebSocket; long background kills it), the
+        // status may still read 'online' until xmpp.js notices the dead
+        // TCP — which can take a full timeout. Force an immediate
+        // reconnect when we're not provably online so cached UI gets
+        // live again fast instead of "100 years".
+        // Only force a reconnect from a genuinely dead state. Don't
+        // interrupt an in-progress 'connecting' (iOS delivers spurious
+        // inactive→active flaps for control-center / notifications /
+        // biometric prompts that would otherwise restart a healthy
+        // connect).
+        if (c && (c.status === 'offline' || c.status === 'error')) {
+          (0, _devLogger.pushLog)('rn', `AppState active: client ${c.status} → forceReconnect`);
+          c.forceReconnect();
+        }
+        // Re-mark the previously-open room visible so its unread clears
+        // now that the user is looking again. We restore ONLY what was
+        // visible at background time, so a chat the consumer had already
+        // blurred (e.g. on a non-chat tab/route) correctly stays cleared.
+        if (visibleBeforeBackground) {
+          _roomStore.store.dispatch((0, _roomsSlice.setVisibleRoom)({
+            roomJID: visibleBeforeBackground
+          }));
+          visibleBeforeBackground = null;
+        }
         return;
       }
-      const c = client;
+      // Going to background/inactive (sleep / app switcher / tray):
       if (!c) {
         return;
       }
       const state = _roomStore.store.getState();
       const rooms = state.rooms?.rooms;
-      const activeRoomJID = state.rooms?.activeRoomJID || null;
+      const visibleRoomJID = state.rooms?.visibleRoomJID || null;
+      // Mark the open room "not visible" while backgrounded so messages
+      // that arrive (or MAM-replay on reconnect) count as unread instead
+      // of being silently treated as read — the "mounted == visible ==
+      // read" gap. Stamp lastViewed=now as the read baseline, clear
+      // visibility, then flush that marker to the server private store.
+      // Restored on the next 'active' transition above. Handled here in
+      // the provider so consumers using the component as a package get
+      // correct unread without reaching into the chat store themselves.
+      visibleBeforeBackground = visibleRoomJID;
+      if (visibleRoomJID) {
+        _roomStore.store.dispatch((0, _roomsSlice.setLastViewedTimestamp)({
+          chatJID: visibleRoomJID,
+          timestamp: Date.now()
+        }));
+        // Drop the "New messages" divider for the room we're leaving so it
+        // doesn't linger when the user comes back (mirrors ChatRoom's
+        // unmount cleanup, which never runs while the pane stays mounted).
+        _roomStore.store.dispatch((0, _roomsSlice.deleteRoomMessage)({
+          roomJID: visibleRoomJID,
+          messageId: 'delimiter-new'
+        }));
+        _roomStore.store.dispatch((0, _roomsSlice.clearVisibleRoom)());
+      }
       // Fire-and-forget — we're going to the background and don't
       // care about the resolution path.
       c.flushLastViewedToPrivateStoreStanza(rooms, {
-        activeRoomJID
+        visibleRoomJID
       }).catch(() => {});
     });
     return () => sub.remove();
   }, [client]);
 
+  // -----------------------------------------------------------
+  // Consumer visibility signal (`isVisible` prop). For hosts that keep
+  // <Chat> MOUNTED while hidden (tab/route navigators — so the XMPP
+  // connection survives tab switches), ChatRoom's mount/unmount can't tell
+  // "shown" from "hidden", so the unread middleware would keep the open
+  // room's badge at 0 and messages arriving while you're elsewhere look
+  // already-read. When the host passes `isVisible`, mirror the AppState
+  // background/foreground handling: hidden → stamp lastViewed=now + clear
+  // room visibility (so later messages count) + flush; shown → restore
+  // visibility for the open room. Doing it here means consumers never
+  // touch the chat store themselves. (Undefined = host unmounts on hide,
+  // nothing to do.)
+  // -----------------------------------------------------------
+  (0, _react.useEffect)(() => {
+    if (typeof isVisible !== 'boolean') {
+      return;
+    }
+    const state = _roomStore.store.getState();
+    const rooms = state.rooms?.rooms;
+    const activeRoomJID = state.rooms?.activeRoomJID || null;
+    if (isVisible) {
+      if (activeRoomJID) {
+        _roomStore.store.dispatch((0, _roomsSlice.setVisibleRoom)({
+          roomJID: activeRoomJID
+        }));
+      }
+    } else {
+      if (activeRoomJID) {
+        _roomStore.store.dispatch((0, _roomsSlice.setLastViewedTimestamp)({
+          chatJID: activeRoomJID,
+          timestamp: Date.now()
+        }));
+        // Drop the "New messages" divider so it's gone when the user
+        // returns to the chat (mirrors ChatRoom's unmount cleanup).
+        _roomStore.store.dispatch((0, _roomsSlice.deleteRoomMessage)({
+          roomJID: activeRoomJID,
+          messageId: 'delimiter-new'
+        }));
+      }
+      _roomStore.store.dispatch((0, _roomsSlice.clearVisibleRoom)());
+      if (client?.flushLastViewedToPrivateStoreStanza) {
+        client.flushLastViewedToPrivateStoreStanza(rooms, {
+          visibleRoomJID: activeRoomJID
+        }).catch(() => {});
+      }
+    }
+  }, [isVisible, client]);
+
+  // -----------------------------------------------------------
+  // NetInfo → proactive reconnect on network restore. Without this the
+  // only reconnect trigger is xmpp.js noticing the socket is dead, which
+  // on a Wi-Fi/cellular drop can hang on the TCP timeout for tens of
+  // seconds. NetInfo tells us the instant connectivity returns so we can
+  // force a reconnect immediately (and reset the backoff budget).
+  // -----------------------------------------------------------
+  (0, _react.useEffect)(() => {
+    if (!client) {
+      return;
+    }
+    const unsub = _netinfo.default.addEventListener(state => {
+      // Guard against undefined/partial state (jest mock, early emit).
+      const reachable = !!state?.isConnected && state?.isInternetReachable !== false;
+      if (!reachable) {
+        return;
+      }
+      // Reachable. If we're in a dead state, kick a reconnect — do NOT
+      // require a prior offline→online transition (a missed/coalesced
+      // offline event otherwise left us stuck offline forever). Skip
+      // 'connecting' so we don't interrupt an in-progress connect; the
+      // watchdog covers a stuck 'connecting'. forceReconnect() debounces
+      // bursts and resets the backoff itself.
+      if (client.status === 'offline' || client.status === 'error') {
+        (0, _devLogger.pushLog)('rn', `NetInfo: reachable & client ${client.status} → forceReconnect`);
+        client.forceReconnect();
+      }
+    });
+    return () => unsub();
+  }, [client]);
+
   // -----------------------------------------------------------
   // Retry-bootstrap listener — fired by ChatWrapper's error modal so
   // a transient failure (bad endpoint, server hiccup, etc.) can be
@@ -404,7 +607,6 @@ const XmppProvider = ({
       setClient(null);
       completedBootstrapKeyRef.current = '';
       inflightBootstrapKeyRef.current = '';
-      setReconnectAttempts(0);
       setProviderBootstrapStatus('idle');
       await (0, _persistence.clearPersistedState)();
     });
@@ -427,6 +629,16 @@ const useXmppClient = () => {
   if (!context) {
     throw new Error('useXmppClient must be used within an XmppProvider');
   }
+  if (!context.client) {
+    const candidates = [(0, _clientRegistry.getGlobalXmppClient)(), _roomStore.store.getState()?.chatSettingStore?.client];
+    const live = candidates.find(c => c && c.status === 'online');
+    if (live) {
+      return {
+        ...context,
+        client: live
+      };
+    }
+  }
   return context;
 };
 

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

@@ -1 +1 @@
-{"version":3,"names":["_react","_interopRequireWildcard","require","_reactNative","_xmppClient","_interopRequireDefault","_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","client","setClient","useState","providerBootstrapStatus","setProviderBootstrapStatus","reconnectAttempts","setReconnectAttempts","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","newClient","XmppClient","setCredentialsProvider","setGlobalXmppClient","waitForOnline","console","error","useEffect","abortController","AbortController","cancelled","run","explicitUser","appId","baseUrl","devServer","join","mode","clearStoreBeforeInit","setLogoutState","logout","asyncLocalStorage","localStorageConstants","ETHORA_USER","remove","undefined","ensureScopedChatCache","resolved","resolveInitBeforeLoadUser","signal","hasResolved","xmppPasswordPresent","restRoomsPromise","prefetchRoomsViaRest","c","getRoomsStanza","getChatsPrivateStoreRequestStanza","roomCount","keys","rooms","length","allRoomPresences","setStoreClient","qos","historyQoS","activeRoomJID","defaultRoomJids","defaultRooms","map","jid","filter","Boolean","runHistoryPreloadScheduler","selectedRoomJid","concurrency","stagedPreloadConcurrency","pageSize","stagedPreloadFirstPassSize","roomLimit","preloadTopKRooms","warn","message","status","response","data","abort","log","scheduleReconnect","prev","sub","AppState","addEventListener","next","state","flushLastViewedToPrivateStoreStanza","DeviceEventEmitter","addListener","disconnect","suppressReconnect","clearPersistedState","jsx","Provider","value","exports","useXmppClient","context","useContext","Error","emitXmppLogout","emit"],"sourceRoot":"../../../src","sources":["context/xmppProvider.tsx"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["_react","_interopRequireWildcard","require","_reactNative","_netinfo","_interopRequireDefault","_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","clearBudget","clearTimeout","run","explicitUser","appId","baseUrl","devServer","join","mode","clearStoreBeforeInit","setLogoutState","logout","asyncLocalStorage","localStorageConstants","ETHORA_USER","remove","undefined","ensureScopedChatCache","resolved","resolveInitBeforeLoadUser","signal","hasResolved","xmppPasswordPresent","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","clearInterval","visibleBeforeBackground","sub","addEventListener","next","setVisibleRoom","roomJID","state","visibleRoomJID","setLastViewedTimestamp","chatJID","timestamp","Date","now","deleteRoomMessage","messageId","clearVisibleRoom","flushLastViewedToPrivateStoreStanza","unsub","NetInfo","reachable","isConnected","isInternetReachable","DeviceEventEmitter","addListener","disconnect","clearPersistedState","jsx","Provider","value","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/chatAutoEnterer.js

@@ -5,6 +5,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.chatAutoEnterer = void 0;
 var _roomsSlice = require("../roomStore/roomsSlice");
+var _normalizeRoomJid = require("./normalizeRoomJid");
 /** @format */
 
 const chatAutoEnterer = ({
@@ -18,14 +19,8 @@ const chatAutoEnterer = ({
     wasAutoSelected
   });
   if (roomJID) {
-    // If roomJID is already a full JID, use it directly
-    // Otherwise, construct it from chatId if needed
     const conferenceDomain = config.xmppSettings?.conference ?? '';
-    let finalRoomJID = roomJID;
-    if (!roomJID.includes('@') && conferenceDomain) {
-      finalRoomJID = `${roomJID}@${conferenceDomain}`;
-      console.log('🟡 chatAutoEnterer: Constructed roomJID', finalRoomJID);
-    }
+    const finalRoomJID = (0, _normalizeRoomJid.normalizeRoomJid)(roomJID, conferenceDomain);
     console.log('🟡 chatAutoEnterer: Setting current room', finalRoomJID);
     dispatch((0, _roomsSlice.setCurrentRoom)({
       roomJID: finalRoomJID

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

@@ -1 +1 @@
-{"version":3,"names":["_roomsSlice","require","chatAutoEnterer","roomJID","wasAutoSelected","config","dispatch","console","log","conferenceDomain","xmppSettings","conference","finalRoomJID","includes","setCurrentRoom","exports"],"sourceRoot":"../../../src","sources":["helpers/chatAutoEnterer.ts"],"mappings":";;;;;;AAGA,IAAAA,WAAA,GAAAC,OAAA;AAHA;;AAkBO,MAAMC,eAAe,GAAGA,CAAC;EAC9BC,OAAO;EACPC,eAAe;EACfC,MAAM;EACNC;AACc,CAAC,KAAW;EAC1BC,OAAO,CAACC,GAAG,CAAC,4BAA4B,EAAE;IAAEL,OAAO;IAAEC;EAAgB,CAAC,CAAC;EAEvE,IAAID,OAAO,EAAE;IACX;IACA;IACA,MAAMM,gBAAgB,GAAGJ,MAAM,CAACK,YAAY,EAAEC,UAAU,IAAI,EAAE;IAC9D,IAAIC,YAAY,GAAGT,OAAO;IAE1B,IAAI,CAACA,OAAO,CAACU,QAAQ,CAAC,GAAG,CAAC,IAAIJ,gBAAgB,EAAE;MAC9CG,YAAY,GAAG,GAAGT,OAAO,IAAIM,gBAAgB,EAAE;MAC/CF,OAAO,CAACC,GAAG,CAAC,yCAAyC,EAAEI,YAAY,CAAC;IACtE;IAEAL,OAAO,CAACC,GAAG,CAAC,0CAA0C,EAAEI,YAAY,CAAC;IACrEN,QAAQ,CAAC,IAAAQ,0BAAc,EAAC;MAAEX,OAAO,EAAES;IAAa,CAAC,CAAC,CAAC;IACnD;EACF;EAEAL,OAAO,CAACC,GAAG,CAAC,yCAAyC,CAAC;EACtD;EACA;AACF,CAAC;AAACO,OAAA,CAAAb,eAAA,GAAAA,eAAA","ignoreList":[]}
+{"version":3,"names":["_roomsSlice","require","_normalizeRoomJid","chatAutoEnterer","roomJID","wasAutoSelected","config","dispatch","console","log","conferenceDomain","xmppSettings","conference","finalRoomJID","normalizeRoomJid","setCurrentRoom","exports"],"sourceRoot":"../../../src","sources":["helpers/chatAutoEnterer.ts"],"mappings":";;;;;;AAGA,IAAAA,WAAA,GAAAC,OAAA;AACA,IAAAC,iBAAA,GAAAD,OAAA;AAJA;;AAmBO,MAAME,eAAe,GAAGA,CAAC;EAC9BC,OAAO;EACPC,eAAe;EACfC,MAAM;EACNC;AACc,CAAC,KAAW;EAC1BC,OAAO,CAACC,GAAG,CAAC,4BAA4B,EAAE;IAAEL,OAAO;IAAEC;EAAgB,CAAC,CAAC;EAEvE,IAAID,OAAO,EAAE;IACX,MAAMM,gBAAgB,GAAGJ,MAAM,CAACK,YAAY,EAAEC,UAAU,IAAI,EAAE;IAC9D,MAAMC,YAAY,GAAG,IAAAC,kCAAgB,EAACV,OAAO,EAAEM,gBAAgB,CAAC;IAEhEF,OAAO,CAACC,GAAG,CAAC,0CAA0C,EAAEI,YAAY,CAAC;IACrEN,QAAQ,CAAC,IAAAQ,0BAAc,EAAC;MAAEX,OAAO,EAAES;IAAa,CAAC,CAAC,CAAC;IACnD;EACF;EAEAL,OAAO,CAACC,GAAG,CAAC,yCAAyC,CAAC;EACtD;EACA;AACF,CAAC;AAACO,OAAA,CAAAb,eAAA,GAAAA,eAAA","ignoreList":[]}

package/lib/commonjs/helpers/historyPreloadScheduler.js

@@ -8,7 +8,10 @@ var _reactNative = require("react-native");
 var _roomStore = require("../roomStore");
 var _roomsSlice = require("../roomStore/roomsSlice");
 const DEFAULT_CONCURRENCY = 3;
-const DEFAULT_PAGE_SIZE = 10;
+// Fetch the most recent ~20 on re-entry (mirrors web). A larger first page
+// also means more id-overlap with cache, so the merge in
+// `mergeHistoryIntoCache` rarely has to fall back to clear-and-replace.
+const DEFAULT_PAGE_SIZE = 20;
 const DEFAULT_RETRY_LIMIT = 2;
 const sleep = ms => new Promise(resolve => setTimeout(resolve, ms));
 const messageTimestamp = m => {

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","state","store","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","dispatch","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","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","state","store","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","dispatch","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":[]}

package/lib/commonjs/helpers/insertMessageWithDelimiter.js

@@ -18,12 +18,25 @@ function deepMerge(target, source) {
 function insertMessageWithDelimiter(roomMessages, message, lastViewedTimestamp) {
   const existingIndex = roomMessages.findIndex(msg => msg.id === message.id || message.xmppId && msg.id === message.xmppId || msg.xmppId && msg.xmppId === message.id);
   if (existingIndex !== -1) {
-    roomMessages[existingIndex] = deepMerge({
-      ...roomMessages[existingIndex]
+    const existing = roomMessages[existingIndex];
+    // Preserve the sender identity captured on first insert. The MUC echo
+    // parses user.id from the stanza's `from`/senderJID (the room nick or
+    // bare-jid local part), which often differs from the optimistic
+    // sender id (xmppUsername / walletAddress) set when WE sent it.
+    // deepMerge would overwrite it, flipping an own message to the "other"
+    // side (rendered on the left, "as if someone else wrote it"). Keep the
+    // original id so ownership (user.id === self) stays correct.
+    const preservedUserId = existing?.user?.id || message?.user?.id;
+    const merged = deepMerge({
+      ...existing
     }, {
       ...message,
       pending: false
     });
+    if (merged.user && preservedUserId) {
+      merged.user.id = preservedUserId;
+    }
+    roomMessages[existingIndex] = merged;
     return;
   }
   const newMessageDate = message.date;
@@ -55,9 +68,6 @@ function insertMessageWithDelimiter(roomMessages, message, lastViewedTimestamp)
           body: 'New Messages',
           roomJid: ''
         });
-        if (lastViewedTimestamp.toString() === '0') {
-          roomMessages.splice(delimiterIndex, 1);
-        }
       }
     }
   } else if ((0, _dateComparison.isDateBefore)(newMessageDate.toString(), firstMessage?.date?.toString() ?? '')) {