@ethora/chat-component-rn 26.8.5 → 26.8.7

package/lib/commonjs/helpers/videoCache.js

@@ -0,0 +1,136 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.markStreamingUnsupported = exports.isStreamingUnsupported = exports.isRemoteUrl = exports.getVideoCacheUri = exports.findCachedVideo = exports.downloadVideoToCache = exports.__resetVideoCacheForTests = void 0;
+var FileSystem = _interopRequireWildcard(require("expo-file-system/legacy"));
+var _mimeToExtension = require("./mimeToExtension");
+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); }
+// Containers the native players open from a local file by extension.
+const VIDEO_EXT_RE = /\.(mp4|mov|m4v|webm|3gp|mkv|mpeg)$/i;
+const hashString = value => {
+  let hash = 5381;
+  for (let i = 0; i < value.length; i++) {
+    hash = hash * 33 ^ value.charCodeAt(i);
+  }
+  return (hash >>> 0).toString(36);
+};
+const isRemoteUrl = url => /^https?:\/\//i.test(url || '');
+exports.isRemoteUrl = isRemoteUrl;
+const hostOf = url => (/^https?:\/\/(?:[^@/]+@)?([^:/?#]+)/i.exec(url)?.[1] || '').toLowerCase();
+
+// The query carries the short-lived file token; the file is the same.
+const withoutQuery = url => url.split('#')[0].split('?')[0];
+
+/**
+ * Where a remote video is kept once downloaded. The extension matters:
+ * AVFoundation picks the demuxer of a local file by it.
+ */
+const getVideoCacheUri = (url, mimetype, cacheDirectory) => {
+  const fromUrl = VIDEO_EXT_RE.exec((0, _mimeToExtension.filenameFromUrl)(url))?.[0];
+  const fromMime = (0, _mimeToExtension.getExtensionForMime)(mimetype);
+  const ext = (fromUrl || (VIDEO_EXT_RE.test(fromMime) ? fromMime : '.mp4')).toLowerCase();
+  return `${cacheDirectory}ethora-video-${hashString(withoutQuery(url))}${ext}`;
+};
+
+/**
+ * Hosts that answered a streaming attempt with an error. AVPlayer refuses a
+ * server that replies 200 to a byte-range request ("server is not correctly
+ * configured"), so for those the next video skips the doomed stream and
+ * downloads straight away.
+ */
+exports.getVideoCacheUri = getVideoCacheUri;
+const hostsWithoutStreaming = new Set();
+const markStreamingUnsupported = url => {
+  const host = hostOf(url);
+  if (host) {
+    hostsWithoutStreaming.add(host);
+  }
+};
+exports.markStreamingUnsupported = markStreamingUnsupported;
+const isStreamingUnsupported = url => hostsWithoutStreaming.has(hostOf(url));
+exports.isStreamingUnsupported = isStreamingUnsupported;
+const findCachedVideo = async (url, mimetype) => {
+  const cacheDirectory = FileSystem.cacheDirectory;
+  if (!cacheDirectory || !isRemoteUrl(url)) {
+    return null;
+  }
+  try {
+    const uri = getVideoCacheUri(url, mimetype, cacheDirectory);
+    const info = await FileSystem.getInfoAsync(uri);
+    return info.exists ? uri : null;
+  } catch {
+    return null;
+  }
+};
+exports.findCachedVideo = findCachedVideo;
+const inFlight = new Map();
+
+/**
+ * Downloads the video next to the app's other caches and resolves with the
+ * local uri. One download per file however many callers ask; `onProgress`
+ * gets 0..1 when the server reports a length.
+ */
+const downloadVideoToCache = (url, mimetype, onProgress) => {
+  const cacheDirectory = FileSystem.cacheDirectory;
+  if (!cacheDirectory) {
+    return Promise.reject(new Error('video_cache_unavailable'));
+  }
+  const finalUri = getVideoCacheUri(url, mimetype, cacheDirectory);
+  const running = inFlight.get(finalUri);
+  if (running) {
+    if (onProgress) {
+      running.listeners.add(onProgress);
+    }
+    return running.promise;
+  }
+  const listeners = new Set();
+  if (onProgress) {
+    listeners.add(onProgress);
+  }
+  const run = async () => {
+    // Download under another name: an interrupted download must not be
+    // mistaken for the cached file next time.
+    const part = `${finalUri}.part`;
+    await FileSystem.deleteAsync(part, {
+      idempotent: true
+    }).catch(() => {});
+    const task = FileSystem.createDownloadResumable(url, part, {}, p => {
+      if (p.totalBytesExpectedToWrite > 0) {
+        const fraction = Math.min(1, p.totalBytesWritten / p.totalBytesExpectedToWrite);
+        listeners.forEach(listener => listener(fraction));
+      }
+    });
+    const result = await task.downloadAsync();
+    if (!result || result.status < 200 || result.status >= 300) {
+      await FileSystem.deleteAsync(part, {
+        idempotent: true
+      }).catch(() => {});
+      throw new Error(`video_download_status_${result?.status ?? 'cancelled'}`);
+    }
+    await FileSystem.deleteAsync(finalUri, {
+      idempotent: true
+    }).catch(() => {});
+    await FileSystem.moveAsync({
+      from: part,
+      to: finalUri
+    });
+    return finalUri;
+  };
+  const promise = run().finally(() => {
+    inFlight.delete(finalUri);
+  });
+  inFlight.set(finalUri, {
+    promise,
+    listeners
+  });
+  return promise;
+};
+exports.downloadVideoToCache = downloadVideoToCache;
+const __resetVideoCacheForTests = () => {
+  hostsWithoutStreaming.clear();
+  inFlight.clear();
+};
+exports.__resetVideoCacheForTests = __resetVideoCacheForTests;
+//# sourceMappingURL=videoCache.js.map

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

@@ -0,0 +1 @@
+{"version":3,"names":["FileSystem","_interopRequireWildcard","require","_mimeToExtension","e","t","WeakMap","r","n","__esModule","o","i","f","__proto__","default","has","get","set","hasOwnProperty","call","Object","defineProperty","getOwnPropertyDescriptor","VIDEO_EXT_RE","hashString","value","hash","length","charCodeAt","toString","isRemoteUrl","url","test","exports","hostOf","exec","toLowerCase","withoutQuery","split","getVideoCacheUri","mimetype","cacheDirectory","fromUrl","filenameFromUrl","fromMime","getExtensionForMime","ext","hostsWithoutStreaming","Set","markStreamingUnsupported","host","add","isStreamingUnsupported","findCachedVideo","uri","info","getInfoAsync","exists","inFlight","Map","downloadVideoToCache","onProgress","Promise","reject","Error","finalUri","running","listeners","promise","run","part","deleteAsync","idempotent","catch","task","createDownloadResumable","p","totalBytesExpectedToWrite","fraction","Math","min","totalBytesWritten","forEach","listener","result","downloadAsync","status","moveAsync","from","to","finally","delete","__resetVideoCacheForTests","clear"],"sourceRoot":"../../../src","sources":["helpers/videoCache.ts"],"mappings":"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","ignoreList":[]}

package/lib/commonjs/hooks/useHeapSender.js

@@ -37,7 +37,9 @@ const useHeapSender = client => {
           if (msg.langSource) {
             await client.sendTextMessageWithTranslateTagStanza(msg.roomJid, msg.user.firstName || msg.user.name?.split(' ')[0] || '', msg.user.lastName || msg.user.name?.split(' ')[1] || '', '', msg.user.walletAddress || '', msg.body, '', !!msg.isReply, msg.showInChannel === 'true', msg.mainMessage || '', msg.langSource, msg.id);
           } else {
-            await client.sendMessage(msg.roomJid, msg.user.firstName || msg.user.name?.split(' ')[0] || '', msg.user.lastName || msg.user.name?.split(' ')[1] || '', '', msg.user.walletAddress || '', msg.body, '', !!msg.isReply, !!msg.showInChannel, msg.mainMessage, msg.id);
+            await client.sendMessage(msg.roomJid, msg.user.firstName || msg.user.name?.split(' ')[0] || '', msg.user.lastName || msg.user.name?.split(' ')[1] || '', '', msg.user.walletAddress || '', msg.body, '',
+            // Wire values are strings: '"false"' is truthy.
+            String(msg.isReply) === 'true', String(msg.showInChannel) === 'true', msg.mainMessage, msg.id);
           }
         } catch (err) {
           console.warn('Failed to send heap message', msg, err);

package/lib/commonjs/hooks/useHeapSender.js.map

@@ -1 +1 @@
-{"version":3,"names":["_react","require","_reactRedux","_useMessageHeapState","useHeapSender","client","dispatch","useDispatch","queue","useMessageHeapState","sendingRef","useRef","inFlightRef","Map","sendHeapMessages","useCallback","length","presencesReady","console","warn","current","msg","lastAttempt","get","id","Date","now","set","langSource","sendTextMessageWithTranslateTagStanza","roomJid","user","firstName","name","split","lastName","walletAddress","body","isReply","showInChannel","mainMessage","sendMessage","err","delete","prevReadyRef","useEffect","nowReady","wasReady","currentIds","Set","map","m","Array","from","keys","has","exports"],"sourceRoot":"../../../src","sources":["hooks/useHeapSender.tsx"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["_react","require","_reactRedux","_useMessageHeapState","useHeapSender","client","dispatch","useDispatch","queue","useMessageHeapState","sendingRef","useRef","inFlightRef","Map","sendHeapMessages","useCallback","length","presencesReady","console","warn","current","msg","lastAttempt","get","id","Date","now","set","langSource","sendTextMessageWithTranslateTagStanza","roomJid","user","firstName","name","split","lastName","walletAddress","body","isReply","showInChannel","mainMessage","sendMessage","String","err","delete","prevReadyRef","useEffect","nowReady","wasReady","currentIds","Set","map","m","Array","from","keys","has","exports"],"sourceRoot":"../../../src","sources":["hooks/useHeapSender.tsx"],"mappings":"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","ignoreList":[]}

package/lib/commonjs/hooks/useLogout.js

@@ -18,6 +18,7 @@ var _rooms = require("../networking/api-requests/rooms.api");
 var _persistence = require("../roomStore/persistence");
 var _secureUserStorage = require("../helpers/secureUserStorage");
 var _getServerReadTimestamp = require("../helpers/getServerReadTimestamp");
+var _e2ee = require("../e2ee");
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 // AsyncStorage keys the library writes but that aren't cleared by any
 // slice reducer. Listed here so a single logout call wipes the full
@@ -103,6 +104,13 @@ const logoutService = exports.logoutService = {
     } catch (e) {
       console.warn('logoutService: push reset failed', e);
     }
+    (0, _e2ee.stopOmemo)();
+    try {
+      const {
+        clearOpenedFiles
+      } = require('../e2ee/sealedFiles');
+      clearOpenedFiles();
+    } catch {}
 
     // 3. REST: nuke the in-memory `/chats/my` cache so the next login
     //    doesn't read user A's rooms while user B is bootstrapping.

package/lib/commonjs/hooks/useLogout.js.map

@@ -1 +1 @@
-{"version":3,"names":["_reactRedux","require","_reactNative","_asyncStorage","_interopRequireDefault","_roomStore","_chatSettingsSlice","_roomsSlice","_react","_roomHeapSlice","_pushSubscriptionService","_pushRegistration","_rooms","_persistence","_secureUserStorage","_getServerReadTimestamp","e","__esModule","default","LIBRARY_STRAY_KEYS","logoutService","exports","performLogout","state","store","getState","client","chatSettingStore","rooms","visibleRoomJID","boundaryTs","getFlushBoundaryTs","roomHeapSlice","readBoundaries","undefined","flushLastViewedToPrivateStoreStanza","Promise","race","visibleRoomTs","onlyIfNoUnread","res","setTimeout","console","warn","DeviceEventEmitter","emit","releasePushRegistration","pushSubscriptionService","reset","clearRoomsRestCache","dispatch","setLogoutState","clearHeap","logout","clearPersistedState","AsyncStorage","multiRemove","secureUserStorage","remove","useLogout","useDispatch","useCallback","err"],"sourceRoot":"../../../src","sources":["hooks/useLogout.tsx"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["_reactRedux","require","_reactNative","_asyncStorage","_interopRequireDefault","_roomStore","_chatSettingsSlice","_roomsSlice","_react","_roomHeapSlice","_pushSubscriptionService","_pushRegistration","_rooms","_persistence","_secureUserStorage","_getServerReadTimestamp","_e2ee","e","__esModule","default","LIBRARY_STRAY_KEYS","logoutService","exports","performLogout","state","store","getState","client","chatSettingStore","rooms","visibleRoomJID","boundaryTs","getFlushBoundaryTs","roomHeapSlice","readBoundaries","undefined","flushLastViewedToPrivateStoreStanza","Promise","race","visibleRoomTs","onlyIfNoUnread","res","setTimeout","console","warn","DeviceEventEmitter","emit","releasePushRegistration","pushSubscriptionService","reset","stopOmemo","clearOpenedFiles","clearRoomsRestCache","dispatch","setLogoutState","clearHeap","logout","clearPersistedState","AsyncStorage","multiRemove","secureUserStorage","remove","useLogout","useDispatch","useCallback","err"],"sourceRoot":"../../../src","sources":["hooks/useLogout.tsx"],"mappings":"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","ignoreList":[]}

package/lib/commonjs/hooks/useMessageHeapState.js

@@ -4,12 +4,13 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.useMessageHeapState = void 0;
+var _react = require("react");
 var _reactRedux = require("react-redux");
 const useMessageHeapState = () => {
   const queue = (0, _reactRedux.useSelector)(state => state.roomHeapSlice?.messageHeap);
   const failedMessages = (0, _reactRedux.useSelector)(state => state.roomHeapSlice?.failedMessages);
-  const idSet = new Set(queue?.map(m => m.id) ?? []);
-  const failedIdSet = new Set(Object.keys(failedMessages || {}));
+  const idSet = (0, _react.useMemo)(() => new Set(queue?.map(m => m.id) ?? []), [queue]);
+  const failedIdSet = (0, _react.useMemo)(() => new Set(Object.keys(failedMessages || {})), [failedMessages]);
   return {
     queue,
     idSet,

package/lib/commonjs/hooks/useMessageHeapState.js.map

@@ -1 +1 @@
-{"version":3,"names":["_reactRedux","require","useMessageHeapState","queue","useSelector","state","roomHeapSlice","messageHeap","failedMessages","idSet","Set","map","m","id","failedIdSet","Object","keys","exports"],"sourceRoot":"../../../src","sources":["hooks/useMessageHeapState.tsx"],"mappings":";;;;;;AAAA,IAAAA,WAAA,GAAAC,OAAA;AAGO,MAAMC,mBAAmB,GAAGA,CAAA,KAAM;EACvC,MAAMC,KAAK,GAAG,IAAAC,uBAAW,EACtBC,KAAgB,IAAKA,KAAK,CAACC,aAAa,EAAEC,WAC7C,CAAC;EACD,MAAMC,cAAc,GAAG,IAAAJ,uBAAW,EAC/BC,KAAgB,IAAKA,KAAK,CAACC,aAAa,EAAEE,cAC7C,CAAC;EACD,MAAMC,KAAK,GAAG,IAAIC,GAAG,CAACP,KAAK,EAAEQ,GAAG,CAAEC,CAAC,IAAKA,CAAC,CAACC,EAAE,CAAC,IAAI,EAAE,CAAC;EACpD,MAAMC,WAAW,GAAG,IAAIJ,GAAG,CAACK,MAAM,CAACC,IAAI,CAACR,cAAc,IAAI,CAAC,CAAC,CAAC,CAAC;EAE9D,OAAO;IAAEL,KAAK;IAAEM,KAAK;IAAED,cAAc;IAAEM;EAAY,CAAC;AACtD,CAAC;AAACG,OAAA,CAAAf,mBAAA,GAAAA,mBAAA","ignoreList":[]}
+{"version":3,"names":["_react","require","_reactRedux","useMessageHeapState","queue","useSelector","state","roomHeapSlice","messageHeap","failedMessages","idSet","useMemo","Set","map","m","id","failedIdSet","Object","keys","exports"],"sourceRoot":"../../../src","sources":["hooks/useMessageHeapState.tsx"],"mappings":";;;;;;AAAA,IAAAA,MAAA,GAAAC,OAAA;AACA,IAAAC,WAAA,GAAAD,OAAA;AAGO,MAAME,mBAAmB,GAAGA,CAAA,KAAM;EACvC,MAAMC,KAAK,GAAG,IAAAC,uBAAW,EACtBC,KAAgB,IAAKA,KAAK,CAACC,aAAa,EAAEC,WAC7C,CAAC;EACD,MAAMC,cAAc,GAAG,IAAAJ,uBAAW,EAC/BC,KAAgB,IAAKA,KAAK,CAACC,aAAa,EAAEE,cAC7C,CAAC;EACD,MAAMC,KAAK,GAAG,IAAAC,cAAO,EAAC,MAAM,IAAIC,GAAG,CAACR,KAAK,EAAES,GAAG,CAAEC,CAAC,IAAKA,CAAC,CAACC,EAAE,CAAC,IAAI,EAAE,CAAC,EAAE,CAACX,KAAK,CAAC,CAAC;EAC5E,MAAMY,WAAW,GAAG,IAAAL,cAAO,EACzB,MAAM,IAAIC,GAAG,CAACK,MAAM,CAACC,IAAI,CAACT,cAAc,IAAI,CAAC,CAAC,CAAC,CAAC,EAChD,CAACA,cAAc,CACjB,CAAC;EAED,OAAO;IAAEL,KAAK;IAAEM,KAAK;IAAED,cAAc;IAAEO;EAAY,CAAC;AACtD,CAAC;AAACG,OAAA,CAAAhB,mBAAA,GAAAA,mBAAA","ignoreList":[]}

package/lib/commonjs/hooks/useRoomInitialization.js

@@ -18,11 +18,20 @@ const hasLoadedRoomHistory = room => {
   }
   return messages.some(message => message?.id !== 'delimiter-new' && message?.pending !== true && !!String(message?.body || '').trim());
 };
-const useRoomInitialization = (activeRoomJID, roomsList, config, messageLength) => {
+const defaultRoomJids = config => (config?.defaultRooms || []).map(room => typeof room === 'string' ? room : room?.jid);
+const useRoomInitialization = (activeRoomJID, config) => {
   const {
     client
   } = (0, _xmppProvider.useXmppClient)();
   const dispatch = (0, _reactRedux.useDispatch)();
+  const reduxStore = (0, _reactRedux.useStore)();
+  const hasRooms = (0, _reactRedux.useSelector)(state => Object.keys(state.rooms.rooms || {}).length > 0);
+  const activeRoomExists = (0, _reactRedux.useSelector)(state => !!activeRoomJID && !!state.rooms.rooms?.[activeRoomJID]);
+  const activeHistoryLoaded = (0, _reactRedux.useSelector)(state => hasLoadedRoomHistory(state.rooms.rooms?.[activeRoomJID]));
+  const defaultRoomsMissing = (0, _reactRedux.useSelector)(state => {
+    const jids = defaultRoomJids(config);
+    return jids.length > 0 && jids.some(jid => !state.rooms.rooms?.[jid]);
+  });
   const syncRooms = (0, _useGetNewArchRoom.default)();
 
   // Fast active-room join. Mirrors web's first effect: as soon as the
@@ -51,8 +60,8 @@ const useRoomInitialization = (activeRoomJID, roomsList, config, messageLength)
     }
   }, [client, activeRoomJID]);
   (0, _react.useEffect)(() => {
-    const activeRoom = roomsList?.[activeRoomJID];
-    const shouldLoadActiveHistory = !!activeRoomJID && !hasLoadedRoomHistory(activeRoom);
+    const roomsList = reduxStore.getState().rooms.rooms || {};
+    const shouldLoadActiveHistory = !!activeRoomJID && !activeHistoryLoaded;
     const getDefaultHistory = async () => {
       if (!client || !activeRoomJID) {
         return;
@@ -121,7 +130,7 @@ const useRoomInitialization = (activeRoomJID, roomsList, config, messageLength)
           chatJID: activeRoomJID
         }));
         getDefaultHistory();
-      } else {
+      } else if (roomsList?.[activeRoomJID]?.isLoading) {
         dispatch((0, _roomsSlice.setIsLoading)({
           loading: false,
           chatJID: activeRoomJID
@@ -131,8 +140,7 @@ const useRoomInitialization = (activeRoomJID, roomsList, config, messageLength)
       initialPresenceAndHistory();
     }
     if (client && config?.defaultRooms) {
-      const allExist = config?.defaultRooms.every(room => roomsList[typeof room === 'string' ? room : room.jid] !== undefined);
-      if (roomsList && !allExist) {
+      if (defaultRoomsMissing) {
         config?.defaultRooms.map(async room => {
           client.presenceInRoomStanza(typeof room === 'string' ? room : room.jid);
         });
@@ -143,7 +151,8 @@ const useRoomInitialization = (activeRoomJID, roomsList, config, messageLength)
         }
       }
     }
-  }, [activeRoomJID, Object.keys(roomsList).length, messageLength, roomsList?.[activeRoomJID]?.messages?.length]);
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [activeRoomJID, hasRooms, activeRoomExists, activeHistoryLoaded, defaultRoomsMissing]);
 };
 exports.useRoomInitialization = useRoomInitialization;
 //# sourceMappingURL=useRoomInitialization.js.map

package/lib/commonjs/hooks/useRoomInitialization.js.map

@@ -1 +1 @@
-{"version":3,"names":["_react","require","_roomsSlice","_xmppProvider","_reactRedux","_useGetNewArchRoom","_interopRequireDefault","e","__esModule","default","countUndefinedText","arr","Array","isArray","filter","item","body","undefined","length","hasLoadedRoomHistory","room","messages","some","message","id","pending","String","trim","useRoomInitialization","activeRoomJID","roomsList","config","messageLength","client","useXmppClient","dispatch","useDispatch","syncRooms","useGetNewArchRoom","useEffect","setActiveRoomJid","promoteRoomHistory","presenceInRoomStanza","getRoomInfoStanza","activeRoom","shouldLoadActiveHistory","getDefaultHistory","setIsLoading","loading","chatJID","res","getHistoryStanza","prioritizeRoomPresence","catch","Number","loadingText","initialPresenceAndHistory","newArch","getRoomsStanza","Object","keys","defaultRooms","allExist","every","jid","map","exports"],"sourceRoot":"../../../src","sources":["hooks/useRoomInitialization.tsx"],"mappings":";;;;;;AAAA,IAAAA,MAAA,GAAAC,OAAA;AACA,IAAAC,WAAA,GAAAD,OAAA;AACA,IAAAE,aAAA,GAAAF,OAAA;AAEA,IAAAG,WAAA,GAAAH,OAAA;AACA,IAAAI,kBAAA,GAAAC,sBAAA,CAAAL,OAAA;AAAoD,SAAAK,uBAAAC,CAAA,WAAAA,CAAA,IAAAA,CAAA,CAAAC,UAAA,GAAAD,CAAA,KAAAE,OAAA,EAAAF,CAAA;AAEpD,MAAMG,kBAAkB,GAAIC,GAAe,IACzC,CAACC,KAAK,CAACC,OAAO,CAACF,GAAG,CAAC,GAAGA,GAAG,GAAG,EAAE,EAAEG,MAAM,CACnCC,IAAI,IAAKA,IAAI,EAAEC,IAAI,KAAKC,SAC3B,CAAC,EAAEC,MAAM;AAEX,MAAMC,oBAAoB,GAAIC,IAAY,IAAc;EACtD,MAAMC,QAAQ,GAAGT,KAAK,CAACC,OAAO,CAACO,IAAI,EAAEC,QAAQ,CAAC,GAAGD,IAAI,CAACC,QAAQ,GAAG,EAAE;EACnE,IAAI,CAACA,QAAQ,CAACH,MAAM,EAAE;IAAC,OAAO,KAAK;EAAC;EACpC,OAAOG,QAAQ,CAACC,IAAI,CACjBC,OAAO,IACNA,OAAO,EAAEC,EAAE,KAAK,eAAe,IAC/BD,OAAO,EAAEE,OAAO,KAAK,IAAI,IACzB,CAAC,CAACC,MAAM,CAACH,OAAO,EAAEP,IAAI,IAAI,EAAE,CAAC,CAACW,IAAI,CAAC,CACvC,CAAC;AACH,CAAC;AAEM,MAAMC,qBAAqB,GAAGA,CACnCC,aAAqB,EACrBC,SAAgC,EAChCC,MAAe,EACfC,aAAqB,KAClB;EACH,MAAM;IAAEC;EAAO,CAAC,GAAG,IAAAC,2BAAa,EAAC,CAAC;EAClC,MAAMC,QAAQ,GAAG,IAAAC,uBAAW,EAAC,CAAC;EAE9B,MAAMC,SAAS,GAAG,IAAAC,0BAAiB,EAAC,CAAC;;EAErC;EACA;EACA;EACA;EACA;EACA;EACA,IAAAC,gBAAS,EAAC,MAAM;IACd,IAAIN,MAAM,IAAIJ,aAAa,EAAE;MAC3BI,MAAM,CAACO,gBAAgB,GAAGX,aAAa,CAAC;MACxCI,MAAM,CAACQ,kBAAkB,GAAGZ,aAAa,CAAC;MAC1C,IAAI;QACFI,MAAM,CAACS,oBAAoB,CAACb,aAAa,CAAC;MAC5C,CAAC,CAAC,MAAM;QACN;MAAA;MAEF,IAAI;QACFI,MAAM,CAACU,iBAAiB,GAAGd,aAAa,CAAC;MAC3C,CAAC,CAAC,MAAM;QACN;MAAA;IAEJ;IACA,IAAII,MAAM,IAAI,CAACJ,aAAa,EAAE;MAC5BI,MAAM,CAACO,gBAAgB,GAAG,IAAI,CAAC;IACjC;EACF,CAAC,EAAE,CAACP,MAAM,EAAEJ,aAAa,CAAC,CAAC;EAE3B,IAAAU,gBAAS,EAAC,MAAM;IACd,MAAMK,UAAU,GAAGd,SAAS,GAAGD,aAAa,CAAC;IAC7C,MAAMgB,uBAAuB,GAC3B,CAAC,CAAChB,aAAa,IAAI,CAACV,oBAAoB,CAACyB,UAAU,CAAC;IAEtD,MAAME,iBAAiB,GAAG,MAAAA,CAAA,KAAY;MACpC,IAAI,CAACb,MAAM,IAAI,CAACJ,aAAa,EAAE;QAAC;MAAO;MACvC;MACA;MACA;MACA,IAAI;QACFI,MAAM,CAACS,oBAAoB,CAACb,aAAa,CAAC;MAC5C,CAAC,CAAC,MAAM;QACN;MAAA;MAEFM,QAAQ,CAAC,IAAAY,wBAAY,EAAC;QAAEC,OAAO,EAAE,IAAI;QAAEC,OAAO,EAAEpB;MAAc,CAAC,CAAC,CAAC;MACjE,IAAI;QACF,MAAMqB,GAAG,GAAG,MAAMjB,MAAM,CAACkB,gBAAgB,CAACtB,aAAa,EAAE,EAAE,CAAC;QAC5D,IAAI,CAACqB,GAAG,EAAEhC,MAAM,EAAE;UAChBe,MAAM,CAACmB,sBAAsB,GAAGvB,aAAa,CAAC,CAACwB,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC;QAChE;QACA,IAAIH,GAAG,IAAIxC,kBAAkB,CAACwC,GAAG,CAAC,GAAG,CAAC,EAAE;UACtCf,QAAQ,CAAC,IAAAY,wBAAY,EAAC;YAAEC,OAAO,EAAE,KAAK;YAAEC,OAAO,EAAEpB;UAAc,CAAC,CAAC,CAAC;UAClE,MAAMI,MAAM,CAACkB,gBAAgB,CAC3BtB,aAAa,EACb,EAAE,GAAGnB,kBAAkB,CAACwC,GAAG,CAAC,EAC5BI,MAAM,CAACJ,GAAG,CAAC,CAAC,CAAC,CAAC1B,EAAE,CAClB,CAAC;QACH;MACF,CAAC,SAAS;QACRW,QAAQ,CACN,IAAAY,wBAAY,EAAC;UACXC,OAAO,EAAE,KAAK;UACdC,OAAO,EAAEpB,aAAa;UACtB0B,WAAW,EAAEtC;QACf,CAAC,CACH,CAAC;MACH;IACF,CAAC;IAED,MAAMuC,yBAAyB,GAAG,MAAAA,CAAA,KAAY;MAC5C,IAAI,CAAC1B,SAAS,CAACD,aAAa,CAAC,IAAIA,aAAa,IAAII,MAAM,EAAE;QACxD,MAAMA,MAAM,CAACS,oBAAoB,CAACb,aAAa,CAAC;QAChD,IAAIE,MAAM,EAAE0B,OAAO,EAAE;UACnB,MAAMpB,SAAS,CAACJ,MAAM,EAAEF,MAAM,CAAC;QACjC,CAAC,MAAM;UACL,MAAME,MAAM,CAACyB,cAAc,CAAC,CAAC;QAC/B;QACA,MAAMZ,iBAAiB,CAAC,CAAC;MAC3B,CAAC,MAAM;QACL,MAAMA,iBAAiB,CAAC,CAAC;MAC3B;IACF,CAAC;IAED,IAAIa,MAAM,CAACC,IAAI,CAAC9B,SAAS,CAAC,EAAEZ,MAAM,GAAG,CAAC,EAAE;MACtC,IACEW,aAAa,IACb,CAACC,SAAS,GAAGD,aAAa,CAAC,IAC3B8B,MAAM,CAACC,IAAI,CAAC9B,SAAS,CAAC,CAACZ,MAAM,GAAG,CAAC,EACjC;QACAiB,QAAQ,CAAC,IAAAY,wBAAY,EAAC;UAAEC,OAAO,EAAE,IAAI;UAAEC,OAAO,EAAEpB;QAAc,CAAC,CAAC,CAAC;QACjE2B,yBAAyB,CAAC,CAAC;MAC7B,CAAC,MAAM,IAAI3B,aAAa,IAAIgB,uBAAuB,EAAE;QACnD;QACA;QACA;QACA;QACA;QACA;QACAV,QAAQ,CAAC,IAAAY,wBAAY,EAAC;UAAEC,OAAO,EAAE,IAAI;UAAEC,OAAO,EAAEpB;QAAc,CAAC,CAAC,CAAC;QACjEiB,iBAAiB,CAAC,CAAC;MACrB,CAAC,MAAM;QACLX,QAAQ,CAAC,IAAAY,wBAAY,EAAC;UAAEC,OAAO,EAAE,KAAK;UAAEC,OAAO,EAAEpB;QAAc,CAAC,CAAC,CAAC;MACpE;IACF,CAAC,MAAM,IAAI,CAACC,SAAS,GAAGD,aAAa,CAAC,EAAE;MACtC2B,yBAAyB,CAAC,CAAC;IAC7B;IAEA,IAAIvB,MAAM,IAAIF,MAAM,EAAE8B,YAAY,EAAE;MAClC,MAAMC,QAAQ,GAAG/B,MAAM,EAAE8B,YAAY,CAACE,KAAK,CACxC3C,IAAI,IAAKU,SAAS,CAAC,OAAOV,IAAI,KAAK,QAAQ,GAAGA,IAAI,GAAGA,IAAI,CAAC4C,GAAG,CAAC,KAAK/C,SACtE,CAAC;MACD,IAAIa,SAAS,IAAI,CAACgC,QAAQ,EAAE;QAC1B/B,MAAM,EAAE8B,YAAY,CAACI,GAAG,CAAC,MAAO7C,IAAI,IAAK;UACvCa,MAAM,CAACS,oBAAoB,CAAC,OAAOtB,IAAI,KAAK,QAAQ,GAAGA,IAAI,GAAGA,IAAI,CAAC4C,GAAG,CAAC;QACzE,CAAC,CAAC;QACF,IAAIjC,MAAM,EAAE0B,OAAO,EAAE;UACnB;QAAA,CACD,MAAM;UACLxB,MAAM,CAACyB,cAAc,CAAC,CAAC;QACzB;MACF;IACF;EACF,CAAC,EAAE,CACD7B,aAAa,EACb8B,MAAM,CAACC,IAAI,CAAC9B,SAAS,CAAC,CAACZ,MAAM,EAC7Bc,aAAa,EACbF,SAAS,GAAGD,aAAa,CAAC,EAAER,QAAQ,EAAEH,MAAM,CAC7C,CAAC;AACJ,CAAC;AAACgD,OAAA,CAAAtC,qBAAA,GAAAA,qBAAA","ignoreList":[]}
+{"version":3,"names":["_react","require","_roomsSlice","_xmppProvider","_reactRedux","_useGetNewArchRoom","_interopRequireDefault","e","__esModule","default","countUndefinedText","arr","Array","isArray","filter","item","body","undefined","length","hasLoadedRoomHistory","room","messages","some","message","id","pending","String","trim","defaultRoomJids","config","defaultRooms","map","jid","useRoomInitialization","activeRoomJID","client","useXmppClient","dispatch","useDispatch","reduxStore","useStore","hasRooms","useSelector","state","Object","keys","rooms","activeRoomExists","activeHistoryLoaded","defaultRoomsMissing","jids","syncRooms","useGetNewArchRoom","useEffect","setActiveRoomJid","promoteRoomHistory","presenceInRoomStanza","getRoomInfoStanza","roomsList","getState","shouldLoadActiveHistory","getDefaultHistory","setIsLoading","loading","chatJID","res","getHistoryStanza","prioritizeRoomPresence","catch","Number","loadingText","initialPresenceAndHistory","newArch","getRoomsStanza","isLoading","exports"],"sourceRoot":"../../../src","sources":["hooks/useRoomInitialization.tsx"],"mappings":"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","ignoreList":[]}

package/lib/commonjs/hooks/useSendMessage.js

@@ -16,6 +16,8 @@ var _outboundQueue = require("../networking/outboundQueue");
 var _roomStore = require("../roomStore");
 var _clientRegistry = require("../utils/clientRegistry");
 var _useEventHandlers = require("./useEventHandlers");
+var _e2ee = require("../e2ee");
+var _send = require("../e2ee/send");
 // Watchdog: if a message stays "pending" (no server echo) for this
 // long after the optimistic dispatch, mark it failed so the bubble
 // flips out of the "sending..." state. Covers the silent-failure
@@ -75,16 +77,22 @@ const useSendMessage = _configOverride => {
   // Mirrors the web SDK, which always sends through the translate-tag path.
   const langSource = (0, _reactRedux.useSelector)(state => state.chatSettingStore.langSource);
   const editAction = (0, _reactRedux.useSelector)(state => state.rooms.editAction);
-  const rooms = (0, _reactRedux.useSelector)(state => state.rooms.rooms);
   const {
     handleMessageSent,
     handleMessageFailed,
     handleMessageEdited,
     handleMessageRetry
   } = (0, _useEventHandlers.useEventHandlers)(config);
-  const failedMessages = (0, _reactRedux.useSelector)(state => state.roomHeapSlice?.failedMessages || {});
   const sendMessage = (0, _react.useCallback)(async (message, activeRoomJID, isReply, isChecked, mainMessage, existingId) => {
     if (editAction?.isEdit) {
+      const edited = reduxStore.getState().rooms?.rooms?.[editAction.roomJid]?.messages?.find(m => m.id === editAction.messageId);
+      if (edited && !(0, _e2ee.canEditMessage)(edited)) {
+        console.warn('edit not sent: the message was encrypted');
+        dispatch((0, _roomsSlice.setEditAction)({
+          isEdit: false
+        }));
+        return;
+      }
       try {
         client?.editMessageStanza(editAction.roomJid, editAction.messageId, message);
         handleMessageEdited({
@@ -106,6 +114,10 @@ const useSendMessage = _configOverride => {
       }));
       return;
     }
+    if (!(0, _e2ee.canSendToRoom)(activeRoomJID)) {
+      console.warn('message not sent: room is end-to-end encrypted');
+      return;
+    }
 
     // Critical-send hint to the QoS scheduler.
     client?.onCriticalSend?.(activeRoomJID);
@@ -136,6 +148,14 @@ const useSendMessage = _configOverride => {
       // manual-mode readers see the Translate link on it too (parity with
       // the web SDK, which stamps langSource on the optimistic message).
       langSource: langSource || 'en',
+      // Reply fields as the wire carries them (strings), so a thread reply
+      // shows in its thread — and NOT in the channel — from the first
+      // frame, not only once the server echo lands.
+      ...(isReply ? {
+        isReply: 'true',
+        showInChannel: isChecked ? 'true' : 'false',
+        mainMessage
+      } : {}),
       user: {
         ...user,
         id: selfId,
@@ -277,6 +297,10 @@ const useSendMessage = _configOverride => {
     }
   }, [editAction, client, user, langSource, dispatch, handleMessageSent, handleMessageEdited, handleMessageFailed, reduxStore]);
   const sendMedia = (0, _react.useCallback)(async (data, type, activeRoomJID, isReply = false, isChecked = false, mainMessage = '', existingId) => {
+    if (!(0, _e2ee.canSendMediaToRoom)(activeRoomJID)) {
+      console.warn('media not sent: room is end-to-end encrypted');
+      return;
+    }
     client?.onCriticalSend?.(activeRoomJID);
 
     // Defensive 50 MB guard on every send path (SendInput blocks it at
@@ -339,7 +363,7 @@ const useSendMessage = _configOverride => {
           mimetype: type,
           originalName: data?.name,
           size: fileSizeStr,
-          isReply,
+          isReply: isReply ? 'true' : 'false',
           showInChannel: `${isChecked}`,
           mainMessage
         }
@@ -406,20 +430,40 @@ const useSendMessage = _configOverride => {
       type: data?.type || data?.mimeType || type || 'application/octet-stream',
       name: data?.name || data?.fileName || `media_${Date.now()}`
     };
+    let sealed;
     const tryUpload = async () => {
+      if ((0, _send.shouldEncrypt)(activeRoomJID) && !sealed) {
+        const {
+          sealPickedFile
+        } = require('../e2ee/sealedFiles');
+        sealed = await sealPickedFile({
+          uri: fileBlob.uri,
+          name: fileBlob.name,
+          type: fileBlob.type,
+          size: typeof data?.size === 'number' ? data.size : undefined
+        });
+      }
+      const part = sealed ? {
+        uri: sealed.uri,
+        type: 'application/octet-stream',
+        name: sealed.name
+      } : fileBlob;
+      const options = {
+        clientEncrypted: !!sealed
+      };
       const fd = new FormData();
-      fd.append('files', fileBlob);
+      fd.append('files', part);
       try {
-        return await (0, _auth.uploadFileV2)(fd, activeRoomJID);
+        return await (0, _auth.uploadFileV2)(fd, activeRoomJID, options);
       } catch (err) {
         if (err?.response?.status === 500) {
           console.warn('upload "files" field returned 500 — retrying with "file" (singular)', {
-            name: fileBlob.name,
-            type: fileBlob.type
+            name: part.name,
+            type: part.type
           });
           const fd2 = new FormData();
-          fd2.append('file', fileBlob);
-          return await (0, _auth.uploadFileV2)(fd2, activeRoomJID);
+          fd2.append('file', part);
+          return await (0, _auth.uploadFileV2)(fd2, activeRoomJID, options);
         }
         throw err;
       }
@@ -457,8 +501,25 @@ const useSendMessage = _configOverride => {
           isReply,
           mainMessage,
           isPrivate: item?.isPrivate,
-          __v: item.__v
+          __v: item.__v,
+          e2eeKeys: sealed ? [sealed.keyMaterial] : undefined
         };
+        if (sealed) {
+          try {
+            const {
+              rememberOpened
+            } = require('../e2ee/sealedFiles');
+            await rememberOpened(item.location, {
+              uri: fileBlob.uri,
+              name: fileBlob.name,
+              type: fileBlob.type,
+              size: typeof data?.size === 'number' ? data.size : undefined
+            });
+          } catch (err) {
+            console.warn('could not keep the sent attachment', err);
+          }
+          sealed.dispose();
+        }
         // Stanza id == placeholder id so the MUC echo's outer
         // <message id="..."> matches xmppId on the placeholder and
         // insertMessageWithDelimiter merges in place + flips pending.
@@ -508,6 +569,7 @@ const useSendMessage = _configOverride => {
       // Upload (or stanza send) threw an explicit error. Clear the
       // watchdog so it doesn't double-fire `markMessageFailed`.
       clearTimeout(mediaWatchdog);
+      sealed?.dispose();
       // Surface the real server payload so we can see why the upload
       // was rejected (axios collapses the message to "Request failed
       // with status code N"; the actual reason lives in
@@ -554,7 +616,7 @@ const useSendMessage = _configOverride => {
   // "sending..."; if the retry fails again `markMessageFailed` re-arms
   // it. No-op when the id isn't in the failed map.
   const retryMessage = (0, _react.useCallback)(async failedId => {
-    const payload = failedMessages[failedId];
+    const payload = reduxStore.getState().roomHeapSlice?.failedMessages?.[failedId];
     if (!payload) {
       return;
     }
@@ -564,7 +626,7 @@ const useSendMessage = _configOverride => {
     // failed, but a confirmed (non-pending) copy is already sitting in
     // the room. Resending here would deliver a genuine duplicate; just
     // clear the failure and let the existing copy stand.
-    const roomMsgs = rooms?.[payload.roomJID]?.messages || [];
+    const roomMsgs = reduxStore.getState().rooms?.rooms?.[payload.roomJID]?.messages || [];
     const alreadyDelivered = roomMsgs.some(m => !m.pending && (m.id === failedId || m.xmppId === failedId));
     if (alreadyDelivered) {
       dispatch((0, _roomHeapSlice.clearMessageFailure)(failedId));
@@ -584,7 +646,7 @@ const useSendMessage = _configOverride => {
     } else {
       await sendMedia(payload.data, payload.type, payload.roomJID, payload.isReply, payload.isChecked, payload.mainMessage, failedId);
     }
-  }, [failedMessages, rooms, dispatch, handleMessageRetry, sendMessage, sendMedia]);
+  }, [reduxStore, dispatch, handleMessageRetry, sendMessage, sendMedia]);
 
   // ChatRoom/ThreadWrapper consume this as the "edit branch" of send.
   // It mirrors the edit path inside `sendMessage` so callers can wire it
@@ -593,6 +655,14 @@ const useSendMessage = _configOverride => {
     if (!editAction?.isEdit || !editAction.roomJid || !editAction.messageId) {
       return;
     }
+    const edited = reduxStore.getState().rooms?.rooms?.[editAction.roomJid]?.messages?.find(m => m.id === editAction.messageId);
+    if (edited && !(0, _e2ee.canEditMessage)(edited)) {
+      console.warn('edit not sent: the message was encrypted');
+      dispatch((0, _roomsSlice.setEditAction)({
+        isEdit: false
+      }));
+      return;
+    }
     try {
       client?.editMessageStanza(editAction.roomJid, editAction.messageId, message);
       handleMessageEdited({
@@ -621,7 +691,7 @@ const useSendMessage = _configOverride => {
     if (!roomJID) {
       return false;
     }
-    const msgs = rooms?.[roomJID]?.messages;
+    const msgs = reduxStore.getState().rooms?.rooms?.[roomJID]?.messages;
     if (!msgs || msgs.length === 0) {
       return false;
     }
@@ -634,7 +704,7 @@ const useSendMessage = _configOverride => {
       return false;
     }
     return last.user?.id === selfId;
-  }, [rooms, user?.xmppUsername, user?.walletAddress]);
+  }, [reduxStore, user?.xmppUsername, user?.walletAddress]);
   return {
     sendMessage,
     sendMedia,