@ethora/chat-component-rn 26.8.5 → 26.8.7

package/lib/commonjs/roomStore/Middleware/newMessageMidlleware.js

@@ -4,7 +4,6 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.newMessageMidlleware = void 0;
-var _roomsSlice = require("../roomsSlice");
 var _roomHeapSlice = require("../roomHeapSlice");
 var _outboundQueue = require("../../networking/outboundQueue");
 const newMessageMidlleware = storeAPI => next => action => {
@@ -12,7 +11,9 @@ const newMessageMidlleware = storeAPI => next => action => {
     console.error('Invalid action in newMessageMiddleware:', action);
     return next(action);
   }
-  if (action.type !== 'roomMessages/addRoomMessage') {
+  const isSingle = action.type === 'roomMessages/addRoomMessage';
+  const isBatch = action.type === 'roomMessages/addRoomMessages';
+  if (!isSingle && !isBatch) {
     return next(action);
   }
   if (!action.payload || typeof action.payload !== 'object') {
@@ -21,45 +22,39 @@ const newMessageMidlleware = storeAPI => next => action => {
   }
   const result = next(action);
   const state = storeAPI.getState();
-  const rooms = state.rooms.rooms;
-  const {
-    roomJID,
-    message
-  } = action.payload;
 
-  // Un-fail on confirmed delivery. A server-confirmed copy (echo or MAM
-  // history, never `pending`) arriving for a message we'd flagged failed
-  // means the send actually went through — e.g. a slow send that completed
-  // just after the 5s watchdog window, or a queued auto-resend landing on
-  // reconnect. The failed flag is keyed by our optimistic/stanza id, which
-  // the echo carries back as `id`/`xmppId`, so clear it here and let the
-  // bubble flip to delivered instead of staying stuck on "Failed".
-  if (message && !message.pending) {
-    // The confirmed copy carries our optimistic/stanza id back as id/xmppId.
-    // Drop any still-buffered replay for it so a later reconnect flush can't
-    // re-send an already-delivered message.
-    (0, _outboundQueue.removeOutboundSend)(message.id);
-    (0, _outboundQueue.removeOutboundSend)(message.xmppId);
-    const failedMap = state.roomHeapSlice?.failedMessages || {};
-    const failedKey = [message.id, message.xmppId].find(k => k && failedMap[k]);
-    if (failedKey) {
-      storeAPI.dispatch((0, _roomHeapSlice.clearMessageFailure)(failedKey));
-    }
-  }
-  if ((rooms[roomJID]?.lastMessageTimestamp ?? 0) <= Number(message.id)) {
-    storeAPI.dispatch((0, _roomsSlice.updateRoom)({
-      jid: roomJID,
-      updates: {
-        lastMessageTimestamp: Number(message.id) ?? 0
+  // `lastMessageTimestamp` is now bumped inside the reducer itself (no
+  // second `updateRoom` pass per message). What is left here are the
+  // side effects outside the rooms slice.
+  const messages = isBatch ? action.payload.messages || [] : [action.payload.message];
+  const failedMap = state.roomHeapSlice?.failedMessages || {};
+  for (const message of messages) {
+    // Un-fail on confirmed delivery. A server-confirmed copy (echo or MAM
+    // history, never `pending`) arriving for a message we'd flagged failed
+    // means the send actually went through — e.g. a slow send that completed
+    // just after the 5s watchdog window, or a queued auto-resend landing on
+    // reconnect. The failed flag is keyed by our optimistic/stanza id, which
+    // the echo carries back as `id`/`xmppId`, so clear it here and let the
+    // bubble flip to delivered instead of staying stuck on "Failed".
+    if (message && !message.pending) {
+      // The confirmed copy carries our optimistic/stanza id back as id/xmppId.
+      // Drop any still-buffered replay for it so a later reconnect flush can't
+      // re-send an already-delivered message.
+      (0, _outboundQueue.removeOutboundSend)(message.id);
+      if (message.xmppId) {
+        (0, _outboundQueue.removeOutboundSend)(message.xmppId);
       }
-    }));
+      const failedKey = [message.id, message.xmppId].find(k => k && failedMap[k]);
+      if (failedKey) {
+        storeAPI.dispatch((0, _roomHeapSlice.clearMessageFailure)(failedKey));
+      }
+    }
   }
   return result;
 };
 
 //   import { Middleware, PayloadAction } from '@reduxjs/toolkit';
-// import { updateRoom } from '../roomsSlice';
-// import { AddRoomMessageAction, IRoom } from '../../types/types';
+// // import { AddRoomMessageAction, IRoom } from '../../types/types';
 // import { nanoToMs } from '../../helpers/nanoToMs';
 
 // export const newMessageMidlleware: Middleware =

package/lib/commonjs/roomStore/Middleware/newMessageMidlleware.js.map

@@ -1 +1 @@
-{"version":3,"names":["_roomsSlice","require","_roomHeapSlice","_outboundQueue","newMessageMidlleware","storeAPI","next","action","type","console","error","payload","result","state","getState","rooms","roomJID","message","pending","removeOutboundSend","id","xmppId","failedMap","roomHeapSlice","failedMessages","failedKey","find","k","dispatch","clearMessageFailure","lastMessageTimestamp","Number","updateRoom","jid","updates","exports"],"sourceRoot":"../../../../src","sources":["roomStore/Middleware/newMessageMidlleware.tsx"],"mappings":";;;;;;AACA,IAAAA,WAAA,GAAAC,OAAA;AACA,IAAAC,cAAA,GAAAD,OAAA;AACA,IAAAE,cAAA,GAAAF,OAAA;AAGO,MAAMG,oBAAgC,GAC1CC,QAAQ,IAAMC,IAAI,IAAMC,MAAW,IAAK;EACvC,IAAI,CAACA,MAAM,IAAI,CAACA,MAAM,CAACC,IAAI,EAAE;IAC3BC,OAAO,CAACC,KAAK,CAAC,yCAAyC,EAAEH,MAAM,CAAC;IAChE,OAAOD,IAAI,CAACC,MAAM,CAAC;EACrB;EAEA,IAAIA,MAAM,CAACC,IAAI,KAAK,6BAA6B,EAAE;IACjD,OAAOF,IAAI,CAACC,MAAM,CAAC;EACrB;EAEA,IAAI,CAACA,MAAM,CAACI,OAAO,IAAI,OAAOJ,MAAM,CAACI,OAAO,KAAK,QAAQ,EAAE;IACzDF,OAAO,CAACC,KAAK,CAAC,4CAA4C,EAAEH,MAAM,CAAC;IACnE,OAAOD,IAAI,CAACC,MAAM,CAAC;EACrB;EAEA,MAAMK,MAAM,GAAGN,IAAI,CAACC,MAAM,CAAC;EAC3B,MAAMM,KAAK,GAAGR,QAAQ,CAACS,QAAQ,CAAC,CAAC;EACjC,MAAMC,KAA+B,GAAGF,KAAK,CAACE,KAAK,CAACA,KAAK;EAEzD,MAAM;IAAEC,OAAO;IAAEC;EAAQ,CAAC,GAAGV,MAAM,CAACI,OAAO;;EAE3C;EACA;EACA;EACA;EACA;EACA;EACA;EACA,IAAIM,OAAO,IAAI,CAACA,OAAO,CAACC,OAAO,EAAE;IAC/B;IACA;IACA;IACA,IAAAC,iCAAkB,EAACF,OAAO,CAACG,EAAE,CAAC;IAC9B,IAAAD,iCAAkB,EAACF,OAAO,CAACI,MAAM,CAAC;IAElC,MAAMC,SAAS,GAAGT,KAAK,CAACU,aAAa,EAAEC,cAAc,IAAI,CAAC,CAAC;IAC3D,MAAMC,SAAS,GAAG,CAACR,OAAO,CAACG,EAAE,EAAEH,OAAO,CAACI,MAAM,CAAC,CAACK,IAAI,CAChDC,CAAqB,IAAKA,CAAC,IAAIL,SAAS,CAACK,CAAC,CAC7C,CAAC;IACD,IAAIF,SAAS,EAAE;MACbpB,QAAQ,CAACuB,QAAQ,CAAC,IAAAC,kCAAmB,EAACJ,SAAmB,CAAC,CAAC;IAC7D;EACF;EAEA,IAAI,CAACV,KAAK,CAACC,OAAO,CAAC,EAAEc,oBAAoB,IAAI,CAAC,KAAKC,MAAM,CAACd,OAAO,CAACG,EAAE,CAAC,EAAE;IACrEf,QAAQ,CAACuB,QAAQ,CACf,IAAAI,sBAAU,EAAC;MACTC,GAAG,EAAEjB,OAAO;MACZkB,OAAO,EAAE;QAAEJ,oBAAoB,EAAEC,MAAM,CAACd,OAAO,CAACG,EAAE,CAAC,IAAI;MAAE;IAC3D,CAAC,CACH,CAAC;EACH;EAEA,OAAOR,MAAM;AACf,CAAC;;AAEH;AACA;AACA;AACA;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;;AAEA;AACA;AACA;AACA;;AAEA;AACA;AACA;AACA;AACA;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;;AAEA;AACA;AACA;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAEA;AACA;AAAAuB,OAAA,CAAA/B,oBAAA,GAAAA,oBAAA","ignoreList":[]}
+{"version":3,"names":["_roomHeapSlice","require","_outboundQueue","newMessageMidlleware","storeAPI","next","action","type","console","error","isSingle","isBatch","payload","result","state","getState","messages","message","failedMap","roomHeapSlice","failedMessages","pending","removeOutboundSend","id","xmppId","failedKey","find","k","dispatch","clearMessageFailure","exports"],"sourceRoot":"../../../../src","sources":["roomStore/Middleware/newMessageMidlleware.tsx"],"mappings":";;;;;;AACA,IAAAA,cAAA,GAAAC,OAAA;AACA,IAAAC,cAAA,GAAAD,OAAA;AAGO,MAAME,oBAAgC,GAC1CC,QAAQ,IAAMC,IAAI,IAAMC,MAAW,IAAK;EACvC,IAAI,CAACA,MAAM,IAAI,CAACA,MAAM,CAACC,IAAI,EAAE;IAC3BC,OAAO,CAACC,KAAK,CAAC,yCAAyC,EAAEH,MAAM,CAAC;IAChE,OAAOD,IAAI,CAACC,MAAM,CAAC;EACrB;EAEA,MAAMI,QAAQ,GAAGJ,MAAM,CAACC,IAAI,KAAK,6BAA6B;EAC9D,MAAMI,OAAO,GAAGL,MAAM,CAACC,IAAI,KAAK,8BAA8B;EAC9D,IAAI,CAACG,QAAQ,IAAI,CAACC,OAAO,EAAE;IACzB,OAAON,IAAI,CAACC,MAAM,CAAC;EACrB;EAEA,IAAI,CAACA,MAAM,CAACM,OAAO,IAAI,OAAON,MAAM,CAACM,OAAO,KAAK,QAAQ,EAAE;IACzDJ,OAAO,CAACC,KAAK,CAAC,4CAA4C,EAAEH,MAAM,CAAC;IACnE,OAAOD,IAAI,CAACC,MAAM,CAAC;EACrB;EAEA,MAAMO,MAAM,GAAGR,IAAI,CAACC,MAAM,CAAC;EAC3B,MAAMQ,KAAK,GAAGV,QAAQ,CAACW,QAAQ,CAAC,CAAC;;EAEjC;EACA;EACA;EACA,MAAMC,QAAoB,GAAGL,OAAO,GAChCL,MAAM,CAACM,OAAO,CAACI,QAAQ,IAAI,EAAE,GAC7B,CAACV,MAAM,CAACM,OAAO,CAACK,OAAO,CAAC;EAC5B,MAAMC,SAAS,GAAGJ,KAAK,CAACK,aAAa,EAAEC,cAAc,IAAI,CAAC,CAAC;EAE3D,KAAK,MAAMH,OAAO,IAAID,QAAQ,EAAE;IAC9B;IACA;IACA;IACA;IACA;IACA;IACA;IACA,IAAIC,OAAO,IAAI,CAACA,OAAO,CAACI,OAAO,EAAE;MAC/B;MACA;MACA;MACA,IAAAC,iCAAkB,EAACL,OAAO,CAACM,EAAE,CAAC;MAC9B,IAAIN,OAAO,CAACO,MAAM,EAAE;QAAC,IAAAF,iCAAkB,EAACL,OAAO,CAACO,MAAM,CAAC;MAAC;MAExD,MAAMC,SAAS,GAAG,CAACR,OAAO,CAACM,EAAE,EAAEN,OAAO,CAACO,MAAM,CAAC,CAACE,IAAI,CAChDC,CAAqB,IAAKA,CAAC,IAAIT,SAAS,CAACS,CAAC,CAC7C,CAAC;MACD,IAAIF,SAAS,EAAE;QACbrB,QAAQ,CAACwB,QAAQ,CAAC,IAAAC,kCAAmB,EAACJ,SAAmB,CAAC,CAAC;MAC7D;IACF;EACF;EAEA,OAAOZ,MAAM;AACf,CAAC;;AAEH;AACA;AACA;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;;AAEA;AACA;AACA;AACA;;AAEA;AACA;AACA;AACA;AACA;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;;AAEA;AACA;AACA;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAEA;AACA;AAAAiB,OAAA,CAAA3B,oBAAA,GAAAA,oBAAA","ignoreList":[]}

package/lib/commonjs/roomStore/Middleware/perfMiddleware.js

@@ -0,0 +1,51 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.perfMiddleware = exports.isPerfProfilingEnabled = void 0;
+/**
+ * Dev-only store profiler: counts dispatches and the time the reducer +
+ * middleware chain spent on them, and prints a one-line summary every
+ * 10 s while there was activity. Reads as
+ *   [perf] 10s: 143 actions, 212ms in store, top: roomMessages/addRoomMessages×12 (90ms) …
+ * No-op (and not even installed) in release builds.
+ */
+const WINDOW_MS = 10000;
+let count = 0;
+let totalMs = 0;
+let byType = {};
+let timer = null;
+const flush = () => {
+  timer = null;
+  if (count === 0) {
+    return;
+  }
+  const top = Object.entries(byType).sort((a, b) => b[1].ms - a[1].ms).slice(0, 4).map(([type, v]) => `${type}×${v.n} (${v.ms.toFixed(0)}ms)`).join(', ');
+  console.log(`[perf] ${WINDOW_MS / 1000}s: ${count} actions, ${totalMs.toFixed(0)}ms in store, top: ${top}`);
+  count = 0;
+  totalMs = 0;
+  byType = {};
+};
+const perfMiddleware = () => next => action => {
+  const start = Date.now();
+  const result = next(action);
+  const ms = Date.now() - start;
+  count += 1;
+  totalMs += ms;
+  const type = action?.type || '?';
+  const entry = byType[type] || (byType[type] = {
+    n: 0,
+    ms: 0
+  });
+  entry.n += 1;
+  entry.ms += ms;
+  if (!timer) {
+    timer = setTimeout(flush, WINDOW_MS);
+  }
+  return result;
+};
+exports.perfMiddleware = perfMiddleware;
+const isPerfProfilingEnabled = () => typeof __DEV__ !== 'undefined' && __DEV__ === true;
+exports.isPerfProfilingEnabled = isPerfProfilingEnabled;
+//# sourceMappingURL=perfMiddleware.js.map

package/lib/commonjs/roomStore/Middleware/perfMiddleware.js.map

@@ -0,0 +1 @@
+{"version":3,"names":["WINDOW_MS","count","totalMs","byType","timer","flush","top","Object","entries","sort","a","b","ms","slice","map","type","v","n","toFixed","join","console","log","perfMiddleware","next","action","start","Date","now","result","entry","setTimeout","exports","isPerfProfilingEnabled","__DEV__"],"sourceRoot":"../../../../src","sources":["roomStore/Middleware/perfMiddleware.ts"],"mappings":";;;;;;AAIA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,MAAMA,SAAS,GAAG,KAAK;AAEvB,IAAIC,KAAK,GAAG,CAAC;AACb,IAAIC,OAAO,GAAG,CAAC;AACf,IAAIC,MAAiD,GAAG,CAAC,CAAC;AAC1D,IAAIC,KAA2C,GAAG,IAAI;AAEtD,MAAMC,KAAK,GAAGA,CAAA,KAAM;EAClBD,KAAK,GAAG,IAAI;EACZ,IAAIH,KAAK,KAAK,CAAC,EAAE;IAAC;EAAO;EACzB,MAAMK,GAAG,GAAGC,MAAM,CAACC,OAAO,CAACL,MAAM,CAAC,CAC/BM,IAAI,CAAC,CAACC,CAAC,EAAEC,CAAC,KAAKA,CAAC,CAAC,CAAC,CAAC,CAACC,EAAE,GAAGF,CAAC,CAAC,CAAC,CAAC,CAACE,EAAE,CAAC,CACjCC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CACXC,GAAG,CAAC,CAAC,CAACC,IAAI,EAAEC,CAAC,CAAC,KAAK,GAAGD,IAAI,IAAIC,CAAC,CAACC,CAAC,KAAKD,CAAC,CAACJ,EAAE,CAACM,OAAO,CAAC,CAAC,CAAC,KAAK,CAAC,CAC3DC,IAAI,CAAC,IAAI,CAAC;EACbC,OAAO,CAACC,GAAG,CACT,UAAUrB,SAAS,GAAG,IAAI,MAAMC,KAAK,aAAaC,OAAO,CAACgB,OAAO,CAAC,CAAC,CAAC,qBAAqBZ,GAAG,EAC9F,CAAC;EACDL,KAAK,GAAG,CAAC;EACTC,OAAO,GAAG,CAAC;EACXC,MAAM,GAAG,CAAC,CAAC;AACb,CAAC;AAEM,MAAMmB,cAA0B,GAAGA,CAAA,KAAOC,IAAI,IAAMC,MAAW,IAAK;EACzE,MAAMC,KAAK,GAAGC,IAAI,CAACC,GAAG,CAAC,CAAC;EACxB,MAAMC,MAAM,GAAGL,IAAI,CAACC,MAAM,CAAC;EAC3B,MAAMZ,EAAE,GAAGc,IAAI,CAACC,GAAG,CAAC,CAAC,GAAGF,KAAK;EAC7BxB,KAAK,IAAI,CAAC;EACVC,OAAO,IAAIU,EAAE;EACb,MAAMG,IAAI,GAAGS,MAAM,EAAET,IAAI,IAAI,GAAG;EAChC,MAAMc,KAAK,GAAG1B,MAAM,CAACY,IAAI,CAAC,KAAKZ,MAAM,CAACY,IAAI,CAAC,GAAG;IAAEE,CAAC,EAAE,CAAC;IAAEL,EAAE,EAAE;EAAE,CAAC,CAAC;EAC9DiB,KAAK,CAACZ,CAAC,IAAI,CAAC;EACZY,KAAK,CAACjB,EAAE,IAAIA,EAAE;EACd,IAAI,CAACR,KAAK,EAAE;IAACA,KAAK,GAAG0B,UAAU,CAACzB,KAAK,EAAEL,SAAS,CAAC;EAAC;EAClD,OAAO4B,MAAM;AACf,CAAC;AAACG,OAAA,CAAAT,cAAA,GAAAA,cAAA;AAEK,MAAMU,sBAAsB,GAAGA,CAAA,KACpC,OAAOC,OAAO,KAAK,WAAW,IAAIA,OAAO,KAAK,IAAI;AAACF,OAAA,CAAAC,sBAAA,GAAAA,sBAAA","ignoreList":[]}

package/lib/commonjs/roomStore/Middleware/reactionsMiddleware.js

@@ -5,9 +5,17 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.reactionsMiddleware = void 0;
 var _roomsSlice = require("../roomsSlice");
-var _nanoToMs = require("../../helpers/nanoToMs");
+/**
+ * Keeps the room-list preview in step with reactions (as on web): the
+ * newest event in a room being a reaction shows "Ann: 👍"; a reactor
+ * clearing theirs puts the last real message back.
+ *
+ * Timestamps here are the server's stanza ids, the same unit as
+ * `lastMessageTimestamp` (set from message ids in the reducer), so a
+ * reaction older than the room's latest message never takes the preview.
+ */
 const reactionsMiddleware = storeAPI => next => action => {
-  if (action.type !== 'roomMessages/setReactions') {
+  if (action?.type !== 'roomMessages/setReactions') {
     return next(action);
   }
   if (!action.payload || typeof action.payload !== 'object') {
@@ -15,53 +23,68 @@ const reactionsMiddleware = storeAPI => next => action => {
     return next(action);
   }
   const result = next(action);
-  const state = storeAPI.getState();
-  const rooms = state.rooms.rooms;
-  const {
-    roomJID,
-    reactions,
-    latestReactionTimestamp,
-    data,
-    ...rest
-  } = action.payload;
-  const updLastMessage = () => {
-    if (!reactions?.[0]) {
-      const newLastMessage = rooms[roomJID].messages[rooms[roomJID].messages.length - 1];
+  try {
+    const payload = action.payload || {};
+    const {
+      roomJID,
+      reactions,
+      latestReactionTimestamp,
+      data
+    } = payload;
+    const room = storeAPI.getState().rooms?.rooms?.[roomJID];
+    if (!room) {
+      return result;
+    }
+    const ts = Number(latestReactionTimestamp) || 0;
+    const roomTs = Number(room.lastMessageTimestamp) || 0;
+    if (Array.isArray(reactions) && reactions[0]) {
+      // Only the newest event in the room may become the preview.
+      if (!ts || ts < roomTs) {
+        return result;
+      }
+      const name = `${data?.senderFirstName || ''} ${data?.senderLastName || ''}`.trim();
       storeAPI.dispatch((0, _roomsSlice.updateRoom)({
         jid: roomJID,
         updates: {
-          lastMessageTimestamp: (0, _nanoToMs.nanoToMs)(rooms[roomJID].messages[rooms[roomJID].messages.length - 1].id) ?? 0,
-          lastMessage: newLastMessage
-        }
-      }));
-    } else {
-      const updates = {
-        lastMessageTimestamp: (0, _nanoToMs.nanoToMs)(latestReactionTimestamp) ?? 0,
-        lastMessage: {
-          ...rest,
-          body: reactions[0],
-          emoji: reactions[0],
-          user: {
-            name: `${data.senderFirstName} ${data.senderLastName}`,
-            id: `emoji-${new Date().toString()}`
-          },
-          date: new Date((0, _nanoToMs.nanoToMs)(latestReactionTimestamp) ?? 0).toISOString()
+          lastMessageTimestamp: ts,
+          lastMessage: {
+            id: `reaction-${ts}`,
+            body: reactions[0],
+            emoji: reactions[0],
+            user: {
+              id: `emoji-${ts}`,
+              name
+            },
+            date: new Date(Math.floor(ts / 1000)).toISOString()
+          }
         }
-      };
-      storeAPI.dispatch((0, _roomsSlice.updateRoom)({
-        jid: roomJID,
-        updates: updates
       }));
+      return result;
     }
-  };
-  if (!rooms[roomJID]) {
-    console.warn(`Room ${roomJID} not found in reactions middleware`);
-    return result;
-  }
-  if ((rooms[roomJID]?.lastMessageTimestamp ?? 0) <= ((0, _nanoToMs.nanoToMs)(latestReactionTimestamp) ?? 0)) {
-    updLastMessage();
-  } else if (!rooms[roomJID]?.lastMessageTimestamp) {
-    updLastMessage();
+
+    // A reaction was cleared: if the preview was a reaction, fall back to
+    // the newest real message (the room may have none loaded yet).
+    if (!room.lastMessage?.emoji) {
+      return result;
+    }
+    const messages = room.messages || [];
+    let last;
+    for (let i = messages.length - 1; i >= 0; i--) {
+      const m = messages[i];
+      if (m && m.id !== 'delimiter-new' && !m.isDeleted) {
+        last = m;
+        break;
+      }
+    }
+    storeAPI.dispatch((0, _roomsSlice.updateRoom)({
+      jid: roomJID,
+      updates: {
+        lastMessage: last ?? undefined
+      }
+    }));
+  } catch (e) {
+    // A preview update must never break the action that carried it.
+    console.warn('reactionsMiddleware: preview update failed', e);
   }
   return result;
 };

package/lib/commonjs/roomStore/Middleware/reactionsMiddleware.js.map

@@ -1 +1 @@
-{"version":3,"names":["_roomsSlice","require","_nanoToMs","reactionsMiddleware","storeAPI","next","action","type","payload","console","error","result","state","getState","rooms","roomJID","reactions","latestReactionTimestamp","data","rest","updLastMessage","newLastMessage","messages","length","dispatch","updateRoom","jid","updates","lastMessageTimestamp","nanoToMs","id","lastMessage","body","emoji","user","name","senderFirstName","senderLastName","Date","toString","date","toISOString","warn","exports"],"sourceRoot":"../../../../src","sources":["roomStore/Middleware/reactionsMiddleware.tsx"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["_roomsSlice","require","reactionsMiddleware","storeAPI","next","action","type","payload","console","error","result","roomJID","reactions","latestReactionTimestamp","data","room","getState","rooms","ts","Number","roomTs","lastMessageTimestamp","Array","isArray","name","senderFirstName","senderLastName","trim","dispatch","updateRoom","jid","updates","lastMessage","id","body","emoji","user","date","Date","Math","floor","toISOString","messages","last","i","length","m","isDeleted","undefined","e","warn","exports"],"sourceRoot":"../../../../src","sources":["roomStore/Middleware/reactionsMiddleware.tsx"],"mappings":"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","ignoreList":[]}

package/lib/commonjs/roomStore/Middleware/unreadMidlleware.js

@@ -59,7 +59,7 @@ const isOwnMessage = (msg, selfXmpp, selfWallet) => {
 // events, typing-indicator setComposing, etc. — and walked every room's
 // messages array looking for a count delta that almost never came. For
 // 50 rooms × 100 messages that's 5000 Date() parses per modal click.
-const TRIGGER_ACTIONS = new Set(['roomMessages/addRoomMessage', 'roomMessages/setRoomMessages', 'roomMessages/editRoomMessage', 'roomMessages/setLastViewedTimestamp',
+const TRIGGER_ACTIONS = new Set(['roomMessages/addRoomMessage', 'roomMessages/addRoomMessages', 'roomMessages/addRooms', 'roomMessages/setRoomMessages', 'roomMessages/editRoomMessage', 'roomMessages/setLastViewedTimestamp',
 // Hydrating server-side read markers can move several rooms' baselines
 // at once; recompute so the badges reflect the freshly-applied markers
 // (with own-message filtering this middleware adds on top).
@@ -69,6 +69,38 @@ const TRIGGER_ACTIONS = new Set(['roomMessages/addRoomMessage', 'roomMessages/se
 // app was away (the per-room fingerprint cache below skips no-op batches,
 // e.g. the 'loading' marker dispatch that carries no messages).
 'roomMessages/applyRoomsPreloadBatch']);
+
+// Which rooms an action can have changed the unread count of. Walking
+// every room on every message (the previous behaviour) made each incoming
+// message cost O(rooms); `'all'` is reserved for the few actions that move
+// several rooms' baselines at once.
+const touchedRooms = action => {
+  const p = action?.payload;
+  switch (action?.type) {
+    case 'roomMessages/addRoomMessage':
+    case 'roomMessages/addRoomMessages':
+    case 'roomMessages/setRoomMessages':
+    case 'roomMessages/editRoomMessage':
+      return p?.roomJID ? [p.roomJID] : [];
+    case 'roomMessages/setLastViewedTimestamp':
+      return p?.chatJID ? [p.chatJID] : [];
+    case 'roomMessages/addRoom':
+      return p?.roomData?.jid ? [p.roomData.jid] : [];
+    case 'roomMessages/addRooms':
+    case 'roomMessages/applyRoomsPreloadBatch':
+      return Array.isArray(p?.rooms) ? p.rooms.map(r => r?.jid).filter(Boolean) : [];
+    case 'roomMessages/updateRoom':
+      {
+        // The counts this middleware writes itself, and the room-list
+        // ordering stamp, never change what is unread.
+        const keys = Object.keys(p?.updates || {});
+        const relevant = keys.some(k => k !== 'unreadMessages' && k !== 'lastMessageTimestamp');
+        return relevant && p?.jid ? [p.jid] : [];
+      }
+    default:
+      return 'all';
+  }
+};
 const unreadMiddleware = storeAPI => next => action => {
   if (!action || !action.type) {
     console.error('Invalid action in unreadMiddleware:', action);
@@ -93,80 +125,68 @@ const unreadMiddleware = storeAPI => next => action => {
   }
   const state = storeAPI.getState();
   const rooms = state.rooms.rooms;
+  if (!rooms) {
+    return result;
+  }
   const visibleRoomJID = state.rooms.visibleRoomJID;
   const selfUser = state.chatSettingStore?.user;
   const selfXmpp = selfUser?.xmppUsername || '';
   const selfWallet = selfUser?.walletAddress || '';
-  if (rooms && Object.keys(rooms).length > 0) {
-    Object.keys(rooms).forEach(jid => {
-      const room = rooms[jid];
-      if (!room) {
-        return;
-      }
-      // Skip rooms the user is currently viewing — visibility clears the
-      // badge directly. Skip rooms with no reference point (covers
-      // undefined / null / 0) — after logout→login, hydrated rooms
-      // come back without lastViewedTimestamp, and treating that as 0
-      // made every history message satisfy `date > 0` and incorrectly
-      // bumped unread for already-seen content.
-      if (jid === visibleRoomJID) {
-        if (room.unreadMessages !== 0) {
-          storeAPI.dispatch((0, _roomsSlice.updateRoom)({
-            jid,
-            updates: {
-              unreadMessages: 0
-            }
-          }));
-        }
-        return;
-      }
-      if (!(room.lastViewedTimestamp > 0)) {
-        return;
-      }
-      const msgs = room.messages;
-      const currentMessagesLength = msgs?.length || 0;
-      const firstId = currentMessagesLength ? String(msgs[0]?.id ?? '') : '';
-      const lastId = currentMessagesLength ? String(msgs[currentMessagesLength - 1]?.id ?? '') : '';
-      const fingerprint = `${currentMessagesLength}|${room.lastViewedTimestamp || 0}|${firstId}|${lastId}`;
-      if (triggerCache[jid] === fingerprint) {
-        return;
+  const touched = touchedRooms(action);
+  const jids = touched === 'all' ? Object.keys(rooms) : touched;
+  if (jids.length === 0) {
+    return result;
+  }
+  const counts = {};
+  for (const jid of jids) {
+    const room = rooms[jid];
+    if (!room) {
+      continue;
+    }
+    // The room the user is looking at never carries a badge.
+    if (jid === visibleRoomJID) {
+      if (room.unreadMessages !== 0) {
+        counts[jid] = 0;
       }
-      triggerCache[jid] = fingerprint;
+      continue;
+    }
+    // No reference point (undefined / null / 0): after logout→login,
+    // hydrated rooms come back without lastViewedTimestamp, and treating
+    // that as 0 made every history message count as unread.
+    if (!(room.lastViewedTimestamp > 0)) {
+      continue;
+    }
+    const msgs = room.messages;
+    const currentMessagesLength = msgs?.length || 0;
+    const firstId = currentMessagesLength ? String(msgs[0]?.id ?? '') : '';
+    const lastId = currentMessagesLength ? String(msgs[currentMessagesLength - 1]?.id ?? '') : '';
+    const fingerprint = `${currentMessagesLength}|${room.lastViewedTimestamp || 0}|${firstId}|${lastId}`;
+    if (triggerCache[jid] === fingerprint) {
+      continue;
+    }
+    triggerCache[jid] = fingerprint;
 
-      // Ignore the "delimiter-new" sentinel + locally-pending sends
-      // so the two unread-counting paths (this middleware + the
-      // reducer's countNewerMessages) never disagree. Also exclude
-      // own messages so MAM-replayed sends on re-login don't bump
-      // the user's own badge.
-      const unreadMessagesCount = room.messages?.filter(msg => msg.id !== 'delimiter-new' && !msg.pending && !isOwnMessage(msg, selfXmpp, selfWallet) && (0, _roomsSlice.msgSortableMs)(msg) > (room.lastViewedTimestamp || 0)).length;
-      const newerByTs = (room.messages || []).filter(m => m.id !== 'delimiter-new' && !m.pending && (0, _roomsSlice.msgSortableMs)(m) > (room.lastViewedTimestamp || 0));
-      if (newerByTs.length > 0 && (unreadMessagesCount || 0) === 0) {
-        const s = newerByTs[newerByTs.length - 1] || {};
-        console.log('[unread-diag] ownership suppressed', {
-          jid,
-          selfXmpp,
-          selfWallet,
-          newerByTs: newerByTs.length,
-          unreadAfterOwnFilter: unreadMessagesCount,
-          sample: {
-            id: s.id,
-            userId: s?.user?.id,
-            userJID: s?.user?.userJID,
-            xmppUsername: s?.user?.xmppUsername,
-            xmppFrom: s?.xmppFrom,
-            senderJID: s?.senderJID
-          }
-        });
+    // Ignore the "delimiter-new" sentinel + locally-pending sends
+    // so the two unread-counting paths (this middleware + the
+    // reducer's countNewerMessages) never disagree. Also exclude
+    // own messages so MAM-replayed sends on re-login don't bump
+    // the user's own badge.
+    const since = room.lastViewedTimestamp || 0;
+    let unreadMessagesCount = 0;
+    for (const msg of msgs || []) {
+      if (msg.id !== 'delimiter-new' && !msg.pending && (0, _roomsSlice.msgSortableMs)(msg) > since && !isOwnMessage(msg, selfXmpp, selfWallet)) {
+        unreadMessagesCount += 1;
       }
-      if (room.unreadMessages !== unreadMessagesCount) {
-        storeAPI.dispatch((0, _roomsSlice.updateRoom)({
-          jid,
-          updates: {
-            unreadMessages: unreadMessagesCount
-          }
-        }));
-      }
-    });
+    }
+    if (room.unreadMessages !== unreadMessagesCount) {
+      counts[jid] = unreadMessagesCount;
+    }
+  }
+
+  // One action for every room that changed — and one that is not itself
+  // a trigger, so the chain stops here.
+  if (Object.keys(counts).length > 0) {
+    storeAPI.dispatch((0, _roomsSlice.setUnreadCounts)(counts));
   }
   return result;
 };

package/lib/commonjs/roomStore/Middleware/unreadMidlleware.js.map

@@ -1 +1 @@
-{"version":3,"names":["_roomsSlice","require","triggerCache","norm","s","v","String","toLowerCase","split","replace","isOwnMessage","msg","selfXmpp","selfWallet","candidates","user","id","userJID","xmppUsername","filter","Boolean","length","self","Set","c","has","TRIGGER_ACTIONS","unreadMiddleware","storeAPI","next","action","type","console","error","result","state","getState","rooms","visibleRoomJID","selfUser","chatSettingStore","walletAddress","Object","keys","forEach","jid","room","unreadMessages","dispatch","updateRoom","updates","lastViewedTimestamp","msgs","messages","currentMessagesLength","firstId","lastId","fingerprint","unreadMessagesCount","pending","msgSortableMs","newerByTs","m","log","unreadAfterOwnFilter","sample","userId","xmppFrom","senderJID","exports"],"sourceRoot":"../../../../src","sources":["roomStore/Middleware/unreadMidlleware.tsx"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["_roomsSlice","require","triggerCache","norm","s","v","String","toLowerCase","split","replace","isOwnMessage","msg","selfXmpp","selfWallet","candidates","user","id","userJID","xmppUsername","filter","Boolean","length","self","Set","c","has","TRIGGER_ACTIONS","touchedRooms","action","p","payload","type","roomJID","chatJID","roomData","jid","Array","isArray","rooms","map","r","keys","Object","updates","relevant","some","k","unreadMiddleware","storeAPI","next","console","error","result","state","getState","visibleRoomJID","selfUser","chatSettingStore","walletAddress","touched","jids","counts","room","unreadMessages","lastViewedTimestamp","msgs","messages","currentMessagesLength","firstId","lastId","fingerprint","since","unreadMessagesCount","pending","msgSortableMs","dispatch","setUnreadCounts","exports"],"sourceRoot":"../../../../src","sources":["roomStore/Middleware/unreadMidlleware.tsx"],"mappings":"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","ignoreList":[]}

package/lib/commonjs/roomStore/index.js

@@ -13,6 +13,7 @@ var _unreadMidlleware = require("./Middleware/unreadMidlleware");
 var _logoutMiddleware = require("./Middleware/logoutMiddleware");
 var _newMessageMidlleware = require("./Middleware/newMessageMidlleware");
 var _reactionsMiddleware = require("./Middleware/reactionsMiddleware");
+var _perfMiddleware = require("./Middleware/perfMiddleware");
 var _persistence = require("./persistence");
 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); }
@@ -27,14 +28,19 @@ const rootReducer = (0, _toolkit.combineReducers)({
 });
 const createChatStore = () => (0, _toolkit.configureStore)({
   reducer: rootReducer,
-  middleware: getDefaultMiddleware => getDefaultMiddleware({
-    serializableCheck: {
-      // Slice names: chatSlice→'chat', roomsStore→'roomMessages'.
-      ignoredActions: ['chat/addMessage', 'chat/setStoreClient', 'chat/setConfig', 'roomMessages/addRoom'],
-      ignoredActionPaths: ['payload.client', 'payload.config'],
-      ignoredPaths: ['chat.messages.timestamp', 'chatSettingStore.client', 'chatSettingStore.config']
-    }
-  }).concat(_unreadMidlleware.unreadMiddleware).concat(_newMessageMidlleware.newMessageMidlleware).concat(_reactionsMiddleware.reactionsMiddleware).concat(_logoutMiddleware.logoutMiddleware).concat(_persistence.persistenceMiddleware)
+  middleware: getDefaultMiddleware => {
+    const base = getDefaultMiddleware({
+      // Both dev-only invariant checks walk the WHOLE state on every
+      // action. With rooms + message history in the store that took
+      // 60-80 ms per dispatch (RTK's own "took Xms" warning), blocking
+      // the JS thread long enough to make taps feel dead in dev builds.
+      // Production builds never ran them.
+      serializableCheck: false,
+      immutableCheck: false
+    });
+    const chain = [_unreadMidlleware.unreadMiddleware, _newMessageMidlleware.newMessageMidlleware, _reactionsMiddleware.reactionsMiddleware, _logoutMiddleware.logoutMiddleware, _persistence.persistenceMiddleware];
+    return (0, _perfMiddleware.isPerfProfilingEnabled)() ? base.concat(_perfMiddleware.perfMiddleware, ...chain) : base.concat(...chain);
+  }
 });
 const globalScope = globalThis;
 const store = exports.store = globalScope.__CHAT_STORE__ || (globalScope.__CHAT_STORE__ = createChatStore());
@@ -56,12 +62,10 @@ const persistorReady = exports.persistorReady = globalScope.__CHAT_PERSISTOR_REA
     store.dispatch((0, _chatSettingsSlice.setUser)(chat.user));
   }
   if (rooms?.rooms) {
-    for (const [jid, room] of Object.entries(rooms.rooms)) {
-      if (!jid || !room) {
-        continue;
-      }
-      store.dispatch((0, _roomsSlice.addRoom)({
-        roomData: room
+    const restored = Object.entries(rooms.rooms).filter(([jid, room]) => !!jid && !!room).map(([, room]) => room);
+    if (restored.length) {
+      store.dispatch((0, _roomsSlice.addRooms)({
+        rooms: restored
       }));
     }
   }