@ethora/chat-component-rn 26.8.6 → 26.8.7

package/src/networking/xmpp/handleStanzas.xmpp.ts

@@ -20,6 +20,12 @@ import {
 } from '../stanzaHandlers';
 import XmppClient from '../xmppClient';
 import { onCallTokenMessage } from '../callTokenStanza';
+import { accountDomain, isE2eeEnabled } from '../../e2ee';
+import {
+  decryptStanzaInPlace,
+  encryptedCarrier,
+  rewriteEncryptedStanza,
+} from '../../e2ee/stanza';
 
 /**
  * Unwrap a mucsub event wrapper so the chat handlers see the real inner
@@ -49,7 +55,46 @@ const unwrapMucsubMessage = (stanza: Element): Element => {
   return (inner as Element) || stanza;
 };
 
+let held = 0;
+let queue: Promise<void> = Promise.resolve();
+
 export function handleStanza(stanza: Element, xmppWs: XmppClient) {
+  if (!isE2eeEnabled()) {
+    dispatchStanza(stanza, xmppWs);
+    return;
+  }
+  const carrier =
+    stanza?.name === 'message' ? encryptedCarrier(stanza) : undefined;
+  if (!carrier && held === 0) {
+    dispatchStanza(stanza, xmppWs);
+    return;
+  }
+
+  held++;
+  queue = queue.then(async () => {
+    try {
+      if (carrier) {
+        const outcome = await decryptStanzaInPlace(
+          stanza,
+          accountDomain(xmppWs.client)
+        );
+        if (outcome === 'drop') {return;}
+      }
+      dispatchStanza(stanza, xmppWs);
+    } catch (err) {
+      console.warn('OMEMO: failed to handle stanza', err);
+    } finally {
+      held--;
+    }
+  });
+}
+
+export const __resetStanzaQueueForTests = (): void => {
+  held = 0;
+  queue = Promise.resolve();
+};
+
+function dispatchStanza(stanza: Element, xmppWs: XmppClient) {
   if (stanza?.attrs?.type === 'headline') {return;}
 
   // Call signaling is swallowed before any chat handler sees it. A
@@ -61,6 +106,10 @@ export function handleStanza(stanza: Element, xmppWs: XmppClient) {
     return;
   }
 
+  if (stanza?.name === 'message' && rewriteEncryptedStanza(stanza) === 'drop') {
+    return;
+  }
+
   switch (stanza.name) {
     case 'message': {
       const unwrapped = unwrapMucsubMessage(stanza);

package/src/networking/xmpp/sendMediaMessage.xmpp.ts

@@ -1,4 +1,5 @@
 import { Client, xml } from '@xmpp/client';
+import { sendSealedMedia, shouldEncrypt } from '../../e2ee/send';
 
 // Monotonic counter — see sendTextMessage for the rationale (avoids
 // Date.now() id collisions on <1ms-apart sends).
@@ -63,6 +64,23 @@ export function sendMediaMessage(
     push: 'true',
   };
 
+  const keys: string[] | undefined = data?.e2eeKeys;
+  if (keys?.length) {
+    (dataToSend as Record<string, unknown>).clientEncrypted = 'true';
+  }
+  const hints = xml('store', { xmlns: 'urn:xmpp:hints' });
+
+  if (keys?.length && shouldEncrypt(roomJID)) {
+    sendSealedMedia(
+      client,
+      roomJID,
+      id,
+      xml('body', {}, JSON.stringify({ v: 1, keys })),
+      [xml('data', dataToSend), hints]
+    );
+    return id;
+  }
+
   const message = xml(
     'message',
     {
@@ -72,7 +90,7 @@ export function sendMediaMessage(
       to: roomJID,
     },
     xml('body', {}, 'media'),
-    xml('store', { xmlns: 'urn:xmpp:hints' }),
+    hints,
     xml('data', dataToSend)
   );
 

package/src/networking/xmpp/sendTextMessage.xmpp.ts

@@ -1,4 +1,5 @@
 import { Client, xml } from '@xmpp/client';
+import { sendEncrypted, shouldEncrypt } from '../../e2ee/send';
 
 // Local monotonic counter — see comment in id construction below.
 let _sendTextSeq = 0;
@@ -52,14 +53,7 @@ export const sendTextMessage = (
 
   try {
     const dataXmlns = toServiceXmlns(devServer, client);
-    const message = xml(
-      'message',
-      {
-        to: roomJID,
-        type: 'groupchat',
-        id: id,
-      },
-      xml('data', {
+    const data = xml('data', {
         xmlns: dataXmlns,
         senderFirstName: firstName,
         senderLastName: lastName,
@@ -76,9 +70,22 @@ export const sendTextMessage = (
         isReply: isReply || false,
         mainMessage: mainMessage || '',
         push: 'true',
-      }),
-      xml('body', {}, userMessage)
+      });
+    const body = xml('body', {}, userMessage);
+    const message = xml(
+      'message',
+      {
+        to: roomJID,
+        type: 'groupchat',
+        id: id,
+      },
+      data,
+      body
     );
+    if (shouldEncrypt(roomJID)) {
+      sendEncrypted(client, roomJID, id, data, body, message);
+      return;
+    }
     const sendResult = client.send(message);
     if (sendResult && typeof (sendResult as any).then === 'function') {
       (sendResult as Promise<unknown>)

package/src/networking/xmpp/sendTextMessageWithTranslateTag.xmpp.ts

@@ -1,6 +1,7 @@
 import { Client, xml } from '@xmpp/client';
 import { Iso639_1Codes } from '../../types/types';
 import { toServiceXmlns } from './sendTextMessage.xmpp';
+import { sendEncrypted, shouldEncrypt } from '../../e2ee/send';
 
 /**
  * Same wire message as `sendTextMessage`, plus a `<translate source="xx"/>`
@@ -39,14 +40,7 @@ export const sendTextMessageWithTranslateTag = (
 
   try {
     const dataXmlns = toServiceXmlns(stanzaMessage.devServer, client);
-    const message = xml(
-      'message',
-      {
-        to: stanzaMessage.roomJID,
-        type: 'groupchat',
-        id,
-      },
-      xml('data', {
+    const data = xml('data', {
         xmlns: dataXmlns,
         senderFirstName: stanzaMessage.firstName,
         senderLastName: stanzaMessage.lastName,
@@ -63,8 +57,27 @@ export const sendTextMessageWithTranslateTag = (
         isReply: stanzaMessage.isReply || false,
         mainMessage: stanzaMessage.mainMessage || '',
         push: 'true',
-      }),
-      xml('body', {}, stanzaMessage.userMessage),
+      });
+    const body = xml('body', {}, stanzaMessage.userMessage);
+    const envelope = { to: stanzaMessage.roomJID, type: 'groupchat', id };
+
+    if (shouldEncrypt(stanzaMessage.roomJID)) {
+      sendEncrypted(
+        client,
+        stanzaMessage.roomJID,
+        id,
+        data,
+        body,
+        xml('message', envelope, data, body)
+      );
+      return true;
+    }
+
+    const message = xml(
+      'message',
+      envelope,
+      data,
+      body,
       // `<translate source>` only DECLARES the language this text is in; it
       // costs nothing to send and is what lets each reader translate the
       // message into their own language on their side.

package/src/networking/xmppClient.ts

@@ -24,6 +24,7 @@ import { editMessage } from './xmpp/editMessage.xmpp';
 import { inviteRoomRequest } from './xmpp/inviteRoomRequest.xmpp';
 import { getRooms } from './xmpp/getRooms.xmpp';
 import { handleStanza } from './xmpp/handleStanzas.xmpp';
+import { onOnline as e2eeOnOnline } from '../e2ee';
 import { pushLog as devPushLog, isDevLogActive } from '../utils/devLogger';
 import { normalizeRoomJid } from '../helpers/normalizeRoomJid';
 import { store } from '../roomStore';
@@ -569,6 +570,11 @@ export class XmppClient {
       } catch (err) {
         console.warn('onOnline callback failed', err);
       }
+      try {
+        e2eeOnOnline(this.client);
+      } catch (err) {
+        console.warn('e2ee onOnline failed', err);
+      }
       // Drain any sends that were buffered while the stream was down. The
       // presence stanzas from onOnlineCallback above were written to the
       // socket synchronously (allRoomPresences → presenceInRoom send the

package/src/roomStore/persistBackend.ts

@@ -1,5 +1,5 @@
 import AsyncStorage from '@react-native-async-storage/async-storage';
-import { secureGet, secureSet } from '../helpers/secureKeyValue';
+import { secureGetOrCreate } from '../helpers/secureKeyValue';
 import { encryptForPersist, decryptFromPersist } from '../helpers/persistCrypto';
 
 
@@ -12,7 +12,7 @@ export interface PersistBackend {
 }
 
 const MMKV_INSTANCE_ID = 'ethora-chat-persist';
-const MMKV_KEY_STORE_KEY = '@ethora/persist:mmkvKey';
+const MMKV_KEY_STORE_KEY = 'ethora_persist_mmkv_key';
 const MMKV_KEY_LENGTH = 16;
 
 const randomKey = (length: number): string => {
@@ -25,13 +25,6 @@ const randomKey = (length: number): string => {
   return out;
 };
 
-const loadOrCreateMmkvKey = async (): Promise<string> => {
-  const existing = await secureGet(MMKV_KEY_STORE_KEY);
-  if (existing) {return existing;}
-  const key = randomKey(MMKV_KEY_LENGTH);
-  await secureSet(MMKV_KEY_STORE_KEY, key);
-  return key;
-};
 
 const createMmkvBackend = async (): Promise<PersistBackend | null> => {
   let MMKV: any;
@@ -42,9 +35,13 @@ const createMmkvBackend = async (): Promise<PersistBackend | null> => {
   }
   if (typeof MMKV !== 'function') {return null;}
   try {
-    const encryptionKey = await loadOrCreateMmkvKey();
+    const key = await secureGetOrCreate(MMKV_KEY_STORE_KEY, () =>
+      randomKey(MMKV_KEY_LENGTH)
+    );
+    if (!key) {return null;}
     // Throws when the native module is missing from the binary.
-    const storage = new MMKV({ id: MMKV_INSTANCE_ID, encryptionKey });
+    const storage = new MMKV({ id: MMKV_INSTANCE_ID, encryptionKey: key.value });
+    if (key.created) {storage.clearAll();}
     return {
       name: 'mmkv',
       getMany: async (keys) => keys.map((k) => storage.getString(k) ?? null),

package/src/roomStore/persistence.ts

@@ -132,6 +132,11 @@ const PERSISTED_MESSAGE_FIELDS: (keyof IMessage)[] = [
   // computeBootTimeFailures below) find exactly the messages that never
   // got confirmed and flip them to failed instead.
   'pending',
+  'unencrypted',
+  'undecryptable',
+  'e2eeError',
+  'clientEncrypted',
+  'e2eeKeys',
 ];
 
 // The sender identity that rides along on every message over the wire
@@ -164,6 +169,7 @@ const PERSISTED_MESSAGE_USER_FIELDS = ['id', 'name'] as const;
 // repopulates from /chats/my on the very next load. `usersCnt`, which the
 // header actually reads, is its own scalar field and is preserved below.
 const REFETCHED_ROOM_FIELDS = ['members'] as const;
+const PERSISTED_ROOM_MEMBERS = 30;
 
 const pickDefined = <T extends object>(
   source: T,
@@ -218,6 +224,15 @@ const sanitizeRooms = (
     for (const field of REFETCHED_ROOM_FIELDS) {
       delete compactRoom[field];
     }
+    // The same reasoning, one size down: the full roster a room gets once
+    // it is opened (loadRoomMembers) is re-fetched on the next open, so only
+    // the preview-sized head of it is worth a place in the cache.
+    if (
+      Array.isArray(compactRoom.roomMembers) &&
+      compactRoom.roomMembers.length > PERSISTED_ROOM_MEMBERS
+    ) {
+      compactRoom.roomMembers = compactRoom.roomMembers.slice(0, PERSISTED_ROOM_MEMBERS);
+    }
 
     out[jid] = {
       ...(compactRoom as IRoom),

package/src/types/models/message.model.ts

@@ -17,6 +17,11 @@ export interface IMessage {
   mimetype?: string;
   location?: string;
   pending?: boolean;
+  unencrypted?: boolean;
+  undecryptable?: string;
+  e2eeError?: string;
+  e2eeKeys?: string[];
+  clientEncrypted?: string;
   timestamp?: number;
   showInChannel?: string;
   activeMessage?: boolean;

package/src/types/models/room.model.ts

@@ -11,6 +11,8 @@ export interface RoomMember {
   name?: string;
   role?: string;
   last_active?: number;
+  profileImage?: string;
+  description?: string;
 }
 
 export interface RoomLastMessage {
@@ -29,6 +31,7 @@ export interface IRoom {
 
   members?: RoomMember[];
   type?: 'public' | 'group' | 'private';
+  e2ee?: boolean;
   creteadAt?: string; // Typo? Should it be createdAt?
 
   appId?: string;
@@ -79,6 +82,7 @@ export interface ApiRoom {
   name: string;
   type: 'public' | 'group' | 'private';
 
+  e2ee?: boolean;
   title?: string;
   description?: string;
   picture?: string;
@@ -93,6 +97,7 @@ export interface ApiRoom {
   __v?: string;
   jid?: string;
   participants?: number;
+  usersCnt?: number;
   icon?: string;
   muted?: boolean;
   /** See ApiRoomLastMessage. */

package/src/types/types.ts

@@ -47,6 +47,7 @@ export interface IRoom {
   // in ChatProfileModal under Description / Chat type fields.
   description?: string;
   type?: string;
+  e2ee?: boolean;
 
   roomMembers?: RoomMember[];
   members?: RoomMember[];
@@ -358,6 +359,9 @@ export interface TypographyConfig {
 export interface IConfig {
   // ----- identity / network -----
   appId?: string;
+  e2ee?: {
+    enabled: boolean;
+  };
   baseUrl?: string;
   customAppToken?: string;
   projectName?: string;

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.8.6';
+export const ETHORA_CHAT_COMPONENT_VERSION = '26.8.7';