@ethora/chat-component-rn 26.5.5 → 26.5.7

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

@@ -1 +1 @@
-{"version":3,"names":["React","TouchableOpacity","StyleSheet","Video","ResizeMode","useDispatch","setActiveFile","setActiveModal","MODAL_TYPES","jsx","_jsx","CustomMessageVideo","fileName","fileURL","mimetype","dispatch","handleOpen","FILE_PREVIEW","style","styles","container","onPress","children","source","uri","video","useNativeControls","resizeMode","CONTAIN","shouldPlay","create","margin","alignItems","justifyContent","width","height","borderRadius","backgroundColor"],"sourceRoot":"../../../../src","sources":["components/styled/VideoMessage.tsx"],"mappings":";;AAAA,OAAOA,KAAK,MAAM,OAAO;AACzB,SAASC,gBAAgB,EAAEC,UAAU,QAAQ,cAAc;AAC3D,SAASC,KAAK,EAAEC,UAAU,QAAQ,SAAS;AAC3C,SAASC,WAAW,QAAQ,aAAa;AACzC,SACEC,aAAa,EACbC,cAAc,QACT,mCAAmC;AAC1C,SAASC,WAAW,QAAQ,qCAAqC;AAAC,SAAAC,GAAA,IAAAC,IAAA;AAQlE,MAAMC,kBAAqD,GAAGA,CAAC;EAC7DC,QAAQ;EACRC,OAAO;EACPC;AACF,CAAC,KAAK;EACJ,MAAMC,QAAQ,GAAGV,WAAW,CAAC,CAAC;EAE9B,MAAMW,UAAU,GAAGA,CAAA,KAAM;IACvBD,QAAQ,CAACT,aAAa,CAAC;MAAEM,QAAQ;MAAEC,OAAO;MAAEC;IAAS,CAAC,CAAC,CAAC;IACxDC,QAAQ,CAACR,cAAc,CAACC,WAAW,CAACS,YAAY,CAAC,CAAC;EACpD,CAAC;EAED,oBACEP,IAAA,CAACT,gBAAgB;IAACiB,KAAK,EAAEC,MAAM,CAACC,SAAU;IAACC,OAAO,EAAEL,UAAW;IAAAM,QAAA,eAC7DZ,IAAA,CAACP,KAAK;MACJoB,MAAM,EAAE;QAAEC,GAAG,EAAEX;MAAQ,CAAE;MACzBK,KAAK,EAAEC,MAAM,CAACM,KAAM;MACpBC,iBAAiB;MACjBC,UAAU,EAAEvB,UAAU,CAACwB,OAAQ;MAC/BC,UAAU,EAAE;IAAM,CACnB;EAAC,CACc,CAAC;AAEvB,CAAC;AAED,eAAelB,kBAAkB;AAEjC,MAAMQ,MAAM,GAAGjB,UAAU,CAAC4B,MAAM,CAAC;EAC/BV,SAAS,EAAE;IACTW,MAAM,EAAE,CAAC;IACTC,UAAU,EAAE,QAAQ;IACpBC,cAAc,EAAE,QAAQ;IACxBC,KAAK,EAAE;EACT,CAAC;EACDT,KAAK,EAAE;IACLS,KAAK,EAAE,GAAG;IACVC,MAAM,EAAE,GAAG;IACXC,YAAY,EAAE,EAAE;IAChBC,eAAe,EAAE;EACnB;AACF,CAAC,CAAC","ignoreList":[]}
+{"version":3,"names":["React","TouchableOpacity","StyleSheet","Video","ResizeMode","useDispatch","setActiveFile","setActiveModal","MODAL_TYPES","jsx","_jsx","CustomMessageVideo","fileName","fileURL","mimetype","dispatch","handleOpen","FILE_PREVIEW","onPress","children","source","uri","style","styles","video","useNativeControls","resizeMode","CONTAIN","shouldPlay","create","width","aspectRatio","backgroundColor"],"sourceRoot":"../../../../src","sources":["components/styled/VideoMessage.tsx"],"mappings":";;AAAA,OAAOA,KAAK,MAAM,OAAO;AACzB,SAASC,gBAAgB,EAAEC,UAAU,QAAQ,cAAc;AAC3D,SAASC,KAAK,EAAEC,UAAU,QAAQ,SAAS;AAC3C,SAASC,WAAW,QAAQ,aAAa;AACzC,SACEC,aAAa,EACbC,cAAc,QACT,mCAAmC;AAC1C,SAASC,WAAW,QAAQ,qCAAqC;AAAC,SAAAC,GAAA,IAAAC,IAAA;AAQlE,MAAMC,kBAAqD,GAAGA,CAAC;EAC7DC,QAAQ;EACRC,OAAO;EACPC;AACF,CAAC,KAAK;EACJ,MAAMC,QAAQ,GAAGV,WAAW,CAAC,CAAC;EAE9B,MAAMW,UAAU,GAAGA,CAAA,KAAM;IACvBD,QAAQ,CAACT,aAAa,CAAC;MAAEM,QAAQ;MAAEC,OAAO;MAAEC;IAAS,CAAC,CAAC,CAAC;IACxDC,QAAQ,CAACR,cAAc,CAACC,WAAW,CAACS,YAAY,CAAC,CAAC;EACpD,CAAC;EAED,oBACEP,IAAA,CAACT,gBAAgB;IAACiB,OAAO,EAAEF,UAAW;IAAAG,QAAA,eACpCT,IAAA,CAACP,KAAK;MACJiB,MAAM,EAAE;QAAEC,GAAG,EAAER;MAAQ,CAAE;MACzBS,KAAK,EAAEC,MAAM,CAACC,KAAM;MACpBC,iBAAiB;MACjBC,UAAU,EAAEtB,UAAU,CAACuB,OAAQ;MAC/BC,UAAU,EAAE;IAAM,CACnB;EAAC,CACc,CAAC;AAEvB,CAAC;AAED,eAAejB,kBAAkB;AAEjC,MAAMY,MAAM,GAAGrB,UAAU,CAAC2B,MAAM,CAAC;EAC/BL,KAAK,EAAE;IACLM,KAAK,EAAE,MAAM;IACbC,WAAW,EAAE,EAAE,GAAG,CAAC;IACnBC,eAAe,EAAE;EACnB;AACF,CAAC,CAAC","ignoreList":[]}

