@ethora/chat-component-rn 26.8.5 → 26.8.7

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

@@ -1,6 +1,6 @@
 import { ApiRoom, DeleteRoomMember, PostAddRoomMember, PostReportRoom, PostRoom, RoomMember } from '../../types/models/room.model';
 import { store } from '../../roomStore';
-import { addRoom, mergeUsersSet } from '../../roomStore/roomsSlice';
+import { addRoom, mergeUsersSet, updateRoom } from '../../roomStore/roomsSlice';
 import { IRoom } from '../../types/types';
 import http from '../apiClient';
 
@@ -19,6 +19,11 @@ import http from '../apiClient';
  *   - `_id`            (fallback)
  *   - `xmppUsername`   (raw + localpart) when the API does return one
  */
+const usableImage = (value: unknown): string => {
+  const url = typeof value === 'string' ? value.trim() : '';
+  return url && url !== 'none' ? url : '';
+};
+
 function dispatchUsersSetFromRestItems(items: ApiRoom[]): void {
   if (!items?.length) {return;}
   const ownXmpp = String(
@@ -26,16 +31,24 @@ function dispatchUsersSetFromRestItems(items: ApiRoom[]): void {
   );
   const appId = ownXmpp.includes('_') ? ownXmpp.split('_')[0] : '';
 
+  const known = (store.getState().rooms?.usersSet || {}) as Record<string, RoomMember>;
   const members: Record<string, RoomMember> = {};
   for (const item of items) {
     const list = Array.isArray((item as any)?.members) ? (item as any).members : [];
     for (const m of list) {
       if (!m) {continue;}
+      const before: RoomMember | undefined =
+        (m._id && (members[m._id] || known[m._id])) || undefined;
       const entry: RoomMember = {
-        firstName: m.firstName || '',
-        lastName: m.lastName || '',
+        firstName: m.firstName ?? before?.firstName ?? '',
+        lastName: m.lastName ?? before?.lastName ?? '',
         xmppUsername: m.xmppUsername || (appId && m._id ? `${appId}_${m._id}` : m._id || ''),
         _id: m._id || '',
+        profileImage:
+          m.profileImage !== undefined
+            ? usableImage(m.profileImage)
+            : before?.profileImage ?? '',
+        description: m.description ?? before?.description,
         role: m.role,
         ban_status: m.ban_status,
         last_active: m.last_active,
@@ -85,9 +98,53 @@ interface ApiRoomMember {
  *      manifested as a phantom "ethora" room stub on third-party servers,
  *      customer-reported #23)
  */
+export function memberAccount(member: any, appId: string): string {
+  const explicit = String(member?.xmppUsername || '').split('@')[0];
+  if (explicit) {return explicit;}
+  return appId && member?._id ? `${appId}_${member._id}` : '';
+}
+
+export function ownAppId(): string {
+  const ownXmpp = String(
+    store.getState().chatSettingStore?.user?.xmppUsername || ''
+  );
+  return ownXmpp.includes('_') ? ownXmpp.split('_')[0]! : '';
+}
+
+const toRoomMembers = (members: any[] | undefined): RoomMember[] => {
+  const known = (store.getState().rooms?.usersSet || {}) as Record<string, RoomMember>;
+  return (members || []).map((m: any) => ({
+    firstName: m.firstName,
+    lastName: m.lastName,
+    profileImage:
+      m.profileImage !== undefined
+        ? usableImage(m.profileImage)
+        : known[m._id]?.profileImage ?? '',
+    xmppUsername: m._id || '',
+    role: m.role,
+    ban_status: m.ban_status,
+    last_active: m.last_active,
+    jid: m.jid || '',
+  })) as any;
+};
+
+const toE2eeMembers = (members: any[] | undefined, appId: string): RoomMember[] =>
+  (members || [])
+    .map((m: any) => ({
+      _id: m._id || '',
+      firstName: m.firstName || '',
+      lastName: m.lastName || '',
+      xmppUsername: memberAccount(m, appId),
+    }))
+    .filter((m) => m.xmppUsername) as RoomMember[];
+
+const memberCount = (item: ApiRoom): number =>
+  item.usersCnt ?? item.participants ?? item.members?.length ?? 0;
+
 function dispatchRoomsFromRestItems(items: ApiRoom[]): void {
   if (!items?.length) return;
   const config = store.getState().chatSettingStore?.config as any;
+  const appId = ownAppId();
   // Best: explicit xmpp settings.
   let host: string | undefined =
     config?.xmppSettings?.host ||
@@ -118,12 +175,16 @@ function dispatchRoomsFromRestItems(items: ApiRoom[]): void {
       jid = `${item.name}@${conference}`;
     }
     if (!jid.includes('@')) continue;
+    const known = store.getState().rooms.rooms?.[jid];
+    const preview = (item.members?.length ?? 0) < memberCount(item);
+    const keep = <T,>(fresh: T[], existing: T[] | undefined): T[] =>
+      preview && (existing?.length ?? 0) > fresh.length ? existing! : fresh;
     const room: IRoom = {
       id: item._id || jid,
       jid,
       name: item.name,
       title: item.title || item.name,
-      usersCnt: item.participants ?? item.members?.length ?? 0,
+      usersCnt: memberCount(item),
       messages: [],
       isLoading: false,
       roomBg: '',
@@ -133,18 +194,14 @@ function dispatchRoomsFromRestItems(items: ApiRoom[]): void {
       muted: item.muted === true,
       description: (item as any).description,
       type: (item as any).type,
-      // ChatProfileModal renders this list under the description/type
-      // fields. The REST API returns `members` (an array of {_id,
-      // firstName?, lastName?}); map to the shape RoomMember expects.
-      roomMembers: (item.members || []).map((m: any) => ({
-        firstName: m.firstName,
-        lastName: m.lastName,
-        xmppUsername: m._id || '',
-        role: m.role,
-        ban_status: m.ban_status,
-        last_active: m.last_active,
-        jid: m.jid || '',
-      })) as any,
+
+      ...(item.e2ee === true
+        ? {
+            e2ee: true,
+            members: keep(toE2eeMembers(item.members, appId), known?.members),
+          }
+        : {}),
+      roomMembers: keep(toRoomMembers(item.members), known?.roomMembers),
     };
     store.dispatch(addRoom({ roomData: room }));
   }
@@ -152,6 +209,51 @@ function dispatchRoomsFromRestItems(items: ApiRoom[]): void {
   dispatchUsersSetFromRestItems(items);
 }
 
+const ROOM_MEMBERS_TTL_MS = 5 * 60_000;
+const roomMembersLoads = new Map<string, { at: number; done: Promise<boolean> }>();
+
+export function loadRoomMembers(roomJid: string): Promise<boolean> {
+  const jid = String(roomJid || '').split('/')[0]!;
+  const room = store.getState().rooms.rooms?.[jid];
+  if (!room) {return Promise.resolve(false);}
+  if ((room.roomMembers?.length ?? 0) >= Number(room.usersCnt || 0)) {
+    return Promise.resolve(false);
+  }
+  const running = roomMembersLoads.get(jid);
+  if (running && Date.now() - running.at < ROOM_MEMBERS_TTL_MS) {return running.done;}
+
+  const done = (async () => {
+    try {
+      const response: any = await getRoomByName(jid.split('@')[0]!);
+      const item: ApiRoom = response?.result ?? response;
+      const members = Array.isArray(item?.members) ? item.members : [];
+      if (members.length === 0) {return false;}
+      dispatchUsersSetFromRestItems([item]);
+      const current = store.getState().rooms.rooms?.[jid];
+      if (!current) {return false;}
+      store.dispatch(
+        updateRoom({
+          jid,
+          updates: {
+            roomMembers: toRoomMembers(members),
+            usersCnt: Math.max(memberCount(item), members.length),
+            ...(current.e2ee
+              ? { members: toE2eeMembers(members, ownAppId()) }
+              : {}),
+          },
+        })
+      );
+      return true;
+    } catch (error) {
+      roomMembersLoads.delete(jid);
+      console.warn('[ethora-rn] rooms.api: could not load room members', jid, error);
+      return false;
+    }
+  })();
+  roomMembersLoads.set(jid, { at: Date.now(), done });
+  return done;
+}
+
 const GET_ROOMS_CACHE_MS = 60_000;
 let getRoomsInFlight: Promise<{ items: ApiRoom[] }> | null = null;
 let getRoomsInFlightToken = '';
@@ -235,14 +337,14 @@ export async function postRoom(data: PostRoom) {
 
 export async function postPrivateRoom(
   username: string,
-  title: string = 'Private chat'
+  e2ee: boolean = false
 ): Promise<ApiRoom> {
   const token = store.getState().chatSettingStore.user.token || '';
 
   try {
     const response = await http.post(
       '/v1/chats/private',
-      { username },
+      e2ee === true ? { username, e2ee: true } : { username },
       {
         headers: {
           Authorization: token,
@@ -391,6 +493,7 @@ export async function createChatCall(
 }
 
 export function clearRoomsRestCache() {
+  roomMembersLoads.clear();
   lastGetRoomsResponse = null;
   lastGetRoomsResponseAt = 0;
   lastGetRoomsResponseToken = '';

package/src/networking/stanzaHandlers.ts

@@ -1,15 +1,22 @@
 import { Element } from 'ltx';
 import { store } from '../roomStore';
 import {
-  addRoom,
+  claimMamResult,
+  collectMamMessage,
+  collectMamReaction,
+} from './xmpp/mamRouter';
+import { extractReaction } from '../helpers/mamReactions';
+import {
+  addRooms,
   addRoomMessage,
   deleteRoomMessage,
   editRoomMessage,
   setComposing,
   setCurrentRoom,
   setRoomRole,
+  setReactions,
 } from '../roomStore/roomsSlice';
-import { IRoom } from '../types/types';
+import { IMessage, IRoom } from '../types/types';
 import { createMessageFromXml } from '../helpers/createMessageFromXml';
 import { getDataFromXml } from '../helpers/getDataFromXml';
 import { setDeleteModal } from '../roomStore/chatSettingsSlice';
@@ -33,7 +40,8 @@ const onRealtimeMessage = async (stanza: Element) => {
     !stanza.getChild('paused') &&
     !stanza.getChild('subject') &&
     !stanza.is('iq') &&
-    stanza.attrs.id !== 'deleteMessageStanza'
+    stanza.attrs.id !== 'deleteMessageStanza' &&
+    !stanza.getChild('reactions')
   ) {
     const body = stanza?.getChild('body');
     const archived = stanza?.getChild('archived');
@@ -47,8 +55,6 @@ const onRealtimeMessage = async (stanza: Element) => {
       ?.getChild('deleted');
 
     if (!data) {
-      console.log(stanza.toString());
-      console.log('Missing data elements in real-time message.');
       return;
     }
 
@@ -66,8 +72,6 @@ const onRealtimeMessage = async (stanza: Element) => {
     // to the same tolerance.
     const senderJID = data.attrs.senderJID || stanza.attrs.from;
     if (!senderJID) {
-      console.log(stanza.toString());
-      console.log('Missing sender information in real-time message.');
       return;
     }
 
@@ -189,11 +193,36 @@ const onEditMessage = async (stanza: Element) => {
   }
 };
 
-const onMessageHistory = async (stanza: any) => {
-  if (
-    stanza.is('message') &&
-    stanza.children[0].attrs.xmlns === 'urn:xmpp:mam:2'
-  ) {
+const isMamResult = (stanza: any): boolean =>
+  !!stanza?.is?.('message') &&
+  stanza.children?.[0]?.attrs?.xmlns === 'urn:xmpp:mam:2';
+
+const parseMamResult = async (stanza: any): Promise<IMessage | undefined> => {
+  {
+    const forwardedMsg = stanza
+      .getChild('result')
+      ?.getChild('forwarded')
+      ?.getChild('message');
+    if (forwardedMsg?.getChild?.('reactions')) {
+      const reaction = extractReaction(
+        forwardedMsg,
+        stanza.attrs?.from,
+        stanza.getChild('result')?.attrs?.id
+      );
+      if (reaction && !collectMamReaction(stanza, reaction)) {
+        store.dispatch(
+          setReactions({
+            roomJID: reaction.roomJID,
+            messageId: reaction.messageId,
+            from: reaction.from,
+            reactions: reaction.emoji,
+            data: reaction.data,
+            latestReactionTimestamp: reaction.ts,
+          })
+        );
+      }
+      return undefined;
+    }
     // console.log("stanza -->", stanza.toString());
     const body = stanza
       .getChild('result')
@@ -218,11 +247,9 @@ const onMessageHistory = async (stanza: any) => {
     const id = stanza.getChild('result')?.attrs.id;
     if (!delay) {
       if (stanza.getChild('subject')) {
-        console.log('Subject.');
         return;
       }
       if (!data || !body || !id) {
-        console.log('Missing required elements in message history.');
         return;
       }
     }
@@ -295,6 +322,22 @@ const onMessageHistory = async (stanza: any) => {
       rawMessage,
       store.getState().chatSettingStore.user?.xmppUsername || ''
     );
+    return message;
+  }
+};
+
+const onMessageHistory = async (stanza: any) => {
+  if (!isMamResult(stanza)) {return;}
+  const claimed = claimMamResult(stanza);
+  let message: IMessage | undefined;
+  try {
+    message = await parseMamResult(stanza);
+  } finally {
+    if (claimed) {
+      collectMamMessage(stanza, message);
+    }
+  }
+  if (!claimed && message) {
     store.dispatch(
       addRoomMessage({
         roomJID: stanza.attrs.from,
@@ -360,7 +403,9 @@ const onPresenceInRoom = (stanza: Element | any) => {
   ) {
     const roomJID: string = stanza.attrs.from.split('/')[0];
     const role: string = stanza?.children[1]?.children[0]?.attrs.role;
-    store.dispatch(setRoomRole({ chatJID: roomJID, role: role }));
+    if (role && store.getState().rooms.rooms?.[roomJID]?.role !== role) {
+      store.dispatch(setRoomRole({ chatJID: roomJID, role: role }));
+    }
   }
 };
 
@@ -423,53 +468,47 @@ const onGetChatRooms = (stanza: Element, xmpp: any) => {
     Array.isArray(stanza.getChild('query')?.children)
   ) {
     const children = stanza.getChild('query')?.children || [];
-    children.forEach(async (result: any) => {
-      const currentChatRooms = store.getState().rooms.rooms;
-
-      const isRoomAlreadyAdded = Object.values(currentChatRooms).some(
-        (element) => element.jid === result?.attrs?.jid
-      );
-
+    const known = store.getState().rooms.rooms;
+    const fresh: IRoom[] = [];
+    const jids: string[] = [];
+    for (const result of children as any[]) {
       const jid = result?.attrs?.jid;
-
-      if (!isRoomAlreadyAdded) {
-        try {
-          const roomData: IRoom = {
-            jid: jid || '',
-            name: result?.attrs?.name || '',
-            id: '',
-            title: result?.attrs?.name || '',
-            usersCnt: Number(result?.attrs?.users_cnt || 0),
-            messages: [],
-            isLoading: false,
-            roomBg:
-              result?.attrs?.room_background !== 'none'
-                ? result?.attrs?.room_background
-                : null,
-            icon:
-              result?.attrs?.room_thumbnail !== 'none'
-                ? result?.attrs?.room_thumbnail
-                : null,
-            unreadMessages: 0,
-            lastViewedTimestamp: 0,
-          };
-
-          store.dispatch(addRoom({ roomData: { ...roomData } }));
-
-          if (!store.getState().rooms.activeRoomJID) {
-            store.dispatch(setCurrentRoom({ roomJID: roomData.jid }));
-          }
-        } catch (error) {}
+      if (!jid) {continue;}
+      jids.push(jid);
+      if (known[jid]) {continue;}
+      fresh.push({
+        jid,
+        name: result?.attrs?.name || '',
+        id: '',
+        title: result?.attrs?.name || '',
+        usersCnt: Number(result?.attrs?.users_cnt || 0),
+        messages: [],
+        isLoading: false,
+        roomBg:
+          result?.attrs?.room_background !== 'none'
+            ? result?.attrs?.room_background
+            : null,
+        icon:
+          result?.attrs?.room_thumbnail !== 'none'
+            ? result?.attrs?.room_thumbnail
+            : null,
+        unreadMessages: 0,
+        lastViewedTimestamp: 0,
+      });
+    }
+    if (fresh.length) {
+      store.dispatch(addRooms({ rooms: fresh }));
+      if (!store.getState().rooms.activeRoomJID) {
+        store.dispatch(setCurrentRoom({ roomJID: fresh[0].jid }));
       }
-
-      if (jid) {
-        try {
-          xmpp.presenceInRoomStanza(jid);
-        } catch (e) {
-          console.warn('presenceInRoomStanza failed', jid, e);
-        }
+    }
+    for (const jid of jids) {
+      try {
+        xmpp.presenceInRoomStanza(jid);
+      } catch (e) {
+        console.warn('presenceInRoomStanza failed', jid, e);
       }
-    });
+    }
   }
 };
 
@@ -477,7 +516,24 @@ const onGetChatRooms = (stanza: Element, xmpp: any) => {
 // RN side hasn't ported yet. Without these the bundle compiles but
 // require() returns undefined at runtime → "X is not a function".
 const onMessageError = (_stanza: Element, _xmpp?: any) => {};
-const onReactionMessage = (_stanza: Element) => {};
+/** A live reaction: the reactor's full current list on one message. */
+const onReactionMessage = (stanza: Element) => {
+  if (!stanza?.is?.('message') || stanza.getChild('result')) {return;}
+  if (!stanza.getChild('reactions')) {return;}
+  const reaction = extractReaction(stanza, stanza.attrs?.from);
+  if (!reaction) {return;}
+  store.dispatch(
+    setReactions({
+      roomJID: reaction.roomJID,
+      messageId: reaction.messageId,
+      latestReactionTimestamp: reaction.ts,
+      reactions: reaction.emoji,
+      from: reaction.from,
+      data: reaction.data,
+    })
+  );
+};
+// Archived reactions are handled by parseMamResult + the MAM router.
 const onReactionHistory = (_stanza: Element) => {};
 const onRoomKicked = (_stanza: Element) => {};
 

package/src/networking/xmpp/getHistory.xmpp.ts

@@ -1,16 +1,19 @@
 import { Client, xml } from '@xmpp/client';
 import { createTimeoutPromise } from './createTimeoutPromise.xmpp';
-import { Element } from 'ltx';
 import { IMessage } from '../../types/types';
-import { getDataFromXml } from '../../helpers/getDataFromXml';
-import { createMessageFromXml } from '../../helpers/createMessageFromXml';
+import { beginMamQuery, cancelMamQuery } from './mamRouter';
+
+declare const __DEV__: boolean | undefined;
+
+let historyIdCounter = 0;
 
 export const getHistory = async (
   client: Client,
   chatJID: string,
   max: number,
   before?: number,
-  otherId?: string
+  otherId?: string,
+  options?: { selfApplied?: boolean }
 ): Promise<IMessage[] | undefined> => {
   if (typeof chatJID !== 'string') {return;}
   // If a caller passes a bare local-part (no `@host`), pick a default
@@ -25,121 +28,56 @@ export const getHistory = async (
         return `${chatJID}@conference.${host}`;
       })();
 
-  const id = otherId ?? `get-history:${Date.now().toString()}`;
-
-  let stanzaHdlrPointer: {
-    (el: Element): void;
-    (stanza: any): void;
-  };
-
-  const unsubscribe = () => {
-    client.off('stanza', stanzaHdlrPointer);
-  };
-
-  const responsePromise = new Promise((resolve, reject) => {
-    let messages: Element[] = [];
-
-    stanzaHdlrPointer = async (stanza) => {
-      const result = stanza.getChild('result');
-
-      if (
-        stanza.is('message') &&
-        stanza.attrs.from &&
-        stanza.attrs.from.startsWith(fixedChatJid) &&
-        result
-      ) {
-        const messageEl = result.getChild('forwarded')?.getChild('message');
-
-        messages.push(messageEl);
-      }
-
-      if (
-        stanza.is('iq') &&
-        stanza.attrs.id === id &&
-        stanza.attrs.type === 'result'
-      ) {
-        let mainMessages: IMessage[] = [];
 
-        for (const msg of messages) {
-          const reactions = msg?.getChild('reactions');
-          const text = msg.getChild('body')?.getText();
+  const id = otherId ?? `get-history:${Date.now().toString(36)}-${(++historyIdCounter).toString(36)}`;
 
-          if (text || reactions) {
-            const result = await getDataFromXml(msg);
-            if (!result) {
-              return;
-            }
-            const { data, id, body, ...rest } = result;
+  const page = beginMamQuery(id, fixedChatJid, !options?.selfApplied);
 
-            if (!data) {
-              console.log('No data in stanza');
-              return;
-            }
-
-            const message = await createMessageFromXml({
-              data,
-              id,
-              body: body || '',
-              ...rest,
-            } as any);
-
-            mainMessages.push(message);
-          }
-        }
-        resolve(mainMessages);
-      }
-
-      if (
-        stanza.is('iq') &&
-        stanza.attrs.id === id &&
-        stanza.attrs.type === 'error'
-      ) {
-        reject();
-      }
-    };
-
-    client?.on('stanza', stanzaHdlrPointer);
-
-    const message = xml(
-      'iq',
-      {
-        type: 'set',
-        to: fixedChatJid,
-        id: id,
-      },
+  const message = xml(
+    'iq',
+    {
+      type: 'set',
+      to: fixedChatJid,
+      id: id,
+    },
+    xml(
+      'query',
+      { xmlns: 'urn:xmpp:mam:2', queryid: id },
       xml(
-        'query',
-        { xmlns: 'urn:xmpp:mam:2' },
-        xml(
-          'set',
-          { xmlns: 'http://jabber.org/protocol/rsm' },
-          xml('max', {}, max.toString()),
-          before ? xml('before', {}, before.toString()) : xml('before')
-        )
+        'set',
+        { xmlns: 'http://jabber.org/protocol/rsm' },
+        xml('max', {}, max.toString()),
+        before ? xml('before', {}, before.toString()) : xml('before')
       )
-    );
+    )
+  );
 
-    client?.send(message).catch((err: any) => console.log('err on load', err));
-  });
+  client?.send(message).catch((err: any) => console.log('err on load', err));
 
   const timeoutPromise = createTimeoutPromise(10000);
 
   try {
-    // @ts-ignore
-    const res: IMessage[] | null = await Promise.race<[IMessage[] | null]>([
-      responsePromise as Promise<IMessage[] | null>,
+    const res = await Promise.race<IMessage[] | null>([
+      page,
       timeoutPromise as Promise<null>,
     ]);
-    return res === null ? [] : res;
+    if (res === null) {
+      const partial = cancelMamQuery(id);
+      if (typeof __DEV__ !== 'undefined' && __DEV__) {
+        console.log(
+          `[mam] history request for ${fixedChatJid} timed out after 10s (${partial.length} results arrived)`
+        );
+      }
+      return partial;
+    }
+    return res;
   } catch (e) {
-    // MAM rejects with no value when an iq error returns; the timeout
-    // path resolves with null instead of throwing. Either is expected
-    // for a room with no history yet — only log if `e` is meaningful.
-    if (e !== undefined) {
-      console.log('=-> error in', fixedChatJid, e);
+    const partial = cancelMamQuery(id);
+    if (typeof __DEV__ !== 'undefined' && __DEV__ && e === undefined) {
+      console.log(
+        `[mam] history request for ${fixedChatJid} got no closing iq within 10s (${partial.length} results arrived)`
+      );
     }
-    return [];
-  } finally {
-    unsubscribe();
+    return partial;
   }
 };