zapo-js 0.1.2 → 0.2.0

package/dist/client/WaClientFactory.js

@@ -8,13 +8,20 @@ const WaConnectionManager_1 = require("./connection/WaConnectionManager");
 const WaKeyShareCoordinator_1 = require("./connection/WaKeyShareCoordinator");
 const WaReceiptQueue_1 = require("./connection/WaReceiptQueue");
 const WaAppStateMutationCoordinator_1 = require("./coordinators/WaAppStateMutationCoordinator");
+const WaBusinessCoordinator_1 = require("./coordinators/WaBusinessCoordinator");
 const WaGroupCoordinator_1 = require("./coordinators/WaGroupCoordinator");
 const WaIncomingNodeCoordinator_1 = require("./coordinators/WaIncomingNodeCoordinator");
 const WaMessageDispatchCoordinator_1 = require("./coordinators/WaMessageDispatchCoordinator");
 const WaPassiveTasksCoordinator_1 = require("./coordinators/WaPassiveTasksCoordinator");
+const WaPrivacyCoordinator_1 = require("./coordinators/WaPrivacyCoordinator");
+const WaProfileCoordinator_1 = require("./coordinators/WaProfileCoordinator");
 const WaRetryCoordinator_1 = require("./coordinators/WaRetryCoordinator");
 const WaStreamControlCoordinator_1 = require("./coordinators/WaStreamControlCoordinator");
+const WaTrustedContactTokenCoordinator_1 = require("./coordinators/WaTrustedContactTokenCoordinator");
 const dirty_1 = require("./dirty");
+const devices_1 = require("./events/devices");
+const identity_1 = require("./events/identity");
+const privacy_token_1 = require("./events/privacy-token");
 const messages_1 = require("./messages");
 const fanout_1 = require("./messaging/fanout");
 const key_protocol_1 = require("./messaging/key-protocol");
@@ -23,6 +30,7 @@ const WaMediaTransferClient_1 = require("../media/WaMediaTransferClient");
 const incoming_1 = require("../message/incoming");
 const WaMessageClient_1 = require("../message/WaMessageClient");
 const constants_1 = require("../protocol/constants");
+const jid_1 = require("../protocol/jid");
 const tracker_1 = require("../retry/tracker");
 const SignalDeviceSyncApi_1 = require("../signal/api/SignalDeviceSyncApi");
 const SignalDigestSyncApi_1 = require("../signal/api/SignalDigestSyncApi");
@@ -34,6 +42,8 @@ const SenderKeyManager_1 = require("../signal/group/SenderKeyManager");
 const resolver_1 = require("../signal/session/resolver");
 const SignalProtocol_1 = require("../signal/session/SignalProtocol");
 const WaKeepAlive_1 = require("../transport/keepalive/WaKeepAlive");
+const global_1 = require("../transport/node/builders/global");
+const helpers_1 = require("../transport/node/helpers");
 const usync_1 = require("../transport/node/usync");
 const WaNodeOrchestrator_1 = require("../transport/node/WaNodeOrchestrator");
 const WaNodeTransport_1 = require("../transport/node/WaNodeTransport");
@@ -94,31 +104,6 @@ function resolveWaClientBase(options, logger) {
         sessionStore
     };
 }
