@ethora/chat-component-rn 26.5.10 → 26.5.11

package/src/helpers/mimeToExtension.ts

@@ -64,6 +64,70 @@ const MIME_TO_EXT: Record<string, string> = {
 
 const VALID_EXT_RE = /\.[a-z0-9]{1,8}$/i;
 
+// Audio file extensions we recognise across the SDK. Used for the
+// "looks like audio even when the mimetype is application/octet-stream"
+// heuristic in MediaMessage / FilePreviewModal. Voice-message senders
+// (web app, push voice memos) sometimes ship audio as octet-stream with
+// no audio mime — sniffing the extension lets us still play it.
+// `.bin` is intentionally NOT here: it's our own fallback extension for
+// truly unknown payloads (see getExtensionForMime), not a real format.
+const AUDIO_EXTENSIONS = [
+  '.mp3', '.m4a', '.wav', '.aac', '.ogg', '.flac',
+  '.weba', '.webm', '.opus', '.amr', '.3gp', '.3gpp',
+] as const;
+const AUDIO_EXT_RE = new RegExp(
+  `(${AUDIO_EXTENSIONS.map((e) => e.replace('.', '\\.')).join('|')})$`,
+  'i'
+);
+// Filename / URL substrings that strongly indicate a voice / audio
+// payload even without an explicit audio extension — e.g. a web-app
+// voicemail uploaded as application/octet-stream named "voicemail-…".
+const AUDIO_NAME_HINT_RE =
+  /(?:^|[_\-./])(voice|voicemail|audio|audio-message|audiomessage|recording|voice-?note)(?:[_\-./]|$)/i;
+
+/**
+ * Returns true when the (mime, fileName, url) triple looks like an
+ * audio payload — either by mime, by recognised extension on the
+ * filename or URL path, or by a voice-message naming hint. The hint
+ * branch is what catches voicemails sent as `application/octet-stream`
+ * with a generic `.bin` filename (customer-reported #9 voicemail).
+ */
+export function isLikelyAudio(
+  mime: string | undefined | null,
+  fileName?: string | null,
+  url?: string | null
+): boolean {
+  const m = (mime || '').toLowerCase();
+  if (m.startsWith('audio/')) {return true;}
+  // For octet-stream (and any other non-audio mime) fall through to the
+  // filename / URL heuristics. We don't restrict to octet-stream — some
+  // backends send no mime at all, or send text/plain by accident.
+  const name = (fileName || '').toLowerCase();
+  const urlLast = filenameFromUrl(url).toLowerCase();
+  if (AUDIO_EXT_RE.test(name) || AUDIO_EXT_RE.test(urlLast)) {return true;}
+  // Last resort: voice-message naming hint anywhere in the filename, the
+  // URL's last segment, OR the URL's full path. Voicemails are commonly
+  // hosted under `/voice/abc-123` or `/voicemail/abc-123` where the last
+  // segment is an opaque id with no hint by itself.
+  const urlPath = (() => {
+    if (!url) {return '';}
+    try {
+      const noQuery = url.split('?')[0]!.split('#')[0]!;
+      return decodeURIComponent(noQuery).toLowerCase();
+    } catch {
+      return '';
+    }
+  })();
+  if (
+    AUDIO_NAME_HINT_RE.test(name) ||
+    AUDIO_NAME_HINT_RE.test(urlLast) ||
+    AUDIO_NAME_HINT_RE.test(urlPath)
+  ) {
+    return true;
+  }
+  return false;
+}
+
 /**
  * Returns the conventional extension (including the leading dot) for a
  * MIME type, or `.bin` as a last-resort fallback so callers never end up

package/src/hooks/useLogout.tsx

@@ -134,18 +134,41 @@ const logoutService = {
   },
 };
 
-export const useLogout = () => {
-  const dispatch = useDispatch();
+/**
+ * Hook that returns an awaitable logout function.
+ *
+ * ```tsx
+ * const logout = useLogout();
+ * await logout();
+ * navigation.replace('SignIn'); // disk is provably clean here
+ * ```
+ *
+ * The returned function resolves AFTER all teardown work has landed:
+ * XMPP disconnect, redux reset, persisted slices wiped, stray
+ * AsyncStorage keys removed, REST cache cleared. It never rejects —
+ * any internal failure is logged via console.warn so a fire-and-forget
+ * `logout()` call (no `await`) still won't crash the host.
+ *
+ * Why awaitable: the persistence middleware debounces writes by 200ms,
+ * and the chat-slice `logout` reducer removes ETHORA_USER fire-and-
+ * forget. If the host navigated / re-mounted `<Chat>` immediately
+ * after a non-awaited call, the next bootstrap could occasionally
+ * read stale persisted state ("old chats reappear"). Awaiting the
+ * returned promise eliminates that race entirely.
+ */
+export const useLogout = (): (() => Promise<void>) => {
+  // dispatch is kept for backward-compat with consumers who treat the
+  // hook's presence as a redux-context requirement; not used directly
+  // here because the work happens through the module-level service.
+  useDispatch();
 
-  const handleLogout = useCallback(() => {
-    // The hook fires-and-forgets — consumers that need to await the
-    // teardown should call `logoutService.performLogout()` directly.
-    logoutService.performLogout().catch((err) => {
-      console.warn('useLogout: performLogout rejected', err);
-    });
+  return useCallback(async () => {
+    try {
+      await logoutService.performLogout();
+    } catch (err) {
+      console.warn('useLogout: performLogout failed', err);
+    }
   }, []);
-
-  return handleLogout;
 };
 
 export { logoutService };

package/src/networking/api-requests/rooms.api.ts

@@ -21,21 +21,45 @@ interface ApiRoomMember {
  *   1. explicit `room.jid` from the server (if present)
  *   2. `<name>@conference.<xmppHost>` where xmppHost comes from the
  *      provider's `xmppSettings.host` saved to `chatSettingStore.config`
- *   3. fallback: `<name>@conference.xmpp.chat.ethora.com`
+ *   3. derive host from `config.baseUrl` (api.<host> → xmpp.<host>)
+ *      as a last-resort heuristic for misconfigured deployments
+ *   4. otherwise: skip the room with a warn log (NEVER fall back to a
+ *      hardcoded vendor host — previously `xmpp.chat.ethora.com`, which
+ *      manifested as a phantom "ethora" room stub on third-party servers,
+ *      customer-reported #23)
  */
 function dispatchRoomsFromRestItems(items: ApiRoom[]): void {
   if (!items?.length) return;
   const config = store.getState().chatSettingStore?.config as any;
-  const host: string =
+  // Best: explicit xmpp settings.
+  let host: string | undefined =
     config?.xmppSettings?.host ||
-    config?.xmppSettings?.conference?.replace(/^conference\./, '') ||
-    'xmpp.chat.ethora.com';
-  const conference =
-    config?.xmppSettings?.conference || `conference.${host}`;
+    config?.xmppSettings?.conference?.replace(/^conference\./, '');
+  // Heuristic fallback: derive xmpp host from the REST baseUrl.
+  // `https://api.foo.com/v1` → `xmpp.foo.com`. Better than a hardcoded
+  // vendor host and right in 99% of single-domain deployments.
+  if (!host && typeof config?.baseUrl === 'string') {
+    const m = /^https?:\/\/(?:api\.)?([^/]+)/i.exec(config.baseUrl);
+    if (m && m[1]) {host = `xmpp.${m[1].replace(/^api\./, '')}`;}
+  }
+  const conference = config?.xmppSettings?.conference
+    || (host ? `conference.${host}` : undefined);
 
   for (const item of items) {
     if (!item) continue;
-    const jid = item.jid || `${item.name}@${conference}`;
+    let jid = item.jid;
+    if (!jid) {
+      if (!conference) {
+        // No server-supplied JID and no way to synthesize one safely —
+        // skip rather than create a phantom room on a wrong host.
+        // Consumers who hit this should set config.xmppSettings.host.
+        console.warn(
+          `[ethora-rn] rooms.api: skipping room "${item.name}" — no item.jid and no xmppSettings.host / baseUrl to derive host from`
+        );
+        continue;
+      }
+      jid = `${item.name}@${conference}`;
+    }
     if (!jid.includes('@')) continue;
     const room: IRoom = {
       id: item._id || jid,

package/src/types/types.ts

@@ -338,6 +338,22 @@ export interface IConfig {
     disableMembers?: boolean;
     hideMembers?: boolean;
     disableChatHeaderMenu?: boolean;
+    /**
+     * Disables uploading / removing the chat icon from the chat-info
+     * modal. The avatar stays rendered (initials / current icon) but
+     * the press-to-pick / remove affordances are gone — so the room
+     * icon becomes read-only regardless of the user's role.
+     */
+    disableIconEdit?: boolean;
+    /**
+     * Disables the tap on a member row in the chat-info member list —
+     * the popup that would show user-profile + per-member actions
+     * (message / copy-id) never opens. `disableMemberProfileActions`
+     * only hid the action BLOCK inside that popup; the popup itself
+     * still opened on tap. Set this when no per-member interaction is
+     * appropriate (e.g. patient-facing apps). Customer-reported #16.
+     */
+    disableMemberTap?: boolean;
   };
   qrUrl?: string;