@agora-sdk/secure-chat-core 0.2.0 → 0.4.0

package/dist/cjs/index.d.ts

@@ -6,6 +6,8 @@ export { useSecureConversations } from "./hooks/useSecureConversations.js";
 export type { UseSecureConversationsValues } from "./hooks/useSecureConversations.js";
 export { useSecureMessages } from "./hooks/useSecureMessages.js";
 export type { UseSecureMessagesOptions, UseSecureMessagesValues, DecryptedSecureMessage, } from "./hooks/useSecureMessages.js";
+export { useSecureHandshakes } from "./hooks/useSecureHandshakes.js";
+export type { UseSecureHandshakesOptions, UseSecureHandshakesValues, } from "./hooks/useSecureHandshakes.js";
 export { SecureChatRestClient } from "./transport/rest.js";
 export type { SecureChatRestConfig } from "./transport/rest.js";
 export { SecureChatSocketClient } from "./transport/socket.js";

package/dist/cjs/index.js

@@ -5,7 +5,7 @@
 // injection of a `SecureChatCrypto`. Platform packages (@agora-sdk/secure-chat-react-js, etc.)
 // re-export this and add the concrete crypto + persistence.
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.bytesToUtf8 = exports.utf8ToBytes = exports.fromBase64 = exports.toBase64 = exports.SecureChatRepository = exports.MemoryStore = exports.SecureChatSocketClient = exports.SecureChatRestClient = exports.useSecureMessages = exports.useSecureConversations = exports.useSecureDevice = exports.useSecureChat = exports.SecureChatProvider = void 0;
+exports.bytesToUtf8 = exports.utf8ToBytes = exports.fromBase64 = exports.toBase64 = exports.SecureChatRepository = exports.MemoryStore = exports.SecureChatSocketClient = exports.SecureChatRestClient = exports.useSecureHandshakes = exports.useSecureMessages = exports.useSecureConversations = exports.useSecureDevice = exports.useSecureChat = exports.SecureChatProvider = void 0;
 // ── context / provider ──────────────────────────────────────────────────────
 var secure_chat_context_js_1 = require("./context/secure-chat-context.js");
 Object.defineProperty(exports, "SecureChatProvider", { enumerable: true, get: function () { return secure_chat_context_js_1.SecureChatProvider; } });
@@ -17,6 +17,8 @@ var useSecureConversations_js_1 = require("./hooks/useSecureConversations.js");
 Object.defineProperty(exports, "useSecureConversations", { enumerable: true, get: function () { return useSecureConversations_js_1.useSecureConversations; } });
 var useSecureMessages_js_1 = require("./hooks/useSecureMessages.js");
 Object.defineProperty(exports, "useSecureMessages", { enumerable: true, get: function () { return useSecureMessages_js_1.useSecureMessages; } });
+var useSecureHandshakes_js_1 = require("./hooks/useSecureHandshakes.js");
+Object.defineProperty(exports, "useSecureHandshakes", { enumerable: true, get: function () { return useSecureHandshakes_js_1.useSecureHandshakes; } });
 // ── transport (for advanced / non-React use) ─────────────────────────────────
 var rest_js_1 = require("./transport/rest.js");
 Object.defineProperty(exports, "SecureChatRestClient", { enumerable: true, get: function () { return rest_js_1.SecureChatRestClient; } });

package/dist/cjs/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":";AAAA,8FAA8F;AAC9F,EAAE;AACF,6FAA6F;AAC7F,+FAA+F;AAC/F,4DAA4D;;;AAE5D,+EAA+E;AAC/E,2EAAqF;AAA5E,4HAAA,kBAAkB,OAAA;AAAE,uHAAA,aAAa,OAAA;AAM1C,gFAAgF;AAChF,iEAA6D;AAApD,qHAAA,eAAe,OAAA;AAExB,+EAA2E;AAAlE,mIAAA,sBAAsB,OAAA;AAE/B,qEAAiE;AAAxD,yHAAA,iBAAiB,OAAA;AAO1B,gFAAgF;AAChF,+CAA2D;AAAlD,+GAAA,oBAAoB,OAAA;AAE7B,mDAA+D;AAAtD,mHAAA,sBAAsB,OAAA;AAwB/B,iEAA4D;AAAnD,8GAAA,WAAW,OAAA;AACpB,6DAAmE;AAA1D,qHAAA,oBAAoB,OAAA;AAG7B,gFAAgF;AAChF,8CAAkF;AAAzE,qGAAA,QAAQ,OAAA;AAAE,uGAAA,UAAU,OAAA;AAAE,wGAAA,WAAW,OAAA;AAAE,wGAAA,WAAW,OAAA"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":";AAAA,8FAA8F;AAC9F,EAAE;AACF,6FAA6F;AAC7F,+FAA+F;AAC/F,4DAA4D;;;AAE5D,+EAA+E;AAC/E,2EAAqF;AAA5E,4HAAA,kBAAkB,OAAA;AAAE,uHAAA,aAAa,OAAA;AAM1C,gFAAgF;AAChF,iEAA6D;AAApD,qHAAA,eAAe,OAAA;AAExB,+EAA2E;AAAlE,mIAAA,sBAAsB,OAAA;AAE/B,qEAAiE;AAAxD,yHAAA,iBAAiB,OAAA;AAM1B,yEAAqE;AAA5D,6HAAA,mBAAmB,OAAA;AAM5B,gFAAgF;AAChF,+CAA2D;AAAlD,+GAAA,oBAAoB,OAAA;AAE7B,mDAA+D;AAAtD,mHAAA,sBAAsB,OAAA;AAwB/B,iEAA4D;AAAnD,8GAAA,WAAW,OAAA;AACpB,6DAAmE;AAA1D,qHAAA,oBAAoB,OAAA;AAG7B,gFAAgF;AAChF,8CAAkF;AAAzE,qGAAA,QAAQ,OAAA;AAAE,uGAAA,UAAU,OAAA;AAAE,wGAAA,WAAW,OAAA;AAAE,wGAAA,WAAW,OAAA"}

