@ethora/chat-component-rn 26.7.10 → 26.8.1

package/lib/commonjs/components/styled/VideoMessage.js

@@ -5,8 +5,8 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 var _react = _interopRequireWildcard(require("react"));
-var _secureFileUrl = require("../../helpers/secureFileUrl");
 var _reactNative = require("react-native");
+var _expoVideo = require("expo-video");
 var _reactRedux = require("react-redux");
 var _chatSettingsSlice = require("../../roomStore/chatSettingsSlice");
 var _MODAL_TYPES = require("../../helpers/constants/MODAL_TYPES");
@@ -14,136 +14,78 @@ var _icons = require("../../assets/icons");
 var _mediaDimensions = require("../../helpers/mediaDimensions");
 var _jsxRuntime = require("react/jsx-runtime");
 function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function (e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, default: e }; if (null === e || "object" != typeof e && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (const t in e) "default" !== t && {}.hasOwnProperty.call(e, t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, t)) && (i.get || i.set) ? o(f, t, i) : f[t] = e[t]); return f; })(e, t); }
-const PlayBadge = () => /*#__PURE__*/(0, _jsxRuntime.jsx)(_reactNative.View, {
-  style: styles.overlay,
-  pointerEvents: "none",
-  children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_reactNative.View, {
-    style: styles.playButton,
-    children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_icons.PlayIcon, {
-      width: 28,
-      height: 28
-    })
-  })
-});
-
-/**
- * Poster path — taken whenever the message carries a `locationPreview`.
- *
- * A chat row only ever needs a still and a play affordance; actual
- * playback happens in the full-screen preview. Drawing that still with a
- * plain <Image> keeps the whole bubble inside the RN view hierarchy, so
- * the play badge is guaranteed to composite on top of it.
- */
-const PosterVideo = ({
-  previewURL,
-  onOpen,
-  onPosterError
-}) => {
-  const [dims, setDims] = (0, _react.useState)((0, _mediaDimensions.defaultMediaDims)());
-  (0, _react.useEffect)(() => {
-    if (!previewURL) {
-      return;
-    }
-    let active = true;
-    _reactNative.Image.getSize(previewURL, (w, h) => {
-      if (active) {
-        setDims((0, _mediaDimensions.fitMediaDimensions)(w, h));
-      }
-    }, () => {
-      /* keep the default box if the size probe fails */
-    });
-    return () => {
-      active = false;
-    };
-  }, [previewURL]);
-  return /*#__PURE__*/(0, _jsxRuntime.jsxs)(_reactNative.Pressable, {
-    onPress: onOpen,
-    style: [styles.wrapper, {
-      width: dims.width,
-      height: dims.height
-    }],
-    accessibilityRole: "button",
-    accessibilityLabel: "Play video",
-    children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_reactNative.Image, {
-      source: {
-        uri: previewURL
-      },
-      style: styles.video,
-      resizeMode: "cover"
-      // Not every backend returns a real still — some set
-      // locationPreview to the video URL itself, which decodes to
-      // nothing. Rather than show an empty box, fall back to the
-      // static placeholder branch.
-      ,
-      onError: onPosterError
-    }), /*#__PURE__*/(0, _jsxRuntime.jsx)(PlayBadge, {})]
-  });
-};
-
-/**
- * Fallback for messages with no usable poster frame: a static dark
- * placeholder behind the play badge.
- *
- * This branch used to mount an expo-video player purely to paint the
- * first frame (`VideoView` + `surfaceType="textureView"`). That never
- * composited reliably: on Android (Pixel, Android 16, New Architecture)
- * the native video surface draws ABOVE sibling RN views, swallowing the
- * play badge — the video looked like a plain photo. There is no
- * surfaceType/zIndex combination that guarantees ordering across SDK 54
- * and 57, so we don't fight it: no live surface in the bubble at all.
- * The badge is plain RN views over a plain RN background, which cannot
- * be occluded, and we drop the per-row player instance as a bonus.
- * Actual playback (and the real first frame) happens in the full-screen
- * preview modal.
- */
-const PlaceholderVideo = ({
-  onOpen
-}) => {
-  const dims = (0, _mediaDimensions.defaultMediaDims)();
-  return /*#__PURE__*/(0, _jsxRuntime.jsx)(_reactNative.Pressable, {
-    onPress: onOpen,
-    style: [styles.wrapper, {
-      width: dims.width,
-      height: dims.height
-    }],
-    accessibilityRole: "button",
-    accessibilityLabel: "Play video",
-    children: /*#__PURE__*/(0, _jsxRuntime.jsx)(PlayBadge, {})
-  });
-};
 const CustomMessageVideo = ({
   fileName,
-  originalName,
   fileURL,
-  mimetype,
-  previewURL
+  mimetype
 }) => {
   const dispatch = (0, _reactRedux.useDispatch)();
-  const [posterFailed, setPosterFailed] = (0, _react.useState)(false);
+  const [dims, setDims] = (0, _react.useState)((0, _mediaDimensions.defaultMediaDims)());
+  const player = (0, _expoVideo.useVideoPlayer)(fileURL, p => {
+    p.muted = true;
+  });
+  (0, _react.useEffect)(() => {
+    const sub = player.addListener('statusChange', () => {
+      const size = player.videoTrack?.size;
+      if (size?.width && size?.height) {
+        setDims((0, _mediaDimensions.fitMediaDimensions)(size.width, size.height));
+      }
+    });
+    return () => sub.remove();
+  }, [player]);
   const handleOpen = () => {
     dispatch((0, _chatSettingsSlice.setActiveFile)({
       fileName,
       fileURL,
-      mimetype,
-      originalName
+      mimetype
     }));
     dispatch((0, _chatSettingsSlice.setActiveModal)(_MODAL_TYPES.MODAL_TYPES.FILE_PREVIEW));
   };
-  if (previewURL && !posterFailed) {
-    return /*#__PURE__*/(0, _jsxRuntime.jsx)(PosterVideo, {
-      previewURL: previewURL,
-      onOpen: handleOpen,
-      onPosterError: () => {
-        if ((0, _secureFileUrl.isSecureFileUrl)(previewURL)) {
-          (0, _secureFileUrl.requestFileTokenRecovery)();
-        }
-        setPosterFailed(true);
-      }
-    });
-  }
-  return /*#__PURE__*/(0, _jsxRuntime.jsx)(PlaceholderVideo, {
-    onOpen: handleOpen
-  });
+  return (
+    /*#__PURE__*/
+    // Capture-overlay pattern: VideoView sits underneath without ANY
+    // touch participation; a transparent absolute-fill <Pressable> on
+    // top owns the tap. Previously we wrapped VideoView in a
+    // TouchableOpacity and set `pointerEvents="none"` on the inner
+    // VideoView — but on some expo-video versions / iOS the native
+    // VideoView still intercepted gestures despite that hint, so
+    // tapping the poster did nothing. Customer-reported #9 (video
+    // preview unresponsive). The Pressable now guarantees the tap
+    // reaches `handleOpen`.
+    (0, _jsxRuntime.jsxs)(_reactNative.View, {
+      style: [styles.wrapper, {
+        width: dims.width,
+        height: dims.height
+      }],
+      children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_expoVideo.VideoView, {
+        player: player,
+        style: styles.video,
+        contentFit: "cover",
+        nativeControls: false,
+        surfaceType: "textureView",
+        pointerEvents: "none"
+      }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_reactNative.View, {
+        style: styles.overlay,
+        pointerEvents: "none",
+        children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_reactNative.View, {
+          style: styles.playButton,
+          children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_icons.PlayIcon, {
+            width: 28,
+            height: 28
+          })
+        })
+      }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_reactNative.Pressable, {
+        onPress: handleOpen
+        // Sits ON TOP of VideoView + the play-button overlay; transparent
+        // so the poster + play icon show through. Captures the tap and
+        // routes to handleOpen → setActiveModal(FILE_PREVIEW).
+        ,
+        style: _reactNative.StyleSheet.absoluteFill,
+        accessibilityRole: "button",
+        accessibilityLabel: "Play video"
+      })]
+    })
+  );
 };
 var _default = exports.default = CustomMessageVideo;
 const styles = _reactNative.StyleSheet.create({

package/lib/commonjs/components/styled/VideoMessage.js.map

@@ -1 +1 @@
-{"version":3,"names":["_react","_interopRequireWildcard","require","_secureFileUrl","_reactNative","_reactRedux","_chatSettingsSlice","_MODAL_TYPES","_icons","_mediaDimensions","_jsxRuntime","e","t","WeakMap","r","n","__esModule","o","i","f","__proto__","default","has","get","set","hasOwnProperty","call","Object","defineProperty","getOwnPropertyDescriptor","PlayBadge","jsx","View","style","styles","overlay","pointerEvents","children","playButton","PlayIcon","width","height","PosterVideo","previewURL","onOpen","onPosterError","dims","setDims","useState","defaultMediaDims","useEffect","active","Image","getSize","w","h","fitMediaDimensions","jsxs","Pressable","onPress","wrapper","accessibilityRole","accessibilityLabel","source","uri","video","resizeMode","onError","PlaceholderVideo","CustomMessageVideo","fileName","originalName","fileURL","mimetype","dispatch","useDispatch","posterFailed","setPosterFailed","handleOpen","setActiveFile","setActiveModal","MODAL_TYPES","FILE_PREVIEW","isSecureFileUrl","requestFileTokenRecovery","_default","exports","StyleSheet","create","borderRadius","overflow","backgroundColor","absoluteFill","justifyContent","alignItems"],"sourceRoot":"../../../../src","sources":["components/styled/VideoMessage.tsx"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["_react","_interopRequireWildcard","require","_reactNative","_expoVideo","_reactRedux","_chatSettingsSlice","_MODAL_TYPES","_icons","_mediaDimensions","_jsxRuntime","e","t","WeakMap","r","n","__esModule","o","i","f","__proto__","default","has","get","set","hasOwnProperty","call","Object","defineProperty","getOwnPropertyDescriptor","CustomMessageVideo","fileName","fileURL","mimetype","dispatch","useDispatch","dims","setDims","useState","defaultMediaDims","player","useVideoPlayer","p","muted","useEffect","sub","addListener","size","videoTrack","width","height","fitMediaDimensions","remove","handleOpen","setActiveFile","setActiveModal","MODAL_TYPES","FILE_PREVIEW","jsxs","View","style","styles","wrapper","children","jsx","VideoView","video","contentFit","nativeControls","surfaceType","pointerEvents","overlay","playButton","PlayIcon","Pressable","onPress","StyleSheet","absoluteFill","accessibilityRole","accessibilityLabel","_default","exports","create","borderRadius","overflow","backgroundColor","justifyContent","alignItems"],"sourceRoot":"../../../../src","sources":["components/styled/VideoMessage.tsx"],"mappings":"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","ignoreList":[]}

package/lib/commonjs/context/xmppProvider.js

@@ -11,20 +11,17 @@ var _reactNative = require("react-native");
 var _netinfo = _interopRequireDefault(require("@react-native-community/netinfo"));
 var _VideoCallOverlay = require("../components/VideoCalls/VideoCallOverlay");
 var _xmppClient = _interopRequireDefault(require("../networking/xmppClient"));
-var _authRefresh = require("../networking/authRefresh");
+var _chatSettingsSlice = require("../roomStore/chatSettingsSlice");
 var _clientRegistry = require("../utils/clientRegistry");
 var _resolveInitBeforeLoadUser = require("../helpers/resolveInitBeforeLoadUser");
 var _ensureScopedChatCache = require("../helpers/ensureScopedChatCache");
 var _rooms = require("../networking/api-requests/rooms.api");
 var _allRoomPresences = require("../networking/xmpp/allRoomPresences.xmpp");
-var _pushSubscriptionService = require("../services/pushSubscriptionService");
 var _roomStore = require("../roomStore");
-var _chatSettingsSlice = require("../roomStore/chatSettingsSlice");
 var _roomsSlice = require("../roomStore/roomsSlice");
-var _getServerReadTimestamp = require("../helpers/getServerReadTimestamp");
 var _historyPreloadScheduler = require("../helpers/historyPreloadScheduler");
-var _updateMessagesTillLast = require("../helpers/updateMessagesTillLast");
-var _secureUserStorage = require("../helpers/secureUserStorage");
+var _useLocalStorage = require("../hooks/useLocalStorage");
+var _LOCAL_STORAGE = require("../helpers/constants/LOCAL_STORAGE");
 var _persistence = require("../roomStore/persistence");
 var _devLogger = require("../utils/devLogger");
 var _jsxRuntime = require("react/jsx-runtime");
@@ -32,14 +29,6 @@ function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e
 function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function (e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, default: e }; if (null === e || "object" != typeof e && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (const t in e) "default" !== t && {}.hasOwnProperty.call(e, t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, t)) && (i.get || i.set) ? o(f, t, i) : f[t] = e[t]); return f; })(e, t); }
 const XmppContext = /*#__PURE__*/(0, _react.createContext)(null);
 const LOGOUT_EVENT = 'ethora-xmpp-logout';