package/lib/module/context/xmppProvider.js

@@ -1,10 +1,11 @@
 "use strict";
 
-import React, { createContext, useCallback, useContext, useEffect, useRef, useState } from 'react';
+import React, { createContext, useCallback, useContext, useEffect, useMemo, useRef, useState } from 'react';
 import { AppState, DeviceEventEmitter } from 'react-native';
 import XmppClient from '../networking/xmppClient';
+import { refreshTokens } from '../roomStore/chatSettingsSlice';
 import { buildXmppClientKey, getReusableXmppClientByKey, isXmppClientReusable, setGlobalXmppClient, withXmppClientInitLock } from '../utils/clientRegistry';
-import { applyResolvedUserToStore, resolveInitBeforeLoadUser } from '../helpers/resolveInitBeforeLoadUser';
+import { applyResolvedUserToStore, refreshUserCredentialsForXmpp, resolveInitBeforeLoadUser } from '../helpers/resolveInitBeforeLoadUser';
 import { ensureScopedChatCache } from '../helpers/ensureScopedChatCache';
 import { getRooms as prefetchRoomsViaRest } from '../networking/api-requests/rooms.api';
 import { allRoomPresences } from '../networking/xmpp/allRoomPresences.xmpp';
@@ -33,6 +34,65 @@ export const XmppProvider = ({
   const lastCredsRef = useRef(null);
   const completedBootstrapKeyRef = useRef('');
   const inflightBootstrapKeyRef = useRef('');
+
+  // Callback XmppClient uses to fetch fresh credentials after a SASL
+  // `not-authorized` (typically JWT expiry during idle, bug #17).
+  // Always installed — the underlying `refreshUserCredentialsForXmpp`
+  // picks the right path based on config:
+  //   - `jwtLogin` → re-exchange JWT via `/users/client`
+  //   - `userLogin` / `customLogin` / store / persisted → `/users/my`
+  //     with REST refresh chain (handles 401 → refresh → retry)
+  // Returns last-known cached creds if nothing usable is available so
+  // the XmppClient at least doesn't crash on `undefined.password`.
+  const credentialsProvider = useMemo(() => {
+    return async () => {
+      // 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) {
+            store.dispatch(refreshTokens({
+              token: result.accessToken,
+              refreshToken: result.refreshToken || ''
+            }));
+          }
+        } catch (err) {
+          devPushLog('warn', 'XMPP creds refresh: customRefresh failed', err);
+        }
+      }
+
+      // 2. Re-mint XMPP creds via the right priority chain for the
+      //    current auth mode. This call ALWAYS hydrates (unlike
+      //    `resolveInitBeforeLoadUser` which short-circuits when a
+      //    cached user already has xmppCredentials).
+      const fresh = await refreshUserCredentialsForXmpp(config).catch(err => {
+        devPushLog('warn', 'XMPP creds refresh: full chain failed', err);
+        return null;
+      });
+      if (fresh) {
+        applyResolvedUserToStore(fresh);
+        return {
+          username: fresh.xmppUsername || fresh.defaultWallet?.walletAddress || '',
+          password: fresh.xmppPassword || ''
+        };
+      }
+
+      // 3. Last-resort: return the cached creds so reconnect() can
+      //    still attempt a connection. If the original failure was
+      //    a stale JWT this will fail again and the user has to
+      //    re-mount the chat — but at least we don't break the
+      //    transient-network-blip case where the cached creds are
+      //    still valid.
+      const u = store.getState().chatSettingStore.user;
+      return {
+        username: u?.xmppUsername || u?.defaultWallet?.walletAddress || '',
+        password: u?.xmppPassword || ''
+      };
+    };
+  }, [config?.jwtLogin?.enabled, config?.jwtLogin?.token, config?.refreshTokens?.refreshFunction, config?.userLogin?.enabled, config?.customLogin?.enabled, config?.initBeforeLoadAuth?.myEndpoint]);
   const initializeClient = useCallback(async (username, password, xmppSettings) => {
     const settings = xmppSettings || config?.xmppSettings;
     const key = buildXmppClientKey(username, settings);
@@ -63,6 +123,12 @@ export const XmppProvider = ({
     //    concurrent calls for the same key.
     const created = await withXmppClientInitLock(key, async () => {
       const newClient = new XmppClient(username, password, settings);
+      // Wire up the credentialsProvider so SASL `not-authorized`
+      // after idle triggers a refresh chain (jwtLogin →
+      // /users/client; userLogin/customLogin/store → /users/my +
+      // REST refresh) instead of looping forever with stale creds.
+      // Bug #17 — full coverage in 26.5.6.
+      newClient.setCredentialsProvider(credentialsProvider);
       setGlobalXmppClient(newClient, key);
       await newClient.waitForOnline().catch(err => {
         console.error('Error waiting for xmpp online:', err);
@@ -70,6 +136,10 @@ export const XmppProvider = ({
       });
       return newClient;
     });
+
+    // Reused clients (steps 1+2 above) also need the provider — config
+    // may have changed since the singleton was created.
+    created.setCredentialsProvider(credentialsProvider);
     setClient(created);
     lastCredsRef.current = {
       username,
@@ -78,7 +148,7 @@ export const XmppProvider = ({
     };
     setReconnectAttempts(0);
     return created;
-  }, [client, config?.xmppSettings]);
+  }, [client, config?.xmppSettings, credentialsProvider]);
 
   // -----------------------------------------------------------
   // initBeforeLoad — eager auth + xmpp connect at provider mount

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

@@ -1 +1 @@
-{"version":3,"names":["React","createContext","useCallback","useContext","useEffect","useRef","useState","AppState","DeviceEventEmitter","XmppClient","buildXmppClientKey","getReusableXmppClientByKey","isXmppClientReusable","setGlobalXmppClient","withXmppClientInitLock","applyResolvedUserToStore","resolveInitBeforeLoadUser","ensureScopedChatCache","getRooms","prefetchRoomsViaRest","allRoomPresences","store","logout","setStoreClient","setLogoutState","runHistoryPreloadScheduler","asyncLocalStorage","localStorageConstants","clearPersistedState","pushLog","devPushLog","jsx","_jsx","XmppContext","LOGOUT_EVENT","XmppProvider","children","config","client","setClient","providerBootstrapStatus","setProviderBootstrapStatus","reconnectAttempts","setReconnectAttempts","initMode","initBeforeLoad","lastCredsRef","completedBootstrapKeyRef","inflightBootstrapKeyRef","initializeClient","username","password","xmppSettings","settings","key","reusable","current","created","newClient","waitForOnline","catch","err","console","error","abortController","AbortController","cancelled","run","explicitUser","userLogin","enabled","user","appId","baseUrl","defaultWallet","walletAddress","xmppUsername","token","jwtLogin","devServer","join","mode","customLogin","clearStoreBeforeInit","dispatch","ETHORA_USER","remove","undefined","resolved","signal","xmppPassword","hasResolved","xmppPasswordPresent","restRoomsPromise","c","getRoomsStanza","e","getChatsPrivateStoreRequestStanza","roomCount","Object","keys","getState","rooms","length","qos","historyQoS","activeRoomJID","defaultRoomJids","defaultRooms","map","r","jid","filter","Boolean","selectedRoomJid","concurrency","stagedPreloadConcurrency","pageSize","stagedPreloadFirstPassSize","roomLimit","preloadTopKRooms","warn","message","status","response","data","abort","log","scheduleReconnect","prev","sub","addEventListener","next","state","flushLastViewedToPrivateStoreStanza","addListener","disconnect","suppressReconnect","Provider","value","useXmppClient","context","Error","emitXmppLogout","emit"],"sourceRoot":"../../../src","sources":["context/xmppProvider.tsx"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["React","createContext","useCallback","useContext","useEffect","useMemo","useRef","useState","AppState","DeviceEventEmitter","XmppClient","refreshTokens","buildXmppClientKey","getReusableXmppClientByKey","isXmppClientReusable","setGlobalXmppClient","withXmppClientInitLock","applyResolvedUserToStore","refreshUserCredentialsForXmpp","resolveInitBeforeLoadUser","ensureScopedChatCache","getRooms","prefetchRoomsViaRest","allRoomPresences","store","logout","setStoreClient","setLogoutState","runHistoryPreloadScheduler","asyncLocalStorage","localStorageConstants","clearPersistedState","pushLog","devPushLog","jsx","_jsx","XmppContext","LOGOUT_EVENT","XmppProvider","children","config","client","setClient","providerBootstrapStatus","setProviderBootstrapStatus","reconnectAttempts","setReconnectAttempts","initMode","initBeforeLoad","lastCredsRef","completedBootstrapKeyRef","inflightBootstrapKeyRef","credentialsProvider","customRefresh","refreshFunction","result","accessToken","dispatch","token","refreshToken","err","fresh","catch","username","xmppUsername","defaultWallet","walletAddress","password","xmppPassword","u","getState","chatSettingStore","user","jwtLogin","enabled","userLogin","customLogin","initBeforeLoadAuth","myEndpoint","initializeClient","xmppSettings","settings","key","reusable","current","created","newClient","setCredentialsProvider","waitForOnline","console","error","abortController","AbortController","cancelled","run","explicitUser","appId","baseUrl","devServer","join","mode","clearStoreBeforeInit","ETHORA_USER","remove","undefined","resolved","signal","hasResolved","xmppPasswordPresent","restRoomsPromise","c","getRoomsStanza","e","getChatsPrivateStoreRequestStanza","roomCount","Object","keys","rooms","length","qos","historyQoS","activeRoomJID","defaultRoomJids","defaultRooms","map","r","jid","filter","Boolean","selectedRoomJid","concurrency","stagedPreloadConcurrency","pageSize","stagedPreloadFirstPassSize","roomLimit","preloadTopKRooms","warn","message","status","response","data","abort","log","scheduleReconnect","prev","sub","addEventListener","next","state","flushLastViewedToPrivateStoreStanza","addListener","disconnect","suppressReconnect","Provider","value","useXmppClient","context","Error","emitXmppLogout","emit"],"sourceRoot":"../../../src","sources":["context/xmppProvider.tsx"],"mappings":"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","ignoreList":[]}

package/lib/module/helpers/mimeToExtension.js

@@ -0,0 +1,124 @@
+"use strict";
+
+// MIME → file extension table for download/preview filename fallbacks.
+// Centralized so FilePreviewModal, MediaMessage, and any future media
+// surface share one source of truth. Keep additions sorted by category.
+
+const MIME_TO_EXT = {
+  // images
+  'image/jpeg': '.jpg',
+  'image/jpg': '.jpg',
+  'image/png': '.png',
+  'image/gif': '.gif',
+  'image/webp': '.webp',
+  'image/heic': '.heic',
+  'image/heif': '.heif',
+  'image/bmp': '.bmp',
+  'image/svg+xml': '.svg',
+  'image/tiff': '.tiff',
+  // video
+  'video/mp4': '.mp4',
+  'video/quicktime': '.mov',
+  'video/x-m4v': '.m4v',
+  'video/webm': '.webm',
+  'video/3gpp': '.3gp',
+  'video/x-matroska': '.mkv',
+  'video/mpeg': '.mpeg',
+  // audio
+  'audio/mpeg': '.mp3',
+  'audio/mp3': '.mp3',
+  'audio/mp4': '.m4a',
+  'audio/x-m4a': '.m4a',
+  'audio/wav': '.wav',
+  'audio/x-wav': '.wav',
+  'audio/aac': '.aac',
+  'audio/ogg': '.ogg',
+  'audio/flac': '.flac',
+  'audio/webm': '.weba',
+  // documents
+  'application/pdf': '.pdf',
+  'application/msword': '.doc',
+  'application/vnd.openxmlformats-officedocument.wordprocessingml.document': '.docx',
+  'application/vnd.ms-excel': '.xls',
+  'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet': '.xlsx',
+  'application/vnd.ms-powerpoint': '.ppt',
+  'application/vnd.openxmlformats-officedocument.presentationml.presentation': '.pptx',
+  'text/plain': '.txt',
+  'text/csv': '.csv',
+  'text/html': '.html',
+  'application/json': '.json',
+  'application/xml': '.xml',
+  'text/xml': '.xml',
+  'application/rtf': '.rtf',
+  // archives
+  'application/zip': '.zip',
+  'application/x-rar-compressed': '.rar',
+  'application/x-7z-compressed': '.7z',
+  'application/gzip': '.gz',
+  'application/x-tar': '.tar'
+};
+const VALID_EXT_RE = /\.[a-z0-9]{1,8}$/i;
+
+/**
+ * Returns the conventional extension (including the leading dot) for a
+ * MIME type, or `.bin` as a last-resort fallback so callers never end up
+ * with an extension-less filename.
+ */
+export function getExtensionForMime(mime) {
+  if (!mime) {
+    return '.bin';
+  }
+  const normalized = mime.toLowerCase().split(';')[0].trim();
+  return MIME_TO_EXT[normalized] || '.bin';
+}
+
+/**
+ * Parses a URL or file path and returns the last segment, URL-decoded,
+ * stripped of query/hash. Returns `''` when nothing usable is present.
+ */
+export function filenameFromUrl(url) {
+  if (!url) {
+    return '';
+  }
+  try {
+    // Strip query + hash without depending on a real URL parser (some RN
+    // URLs from CDNs do not parse cleanly).
+    const noQuery = url.split('?')[0].split('#')[0];
+    const last = noQuery.split('/').pop() || '';
+    return decodeURIComponent(last);
+  } catch {
+    return '';
+  }
+}
+
+/**
+ * Ensures `fileName` ends with a valid extension. Strategy:
+ *   1. If the input already has an extension, return it unchanged.
+ *   2. Otherwise, derive the extension from `mime` and append it.
+ *   3. If `mime` is unknown, append `.bin`.
+ *
+ * Empty/falsy filenames get a `media_<timestamp>` base before the
+ * extension is appended so callers always get a usable filename.
+ */
+export function ensureFilenameHasExtension(fileName, mime) {
+  const base = fileName && fileName.trim() || `media_${Date.now()}`;
+  if (VALID_EXT_RE.test(base)) {
+    return base;
+  }
+  return `${base}${getExtensionForMime(mime)}`;
+}
+
+/**
+ * Best-effort filename derivation for a message bubble:
+ *   - server-provided `fileName`
+ *   - server-provided `originalName`
+ *   - URL pathname
+ *   - generic `media_<timestamp>` so we never render an empty label
+ *
+ * Always returns a string with a valid extension.
+ */
+export function deriveDisplayFilename(opts) {
+  const candidate = opts.fileName && opts.fileName.trim() || opts.originalName && opts.originalName.trim() || filenameFromUrl(opts.url) || '';
+  return ensureFilenameHasExtension(candidate, opts.mime);
+}
+//# sourceMappingURL=mimeToExtension.js.map

package/lib/module/helpers/mimeToExtension.js.map

@@ -0,0 +1 @@
+{"version":3,"names":["MIME_TO_EXT","VALID_EXT_RE","getExtensionForMime","mime","normalized","toLowerCase","split","trim","filenameFromUrl","url","noQuery","last","pop","decodeURIComponent","ensureFilenameHasExtension","fileName","base","Date","now","test","deriveDisplayFilename","opts","candidate","originalName"],"sourceRoot":"../../../src","sources":["helpers/mimeToExtension.ts"],"mappings":"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","ignoreList":[]}

package/lib/module/helpers/resolveInitBeforeLoadUser.js

@@ -238,5 +238,76 @@ export const applyResolvedUserToStore = user => {
   }
   store.dispatch(setUser(user));
 };
+
+/**
+ * Re-mints a User with a fresh xmppPassword for the XMPP credentials-
+ * provider path (bug #17). Unlike `resolveInitBeforeLoadUser` this
+ * ALWAYS hydrates via the chosen auth path even if the cached user
+ * already had xmppCredentials — that's the whole point, the old ones
+ * are stale.
+ *
+ * Selection order:
+ *   1. `jwtLogin` — re-exchange the JWT via `/users/client`.
+ *   2. Anything else (`userLogin` / `customLogin` / store / persisted)
+ *      — `tryHydrateViaMy` on the current user, which calls
+ *      `/users/my` and, on 401, refreshes the access token via
+ *      `/users/login/refresh` and retries.
+ *
+ * Returns `null` only when nothing usable is available — the caller
+ * (xmppProvider) falls back to the cached creds in that case.
+ */
+export const refreshUserCredentialsForXmpp = async (config, signal) => {
+  if (signal?.aborted) {
+    return null;
+  }
+
+  // Priority 1: jwtLogin — same path as `resolveInitBeforeLoadUser`
+  // priority 3. We always re-exchange because the original JWT may
+  // itself have expired (and the consumer is expected to swap
+  // `config.jwtLogin.token` for a fresh one before then).
+  if (config?.jwtLogin?.enabled && config?.jwtLogin?.token) {
+    try {
+      const fresh = await loginViaJwt(config.jwtLogin.token);
+      const normalized = normalizeUserForXmpp(fresh);
+      if (normalized && hasXmppCredentials(normalized)) {
+        return normalized;
+      }
+    } catch (error) {
+      if (signal?.aborted || isAbortError(error)) {
+        return null;
+      }
+      // fall through to /users/my path
+    }
+  }
+  const myEndpoint = config?.initBeforeLoadAuth?.myEndpoint || '/users/my';
+
+  // Priority 2: redux store user (covers userLogin + customLogin +
+  // anything previously persisted into chatSettingStore.user). The
+  // user must have at least a refreshToken for the refresh chain to
+  // produce something useful.
+  const currentUser = store.getState().chatSettingStore.user;
+  if (currentUser?.token || currentUser?.refreshToken) {
+    const hydrated = await tryHydrateViaMy(currentUser, myEndpoint, signal).catch(() => null);
+    if (hydrated && hasXmppCredentials(hydrated)) {
+      return hydrated;
+    }
+  }
+
+  // Priority 3: persisted user in AsyncStorage — defensive; the store
+  // should already mirror this, but if the redux state got cleared
+  // mid-session (logout race) this gives us one last shot.
+  try {
+    const storedUser = await asyncLocalStorage(localStorageConstants.ETHORA_USER).get();
+    if (storedUser && (storedUser.token || storedUser.refreshToken || storedUser.xmppPassword)) {
+      const hydrated = await tryHydrateViaMy(storedUser, myEndpoint, signal).catch(() => null);
+      if (hydrated && hasXmppCredentials(hydrated)) {
+        return hydrated;
+      }
+    }
+  } catch {
+    // ignore storage errors
+  }
+  return null;
+};
 export default resolveInitBeforeLoadUser;
 //# sourceMappingURL=resolveInitBeforeLoadUser.js.map

package/lib/module/helpers/resolveInitBeforeLoadUser.js.map

@@ -1 +1 @@
-{"version":3,"names":["http","setBaseURL","loginViaJwt","getMyUser","store","setUser","walletToUsername","asyncLocalStorage","localStorageConstants","getStatusCode","error","status","response","isAuthError","code","isAbortError","message","toLowerCase","includes","hasXmppCredentials","user","Boolean","xmppPassword","xmppUsername","defaultWallet","walletAddress","normalizeUserForXmpp","normalizedXmppUsername","refreshWithToken","refreshToken","post","headers","Authorization","token","data","mergeUsers","base","patch","tryHydrateViaMy","candidate","myEndpoint","signal","aborted","mergedCandidate","workingToken","workingRefresh","candidateWithCurrentTokens","fallbackWithCreds","normalized","myUser","endpoint","merged","fallback","refreshed","myError","resolveInitBeforeLoadUser","options","config","baseUrl","customAppToken","initBeforeLoadAuth","explicitUser","userLogin","enabled","hydrated","catch","customLogin","loginFunction","customUser","jwtLogin","jwtUser","currentUser","getState","chatSettingStore","storedUser","ETHORA_USER","get","remove","applyResolvedUserToStore","dispatch"],"sourceRoot":"../../../src","sources":["helpers/resolveInitBeforeLoadUser.ts"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["http","setBaseURL","loginViaJwt","getMyUser","store","setUser","walletToUsername","asyncLocalStorage","localStorageConstants","getStatusCode","error","status","response","isAuthError","code","isAbortError","message","toLowerCase","includes","hasXmppCredentials","user","Boolean","xmppPassword","xmppUsername","defaultWallet","walletAddress","normalizeUserForXmpp","normalizedXmppUsername","refreshWithToken","refreshToken","post","headers","Authorization","token","data","mergeUsers","base","patch","tryHydrateViaMy","candidate","myEndpoint","signal","aborted","mergedCandidate","workingToken","workingRefresh","candidateWithCurrentTokens","fallbackWithCreds","normalized","myUser","endpoint","merged","fallback","refreshed","myError","resolveInitBeforeLoadUser","options","config","baseUrl","customAppToken","initBeforeLoadAuth","explicitUser","userLogin","enabled","hydrated","catch","customLogin","loginFunction","customUser","jwtLogin","jwtUser","currentUser","getState","chatSettingStore","storedUser","ETHORA_USER","get","remove","applyResolvedUserToStore","dispatch","refreshUserCredentialsForXmpp","fresh"],"sourceRoot":"../../../src","sources":["helpers/resolveInitBeforeLoadUser.ts"],"mappings":"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","ignoreList":[]}

package/lib/module/hooks/useChatWrapperInit.js

@@ -96,10 +96,8 @@ const useChatWrapperInit = ({
               setInited(false);
               setShowModal(false);
               console.log(' No client, initializing one');
-              const newClient = await initializeClient(user.xmppUsername || user?.defaultWallet?.walletAddress, user?.xmppPassword, config?.xmppSettings).then(client => {
-                console.log(' Client initialized', client?.status);
-                return client;
-              });
+              const newClient = await initializeClient(user.xmppUsername || user?.defaultWallet?.walletAddress, user?.xmppPassword, config?.xmppSettings);
+              console.log(' Client initialized', newClient?.status);
               if (roomsList && Object.keys(roomsList).length > 0) {
                 console.log(' Using existing roomsList', Object.keys(roomsList).length);
                 setInited(true);
@@ -122,9 +120,12 @@ const useChatWrapperInit = ({
                   await newClient.getRoomsStanza();
                 }
               }
-              await newClient.getChatsPrivateStoreRequestStanza().then(async roomTimestampObject => {
+              try {
+                const roomTimestampObject = await newClient.getChatsPrivateStoreRequestStanza();
                 console.log('Got chats private store', roomTimestampObject?.length || 0);
-                updatedChatLastTimestamps(roomTimestampObject, dispatch);
+                if (roomTimestampObject) {
+                  updatedChatLastTimestamps(roomTimestampObject, dispatch);
+                }
                 if (!hasSyncedHistoryRef.current) {
                   console.log('Updating messages till last');
                   await updateMessagesTillLast(rooms, newClient);
@@ -133,7 +134,11 @@ const useChatWrapperInit = ({
                 setClient(newClient);
                 setConnectionLost(false);
                 console.log('Initialization complete');
-              });
+              } catch (err) {
+                console.warn('privateStore/timestamps failed', err);
+                setClient(newClient);
+                setConnectionLost(false);
+              }
               {
                 config?.refreshTokens?.enabled && refresh();
               }
@@ -154,9 +159,12 @@ const useChatWrapperInit = ({
             }
             setInited(true);
             console.log(' Getting chats private store for existing client');
-            await client.getChatsPrivateStoreRequestStanza().then(async roomTimestampObject => {
+            try {
+              const roomTimestampObject = await client.getChatsPrivateStoreRequestStanza();
               console.log('Got chats private store for existing client', roomTimestampObject?.length || 0);
-              updatedChatLastTimestamps(roomTimestampObject, dispatch);
+              if (roomTimestampObject) {
+                updatedChatLastTimestamps(roomTimestampObject, dispatch);
+              }
               if (!hasSyncedHistoryRef.current) {
                 console.log('Updating messages till last for existing client');
                 await updateMessagesTillLast(rooms, client);
@@ -165,7 +173,11 @@ const useChatWrapperInit = ({
               setClient(client);
               setConnectionLost(false);
               console.log(' Initialization complete for existing client');
-            });
+            } catch (err) {
+              console.warn('privateStore/timestamps failed (existing client)', err);
+              setClient(client);
+              setConnectionLost(false);
+            }
             {
               config?.refreshTokens?.enabled && refresh();
             }

package/lib/module/hooks/useChatWrapperInit.js.map

@@ -1 +1 @@
-{"version":3,"names":["useEffect","useRef","useState","useDispatch","useSelector","useXmppClient","chatAutoEnterer","initRoomsPresence","updatedChatLastTimestamps","updateMessagesTillLast","refresh","setLangSource","setConfig","setIsLoading","useRoomState","useChatSettingState","isChatIdPresentInArray","useGetNewArchRoom","getRoomsWithRetry","useChatWrapperInit","roomJID","wasAutoSelected","config","dispatch","inited","setInited","showModal","setShowModal","isConnectionLost","setConnectionLost","isRetrying","setIsRetrying","hasSyncedHistoryRef","client","initializeClient","setClient","syncRooms","rooms","state","roomsList","user","xmppPassword","console","log","close","getRoomsWithRertyRequest","retryRooms","loadRooms","disableLoad","loading","loadingText","undefined","retryTimeout","initXmmpClient","translates","enabled","translations","xmppUsername","error","newClient","defaultWallet","walletAddress","xmppSettings","then","status","Object","keys","length","newArch","loadedRooms","enableRoomsRetry","isSelectedRoomPresent","getRoomsStanza","getChatsPrivateStoreRequestStanza","roomTimestampObject","current","refreshTokens","setTimeout","clearTimeout"],"sourceRoot":"../../../src","sources":["hooks/useChatWrapperInit.ts"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["useEffect","useRef","useState","useDispatch","useSelector","useXmppClient","chatAutoEnterer","initRoomsPresence","updatedChatLastTimestamps","updateMessagesTillLast","refresh","setLangSource","setConfig","setIsLoading","useRoomState","useChatSettingState","isChatIdPresentInArray","useGetNewArchRoom","getRoomsWithRetry","useChatWrapperInit","roomJID","wasAutoSelected","config","dispatch","inited","setInited","showModal","setShowModal","isConnectionLost","setConnectionLost","isRetrying","setIsRetrying","hasSyncedHistoryRef","client","initializeClient","setClient","syncRooms","rooms","state","roomsList","user","xmppPassword","console","log","close","getRoomsWithRertyRequest","retryRooms","loadRooms","disableLoad","loading","loadingText","undefined","retryTimeout","initXmmpClient","translates","enabled","translations","xmppUsername","error","newClient","defaultWallet","walletAddress","xmppSettings","status","Object","keys","length","newArch","loadedRooms","enableRoomsRetry","isSelectedRoomPresent","getRoomsStanza","roomTimestampObject","getChatsPrivateStoreRequestStanza","current","err","warn","refreshTokens","setTimeout","clearTimeout"],"sourceRoot":"../../../src","sources":["hooks/useChatWrapperInit.ts"],"mappings":"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","ignoreList":[]}

package/lib/module/hooks/useEventHandlers.js

@@ -37,10 +37,18 @@ export const useEventHandlers = config => {
       console.error('Error in message edited handler:', error);
     }
   }, [config]);
+  const handleMessageRetry = useCallback(event => {
+    try {
+      config?.eventHandlers?.onMessageRetry?.(event);
+    } catch (error) {
+      console.error('Error in message retry handler:', error);
+    }
+  }, [config]);
   return {
     handleMessageSent,
     handleMessageFailed,
-    handleMessageEdited
+    handleMessageEdited,
+    handleMessageRetry
   };
 };
 //# sourceMappingURL=useEventHandlers.js.map

package/lib/module/hooks/useEventHandlers.js.map

@@ -1 +1 @@
-{"version":3,"names":["useCallback","useEventHandlers","config","handleMessageSent","event","eventHandlers","onMessageSent","error","console","handleMessageFailed","onMessageFailed","message","roomJID","messageType","timestamp","Date","toISOString","handlerError","handleMessageEdited","onMessageEdited"],"sourceRoot":"../../../src","sources":["hooks/useEventHandlers.tsx"],"mappings":";;AAAA,SAASA,WAAW,QAAQ,OAAO;AA+BnC,OAAO,MAAMC,gBAAgB,GAAIC,MAAgB,IAAwB;EACvE,MAAMC,iBAAiB,GAAGH,WAAW,CACnC,MAAOI,KAAuB,IAAK;IACjC,IAAI;MACF,IAAIF,MAAM,EAAEG,aAAa,EAAEC,aAAa,EAAE;QACxC,MAAMJ,MAAM,CAACG,aAAa,CAACC,aAAa,CAACF,KAAK,CAAC;MACjD;IACF,CAAC,CAAC,OAAOG,KAAK,EAAE;MACdC,OAAO,CAACD,KAAK,CAAC,gCAAgC,EAAEA,KAAK,CAAC;MACtD,MAAMA,KAAK;IACb;EACF,CAAC,EACD,CAACL,MAAM,CACT,CAAC;EAED,MAAMO,mBAAmB,GAAGT,WAAW,CACpCI,KAAyB,IAAK;IAC7B,IAAI;MACF,IAAIF,MAAM,EAAEG,aAAa,EAAEK,eAAe,EAAE;QAC1CR,MAAM,CAACG,aAAa,CAACK,eAAe,CAACN,KAAK,CAAC;MAC7C;MACAI,OAAO,CAACD,KAAK,CAAC,yBAAyB,EAAE;QACvCI,OAAO,EAAEP,KAAK,CAACO,OAAO;QACtBC,OAAO,EAAER,KAAK,CAACQ,OAAO;QACtBC,WAAW,EAAET,KAAK,CAACS,WAAW;QAC9BN,KAAK,EAAEH,KAAK,CAACG,KAAK,EAAEI,OAAO;QAC3BG,SAAS,EAAE,IAAIC,IAAI,CAAC,CAAC,CAACC,WAAW,CAAC;MACpC,CAAC,CAAC;IACJ,CAAC,CAAC,OAAOC,YAAY,EAAE;MACrBT,OAAO,CAACD,KAAK,CAAC,kCAAkC,EAAEU,YAAY,CAAC;IACjE;EACF,CAAC,EACD,CAACf,MAAM,CACT,CAAC;EAED,MAAMgB,mBAAmB,GAAGlB,WAAW,CACpCI,KAAyB,IAAK;IAC7B,IAAI;MACF,IAAIF,MAAM,EAAEG,aAAa,EAAEc,eAAe,EAAE;QAC1CjB,MAAM,CAACG,aAAa,CAACc,eAAe,CAACf,KAAK,CAAC;MAC7C;IACF,CAAC,CAAC,OAAOG,KAAK,EAAE;MACdC,OAAO,CAACD,KAAK,CAAC,kCAAkC,EAAEA,KAAK,CAAC;IAC1D;EACF,CAAC,EACD,CAACL,MAAM,CACT,CAAC;EAED,OAAO;IAAEC,iBAAiB;IAAEM,mBAAmB;IAAES;EAAoB,CAAC;AACxE,CAAC","ignoreList":[]}
+{"version":3,"names":["useCallback","useEventHandlers","config","handleMessageSent","event","eventHandlers","onMessageSent","error","console","handleMessageFailed","onMessageFailed","message","roomJID","messageType","timestamp","Date","toISOString","handlerError","handleMessageEdited","onMessageEdited","handleMessageRetry","onMessageRetry"],"sourceRoot":"../../../src","sources":["hooks/useEventHandlers.tsx"],"mappings":";;AAAA,SAASA,WAAW,QAAQ,OAAO;AAsCnC,OAAO,MAAMC,gBAAgB,GAAIC,MAAgB,IAAwB;EACvE,MAAMC,iBAAiB,GAAGH,WAAW,CACnC,MAAOI,KAAuB,IAAK;IACjC,IAAI;MACF,IAAIF,MAAM,EAAEG,aAAa,EAAEC,aAAa,EAAE;QACxC,MAAMJ,MAAM,CAACG,aAAa,CAACC,aAAa,CAACF,KAAK,CAAC;MACjD;IACF,CAAC,CAAC,OAAOG,KAAK,EAAE;MACdC,OAAO,CAACD,KAAK,CAAC,gCAAgC,EAAEA,KAAK,CAAC;MACtD,MAAMA,KAAK;IACb;EACF,CAAC,EACD,CAACL,MAAM,CACT,CAAC;EAED,MAAMO,mBAAmB,GAAGT,WAAW,CACpCI,KAAyB,IAAK;IAC7B,IAAI;MACF,IAAIF,MAAM,EAAEG,aAAa,EAAEK,eAAe,EAAE;QAC1CR,MAAM,CAACG,aAAa,CAACK,eAAe,CAACN,KAAK,CAAC;MAC7C;MACAI,OAAO,CAACD,KAAK,CAAC,yBAAyB,EAAE;QACvCI,OAAO,EAAEP,KAAK,CAACO,OAAO;QACtBC,OAAO,EAAER,KAAK,CAACQ,OAAO;QACtBC,WAAW,EAAET,KAAK,CAACS,WAAW;QAC9BN,KAAK,EAAEH,KAAK,CAACG,KAAK,EAAEI,OAAO;QAC3BG,SAAS,EAAE,IAAIC,IAAI,CAAC,CAAC,CAACC,WAAW,CAAC;MACpC,CAAC,CAAC;IACJ,CAAC,CAAC,OAAOC,YAAY,EAAE;MACrBT,OAAO,CAACD,KAAK,CAAC,kCAAkC,EAAEU,YAAY,CAAC;IACjE;EACF,CAAC,EACD,CAACf,MAAM,CACT,CAAC;EAED,MAAMgB,mBAAmB,GAAGlB,WAAW,CACpCI,KAAyB,IAAK;IAC7B,IAAI;MACF,IAAIF,MAAM,EAAEG,aAAa,EAAEc,eAAe,EAAE;QAC1CjB,MAAM,CAACG,aAAa,CAACc,eAAe,CAACf,KAAK,CAAC;MAC7C;IACF,CAAC,CAAC,OAAOG,KAAK,EAAE;MACdC,OAAO,CAACD,KAAK,CAAC,kCAAkC,EAAEA,KAAK,CAAC;IAC1D;EACF,CAAC,EACD,CAACL,MAAM,CACT,CAAC;EAED,MAAMkB,kBAAkB,GAAGpB,WAAW,CACnCI,KAAwB,IAAK;IAC5B,IAAI;MACFF,MAAM,EAAEG,aAAa,EAAEgB,cAAc,GAAGjB,KAAK,CAAC;IAChD,CAAC,CAAC,OAAOG,KAAK,EAAE;MACdC,OAAO,CAACD,KAAK,CAAC,iCAAiC,EAAEA,KAAK,CAAC;IACzD;EACF,CAAC,EACD,CAACL,MAAM,CACT,CAAC;EAED,OAAO;IACLC,iBAAiB;IACjBM,mBAAmB;IACnBS,mBAAmB;IACnBE;EACF,CAAC;AACH,CAAC","ignoreList":[]}

package/lib/module/hooks/useMessageHeapState.js

@@ -2,11 +2,15 @@
 
 import { useSelector } from 'react-redux';
 export const useMessageHeapState = () => {
-  const queue = useSelector(state => state.roomHeapSlice.messageHeap);
+  const queue = useSelector(state => state.roomHeapSlice?.messageHeap);
+  const failedMessages = useSelector(state => state.roomHeapSlice?.failedMessages);
   const idSet = new Set(queue?.map(m => m.id) ?? []);
+  const failedIdSet = new Set(Object.keys(failedMessages || {}));
   return {
     queue,
-    idSet
+    idSet,
+    failedMessages,
+    failedIdSet
   };
 };
 //# sourceMappingURL=useMessageHeapState.js.map

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

@@ -1 +1 @@
-{"version":3,"names":["useSelector","useMessageHeapState","queue","state","roomHeapSlice","messageHeap","idSet","Set","map","m","id"],"sourceRoot":"../../../src","sources":["hooks/useMessageHeapState.tsx"],"mappings":";;AAAA,SAASA,WAAW,QAAQ,aAAa;AAGzC,OAAO,MAAMC,mBAAmB,GAAGA,CAAA,KAAM;EACvC,MAAMC,KAAK,GAAGF,WAAW,CACtBG,KAAgB,IAAKA,KAAK,CAACC,aAAa,CAACC,WAC5C,CAAC;EACD,MAAMC,KAAK,GAAG,IAAIC,GAAG,CAACL,KAAK,EAAEM,GAAG,CAAEC,CAAC,IAAKA,CAAC,CAACC,EAAE,CAAC,IAAI,EAAE,CAAC;EAEpD,OAAO;IAAER,KAAK;IAAEI;EAAM,CAAC;AACzB,CAAC","ignoreList":[]}
+{"version":3,"names":["useSelector","useMessageHeapState","queue","state","roomHeapSlice","messageHeap","failedMessages","idSet","Set","map","m","id","failedIdSet","Object","keys"],"sourceRoot":"../../../src","sources":["hooks/useMessageHeapState.tsx"],"mappings":";;AAAA,SAASA,WAAW,QAAQ,aAAa;AAGzC,OAAO,MAAMC,mBAAmB,GAAGA,CAAA,KAAM;EACvC,MAAMC,KAAK,GAAGF,WAAW,CACtBG,KAAgB,IAAKA,KAAK,CAACC,aAAa,EAAEC,WAC7C,CAAC;EACD,MAAMC,cAAc,GAAGN,WAAW,CAC/BG,KAAgB,IAAKA,KAAK,CAACC,aAAa,EAAEE,cAC7C,CAAC;EACD,MAAMC,KAAK,GAAG,IAAIC,GAAG,CAACN,KAAK,EAAEO,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;IAAEJ,KAAK;IAAEK,KAAK;IAAED,cAAc;IAAEM;EAAY,CAAC;AACtD,CAAC","ignoreList":[]}