package/dist/cjs/transport/socket.d.ts

@@ -26,10 +26,22 @@ export interface SecureServerEvents {
         userId: string;
     }) => void;
 }
-/** Client → server events. */
+/**
+ * Client → server events.
+ *
+ * @remarks
+ * Payloads are **objects**, not bare ids — the server destructures `{ conversationId }` /
+ * `{ deviceId }` off the first argument (agora-server `realtime/secure-socket.ts`). Emitting a bare
+ * string lands as `undefined` after destructuring (and, on a `null` payload, throws server-side), so
+ * the join silently fails. Keep these shapes in lockstep with the server's `SecureClientToServerEvents`.
+ */
 export interface SecureClientEvents {
-    "join:secure-conversation": (conversationId: string) => void;
-    "join:secure-device": (deviceId: string) => void;
+    "join:secure-conversation": (payload: {
+        conversationId: string;
+    }) => void;
+    "join:secure-device": (payload: {
+        deviceId: string;
+    }) => void;
 }
 /** A socket.io `Socket` typed with the secure-chat event maps in both directions. */
 export type SecureSocket = Socket<SecureServerEvents, SecureClientEvents>;

package/dist/cjs/transport/socket.js

@@ -46,11 +46,13 @@ class SecureChatSocketClient {
     }
     /** Join a conversation room (membership-gated server-side) to receive its broadcasts. */
     joinConversation(conversationId) {
-        this.connect().emit("join:secure-conversation", conversationId);
+        // Object payload — the server destructures `{ conversationId }`; a bare string would arrive as
+        // `undefined` and the join would silently no-op (see SecureClientEvents).
+        this.connect().emit("join:secure-conversation", { conversationId });
     }
     /** Explicitly join a device room (ownership-verified). Owned devices auto-join on connect. */
     joinDevice(deviceId) {
-        this.connect().emit("join:secure-device", deviceId);
+        this.connect().emit("join:secure-device", { deviceId });
     }
     /**
      * Subscribe to a server → client event, auto-connecting if needed.

package/dist/cjs/transport/socket.js.map

@@ -1 +1 @@
-{"version":3,"file":"socket.js","sourceRoot":"","sources":["../../../src/transport/socket.ts"],"names":[],"mappings":";AAAA,8FAA8F;AAC9F,EAAE;AACF,iGAAiG;AACjG,kGAAkG;AAClG,8FAA8F;AAC9F,kCAAkC;;;AAElC,uDAA8C;AAqC9C;;;;GAIG;AACH,MAAa,sBAAsB;IAGjC,YAA6B,MAA8B;QAA9B,WAAM,GAAN,MAAM,CAAwB;QAFnD,WAAM,GAAwB,IAAI,CAAC;IAEmB,CAAC;IAE/D;;;;OAIG;IACH,OAAO;QACL,IAAI,IAAI,CAAC,MAAM,EAAE,SAAS;YAAE,OAAO,IAAI,CAAC,MAAM,CAAC;QAC/C,MAAM,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC,YAAY,EAAE,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;QAC7D,IAAI,CAAC,MAAM,GAAG,IAAA,qBAAE,EAAC,GAAG,MAAM,SAAS,EAAE;YACnC,IAAI,EAAE,EAAE,KAAK,EAAE,IAAI,CAAC,MAAM,CAAC,cAAc,EAAE,EAAE;YAC7C,KAAK,EAAE,EAAE,SAAS,EAAE,IAAI,CAAC,MAAM,CAAC,SAAS,EAAE;YAC3C,UAAU,EAAE,CAAC,WAAW,CAAC;YACzB,WAAW,EAAE,IAAI;SAClB,CAAC,CAAC;QACH,OAAO,IAAI,CAAC,MAAM,CAAC;IACrB,CAAC;IAED,kGAAkG;IAClG,UAAU;QACR,IAAI,CAAC,MAAM,EAAE,UAAU,EAAE,CAAC;QAC1B,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC;IACrB,CAAC;IAED,kGAAkG;IAClG,IAAI,GAAG;QACL,OAAO,IAAI,CAAC,MAAM,CAAC;IACrB,CAAC;IAED,yFAAyF;IACzF,gBAAgB,CAAC,cAAsB;QACrC,IAAI,CAAC,OAAO,EAAE,CAAC,IAAI,CAAC,0BAA0B,EAAE,cAAc,CAAC,CAAC;IAClE,CAAC;IAED,8FAA8F;IAC9F,UAAU,CAAC,QAAgB;QACzB,IAAI,CAAC,OAAO,EAAE,CAAC,IAAI,CAAC,oBAAoB,EAAE,QAAQ,CAAC,CAAC;IACtD,CAAC;IAED;;;;;;OAMG;IACH,EAAE,CAAqC,KAAQ,EAAE,OAA8B;QAC7E,MAAM,CAAC,GAAG,IAAI,CAAC,OAAO,EAAE,CAAC;QACzB,4FAA4F;QAC5F,CAAC,CAAC,EAAE,CAAC,KAAc,EAAE,OAAgB,CAAC,CAAC;QACvC,OAAO,GAAG,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC,KAAc,EAAE,OAAgB,CAAC,CAAC;IACvD,CAAC;CACF;AAxDD,wDAwDC"}
+{"version":3,"file":"socket.js","sourceRoot":"","sources":["../../../src/transport/socket.ts"],"names":[],"mappings":";AAAA,8FAA8F;AAC9F,EAAE;AACF,iGAAiG;AACjG,kGAAkG;AAClG,8FAA8F;AAC9F,kCAAkC;;;AAElC,uDAA8C;AA6C9C;;;;GAIG;AACH,MAAa,sBAAsB;IAGjC,YAA6B,MAA8B;QAA9B,WAAM,GAAN,MAAM,CAAwB;QAFnD,WAAM,GAAwB,IAAI,CAAC;IAEmB,CAAC;IAE/D;;;;OAIG;IACH,OAAO;QACL,IAAI,IAAI,CAAC,MAAM,EAAE,SAAS;YAAE,OAAO,IAAI,CAAC,MAAM,CAAC;QAC/C,MAAM,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC,YAAY,EAAE,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;QAC7D,IAAI,CAAC,MAAM,GAAG,IAAA,qBAAE,EAAC,GAAG,MAAM,SAAS,EAAE;YACnC,IAAI,EAAE,EAAE,KAAK,EAAE,IAAI,CAAC,MAAM,CAAC,cAAc,EAAE,EAAE;YAC7C,KAAK,EAAE,EAAE,SAAS,EAAE,IAAI,CAAC,MAAM,CAAC,SAAS,EAAE;YAC3C,UAAU,EAAE,CAAC,WAAW,CAAC;YACzB,WAAW,EAAE,IAAI;SAClB,CAAC,CAAC;QACH,OAAO,IAAI,CAAC,MAAM,CAAC;IACrB,CAAC;IAED,kGAAkG;IAClG,UAAU;QACR,IAAI,CAAC,MAAM,EAAE,UAAU,EAAE,CAAC;QAC1B,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC;IACrB,CAAC;IAED,kGAAkG;IAClG,IAAI,GAAG;QACL,OAAO,IAAI,CAAC,MAAM,CAAC;IACrB,CAAC;IAED,yFAAyF;IACzF,gBAAgB,CAAC,cAAsB;QACrC,+FAA+F;QAC/F,0EAA0E;QAC1E,IAAI,CAAC,OAAO,EAAE,CAAC,IAAI,CAAC,0BAA0B,EAAE,EAAE,cAAc,EAAE,CAAC,CAAC;IACtE,CAAC;IAED,8FAA8F;IAC9F,UAAU,CAAC,QAAgB;QACzB,IAAI,CAAC,OAAO,EAAE,CAAC,IAAI,CAAC,oBAAoB,EAAE,EAAE,QAAQ,EAAE,CAAC,CAAC;IAC1D,CAAC;IAED;;;;;;OAMG;IACH,EAAE,CAAqC,KAAQ,EAAE,OAA8B;QAC7E,MAAM,CAAC,GAAG,IAAI,CAAC,OAAO,EAAE,CAAC;QACzB,4FAA4F;QAC5F,CAAC,CAAC,EAAE,CAAC,KAAc,EAAE,OAAgB,CAAC,CAAC;QACvC,OAAO,GAAG,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC,KAAc,EAAE,OAAgB,CAAC,CAAC;IACvD,CAAC;CACF;AA1DD,wDA0DC"}

package/dist/esm/context/secure-chat-context.d.ts

@@ -21,6 +21,16 @@ export interface SecureChatContextValue {
     resolveGroup: (conversationId: string) => Promise<GroupHandle | null>;
     /** Cache + persist a conversation's group handle (after createGroup / processWelcome). */
     rememberGroup: (conversationId: string, handle: GroupHandle) => Promise<void>;