-const subscribeAllRoomsForPush = (client, reason) => {
-  const rooms = Object.keys(_roomStore.store.getState().rooms.rooms || {});
-  if (!client || !rooms.length) {
-    return;
-  }
-  const nick = client.jid?.getLocal();
-  _pushSubscriptionService.pushSubscriptionService.subscribeToRooms(client, rooms, nick).then(() => (0, _devLogger.pushLog)('xmpp', `${reason}: mucsub ok for ${rooms.length} rooms`)).catch(e => (0, _devLogger.pushLog)('warn', `${reason}: mucsub subscribe failed`, e));
-};
 const XmppProvider = ({
   children,
   config,
@@ -66,23 +55,21 @@ const XmppProvider = ({
   // the XmppClient at least doesn't crash on `undefined.password`.
   const credentialsProvider = (0, _react.useMemo)(() => {
     return async () => {
-      // 1. Make sure the REST tokens are fresh before re-minting XMPP
-      //    creds. This used to call `config.refreshTokens.refreshFunction`
-      //    directly and then fall into step 2, which refreshes again —
-      //    two rotations back to back, which the new backend scheme
-      //    reads as a race at best and token reuse at worst. One call to
-      //    the shared rotation point covers both the consumer-supplied
-      //    function and the built-in endpoint.
-      if (config?.refreshTokens?.enabled) {
-        const rotated = await (0, _authRefresh.refreshAuthTokensQuietly)({
-          force: true
-        });
-        if (rotated?.xmppPassword) {
-          const rotatedUser = _roomStore.store.getState().chatSettingStore.user;
-          return {
-            username: rotatedUser?.xmppUsername || rotatedUser?.defaultWallet?.walletAddress || '',
-            password: rotated.xmppPassword
-          };
+      // 1. Consumer-supplied REST refresh (when wired). This runs
+      //    before the SDK's own refresh chain so non-Ethora backends
+      //    can keep auth state in sync with their own token endpoint.
+      const customRefresh = config?.refreshTokens?.refreshFunction;
+      if (customRefresh) {
+        try {
+          const result = await customRefresh();
+          if (result?.accessToken) {
+            _roomStore.store.dispatch((0, _chatSettingsSlice.refreshTokens)({
+              token: result.accessToken,
+              refreshToken: result.refreshToken || ''
+            }));
+          }
+        } catch (err) {
+          (0, _devLogger.pushLog)('warn', 'XMPP creds refresh: customRefresh failed', err);
         }
       }
 
@@ -114,7 +101,7 @@ const XmppProvider = ({
         password: u?.xmppPassword || ''
       };
     };
-  }, [config?.jwtLogin?.enabled, config?.jwtLogin?.token, config?.refreshTokens?.enabled, config?.userLogin?.enabled, config?.customLogin?.enabled, config?.initBeforeLoadAuth?.myEndpoint]);
+  }, [config?.jwtLogin?.enabled, config?.jwtLogin?.token, config?.refreshTokens?.refreshFunction, config?.userLogin?.enabled, config?.customLogin?.enabled, config?.initBeforeLoadAuth?.myEndpoint]);
   const initializeClient = (0, _react.useCallback)(async (username, password, xmppSettings) => {
     const settings = xmppSettings || config?.xmppSettings;
     const key = (0, _clientRegistry.buildXmppClientKey)(username, settings);
@@ -180,22 +167,11 @@ const XmppProvider = ({
       if (!underlying) {
         return;
       }
-      (0, _allRoomPresences.allRoomPresences)(underlying).catch(e => (0, _devLogger.pushLog)('warn', 'reconnect: allRoomPresences re-join failed', e)).finally(() => subscribeAllRoomsForPush(underlying, 'reconnect'));
+      (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));
-      // Pull whatever landed in each room's archive while the stream was
-      // down. MUC presence re-join above only restores delivery for
-      // messages sent AFTER this reconnect — anything sent during the
-      // offline window has no live stanza to catch, and previously only
-      // came back on a full app restart (fresh useChatWrapperInit mount
-      // re-running its own one-shot boot sync). Safe on the very first
-      // connect too: rooms have no `lastMessageTimestamp` yet at that
-      // point, so this is a no-op until the bootstrap's own history load
-      // populates it. Customer-reported #32.
-      const rooms = _roomStore.store.getState().rooms?.rooms || {};
-      (0, _updateMessagesTillLast.updateMessagesTillLast)(rooms, created).catch(e => (0, _devLogger.pushLog)('warn', 'reconnect: offline catch-up sync failed', e));
     });
     setClient(created);
     lastCredsRef.current = {
@@ -268,7 +244,7 @@ const XmppProvider = ({
           (0, _devLogger.pushLog)('rn', 'initBeforeLoad: clearStoreBeforeInit');
           _roomStore.store.dispatch((0, _roomsSlice.setLogoutState)());
           _roomStore.store.dispatch((0, _chatSettingsSlice.logout)());
-          await (0, _secureUserStorage.secureUserStorage)().remove().catch(() => undefined);
+          await (0, _useLocalStorage.asyncLocalStorage)(_LOCAL_STORAGE.localStorageConstants.ETHORA_USER).remove().catch(() => undefined);
         }
         await (0, _ensureScopedChatCache.ensureScopedChatCache)(config);
         (0, _devLogger.pushLog)('rn', 'initBeforeLoad: scope ok, resolving user…');
@@ -296,40 +272,13 @@ const XmppProvider = ({
           _roomStore.store.dispatch((0, _chatSettingsSlice.setConfig)(config));
         }
 
-        // Rotate BEFORE the first XMPP connect. On the rotating backend
-        // the xmpp password is a short-lived JWT that only the newest
-        // rotation knows, and each rotation invalidates its predecessors
-        // — so a snapshot's password (a host's cached `userLogin.user`,
-        // a persisted session) is usually already dead at boot. Without
-        // this, the first SASL attempt fails `not-authorized`, all three
-        // bootstrap retries re-present the same dead password, and the
-        // user dead-ends on the Connection error modal even though one
-        // rotation away a perfectly good session existed. The rotation
-        // also lands the fileToken pre-render, so secure media never
-        // paints blank first. Quiet + deduped; when it can't rotate
-        // (no refresh material, non-rotating backend) we just connect
-        // with what the snapshot has, exactly as before.
-        // jwtLogin is skipped: /users/client just minted fresh creds.
-        let connectPassword = resolved.xmppPassword;
-        if (config?.refreshTokens?.enabled && !config?.jwtLogin?.enabled) {
-          const rotated = await (0, _authRefresh.refreshAuthTokensQuietly)({
-            force: true
-          });
-          if (cancelled) {
-            return;
-          }
-          if (rotated?.xmppPassword) {
-            connectPassword = rotated.xmppPassword;
-          }
-        }
-
         // Kick off REST /chats/my; allRoomPresences below needs the
         // room list to be in redux, otherwise it joins 0 MUCs and the
         // user receives zero realtime messages until they manually tap
         // into each room. Track the promise so we can await it before
         // joining presences.
         const restRoomsPromise = (0, _rooms.getRooms)().catch(() => undefined);
-        const c = await initializeClient(resolved.xmppUsername, connectPassword, config?.xmppSettings);
+        const c = await initializeClient(resolved.xmppUsername, resolved.xmppPassword, config?.xmppSettings);
         if (cancelled) {
           return;
         }
@@ -365,7 +314,6 @@ const XmppProvider = ({
         } catch (e) {
           (0, _devLogger.pushLog)('warn', 'initBeforeLoad: allRoomPresences failed', e);
         }
-        subscribeAllRoomsForPush(c.client, 'initBeforeLoad');
         _roomStore.store.dispatch((0, _chatSettingsSlice.setStoreClient)(c));
         completedBootstrapKeyRef.current = key;
         inflightBootstrapKeyRef.current = '';
@@ -498,14 +446,9 @@ const XmppProvider = ({
     // 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 suspendInBackground = !config?.xmppSettings?.keepAliveInBackground;
     const sub = _reactNative.AppState.addEventListener('change', next => {
       const c = client;
       if (next === 'active') {
-        if (c?.isSuspended) {
-          (0, _devLogger.pushLog)('rn', 'AppState active: resuming suspended XMPP client');
-          c.resume();
-        }
         // 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
@@ -537,49 +480,23 @@ const XmppProvider = ({
       if (!c) {
         return;
       }
-      if (next === 'background' && suspendInBackground) {
-        c.suspend().catch(() => undefined);
-      }
       const state = _roomStore.store.getState();
       const rooms = state.rooms?.rooms;
       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=<the read boundary, if the user left
-      // scrolled up, else the newest server-acked message>, not
-      // Date.now(), as the read baseline: a device clock running ahead
-      // would otherwise write a future marker that the forward-only
-      // private-store merge can never correct again (bug #38). Then
-      // clear visibility and 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.
-      //
-      // The read boundary (rooms.readBoundaries) is deliberately left
-      // untouched here - MessageList normally stays mounted through a
-      // simple background/foreground cycle, so its own scroll-tracking
-      // ref (the only thing that could re-derive this value) is still
-      // intact, and clearing the redux copy would desync the two. It's
-      // only USED here for the one-shot stamp+flush, matching customer
-      // #42: leaving (or backgrounding) a room while scrolled up must not
-      // mark messages the user never reached as read.
+      // 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;
-      let boundaryTs = null;
       if (visibleRoomJID) {
-        boundaryTs = state.rooms?.readBoundaries?.[visibleRoomJID] ?? null;
-        const readTs = (0, _getServerReadTimestamp.getReadMarkerTimestamp)(rooms?.[visibleRoomJID], state.roomHeapSlice, boundaryTs);
-        // Nothing to anchor to yet (no known messages, no prior marker)
-        // - skip the local stamp rather than fall back to the device
-        // clock. The flush below still runs so the visibility clear
-        // isn't blocked on this.
-        if (readTs > 0) {
-          _roomStore.store.dispatch((0, _roomsSlice.setLastViewedTimestamp)({
-            chatJID: visibleRoomJID,
-            timestamp: readTs
-          }));
-        }
+        _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).
@@ -590,18 +507,13 @@ const XmppProvider = ({
         _roomStore.store.dispatch((0, _roomsSlice.clearVisibleRoom)());
       }
       // Fire-and-forget — we're going to the background and don't
-      // care about the resolution path. `visibleRoomTs` carries the same
-      // boundary to the SERVER marker - without it the flush defaults to
-      // "everything" for the visible room, overriding a correct smaller
-      // local count.
+      // care about the resolution path.
       c.flushLastViewedToPrivateStoreStanza(rooms, {
-        visibleRoomJID,
-        // Clamped through the same helper as the local stamp above.
-        visibleRoomTs: visibleRoomJID ? (0, _getServerReadTimestamp.getFlushBoundaryTs)(rooms?.[visibleRoomJID], state.roomHeapSlice, boundaryTs) : undefined
+        visibleRoomJID
       }).catch(() => {});
     });
     return () => sub.remove();
-  }, [client, config?.xmppSettings?.keepAliveInBackground]);
+  }, [client]);
 
   // -----------------------------------------------------------
   // Consumer visibility signal (`isVisible` prop). For hosts that keep
@@ -610,11 +522,11 @@ const XmppProvider = ({
   // "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=<newest
-  // server-acked message> + 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.)
+  // 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.)
   // -----------------------------------------------------------
   const chatWasVisibleRef = (0, _react.useRef)(false);
   (0, _react.useEffect)(() => {
@@ -633,25 +545,11 @@ const XmppProvider = ({
         }));
       }
     } else {
-      // The read boundary (rooms.readBoundaries) is USED for the stamp
-      // and flush below but deliberately left in place - a host using
-      // `isVisible` keeps <Chat> mounted while hidden, so MessageList's
-      // own scroll-tracking ref is still intact and the redux copy must
-      // stay in sync with it. Only consumed, never Date.now(): a fast
-      // device clock would write a future marker that the forward-only
-      // private-store merge could then never correct (bug #38). And
-      // never "the newest acked message" unconditionally either - that
-      // silently marks messages the user scrolled past and never reached
-      // as read (bug #42, a regression of #33).
-      const boundaryTs = activeRoomJID ? state.rooms?.readBoundaries?.[activeRoomJID] ?? null : null;
       if (wasVisible && activeRoomJID) {
-        const readTs = (0, _getServerReadTimestamp.getReadMarkerTimestamp)(rooms?.[activeRoomJID], state.roomHeapSlice, boundaryTs);
-        if (readTs > 0) {
-          _roomStore.store.dispatch((0, _roomsSlice.setLastViewedTimestamp)({
-            chatJID: activeRoomJID,
-            timestamp: readTs
-          }));
-        }
+        _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)({
@@ -662,11 +560,7 @@ const XmppProvider = ({
       _roomStore.store.dispatch((0, _roomsSlice.clearVisibleRoom)());
       if (wasVisible && client?.flushLastViewedToPrivateStoreStanza) {
         client.flushLastViewedToPrivateStoreStanza(rooms, {
-          visibleRoomJID: activeRoomJID,
-          // Carry the same boundary to the SERVER marker - without it
-          // the flush defaults to "everything" for the visible room.
-          // Clamped exactly like the local stamp above.
-          visibleRoomTs: activeRoomJID ? (0, _getServerReadTimestamp.getFlushBoundaryTs)(rooms?.[activeRoomJID], state.roomHeapSlice, boundaryTs) : undefined
+          visibleRoomJID: activeRoomJID
         }).catch(() => {});
       }
     }
@@ -692,44 +586,32 @@ const XmppProvider = ({
         return;
       }
       lastMessagesRef = room.messages;
-
-      // getReadMarkerTimestamp (not a hand-rolled scan + Date.now()):
-      // it excludes pending/optimistic messages, which carry the DEVICE
-      // send time via `date` until the server echoes them back - a
-      // manual scan without that exclusion could pick up a pending
-      // message's device timestamp here and write a future marker the
-      // same way a raw Date.now() would (bug #38). And when the user has
-      // scrolled up (a boundary is set for this room), it clamps to that
-      // boundary instead of the newest message - without this, every
-      // incoming message while scrolled up advanced the marker to
-      // "newest" regardless of scroll position, and the later, smaller
-      // boundary write on leave was rejected by the forward-only
-      // private-store merge, leaving 0 unread even after a restart
-      // (customer #42, a regression of #33 reintroduced by #38).
-      const boundaryTs = s.rooms?.readBoundaries?.[jid] ?? null;
-      const newest = (0, _getServerReadTimestamp.getReadMarkerTimestamp)(room, s.roomHeapSlice, boundaryTs);
-      if (!newest || newest <= lastStampedMs) {
+      let newest = 0;
+      const list = room.messages || [];
+      for (const m of list) {
+        if (!m || m.id === 'delimiter-new') {
+          continue;
+        }
+        const ms = (0, _roomsSlice.msgSortableMs)(m);
+        if (ms > newest) {
+          newest = ms;
+        }
+      }
+      if (newest <= lastStampedMs) {
         return;
       }
       lastStampedMs = newest;
       _roomStore.store.dispatch((0, _roomsSlice.setLastViewedTimestamp)({
         chatJID: jid,
-        timestamp: newest
+        timestamp: Date.now()
       }));
       if (flushTimer) {
         clearTimeout(flushTimer);
       }
       if (client?.flushLastViewedToPrivateStoreStanza) {
         flushTimer = setTimeout(() => {
-          // Re-read fresh state rather than closing over `boundaryTs`:
-          // the user may have scrolled back to the bottom (clearing the
-          // boundary) in the 2s between the stamp and this flush, and
-          // the flush should reflect that.
-          const freshState = _roomStore.store.getState();
-          const freshBoundaryTs = freshState.rooms?.readBoundaries?.[jid] ?? null;
-          client.flushLastViewedToPrivateStoreStanza(freshState.rooms?.rooms, {
-            visibleRoomJID: jid,
-            visibleRoomTs: (0, _getServerReadTimestamp.getFlushBoundaryTs)(freshState.rooms?.rooms?.[jid], freshState.roomHeapSlice, freshBoundaryTs)
+          client.flushLastViewedToPrivateStoreStanza(_roomStore.store.getState().rooms?.rooms, {
+            visibleRoomJID: jid
           }).catch(() => {});
         }, 2000);
       }