@ethora/chat-component-rn 26.10.2 → 26.10.4

package/src/helpers/roomUserCount.ts

@@ -2,7 +2,7 @@ import { IRoom } from '../types/types';
 
 type CountSource =
   | Pick<IRoom, 'members' | 'usersCnt'>
-  | { members?: unknown; usersCnt?: unknown }
+  | { members?: unknown; usersCnt?: unknown; type?: unknown }
   | null
   | undefined;
 
@@ -17,11 +17,15 @@ export const getRoomUserCount = (room: CountSource): number => {
     typeof room?.usersCnt === 'number' && Number.isFinite(room.usersCnt)
       ? room.usersCnt
       : 0;
-  return Math.max(cnt, members);
+  const total = Math.max(cnt, members);
+  // A private chat is two people by definition; the server's usersCnt has
+  // been seen to drift above that (3 for a 1:1 room).
+  return (room as { type?: unknown })?.type === 'private' ? Math.min(total, 2) : total;
 };
 
 /** True when the room is known to have more users than members loaded. */
 export const isRoomMembersTruncated = (room: CountSource): boolean => {
+  if ((room as { type?: unknown })?.type === 'private') {return false;}
   const members = Array.isArray(room?.members) ? room.members.length : 0;
   const cnt =
     typeof room?.usersCnt === 'number' && Number.isFinite(room.usersCnt)

package/src/helpers/uniqueMembers.ts

@@ -0,0 +1,26 @@
+/**
+ * Drop repeated entries from a room's member list, keeping the first.
+ *
+ * The same person could appear twice in a 1:1 chat ("Members: 3", four
+ * rows): the list came back from the server with repeats after the private
+ * chat was requested again for an existing room. Members are keyed by
+ * whatever identity the entry carries: xmppUsername, then _id, then the
+ * JID's localpart.
+ */
+export const uniqueMembers = <T,>(members: T[] | undefined | null): T[] => {
+  if (!Array.isArray(members)) {return [];}
+  const seen = new Set<string>();
+  const out: T[] = [];
+  for (const member of members) {
+    const m = member as any;
+    const key = String(
+      m?.xmppUsername || m?._id || String(m?.jid || '').split('@')[0] || ''
+    ).trim();
+    if (key) {
+      if (seen.has(key)) {continue;}
+      seen.add(key);
+    }
+    out.push(member);
+  }
+  return out;
+};

package/src/hooks/useLeaveRoom.ts

@@ -0,0 +1,42 @@
+import { useCallback } from 'react';
+import { useDispatch } from 'react-redux';
+import { deleteRoom } from '../roomStore/roomsSlice';
+import { leaveRoom } from '../networking/api-requests/rooms.api';
+import { useXmppClient } from '../context/xmppProvider';
+
+/** Rooms with a leave request in flight: a second tap waits for the first. */
+const inFlight = new Set<string>();
+
+/**
+ * Leave a chat, shared by the room-list swipe, the chat header and the chat
+ * profile. The server goes first: if it refuses, the chat stays where it is
+ * (dropping it locally would only have it come back on the next /chats/my).
+ * Then the unavailable presence to the MUC and the room out of the store.
+ * Resolves false on failure, so the caller can say so in its own way.
+ */
+export const useLeaveRoom = () => {
+  const dispatch = useDispatch();
+  const { client } = useXmppClient();
+  return useCallback(
+    async (jid: string): Promise<boolean> => {
+      if (!jid || inFlight.has(jid)) {return true;}
+      inFlight.add(jid);
+      try {
+        await leaveRoom(jid.split('@')[0]);
+      } catch (error) {
+        console.warn('[ethora-rn] leave failed', error);
+        return false;
+      } finally {
+        inFlight.delete(jid);
+      }
+      try {
+        client?.leaveTheRoomStanza?.(jid);
+      } catch (error) {
+        console.error('Failed to leave the room:', error);
+      }
+      dispatch(deleteRoom({ jid }));
+      return true;
+    },
+    [client, dispatch]
+  );
+};

package/src/i18n/strings.ts

@@ -115,6 +115,7 @@ const en: UiStringTable = {
   'call.action.stopCamera': 'Turn camera off',
   'call.action.startCamera': 'Turn camera on',
   'call.action.switchCamera': 'Switch camera',
+  'call.action.swapVideo': 'Swap videos',
   'call.action.speakerOn': 'Turn speaker on',
   'call.action.speakerOff': 'Turn speaker off',
   'call.action.startAudioCall': 'Start audio call',
@@ -128,6 +129,8 @@ const en: UiStringTable = {
   'call.error.deviceInUse': 'Your camera or microphone is already in use by another app.',
   'call.error.deviceGeneric': 'Could not access your camera or microphone.',
   'call.error.noAnswerTimeout': 'No answer, the call timed out',
+  'call.peerMuted': '{name} is muted',
+  'call.selfMuted': 'Your microphone is muted',
   'action.send': 'Send',
   'action.cancel': 'Cancel',
   'action.save': 'Save',
@@ -138,6 +141,7 @@ const en: UiStringTable = {
   'action.mute': 'Mute',
   'action.unmute': 'Unmute',
   'toast.muteFailed': 'Could not update notifications for this chat',
+  'toast.leaveFailed': 'Could not leave this chat',
   'action.create': 'Create',
   'action.submit': 'Submit',
   'action.translate': 'Translate',
@@ -492,6 +496,7 @@ const fr: UiStringTable = {
   'call.action.stopCamera': 'Désactiver la caméra',
   'call.action.startCamera': 'Activer la caméra',
   'call.action.switchCamera': 'Changer de caméra',
+  'call.action.swapVideo': 'Inverser les vidéos',
   'call.action.speakerOn': 'Activer le haut-parleur',
   'call.action.speakerOff': 'Désactiver le haut-parleur',
   'call.action.startAudioCall': 'Démarrer un appel audio',
@@ -505,6 +510,8 @@ const fr: UiStringTable = {
   'call.error.deviceInUse': 'Votre caméra ou microphone est déjà utilisé par une autre application.',
   'call.error.deviceGeneric': 'Impossible d\'accéder à votre caméra ou microphone.',
   'call.error.noAnswerTimeout': 'Pas de réponse, l\'appel a expiré',
+  'call.peerMuted': '{name} a coupé son micro',
+  'call.selfMuted': 'Votre micro est coupé',
   'action.send': 'Envoyer',
   'action.cancel': 'Annuler',
   'action.save': 'Enregistrer',
@@ -515,6 +522,7 @@ const fr: UiStringTable = {
   'action.mute': 'Muet',
   'action.unmute': 'Réactiver',
   'toast.muteFailed': 'Impossible de modifier les notifications de ce chat',
+  'toast.leaveFailed': 'Impossible de quitter ce chat',
   'action.create': 'Créer',
   'action.submit': 'Soumettre',
   'action.translate': 'Traduire',
@@ -869,6 +877,7 @@ const es: UiStringTable = {
   'call.action.stopCamera': 'Apagar la cámara',
   'call.action.startCamera': 'Encender la cámara',
   'call.action.switchCamera': 'Cambiar de cámara',
+  'call.action.swapVideo': 'Intercambiar vídeos',
   'call.action.speakerOn': 'Activar el altavoz',
   'call.action.speakerOff': 'Desactivar el altavoz',
   'call.action.startAudioCall': 'Iniciar llamada de audio',
@@ -882,6 +891,8 @@ const es: UiStringTable = {
   'call.error.deviceInUse': 'Tu cámara o micrófono ya está siendo usado por otra aplicación.',
   'call.error.deviceGeneric': 'No se pudo acceder a tu cámara o micrófono.',
   'call.error.noAnswerTimeout': 'Sin respuesta, la llamada expiró',
+  'call.peerMuted': '{name} tiene el micrófono silenciado',
+  'call.selfMuted': 'Tu micrófono está silenciado',
   'action.send': 'Enviar',
   'action.cancel': 'Cancelar',
   'action.save': 'Guardar',
@@ -892,6 +903,7 @@ const es: UiStringTable = {
   'action.mute': 'Silenciar',
   'action.unmute': 'Activar',
   'toast.muteFailed': 'No se pudieron cambiar las notificaciones de este chat',
+  'toast.leaveFailed': 'No se pudo salir de este chat',
   'action.create': 'Crear',
   'action.submit': 'Enviar',
   'action.translate': 'Traducir',
@@ -1246,6 +1258,7 @@ const pt: UiStringTable = {
   'call.action.stopCamera': 'Desligar a câmara',
   'call.action.startCamera': 'Ligar a câmara',
   'call.action.switchCamera': 'Mudar de câmara',
+  'call.action.swapVideo': 'Trocar vídeos',
   'call.action.speakerOn': 'Ligar o altifalante',
   'call.action.speakerOff': 'Desligar o altifalante',
   'call.action.startAudioCall': 'Iniciar chamada de áudio',
@@ -1259,6 +1272,8 @@ const pt: UiStringTable = {
   'call.error.deviceInUse': 'A sua câmara ou microfone já está a ser utilizado por outra aplicação.',
   'call.error.deviceGeneric': 'Não foi possível aceder à câmara ou microfone.',
   'call.error.noAnswerTimeout': 'Sem resposta, a chamada expirou',
+  'call.peerMuted': '{name} está com o microfone desativado',
+  'call.selfMuted': 'Seu microfone está desativado',
   'action.send': 'Enviar',
   'action.cancel': 'Cancelar',
   'action.save': 'Guardar',
@@ -1269,6 +1284,7 @@ const pt: UiStringTable = {
   'action.mute': 'Silenciar',
   'action.unmute': 'Ativar som',
   'toast.muteFailed': 'Could not update notifications for this chat',
+  'toast.leaveFailed': 'Não foi possível sair deste chat',
   'action.create': 'Criar',
   'action.submit': 'Enviar',
   'action.translate': 'Traduzir',
@@ -1623,6 +1639,7 @@ const ht: UiStringTable = {
   'call.action.stopCamera': 'Etenn kamera a',
   'call.action.startCamera': 'Limen kamera a',
   'call.action.switchCamera': 'Chanje kamera',
+  'call.action.swapVideo': 'Chanje videyo yo',
   'call.action.speakerOn': 'Limen opalè a',
   'call.action.speakerOff': 'Etenn opalè a',
   'call.action.startAudioCall': 'Kòmanse yon apèl odyo',
@@ -1636,6 +1653,8 @@ const ht: UiStringTable = {
   'call.error.deviceInUse': 'Kamera oswa mikwofòn ou deja ap itilize pa yon lòt app.',
   'call.error.deviceGeneric': 'Nou pa t kapab jwenn aksè nan kamera oswa mikwofòn ou.',
   'call.error.noAnswerTimeout': 'Pa gen repons, apèl la fini',
+  'call.peerMuted': '{name} koupe mikwo li',
+  'call.selfMuted': 'Mikwo ou koupe',
   'action.send': 'Voye',
   'action.cancel': 'Anile',
   'action.save': 'Anrejistre',
@@ -1646,6 +1665,7 @@ const ht: UiStringTable = {
   'action.mute': 'Mete an silans',
   'action.unmute': 'Retire silans',
   'toast.muteFailed': 'Could not update notifications for this chat',
+  'toast.leaveFailed': 'Pa t kapab kite chat sa a',
   'action.create': 'Kreye',
   'action.submit': 'Soumèt',
   'action.translate': 'Tradui',
@@ -2000,6 +2020,7 @@ const zh: UiStringTable = {
   'call.action.stopCamera': '关闭摄像头',
   'call.action.startCamera': '打开摄像头',
   'call.action.switchCamera': '切换摄像头',
+  'call.action.swapVideo': '切换画面',
   'call.action.speakerOn': '打开扬声器',
   'call.action.speakerOff': '关闭扬声器',
   'call.action.startAudioCall': '发起语音通话',
@@ -2013,6 +2034,8 @@ const zh: UiStringTable = {
   'call.error.deviceInUse': '您的摄像头或麦克风正被其他应用占用。',
   'call.error.deviceGeneric': '无法访问您的摄像头或麦克风。',
   'call.error.noAnswerTimeout': '无人接听，通话已超时',
+  'call.peerMuted': '{name} 已静音',
+  'call.selfMuted': '你的麦克风已静音',
   'action.send': '发送',
   'action.cancel': '取消',
   'action.save': '保存',
@@ -2023,6 +2046,7 @@ const zh: UiStringTable = {
   'action.mute': '静音',
   'action.unmute': '取消静音',
   'toast.muteFailed': 'Could not update notifications for this chat',
+  'toast.leaveFailed': '无法退出此聊天',
   'action.create': '创建',
   'action.submit': '提交',
   'action.translate': '翻译',

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

@@ -1,4 +1,5 @@
 import { ApiRoom, DeleteRoomMember, PostAddRoomMember, PostReportRoom, PostRoom, RoomMember } from '../../types/models/room.model';
+import { uniqueMembers } from '../../helpers/uniqueMembers';
 import { store } from '../../roomStore';
 import { addRoom, mergeUsersSet, updateRoom } from '../../roomStore/roomsSlice';
 import { IRoom } from '../../types/types';
@@ -118,7 +119,7 @@ export function ownAppId(): string {
 
 const toRoomMembers = (members: any[] | undefined): RoomMember[] => {
   const known = (store.getState().rooms?.usersSet || {}) as Record<string, RoomMember>;
-  return (members || []).map((m: any) => ({
+  return uniqueMembers(members).map((m: any) => ({
     firstName: m.firstName,
     lastName: m.lastName,
     profileImage:
@@ -495,6 +496,32 @@ export async function deleteRoomMember(data: DeleteRoomMember) {
   }
 }
 
+/**
+ * Take the signed-in user out of a chat on the server (self-removal via the
+ * same endpoint that removes other members). The unavailable presence alone
+ * only leaves the MUC for this session: the backend keeps the user in
+ * `members` and the next /chats/my brings the chat back. A 404 means the
+ * server already has us out, which is what we wanted.
+ */
+export async function leaveRoom(chatName: string): Promise<void> {
+  const me = (store.getState().chatSettingStore?.user?.xmppUsername || '').split('@')[0];
+  if (!chatName || !me) {
+    throw new Error('Cannot leave the chat: no chat name or user');
+  }
+  const token = store.getState().chatSettingStore.user.token || '';
+  invalidateRoomsCache();
+  try {
+    await http.delete('/v1/chats/users-access', {
+      headers: { Authorization: token },
+      data: { chatName, members: [me] },
+    });
+  } catch (error: any) {
+    if (error?.response?.status !== 404) {throw error;}
+  } finally {
+    invalidateRoomsCache();
+  }
+}
+
 export async function deleteRoom(name: string) {
   const token = store.getState().chatSettingStore.user.token || '';
 

package/src/networking/callTokenStanza.ts

@@ -57,6 +57,15 @@ const consumeKindHint = (
 
 const MAX_CALL_TOKEN_AGE_MS = 5000;
 
+// Dev-only trace of call signalling: which `<data type="call-*">` frames
+// arrive and why a call-token was dropped. A dropped token is silent
+// otherwise: the caller sits on "Calling..." and the callee never rings.
+const callTrace = (message: string, extra?: Record<string, unknown>) => {
+  if (typeof __DEV__ !== 'undefined' && __DEV__) {
+    console.log(`[calls] ${message}`, extra ? JSON.stringify(extra) : '');
+  }
+};
+
 // Hermes has no global `atob` and RN ships no Buffer polyfill by default,
 // so the JWT payload is decoded here by hand. Only used on the ~500-byte
 // middle segment of a call token, so a table-driven loop is plenty fast
@@ -215,7 +224,7 @@ const isFreshCallToken = (stanza: Element): boolean => {
 const resolveRoomByStanzaRoom = (roomAttr: string) => {
   const rooms = (store.getState().rooms.rooms || {}) as Record<
     string,
-    { jid?: string; name?: string; type?: string; usersCnt?: number }
+    { jid?: string; name?: string; title?: string; type?: string; usersCnt?: number }
   >;
   const roomEntries = Object.values(rooms);
 
@@ -338,6 +347,18 @@ export const onCallTokenMessage = (stanza: Element): boolean => {
   const data = findCallData(inner);
   if (data) {
     const dataType = String(data.attrs?.type || '').toLowerCase();
+    const traceStanzaId = inner.getChild?.('stanza-id')?.attrs?.id;
+    const traceTs = extractNumericTimestamp(traceStanzaId);
+    callTrace(`received ${dataType}`, {
+      from: stanza.attrs?.from,
+      type: stanza.attrs?.type,
+      wrapped: inner !== stanza,
+      room: data.attrs?.room,
+      callId: data.attrs?.callId || data.attrs?.callid,
+      hasToken: !!data.attrs?.token,
+      stanzaId: traceStanzaId,
+      ageMs: traceTs ? Date.now() - traceTs : null,
+    });
 
     if (dataType === 'call-state') {
       // Surface the raw call-state attrs so we can confirm what the server
@@ -404,9 +425,11 @@ export const onCallTokenMessage = (stanza: Element): boolean => {
       const videoCallsConfig =
         store.getState().chatSettingStore.config?.videoCalls;
       if (videoCallsConfig?.enabled !== true) {
+        callTrace('drop call-token: calls disabled');
         return true;
       }
       if (!isFreshCallToken(inner)) {
+        callTrace('drop call-token: not fresh');
         return true;
       }
 
@@ -423,6 +446,7 @@ export const onCallTokenMessage = (stanza: Element): boolean => {
       const kind: 'audio' | 'video' =
         hintedKind || (stanzaKind === 'audio' ? 'audio' : 'video');
       if (!token || !stanzaRoom) {
+        callTrace('drop call-token: no token or room');
         return true;
       }
 
@@ -436,9 +460,11 @@ export const onCallTokenMessage = (stanza: Element): boolean => {
         resolvedRoom.type !== 'private' &&
         !isOneToOneLikeRoom
       ) {
+        callTrace('drop call-token: room type', { type: resolvedRoom.type, usersCnt });
         return true;
       }
       if (resolvedRoom?.type === 'private' && !isPrivateAllowed) {
+        callTrace('drop call-token: private not allowed');
         return true;
       }
       if (
@@ -446,6 +472,7 @@ export const onCallTokenMessage = (stanza: Element): boolean => {
         !stanzaRoom.includes('@') &&
         !isOneToOneLikeRoom
       ) {
+        callTrace('drop call-token: room unknown', { stanzaRoom });
         return true;
       }
 
@@ -457,17 +484,25 @@ export const onCallTokenMessage = (stanza: Element): boolean => {
       // title (which for stale / deleted-peer chats reads "deleted").
       const jwtPayload = decodeJwtPayload(token);
       const callerName = extractCallerDisplayName(jwtPayload);
-      const resolvedTitle = String(resolvedRoom?.name || '').trim();
+      // `title` is the display name; on new-arch private rooms `name` is the
+      // bare room id ("${appId}_<a>-${appId}_<b>"), never something to show.
+      const resolvedTitle = String(
+        resolvedRoom?.title || resolvedRoom?.name || ''
+      ).trim();
       const titleLooksBad =
         !resolvedTitle ||
+        resolvedTitle === stanzaRoom ||
         ['deleted', 'deleted user', 'unknown', 'null'].includes(
           resolvedTitle.toLowerCase()
         );
+      // Never fall back to the room id: an empty name renders as
+      // "Unknown caller" on the ring screen.
       const incomingRoomName =
-        (callerName && titleLooksBad ? callerName : resolvedTitle) ||
-        callerName ||
-        stanzaRoom;
-      if (!roomJid) {return true;}
+        (titleLooksBad ? callerName : resolvedTitle) || callerName || '';
+      if (!roomJid) {
+        callTrace('drop call-token: no room jid', { stanzaRoom });
+        return true;
+      }
 
       const callId = extractCallId(data, jwtPayload);
       const selfXmpp =
@@ -481,6 +516,11 @@ export const onCallTokenMessage = (stanza: Element): boolean => {
           callState.roomName === incomingRoomName ||
           callState.roomBareName === stanzaRoom);
 
+      callTrace('accept call-token', {
+        outgoing: isOutgoingRoomMatch,
+        roomJid,
+        callId,
+      });
       if (isOutgoingRoomMatch) {
         store.dispatch(
           setOutgoingCallToken({ roomJid, token, callId: callId || null })

package/src/networking/xmppClient.ts

@@ -1,4 +1,4 @@
-import xmpp, { Client } from '@xmpp/client';
+import xmpp, { Client, xml } from '@xmpp/client';
 import { walletToUsername } from '../helpers/walletUsername';
 import { IMessage, xmppSettingsInterface } from '../types/types';
 
@@ -765,6 +765,15 @@ export class XmppClient {
       this.authRecoveryFailures = 0;
       this.authRejectionsSinceOnline = 0;
       this.reconnectAttempts = 0;
+      // Initial presence, as the web client sends on 'online'. Without it
+      // the session is never "available" to ejabberd, which then holds
+      // back every `type="chat"` message addressed to the bare JID: the
+      // call-invite and the call-token never arrived, so the phone neither
+      // rang nor joined its own outgoing call. Room traffic was unaffected
+      // (MUC joins and mucsub don't need it), which hid the problem.
+      Promise.resolve()
+        .then(() => this.client.send(xml('presence')))
+        .catch((err: unknown) => console.warn('initial presence failed', err));
       this.sendAllPresencesAndMarkReady();
       try {
         devPushLog(

package/src/version.ts

@@ -1,3 +1,3 @@
 // Generated by scripts/sync-version.mjs on `npm version`.
 // Edit package.json's version instead of this file.
-export const ETHORA_CHAT_COMPONENT_VERSION = '26.10.2';
+export const ETHORA_CHAT_COMPONENT_VERSION = '26.10.4';