+    /**
+     * Current change-version for a conversation's group handle. Bumps every time the handle advances
+     * (a join or a processed Commit), so consumers can detect "the group moved" without diffing handles.
+     */
+    getGroupVersion: (conversationId: string) => number;
+    /**
+     * Subscribe to group-handle changes across all conversations (fired by {@link rememberGroup}).
+     * @returns An unsubscribe function.
+     */
+    subscribeGroupChange: (listener: () => void) => () => void;
     /** The Agora project id these clients are scoped to. */
     projectId: string;
 }

package/dist/esm/context/secure-chat-context.js

@@ -47,6 +47,12 @@ export function SecureChatProvider({ crypto, projectId, store, accessToken, getA
     // NOTE: not cleared on a `store` prop swap — a store change in practice means a new provider
     // instance (fresh cache), not a live prop change on the same mounted provider.
     const groupCache = useRef(new Map());
+    // Per-conversation change counter, bumped whenever a group handle advances (a join or a processed
+    // Commit). Lets useSecureMessages re-resolve and flush buffered (undecrypted) rows without a
+    // re-fetch. Held in a ref + listener set so a bump notifies consumers WITHOUT re-rendering the
+    // provider (and thus rebuilding rest/socket/repo).
+    const groupVersion = useRef(new Map());
+    const groupListeners = useRef(new Set());
     const resolveGroup = useCallback(async (conversationId) => {
         const cached = groupCache.current.get(conversationId);
         if (cached)
@@ -62,11 +68,41 @@ export function SecureChatProvider({ crypto, projectId, store, accessToken, getA
         groupCache.current.set(conversationId, handle);
         const bytes = await crypto.exportGroupState(handle);
         await repo.saveGroupState(conversationId, bytes);
+        // Signal that this conversation's group advanced, so message hooks re-resolve + flush.
+        groupVersion.current.set(conversationId, (groupVersion.current.get(conversationId) ?? 0) + 1);
+        groupListeners.current.forEach((l) => l());
     }, [repo, crypto]);
+    const getGroupVersion = useCallback((conversationId) => groupVersion.current.get(conversationId) ?? 0, []);
+    const subscribeGroupChange = useCallback((listener) => {
+        groupListeners.current.add(listener);
+        return () => {
+            groupListeners.current.delete(listener);
+        };
+    }, []);
     useEffect(() => {
         return () => socket.disconnect();
     }, [socket]);
-    const value = useMemo(() => ({ rest, socket, crypto, repo, resolveGroup, rememberGroup, projectId }), [rest, socket, crypto, repo, resolveGroup, rememberGroup, projectId]);
+    const value = useMemo(() => ({
+        rest,
+        socket,
+        crypto,
+        repo,
+        resolveGroup,
+        rememberGroup,
+        getGroupVersion,
+        subscribeGroupChange,
+        projectId,
+    }), [
+        rest,
+        socket,
+        crypto,
+        repo,
+        resolveGroup,
+        rememberGroup,
+        getGroupVersion,
+        subscribeGroupChange,
+        projectId,
+    ]);
     return _jsx(SecureChatContext.Provider, { value: value, children: children });
 }
 /**

package/dist/esm/context/secure-chat-context.js.map

@@ -1 +1 @@
-{"version":3,"file":"secure-chat-context.js","sourceRoot":"","sources":["../../../src/context/secure-chat-context.tsx"],"names":[],"mappings":"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"}
+{"version":3,"file":"secure-chat-context.js","sourceRoot":"","sources":["../../../src/context/secure-chat-context.tsx"],"names":[],"mappings":"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"}

package/dist/esm/contract/index.d.ts

@@ -1,150 +1,2 @@
-export type SecureConversationType = "dm" | "group" | "channel";
-export type SecureMemberRole = "admin" | "member";
-export type SecureHandshakeKind = "welcome" | "commit" | "proposal";
-/** A Welcome targeted at the ONE device whose claimed KeyPackage was consumed. */
-export interface WelcomeEnvelope {
-    targetDeviceId: string;
-    payload: string;
-    epoch: string;
-}
-/** A Commit/Proposal broadcast to the whole group (no target device). */
-export interface HandshakeBlob {
-    payload: string;
-    epoch: string;
-}
-export interface RegisterDeviceBody {
-    deviceId: string;
-    displayName?: string | null;
-    signaturePublicKey: string;
-    credential: string;
-    ciphersuite: number;
-}
-export interface PublishKeyPackagesBody {
-    keyPackages: {
-        keyPackageRef: string;
-        keyPackage: string;
-        ciphersuite: number;
-        expiresAt?: string | null;
-    }[];
-}
-export interface CreateSecureConversationBody {
-    type: SecureConversationType;
-    mlsGroupId: string;
-    spaceId?: string | null;
-    name?: string | null;
-    memberUserIds?: string[];
-    welcomes?: WelcomeEnvelope[];
-}
-export interface AddSecureMemberBody {
-    userId: string;
-    commit: HandshakeBlob;
-    welcomes: WelcomeEnvelope[];
-}
-export interface RemoveSecureMemberBody {
-    commit: HandshakeBlob;
-}
-export interface SendSecureMessageBody {
-    ciphertext: string;
-    epoch: string;
-    senderDeviceId: string;
-    contentType?: string | null;
-}
-export interface UploadKeyBackupBody {
-    deviceId?: string | null;
-    blob: string;
-    nonce: string;
-    kdf: "argon2id" | "pbkdf2";
-    kdfParams: Record<string, unknown>;
-    cipher: "xchacha20poly1305" | "aes-256-gcm";
-    version: number;
-}
-export interface SecureDeviceModel {
-    id: string;
-    projectId: string;
-    userId: string;
-    deviceId: string;
-    displayName: string | null;
-    signaturePublicKey: string;
-    credential: string;
-    ciphersuite: number;
-    revokedAt: string | null;
-    lastSeenAt: string | null;
-    createdAt: string;
-    updatedAt: string;
-}
-export interface SecureKeyPackageClaim {
-    deviceId: string;
-    keyPackageRef: string;
-    keyPackage: string;
-    ciphersuite: number;
-}
-export interface SecureConversationMemberModel {
-    id: string;
-    projectId: string;
-    conversationId: string;
-    userId: string;
-    role: SecureMemberRole;
-    isActive: boolean;
-    joinedAtEpoch: string | null;
-    lastReadAt: string | null;
-    leftAt: string | null;
-    createdAt: string;
-    updatedAt: string;
-}
-export interface SecureConversationModel {
-    id: string;
-    projectId: string;
-    type: SecureConversationType;
-    mlsGroupId: string;
-    spaceId: string | null;
-    currentEpoch: string;
-    name: string | null;
-    createdById: string | null;
-    lastMessageAt: string | null;
-    memberCount?: number;
-    unreadCount?: number;
-    currentMember?: SecureConversationMemberModel;
-    createdAt: string;
-    updatedAt: string;
-}
-export interface SecureMessageModel {
-    id: string;
-    projectId: string;
-    conversationId: string;
-    senderUserId: string | null;
-    senderDeviceId: string | null;
-    epoch: string;
-    ciphertext: string;
-    contentType: string;
-    createdAt: string;
-}
-export interface SecureHandshakeModel {
-    id: string;
-    seq: string;
-    kind: SecureHandshakeKind;
-    conversationId: string;
-    epoch: string;
-    payload: string;
-    senderDeviceId: string | null;
-    targetDeviceId: string | null;
-}
-export interface SecureKeyBackupModel {
-    id: string;
-    projectId: string;
-    userId: string;
-    deviceId: string | null;
-    blob: string;
-    nonce: string;
-    kdf: string;
-    kdfParams: Record<string, unknown>;
-    cipher: string;
-    version: number;
-    createdAt: string;
-    updatedAt: string;
-}
-/** Standard error envelope: `{ error, code, field? }` with `secure-chat/*` codes. */
-export interface SecureChatErrorBody {
-    error: string;
-    code: string;
-    field?: string;
-}
+export type { SecureDeviceModel, SecureKeyPackageClaim, SecureConversationMemberModel, SecureConversationModel, SecureMessageModel, SecureHandshakeModel, SecureKeyBackupModel, } from "@agora-server/contract";
+export type { RegisterDeviceBody, PublishKeyPackagesBody, CreateSecureConversationBody, AddSecureMemberBody, RemoveSecureMemberBody, SendSecureMessageBody, UploadKeyBackupBody, WelcomeEnvelope, HandshakeBlob, } from "@agora-server/contract";

package/dist/esm/contract/index.js

@@ -1,15 +1,16 @@
-// Secure-chat wire contract — stand-in for @agora-server/contract (the Apache-2.0 server contract).
+// Secure-chat wire types — re-exported from the published `@agora-server/contract` (Apache-2.0).
 //
-// Mirrors the response models + request bodies of agora-server's
-// `packages/contract/src/secure-chat.ts`. That package is the source of truth (zod + TS); the
-// client only needs the TypeScript shapes, so this copy is types-only.
+// The dependency arrow is **SDK → contract**: agora-server owns the wire contract, this SDK depends
+// on it. This module used to hold a byte-faithful *copy* of the types (a stand-in until the contract
+// published); now that `@agora-server/contract` is published, it is a thin **type-only re-export** so
+// there is exactly one source of truth and zero drift. The internal import path
+// (`../contract/index.js`) is kept stable so call sites don't churn, and the re-export is scoped to
+// the secure-chat surface (not the contract's reactions/pagination/etc.).
 //
-// ⚠️ Keep this byte-faithful to the server contract. The arrow is SDK → contract: once
-// `@agora-server/contract` is published, DELETE this file and `import type { ... } from "@agora-server/contract"`.
-// Do NOT publish a separate `@agora-sdk/secure-chat-contract` (that would invert the dependency —
-// see STATUS.md). Do not let this copy drift in the meantime.
+// Type-only on purpose: `@agora-server/contract` is ESM-only, but these `export type` re-exports are
+// erased from the emitted JS, so core's dual ESM/CJS build never `require()`s it at runtime.
 //
-// Wire conventions: every binary value is **base64** (the server stores/relays opaque blobs and
-// never parses them); MLS epochs are **decimal strings** (u64 exceeds JS safe-int range).
+// Wire conventions (owned by the contract): every binary value is **base64**; MLS epochs are
+// **decimal strings** (u64 exceeds JS safe-int range).
 export {};
 //# sourceMappingURL=index.js.map

package/dist/esm/contract/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/contract/index.ts"],"names":[],"mappings":"AAAA,oGAAoG;AACpG,EAAE;AACF,iEAAiE;AACjE,8FAA8F;AAC9F,uEAAuE;AACvE,EAAE;AACF,uFAAuF;AACvF,mHAAmH;AACnH,kGAAkG;AAClG,8DAA8D;AAC9D,EAAE;AACF,gGAAgG;AAChG,0FAA0F"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/contract/index.ts"],"names":[],"mappings":"AAAA,iGAAiG;AACjG,EAAE;AACF,oGAAoG;AACpG,qGAAqG;AACrG,sGAAsG;AACtG,gFAAgF;AAChF,oGAAoG;AACpG,0EAA0E;AAC1E,EAAE;AACF,qGAAqG;AACrG,6FAA6F;AAC7F,EAAE;AACF,6FAA6F;AAC7F,uDAAuD"}

package/dist/esm/hooks/useSecureHandshakes.d.ts

@@ -0,0 +1,64 @@
+import { SecureHandshakeModel } from "../contract/index.js";
+/** Options for {@link useSecureHandshakes}. */
+export interface UseSecureHandshakesOptions {
+    /**
+     * The device row id whose inbox to drain. Defaults to the persisted device's `.id`. Pass the id
+     * from `useSecureDevice` so processing starts the moment the device registers (a persisted device
+     * is picked up automatically on reload even without this).
+     */
+    deviceId?: string;
+    /** Disable processing (e.g. before sign-in). Default true. */
+    enabled?: boolean;
+    /** Page size for the catch-up fetch loop. Default 100. */
+    pageSize?: number;
+    /** Called per handshake-processing error; the inbox skips the bad row and continues. */
+    onError?: (err: unknown, handshake?: SecureHandshakeModel) => void;
+}
+/** The state and actions returned by {@link useSecureHandshakes}. */
+export interface UseSecureHandshakesValues {
+    /** True until the initial catch-up loop settles. */
+    catchingUp: boolean;
+    /** True once catch-up completed and live subscriptions are active. */
+    ready: boolean;
+    /** The last processed delivery cursor (`seq`), or `null`. */
+    cursor: string | null;
+    /** Count of handshakes applied this session. */
+    processedCount: number;
+    /** The last error surfaced (also delivered via `onError`), or `null`. */
+    error: unknown;
+    /**
+     * Re-run the catch-up loop from the persisted cursor. The reusable primitive a future 409
+     * epoch-conflict rebase (on a membership Commit) calls before rebuilding + retrying its Commit.
+     */
+    resync: () => Promise<void>;
+}
+/**
+ * Process this device's MLS handshake inbox so the recipient side of secure chat works.
+ *
+ * On mount (once a device id is available) it catches up via `fetchHandshakes(since=cursor)`, re-joins
+ * the socket rooms for groups it already holds, then processes live `secure:welcome` /
+ * `secure:handshake` events — all serialized in `seq` order, deduped, and cursor-persisted. Mount it
+ * exactly once near `useSecureDevice`.
+ *
+ * @param options - {@link UseSecureHandshakesOptions}.
+ * @returns {@link UseSecureHandshakesValues}.
+ *
+ * @remarks
+ * Single-device only (Phase 3 adds own-device fan-out + MLS generation-counter gap detection). A
+ * Commit for a group whose Welcome hasn't been seen is skipped — `seq` ordering puts the Welcome
+ * first, so an unknown group means this device is genuinely not a member.
+ *
+ * Mount it exactly once. Processing is serialized *within* a mount, and the cursor is re-read from
+ * storage at the start of each run, so a serialized re-mount (or `deviceId` change) resumes without
+ * reprocessing. It does NOT serialize across a *concurrent* re-mount whose prior catch-up is still
+ * in flight; that case relies on `processWelcome` / `processCommit` being idempotent for a replayed
+ * blob. The mock is idempotent (so dev StrictMode double-invoke is harmless); harden this when the
+ * real MLS core lands (Task 1) if its handshake processing is not replay-safe.
+ *
+ * @example
+ * ```tsx
+ * const { device } = useSecureDevice();
+ * useSecureHandshakes({ deviceId: device?.id });
+ * ```
+ */
+export declare function useSecureHandshakes(options?: UseSecureHandshakesOptions): UseSecureHandshakesValues;

package/dist/esm/hooks/useSecureHandshakes.js

@@ -0,0 +1,212 @@
+// useSecureHandshakes — drain and process this device's MLS handshake inbox (the recipient side).
+//
+// The blind DS delivers each device a stream of handshakes (Welcomes targeted at it, plus broadcast
+// Commits/Proposals for its groups), ordered by a monotonic `seq`. This hook is what makes a
+// RECIPIENT actually join and stay current: on connect it pulls `GET .../handshakes?since=<cursor>`
+// to the end, then processes live `secure:welcome` / `secure:handshake` events — all funneled through
+// ONE serialized, seq-ordered, idempotent path, persisting the cursor as it goes. A processed Welcome
+// joins a group (rememberGroup); a processed Commit advances its epoch. Mount it once, near
+// useSecureDevice.
+//
+// Ordering invariant: live events that arrive WHILE catching up are buffered and replayed in `seq`
+// order AFTER catch-up — otherwise a high-seq live event would advance the cursor past not-yet-fetched
+// rows and the dedupe check would drop them (data loss).
+import { useCallback, useEffect, useRef, useState } from "react";
+import { fromBase64 } from "../util/base64.js";
+import { useSecureChat } from "../context/secure-chat-context.js";
+/** Compare two decimal-string `seq` cursors numerically (string compare is wrong across digit widths). */
+function compareSeq(a, b) {
+    const d = BigInt(a) - BigInt(b);
+    return d > 0n ? 1 : d < 0n ? -1 : 0;
+}
+/**
+ * Process this device's MLS handshake inbox so the recipient side of secure chat works.
+ *
+ * On mount (once a device id is available) it catches up via `fetchHandshakes(since=cursor)`, re-joins
+ * the socket rooms for groups it already holds, then processes live `secure:welcome` /
+ * `secure:handshake` events — all serialized in `seq` order, deduped, and cursor-persisted. Mount it
+ * exactly once near `useSecureDevice`.
+ *
+ * @param options - {@link UseSecureHandshakesOptions}.
+ * @returns {@link UseSecureHandshakesValues}.
+ *
+ * @remarks
+ * Single-device only (Phase 3 adds own-device fan-out + MLS generation-counter gap detection). A
+ * Commit for a group whose Welcome hasn't been seen is skipped — `seq` ordering puts the Welcome
+ * first, so an unknown group means this device is genuinely not a member.
+ *
+ * Mount it exactly once. Processing is serialized *within* a mount, and the cursor is re-read from
+ * storage at the start of each run, so a serialized re-mount (or `deviceId` change) resumes without
+ * reprocessing. It does NOT serialize across a *concurrent* re-mount whose prior catch-up is still
+ * in flight; that case relies on `processWelcome` / `processCommit` being idempotent for a replayed
+ * blob. The mock is idempotent (so dev StrictMode double-invoke is harmless); harden this when the
+ * real MLS core lands (Task 1) if its handshake processing is not replay-safe.
+ *
+ * @example
+ * ```tsx
+ * const { device } = useSecureDevice();
+ * useSecureHandshakes({ deviceId: device?.id });
+ * ```
+ */
+export function useSecureHandshakes(options = {}) {
+    const { rest, crypto, socket, repo, resolveGroup, rememberGroup } = useSecureChat();
+    const { deviceId: deviceIdOption, pageSize = 100 } = options;
+    const enabled = options.enabled ?? true;
+    const [catchingUp, setCatchingUp] = useState(true);
+    const [ready, setReady] = useState(false);
+    const [cursor, setCursor] = useState(null);
+    const [processedCount, setProcessedCount] = useState(0);
+    const [error, setError] = useState(null);
+    // onError read through a ref so passing an inline callback doesn't re-run the effect.
+    const onErrorRef = useRef(options.onError);
+    onErrorRef.current = options.onError;
+    // The catch-up routine, published from the effect so `resync()` (stable) can invoke it.
+    const runCatchUpRef = useRef(null);
+    const resync = useCallback(async () => {
+        await runCatchUpRef.current?.();
+    }, []);
+    useEffect(() => {
+        if (!enabled)
+            return;
+        let alive = true;
+        const offFns = [];
+        // Async state shared across the catch-up loop, live handlers, and the serial apply queue.
+        const cursorRef = { current: null };
+        const catchingUpRef = { current: true };
+        const liveBuffer = [];
+        let queue = Promise.resolve();
+        let deviceId;
+        const report = (err, h) => {
+            if (alive)
+                setError(err);
+            onErrorRef.current?.(err, h);
+        };
+        const dispatchByKind = async (h) => {
+            const payload = fromBase64(h.payload);
+            if (h.kind === "welcome") {
+                // Targeted at us → join the group, then join its room for future broadcast Commits.
+                if (h.targetDeviceId && h.targetDeviceId !== deviceId)
+                    return;
+                const handle = await crypto.processWelcome(payload);
+                await rememberGroup(h.conversationId, handle);
+                socket.joinConversation(h.conversationId);
+            }
+            else if (h.kind === "commit") {
+                const group = await resolveGroup(h.conversationId);
+                if (!group) {
+                    // Unknown group at a Commit: with seq ordering the Welcome precedes it, so we're not a
+                    // member of this conversation. Skip (the cursor still advances so we don't re-fetch it).
+                    report(new Error(`secure-chat: commit for unknown group ${h.conversationId}`), h);
+                    return;
+                }
+                const advanced = await crypto.processCommit(group, payload);
+                await rememberGroup(h.conversationId, advanced);
+            }
+            else if (h.kind === "proposal") {
+                const group = await resolveGroup(h.conversationId);
+                if (group)
+                    await crypto.processProposal(group, payload);
+            }
+        };
+        // The ONE place that mutates the cursor + crypto state. Dedupes by seq; advances the cursor even
+        // when a row is skipped or its dispatch throws, so a poison blob can never wedge the inbox. A hard
+        // crash mid-dispatch leaves the cursor unsaved, so the row replays on restart (no loss).
+        const applyOrdered = async (h) => {
+            if (cursorRef.current !== null && compareSeq(h.seq, cursorRef.current) <= 0)
+                return;
+            try {
+                await dispatchByKind(h);
+            }
+            catch (err) {
+                report(err, h);
+            }
+            cursorRef.current = h.seq;
+            await repo.saveHandshakeCursor(h.seq);
+            if (alive) {
+                setCursor(h.seq);
+                setProcessedCount((n) => n + 1);
+            }
+        };
+        const schedule = (h) => {
+            queue = queue.then(() => applyOrdered(h));
+            return queue;
+        };
+        const enqueueLive = (h) => {
+            // Buffer while catching up so a high-seq live event can't advance the cursor past rows the
+            // catch-up loop hasn't fetched yet (which the dedupe check would then drop).
+            if (catchingUpRef.current)
+                liveBuffer.push(h);
+            else
+                schedule(h);
+        };
+        // Coalesce overlapping invocations: a `resync()` fired while a catch-up is still draining returns
+        // the in-flight promise instead of starting a second drain (two drains would race the
+        // `catchingUpRef` gate + `liveBuffer` and could break seq ordering).
+        let catchUpInFlight = null;
+        const runCatchUp = () => {
+            if (catchUpInFlight)
+                return catchUpInFlight;
+            catchUpInFlight = (async () => {
+                catchingUpRef.current = true;
+                try {
+                    for (;;) {
+                        const page = await rest.fetchHandshakes(deviceId, {
+                            since: cursorRef.current ?? undefined,
+                            limit: pageSize,
+                        });
+                        for (const h of page.handshakes)
+                            await schedule(h);
+                        if (!page.hasMore)
+                            break;
+                    }
+                }
+                finally {
+                    catchingUpRef.current = false;
+                    // Replay anything that landed live during catch-up, in seq order, through the same queue.
+                    const buffered = liveBuffer.splice(0).sort((a, b) => compareSeq(a.seq, b.seq));
+                    for (const h of buffered)
+                        schedule(h);
+                }
+            })().finally(() => {
+                catchUpInFlight = null;
+            });
+            return catchUpInFlight;
+        };
+        (async () => {
+            // Resolve the device row id (option wins; else the persisted device). Without one, there is no
+            // inbox to drain yet — the effect re-runs when `deviceId` is later supplied.
+            deviceId = deviceIdOption ?? (await repo.loadDevice())?.device?.id;
+            if (!alive || !deviceId)
+                return;
+            cursorRef.current = await repo.loadHandshakeCursor();
+            if (alive)
+                setCursor(cursorRef.current);
+            // Subscribe to live events BEFORE catch-up (buffered until catch-up completes).
+            offFns.push(socket.on("secure:welcome", enqueueLive));
+            offFns.push(socket.on("secure:handshake", enqueueLive));
+            runCatchUpRef.current = runCatchUp;
+            await runCatchUp();
+            // After a reload we hold group state but haven't joined the socket rooms, so broadcast Commits
+            // wouldn't arrive — re-join every known conversation.
+            try {
+                const convIds = await repo.listGroupConversationIds();
+                for (const c of convIds)
+                    socket.joinConversation(c);
+            }
+            catch (err) {
+                report(err);
+            }
+            if (alive) {
+                setCatchingUp(false);
+                setReady(true);
+            }
+        })().catch((err) => report(err));
+        return () => {
+            alive = false;
+            offFns.forEach((off) => off());
+            runCatchUpRef.current = null;
+        };
+    }, [enabled, deviceIdOption, pageSize, rest, socket, repo, crypto, resolveGroup, rememberGroup]);
+    return { catchingUp, ready, cursor, processedCount, error, resync };
+}
+//# sourceMappingURL=useSecureHandshakes.js.map