-function createIncomingMessageAckOptions(input) {
-    const { logger, sendNode, emitEvent, handleIncomingMessageEvent, handleError, getCurrentMeJid, signalProtocol, senderKeyManager, retryCoordinator } = input;
-    return {
-        logger,
-        sendNode,
-        getMeJid: getCurrentMeJid,
-        signalProtocol,
-        senderKeyManager,
-        onDecryptFailure: (context, error) => retryCoordinator.onDecryptFailure(context, error),
-        emitIncomingMessage: (event) => {
-            void handleIncomingMessageEvent(event).catch((err) => handleError((0, primitives_1.toError)(err)));
-        },
-        emitUnhandledStanza: (event) => emitEvent('stanza_unhandled', event)
-    };
-}
-function createHandleClientDirtyBits(input) {
-    const { logger, queryWithContext, syncAppState, getCurrentCredentials, generateUsyncSid } = input;
-    return (dirtyBits) => (0, dirty_1.handleDirtyBits)({
-        logger,
-        queryWithContext,
-        getCurrentCredentials,
-        syncAppState,
-        generateUsyncSid
-    }, dirtyBits);
-}
 function createIncomingNodeRuntime(input) {
     const { logger, emitEvent, authClient, connectionManager, nodeOrchestrator, streamControl, mediaMessageBuildOptions, retryCoordinator, messageDispatch, sendNode, syncAppState, disconnect, clearStoredCredentials, getCurrentMeJid, handleClientDirtyBits, incomingMessageAckOptions } = input;
     return {
@@ -160,6 +145,9 @@ function createIncomingNodeRuntime(input) {
         },
         emitUnhandledIncomingNode: (event) => emitEvent('stanza_unhandled', event),
         syncAppState,
+        stopComms: () => {
+            void connectionManager.getComms()?.stopComms();
+        },
         disconnect,
         clearStoredCredentials,
         parseDirtyBits: (nodes) => (0, dirty_1.parseDirtyBits)(nodes, logger),
@@ -276,7 +264,8 @@ function buildWaClientDependencies(input) {
         deviceBrowser: options.deviceBrowser,
         deviceOsDisplayName: options.deviceOsDisplayName,
         devicePlatform: options.devicePlatform,
-        requireFullSync: options.requireFullSync
+        requireFullSync: options.requireFullSync,
+        version: options.version
     }, {
         logger,
         authStore: sessionStore.auth,
@@ -303,6 +292,16 @@ function buildWaClientDependencies(input) {
     const groupCoordinator = (0, WaGroupCoordinator_1.createGroupCoordinator)({
         queryWithContext: runtime.queryWithContext
     });
+    const privacyCoordinator = (0, WaPrivacyCoordinator_1.createPrivacyCoordinator)({
+        queryWithContext: runtime.queryWithContext
+    });
+    const profileCoordinator = (0, WaProfileCoordinator_1.createProfileCoordinator)({
+        queryWithContext: runtime.queryWithContext,
+        generateSid: generateUsyncSid
+    });
+    const businessCoordinator = (0, WaBusinessCoordinator_1.createBusinessCoordinator)({
+        queryWithContext: runtime.queryWithContext
+    });
     const retryTracker = (0, tracker_1.createOutboundRetryTracker)({
         retryStore: sessionStore.retry,
         logger
@@ -322,9 +321,30 @@ function buildWaClientDependencies(input) {
     });
     const participantsCache = (0, participants_1.createGroupParticipantsCache)({
         participantsStore: sessionStore.participants,
-        queryGroupParticipantJids: async (groupJid) => (await groupCoordinator.queryGroupMetadata(groupJid)).participants.map((participant) => participant.jid),
+        queryGroupParticipantJids: async (groupJid) => {
+            const metadata = await groupCoordinator.queryGroupMetadata(groupJid);
+            const participantJids = new Array(metadata.participants.length);
+            for (let index = 0; index < metadata.participants.length; index += 1) {
+                participantJids[index] = metadata.participants[index].jid;
+            }
+            return participantJids;
+        },
         logger
     });
+    const trustedContactToken = new WaTrustedContactTokenCoordinator_1.WaTrustedContactTokenCoordinator({
+        logger,
+        store: sessionStore.privacyToken,
+        runtime: {
+            queryWithContext: runtime.queryWithContext,
+            emitEvent: runtime.emitEvent,
+            getCurrentMeLid: () => getCurrentMeLid() ?? null
+        },
+        durationS: options.privacyToken?.tcTokenDurationS,
+        numBuckets: options.privacyToken?.tcTokenNumBuckets,
+        senderDurationS: options.privacyToken?.tcTokenSenderDurationS,
+        senderNumBuckets: options.privacyToken?.tcTokenSenderNumBuckets,
+        maxDurationS: options.privacyToken?.tcTokenMaxDurationS
+    });
     let messageDispatch;
     const appStateSyncKeyProtocol = (0, key_protocol_1.createAppStateSyncKeyProtocol)({
         publishSignalMessage: (signalInput, publishOptions) => messageDispatch.publishSignalMessage(signalInput, publishOptions),
@@ -344,9 +364,18 @@ function buildWaClientDependencies(input) {
         buildMessageContent: async (content) => (0, messages_1.buildMediaMessageContent)(mediaMessageBuildOptions, content),
         senderKeyManager,
         signalProtocol,
+        signalStore: sessionStore.signal,
+        deviceListStore: sessionStore.deviceList,
         getCurrentMeJid,
         getCurrentMeLid,
-        getCurrentSignedIdentity
+        getCurrentSignedIdentity,
+        resolvePrivacyTokenNode: (recipientJid) => trustedContactToken.resolveTokenForMessage(recipientJid),
+        onDirectMessageSent: (recipientJid) => {
+            trustedContactToken.maybeIssueSenderToken(recipientJid).catch((err) => logger.warn('sender token issue failed', {
+                to: recipientJid,
+                message: (0, primitives_1.toError)(err).message
+            }));
+        }
     });
     const retryCoordinator = new WaRetryCoordinator_1.WaRetryCoordinator({
         logger,
@@ -391,14 +420,27 @@ function buildWaClientDependencies(input) {
         connectionManager.setMediaConnCache(mediaConnCacheFallback);
     }
     scheduleReconnectAfterPairing = () => connectionManager?.scheduleReconnectAfterPairing();
-    const disconnectWithClientSideEffects = async () => {
+    const disconnectWithClientSideEffects = async (reason, isLogout, code) => {
         keyShareCoordinator.notifyDisconnected();
         await connectionManager?.disconnect();
-        runtime.emitEvent('connection_close', {});
+        runtime.emitEvent('connection', {
+            status: 'close',
+            reason,
+            code,
+            isLogout,
+            isNewLogin: false
+        });
     };
-    const connectWithClientSideEffects = async () => {
+    const connectWithClientSideEffects = async (reason) => {
+        runtime.resumeIncomingEvents();
         await connectionManager?.connect(runtime.handleIncomingFrame);
-        runtime.emitEvent('connection_open', {});
+        runtime.emitEvent('connection', {
+            status: 'open',
+            reason,
+            code: null,
+            isLogout: false,
+            isNewLogin: connectionManager?.wasNewLogin() ?? false
+        });
     };
     const clearStoredCredentialsWithClientSideEffects = async () => {
         await connectionManager?.clearStoredCredentials();
@@ -415,24 +457,27 @@ function buildWaClientDependencies(input) {
         clearStoredCredentials: clearStoredCredentialsWithClientSideEffects,
         connect: connectWithClientSideEffects
     });
-    const incomingMessageAckOptions = createIncomingMessageAckOptions({
+    const incomingMessageAckOptions = {
         logger,
         sendNode: runtime.sendNode,
-        emitEvent: runtime.emitEvent,
-        handleIncomingMessageEvent: runtime.handleIncomingMessageEvent,
-        handleError: runtime.handleError,
-        getCurrentMeJid,
+        getMeJid: getCurrentMeJid,
         signalProtocol,
         senderKeyManager,
-        retryCoordinator
-    });
-    const handleClientDirtyBits = createHandleClientDirtyBits({
+        onDecryptFailure: (context, error) => retryCoordinator.onDecryptFailure(context, error),
+        emitIncomingMessage: (event) => {
+            void runtime
+                .handleIncomingMessageEvent(event)
+                .catch((err) => runtime.handleError((0, primitives_1.toError)(err)));
+        },
+        emitUnhandledStanza: (event) => runtime.emitEvent('stanza_unhandled', event)
+    };
+    const handleClientDirtyBits = (dirtyBits) => (0, dirty_1.handleDirtyBits)({
         logger,
         queryWithContext: runtime.queryWithContext,
-        syncAppState: runtime.syncAppState,
         getCurrentCredentials,
+        syncAppState: runtime.syncAppState,
         generateUsyncSid
-    });
+    }, dirtyBits);
     const incomingNode = new WaIncomingNodeCoordinator_1.WaIncomingNodeCoordinator({
         logger,
         runtime: createIncomingNodeRuntime({
@@ -454,6 +499,207 @@ function buildWaClientDependencies(input) {
             incomingMessageAckOptions
         })
     });
+    incomingNode.registerIncomingHandler({
+        tag: constants_1.WA_NODE_TAGS.NOTIFICATION,
+        subtype: constants_1.WA_NOTIFICATION_TYPES.ENCRYPT,
+        prepend: true,
+        handler: async (node) => {
+            const firstChild = (0, helpers_1.getFirstNodeChild)(node);
+            if (!firstChild) {
+                return false;
+            }
+            const childTag = firstChild.tag;
+            // <count value="N"/> — server prekeys running low
+            if (childTag === 'count') {
+                const ackNode = (0, global_1.buildAckNode)({
+                    kind: 'notification',
+                    node,
+                    includeType: false
+                });
+                await runtime.sendNode(ackNode);
+                const tasks = passiveTasks;
+                if (!tasks) {
+                    logger.warn('encrypt-count: passive tasks not available');
+                    return true;
+                }
+                await tasks.handlePreKeyLowNotification().catch((error) => {
+                    logger.warn('encrypt-count: prekey upload failed', {
+                        message: (0, primitives_1.toError)(error).message
+                    });
+                });
+                return true;
+            }
+            // <digest/> — digest key sync
+            if (childTag === 'digest') {
+                const ackNode = (0, global_1.buildAckNode)({
+                    kind: 'notification',
+                    node,
+                    includeType: false
+                });
+                await runtime.sendNode(ackNode);
+                const tasks = passiveTasks;
+                if (!tasks) {
+                    logger.warn('encrypt-digest: passive tasks not available');
+                    return true;
+                }
+                await tasks.handleDigestNotification().catch((error) => {
+                    logger.warn('encrypt-digest: digest sync failed', {
+                        message: (0, primitives_1.toError)(error).message
+                    });
+                });
+                return true;
+            }
+            // <identity/> — contact identity key changed
+            if (childTag === 'identity') {
+                const parsed = (0, identity_1.parseIdentityChangeNotification)(node);
+                if (!parsed) {
+                    return false;
+                }
+                const ackNode = (0, global_1.buildAckNode)({
+                    kind: 'notification',
+                    node,
+                    includeType: false
+                });
+                await runtime.sendNode(ackNode);
+                const address = (0, jid_1.parseSignalAddressFromJid)(parsed.fromJid);
+                // ignore companion devices (non-primary)
+                if (address.device !== 0) {
+                    logger.debug('identity-change: ignoring companion device', {
+                        jid: parsed.fromJid
+                    });
+                    return true;
+                }
+                // self-primary identity change → must disconnect
+                const meJid = getCurrentMeJid();
+                if (meJid) {
+                    const meUser = (0, jid_1.toUserJid)(meJid);
+                    const fromUser = (0, jid_1.toUserJid)(parsed.fromJid);
+                    if (meUser === fromUser) {
+                        logger.error('self primary identity changed, disconnecting');
+                        void connectionManager?.getComms()?.stopComms();
+                        await disconnectWithClientSideEffects(constants_1.WA_DISCONNECT_REASONS.PRIMARY_IDENTITY_KEY_CHANGE, true, null);
+                        await clearStoredCredentialsWithClientSideEffects();
+                        return true;
+                    }
+                }
+                const oldIdentity = await sessionStore.signal.getRemoteIdentity(address);
+                if (oldIdentity) {
+                    logger.info('identity-change: clearing session', {
+                        jid: parsed.fromJid
+                    });
+                    await sessionStore.signal.deleteSession(address);
+                    const userJid = (0, jid_1.toUserJid)(parsed.fromJid);
+                    await trustedContactToken.reissueOnIdentityChange(userJid).catch((error) => {
+                        logger.warn('identity-change: reissue tc token failed', {
+                            message: (0, primitives_1.toError)(error).message
+                        });
+                    });
+                }
+                runtime.emitEvent('notification', {
+                    rawNode: node,
+                    stanzaId: parsed.stanzaId,
+                    chatJid: parsed.fromJid,
+                    stanzaType: 'encrypt',
+                    notificationType: 'encrypt',
+                    classification: 'core',
+                    details: {
+                        kind: 'identity_change',
+                        displayName: parsed.displayName,
+                        lid: parsed.lid,
+                        hadPreviousIdentity: !!oldIdentity
+                    }
+                });
+                return true;
+            }
+            return false;
+        }
+    });
+    incomingNode.registerIncomingHandler({
+        tag: constants_1.WA_NODE_TAGS.NOTIFICATION,
+        subtype: constants_1.WA_NOTIFICATION_TYPES.DEVICES,
+        prepend: true,
+        handler: async (node) => {
+            const parsed = (0, devices_1.parseDeviceNotification)(node);
+            if (!parsed) {
+                return false;
+            }
+            const ackNode = (0, global_1.buildAckNode)({
+                kind: 'notification',
+                node,
+                includeType: false
+            });
+            await runtime.sendNode(ackNode);
+            const userJid = (0, jid_1.toUserJid)(parsed.fromJid);
+            if (parsed.action === devices_1.DEVICE_NOTIFICATION_ACTIONS.REMOVE) {
+                const baseAddress = (0, jid_1.parseSignalAddressFromJid)(parsed.fromJid);
+                for (const device of parsed.devices) {
+                    const address = {
+                        user: baseAddress.user,
+                        server: baseAddress.server,
+                        device: device.deviceId
+                    };
+                    await sessionStore.signal.deleteSession(address).catch((error) => {
+                        logger.warn('devices-notification: delete session failed', {
+                            message: (0, primitives_1.toError)(error).message
+                        });
+                    });
+                }
+            }
+            // invalidate device list cache so next fanout fetches fresh list
+            if (sessionStore.deviceList) {
+                await sessionStore.deviceList.deleteUserDevices(userJid).catch((error) => {
+                    logger.warn('devices-notification: invalidate cache failed', {
+                        message: (0, primitives_1.toError)(error).message
+                    });
+                });
+            }
+            // for update notifications, re-sync immediately
+            if (parsed.action === devices_1.DEVICE_NOTIFICATION_ACTIONS.UPDATE) {
+                signalDeviceSync.syncDeviceList([userJid]).catch((error) => {
+                    logger.warn('devices-notification: sync device list failed', {
+                        message: (0, primitives_1.toError)(error).message
+                    });
+                });
+            }
+            runtime.emitEvent('notification', {
+                rawNode: node,
+                stanzaId: parsed.stanzaId,
+                chatJid: parsed.fromJid,
+                stanzaType: 'devices',
+                notificationType: 'devices',
+                classification: 'core',
+                details: {
+                    kind: 'device_list_change',
+                    action: parsed.action,
+                    devices: parsed.devices
+                }
+            });
+            return true;
+        }
+    });
+    incomingNode.registerIncomingHandler({
+        tag: constants_1.WA_NODE_TAGS.NOTIFICATION,
+        subtype: constants_1.WA_PRIVACY_TOKEN_NOTIFICATION_TYPE,
+        prepend: true,
+        handler: async (node) => {
+            const fromJid = node.attrs.from ?? node.attrs.sender_lid;
+            if (!fromJid) {
+                return false;
+            }
+            const tokens = (0, privacy_token_1.parsePrivacyTokenNotification)(node);
+            if (tokens.length === 0) {
+                return false;
+            }
+            await trustedContactToken.handleIncomingToken(fromJid, tokens);
+            const ackNode = (0, global_1.buildAckNode)({
+                kind: 'notification',
+                node,
+                typeOverride: constants_1.WA_PRIVACY_TOKEN_NOTIFICATION_TYPE
+            });
+            await runtime.sendNode(ackNode);
+            return true;
+        }
+    });
     passiveTasks = new WaPassiveTasksCoordinator_1.WaPassiveTasksCoordinator({
         logger,
         signalStore: sessionStore.signal,
@@ -486,13 +732,17 @@ function buildWaClientDependencies(input) {
         messageDispatch,
         retryCoordinator,
         appStateSync,
-        appStateMutations,
+        chatCoordinator: appStateMutations,
         streamControl,
         incomingNode,
         passiveTasks,
         groupCoordinator,
+        privacyCoordinator,
+        profileCoordinator,
+        businessCoordinator,
         receiptQueue,
         keyShareCoordinator,
-        connectionManager
+        connectionManager,
+        trustedContactToken
     };
 }

package/dist/client/connection/WaConnectionManager.js

@@ -5,6 +5,7 @@ const WaComms_1 = require("../../transport/WaComms");
 const primitives_1 = require("../../util/primitives");
 class WaConnectionManager {
     constructor(options) {
+        this.lastConnectWasNewLogin = false;
         this.logger = options.logger;
         this.options = options.options;
         this.authClient = options.authClient;
@@ -33,11 +34,12 @@ class WaConnectionManager {
         const operation = this.runLifecycleOperation(async () => {
             await this.connectInternal(frameHandler, lifecycleGeneration);
         });
-        this.connectPromise = operation.finally(() => {
-            if (this.connectPromise === operation) {
+        const promise = operation.finally(() => {
+            if (this.connectPromise === promise) {
                 this.connectPromise = null;
             }
         });
+        this.connectPromise = promise;
         return this.connectPromise;
     }
     scheduleReconnectAfterPairing() {
@@ -67,6 +69,9 @@ class WaConnectionManager {
     isConnected() {
         return !!(this.comms && this.comms.getCommsState().connected);
     }
+    wasNewLogin() {
+        return this.lastConnectWasNewLogin;
+    }
     getComms() {
         return this.comms;
     }
@@ -96,6 +101,7 @@ class WaConnectionManager {
         }
         this.logger.info('wa client connect start');
         let credentials = await this.authClient.loadOrCreateCredentials();
+        this.lastConnectWasNewLogin = !credentials.meJid;
         this.assertLifecycleCurrent(lifecycleGeneration, 'connect');
         try {
             await this.startCommsWithCredentials(credentials, frameHandler, lifecycleGeneration);
@@ -130,11 +136,12 @@ class WaConnectionManager {
         const operation = this.runLifecycleOperation(async () => {
             await this.reconnectAsRegisteredAfterPairingInternal();
         });
-        this.pairingReconnectPromise = operation.finally(() => {
-            if (this.pairingReconnectPromise === operation) {
+        const promise = operation.finally(() => {
+            if (this.pairingReconnectPromise === promise) {
                 this.pairingReconnectPromise = null;
             }
         });
+        this.pairingReconnectPromise = promise;
         return this.pairingReconnectPromise;
     }
     async reconnectAsRegisteredAfterPairingInternal() {
@@ -179,12 +186,14 @@ class WaConnectionManager {
         this.pendingComms = null;
         this.clearCommsBinding(currentComms ?? undefined);
         await this.authClient.clearTransientState();
-        if (pendingComms) {
-            await this.stopCommsQuietly(pendingComms, 'failed to stop pending comms during disconnect');
-        }
-        if (currentComms) {
-            await this.stopCommsQuietly(currentComms, 'failed to stop comms during disconnect');
-        }
+        await Promise.all([
+            pendingComms && pendingComms !== currentComms
+                ? this.stopCommsQuietly(pendingComms, 'failed to stop pending comms during disconnect')
+                : Promise.resolve(),
+            currentComms
+                ? this.stopCommsQuietly(currentComms, 'failed to stop comms during disconnect')
+                : Promise.resolve()
+        ]);
         if (this.isLifecycleCurrent(lifecycleGeneration)) {
             this.logger.info('wa client disconnected');
         }