zapo-js 0.1.1 → 0.2.0

package/dist/esm/client/WaClientFactory.js

@@ -1,17 +1,33 @@
 import { WaAppStateSyncClient } from '../appstate/WaAppStateSyncClient.js';
 import { WaAuthClient } from '../auth/WaAuthClient.js';
+import { WaConnectionManager } from './connection/WaConnectionManager.js';
+import { WaKeyShareCoordinator } from './connection/WaKeyShareCoordinator.js';
+import { WaReceiptQueue } from './connection/WaReceiptQueue.js';
+import { WaAppStateMutationCoordinator } from './coordinators/WaAppStateMutationCoordinator.js';
+import { createBusinessCoordinator } from './coordinators/WaBusinessCoordinator.js';
 import { createGroupCoordinator } from './coordinators/WaGroupCoordinator.js';
 import { WaIncomingNodeCoordinator } from './coordinators/WaIncomingNodeCoordinator.js';
 import { WaMessageDispatchCoordinator } from './coordinators/WaMessageDispatchCoordinator.js';
 import { WaPassiveTasksCoordinator } from './coordinators/WaPassiveTasksCoordinator.js';
+import { createPrivacyCoordinator } from './coordinators/WaPrivacyCoordinator.js';
+import { createProfileCoordinator } from './coordinators/WaProfileCoordinator.js';
 import { WaRetryCoordinator } from './coordinators/WaRetryCoordinator.js';
 import { createStreamControlHandler } from './coordinators/WaStreamControlCoordinator.js';
+import { WaTrustedContactTokenCoordinator } from './coordinators/WaTrustedContactTokenCoordinator.js';
 import { handleDirtyBits, parseDirtyBits } from './dirty.js';
+import { DEVICE_NOTIFICATION_ACTIONS, parseDeviceNotification } from './events/devices.js';
+import { parseIdentityChangeNotification } from './events/identity.js';
+import { parsePrivacyTokenNotification } from './events/privacy-token.js';
 import { buildMediaMessageContent, getMediaConn as getClientMediaConn } from './messages.js';
+import { createDeviceFanoutResolver } from './messaging/fanout.js';
+import { createAppStateSyncKeyProtocol } from './messaging/key-protocol.js';
+import { createGroupParticipantsCache } from './messaging/participants.js';
 import { WaMediaTransferClient } from '../media/WaMediaTransferClient.js';
 import { handleIncomingMessageAck } from '../message/incoming.js';
 import { WaMessageClient } from '../message/WaMessageClient.js';
-import { getWaCompanionPlatformId, WA_DEFAULTS } from '../protocol/constants.js';
+import { getWaCompanionPlatformId, WA_DEFAULTS, WA_DISCONNECT_REASONS, WA_NODE_TAGS, WA_NOTIFICATION_TYPES, WA_PRIVACY_TOKEN_NOTIFICATION_TYPE } from '../protocol/constants.js';
+import { parseSignalAddressFromJid, toUserJid } from '../protocol/jid.js';
+import { createOutboundRetryTracker } from '../retry/tracker.js';
 import { SignalDeviceSyncApi } from '../signal/api/SignalDeviceSyncApi.js';
 import { SignalDigestSyncApi } from '../signal/api/SignalDigestSyncApi.js';
 import { SignalIdentitySyncApi } from '../signal/api/SignalIdentitySyncApi.js';
@@ -19,13 +35,40 @@ import { SignalMissingPreKeysSyncApi } from '../signal/api/SignalMissingPreKeysS
 import { SignalRotateKeyApi } from '../signal/api/SignalRotateKeyApi.js';
 import { SignalSessionSyncApi } from '../signal/api/SignalSessionSyncApi.js';
 import { SenderKeyManager } from '../signal/group/SenderKeyManager.js';
+import { createSignalSessionResolver } from '../signal/session/resolver.js';
 import { SignalProtocol } from '../signal/session/SignalProtocol.js';
 import { WaKeepAlive } from '../transport/keepalive/WaKeepAlive.js';
+import { buildAckNode } from '../transport/node/builders/global.js';
+import { getFirstNodeChild } from '../transport/node/helpers.js';
+import { createUsyncSidGenerator } from '../transport/node/usync.js';
 import { WaNodeOrchestrator } from '../transport/node/WaNodeOrchestrator.js';
 import { WaNodeTransport } from '../transport/node/WaNodeTransport.js';
+import { isProxyTransport, toProxyAgent, toProxyDispatcher } from '../transport/proxy.js';
 import { toError } from '../util/primitives.js';
 import { getRuntimeOsDisplayName } from '../util/runtime.js';
+function assertProxyTransport(value, path) {
+    if (value === undefined) {
+        return;
+    }
+    if (!isProxyTransport(value)) {
+        throw new Error(`${path} must be a proxy transport instance (dispatcher with dispatch(...) or agent with addRequest(...))`);
+    }
+}
+function validateProxyOptions(options) {
+    const rawProxy = options.proxy;
+    if (rawProxy === undefined) {
+        return;
+    }
+    if (typeof rawProxy !== 'object' || rawProxy === null || Array.isArray(rawProxy)) {
+        throw new Error('proxy must be an object with optional ws/mediaUpload/mediaDownload');
+    }
+    const proxy = rawProxy;
+    assertProxyTransport(proxy?.ws, 'proxy.ws');
+    assertProxyTransport(proxy?.mediaUpload, 'proxy.mediaUpload');
+    assertProxyTransport(proxy?.mediaDownload, 'proxy.mediaDownload');
+}
 export function resolveWaClientBase(options, logger) {
+    validateProxyOptions(options);
     const deviceBrowser = options.deviceBrowser ?? WA_DEFAULTS.DEVICE_BROWSER;
     const sessionId = options.sessionId.trim();
     if (sessionId.length === 0) {
@@ -57,79 +100,14 @@ export function resolveWaClientBase(options, logger) {
         sessionStore
     };
 }
-function createAuthClient(input) {
-    const { options, logger, sessionStore, host } = input;
-    return new WaAuthClient({
-        deviceBrowser: options.deviceBrowser,
-        deviceOsDisplayName: options.deviceOsDisplayName,
-        devicePlatform: options.devicePlatform,
-        requireFullSync: options.requireFullSync
-    }, {
-        logger,
-        authStore: sessionStore.auth,
-        signalStore: sessionStore.signal,
-        socket: {
-            sendNode: host.sendNode,
-            query: host.query
-        },
-        callbacks: {
-            onQr: (qr, ttlMs) => host.emitEvent('auth_qr', { qr, ttlMs }),
-            onPairingCode: (code) => host.emitEvent('auth_pairing_code', { code }),
-            onPairingRefresh: (forceManual) => host.emitEvent('auth_pairing_refresh', { forceManual }),
-            onPaired: (credentials) => {
-                host.emitEvent('auth_paired', { credentials });
-                host.scheduleReconnectAfterPairing();
-            },
-            onError: (error) => host.handleError(error)
-        }
-    });
-}
-function createCurrentAuthGetters(authClient) {
-    const getCurrentCredentials = () => authClient.getCurrentCredentials();
-    return {
-        getCurrentCredentials,
-        getCurrentMeJid: () => getCurrentCredentials()?.meJid,
-        getCurrentMeLid: () => getCurrentCredentials()?.meLid,
-        getCurrentSignedIdentity: () => getCurrentCredentials()?.signedIdentity
-    };
-}
-function createIncomingMessageAckOptions(input) {
-    const { logger, host, getCurrentMeJid, signalProtocol, senderKeyManager, retryCoordinator } = input;
-    return {
-        logger,
-        sendNode: host.sendNode,
-        getMeJid: getCurrentMeJid,
-        signalProtocol,
-        senderKeyManager,
-        onDecryptFailure: (context, error) => retryCoordinator.onDecryptFailure(context, error),
-        emitIncomingMessage: (event) => {
-            void host
-                .handleIncomingMessageEvent(event)
-                .catch((err) => host.handleError(toError(err)));
-        },
-        emitUnhandledStanza: (event) => host.emitEvent('stanza_unhandled', event)
-    };
-}
-function createHandleClientDirtyBits(input) {
-    const { logger, host, getCurrentCredentials } = input;
-    return (dirtyBits) => handleDirtyBits({
-        logger,
-        queryWithContext: host.queryWithContext,
-        getCurrentCredentials,
-        syncAppState: host.syncAppState
-    }, dirtyBits);
-}
 function createIncomingNodeRuntime(input) {
-    const { logger, host, authClient, nodeOrchestrator, streamControl, mediaMessageBuildOptions, retryCoordinator, messageDispatch, getCurrentMeJid, handleClientDirtyBits, incomingMessageAckOptions } = input;
+    const { logger, emitEvent, authClient, connectionManager, nodeOrchestrator, streamControl, mediaMessageBuildOptions, retryCoordinator, messageDispatch, sendNode, syncAppState, disconnect, clearStoredCredentials, getCurrentMeJid, handleClientDirtyBits, incomingMessageAckOptions } = input;
     return {
         handleStreamControlResult: streamControl.handleStreamControlResult,
         persistSuccessAttributes: (attributes) => authClient.persistSuccessAttributes(attributes),
-        emitSuccessNode: (node) => host.emitEvent('connection_success', { node }),
-        updateClockSkewFromSuccess: host.updateClockSkewFromSuccess,
-        shouldWarmupMediaConn: () => {
-            const comms = host.getComms();
-            return !!(getCurrentMeJid() && comms && comms.getCommsState().connected);
-        },
+        emitSuccessNode: (node) => emitEvent('connection_success', { node }),
+        updateClockSkewFromSuccess: (serverUnixSeconds) => connectionManager.updateClockSkewFromSuccess(serverUnixSeconds),
+        shouldWarmupMediaConn: () => !!(getCurrentMeJid() && connectionManager.isConnected()),
         warmupMediaConn: async () => {
             await getClientMediaConn(mediaMessageBuildOptions, true);
         },
@@ -140,18 +118,18 @@ function createIncomingNodeRuntime(input) {
         handleLinkCodeNotificationNode: (node) => authClient.handleLinkCodeNotification(node),
         handleCompanionRegRefreshNotificationNode: (node) => authClient.handleCompanionRegRefreshNotification(node),
         handleIncomingMessageNode: (node) => handleIncomingMessageAck(node, incomingMessageAckOptions),
-        sendNode: host.sendNode,
+        sendNode,
         handleIncomingRetryReceipt: (node) => retryCoordinator.handleIncomingRetryReceipt(node),
         trackOutboundReceipt: (node) => retryCoordinator.trackOutboundReceipt(node),
-        emitIncomingReceipt: (event) => host.emitEvent('message_receipt', event),
-        emitIncomingPresence: (event) => host.emitEvent('presence', event),
-        emitIncomingChatstate: (event) => host.emitEvent('chatstate', event),
-        emitIncomingCall: (event) => host.emitEvent('call', event),
-        emitIncomingFailure: (event) => host.emitEvent('failure', event),
-        emitIncomingErrorStanza: (event) => host.emitEvent('stanza_error', event),
-        emitIncomingNotification: (event) => host.emitEvent('notification', event),
+        emitIncomingReceipt: (event) => emitEvent('message_receipt', event),
+        emitIncomingPresence: (event) => emitEvent('presence', event),
+        emitIncomingChatstate: (event) => emitEvent('chatstate', event),
+        emitIncomingCall: (event) => emitEvent('call', event),
+        emitIncomingFailure: (event) => emitEvent('failure', event),
+        emitIncomingErrorStanza: (event) => emitEvent('stanza_error', event),
+        emitIncomingNotification: (event) => emitEvent('notification', event),
         emitGroupEvent: (event) => {
-            host.emitEvent('group_event', event);
+            emitEvent('group_event', event);
             void messageDispatch.mutateParticipantsCacheFromGroupEvent(event).catch((error) => {
                 logger.warn('failed to mutate participants cache from group event', {
                     action: event.action,
@@ -161,29 +139,38 @@ function createIncomingNodeRuntime(input) {
                 });
             });
         },
-        emitUnhandledIncomingNode: (event) => host.emitEvent('stanza_unhandled', event),
-        syncAppState: host.syncAppState,
-        disconnect: host.disconnect,
-        clearStoredCredentials: host.clearStoredState,
+        emitUnhandledIncomingNode: (event) => emitEvent('stanza_unhandled', event),
+        syncAppState,
+        stopComms: () => {
+            void connectionManager.getComms()?.stopComms();
+        },
+        disconnect,
+        clearStoredCredentials,
         parseDirtyBits: (nodes) => parseDirtyBits(nodes, logger),
         handleDirtyBits: (dirtyBits) => handleClientDirtyBits(dirtyBits)
     };
 }
 function createPassiveTasksRuntime(input) {
-    const { host, authClient, nodeOrchestrator, getCurrentCredentials } = input;
+    const { queryWithContext, authClient, nodeOrchestrator, receiptQueue, getCurrentCredentials } = input;
     return {
-        queryWithContext: host.queryWithContext,
+        queryWithContext,
         getCurrentCredentials,
         persistServerHasPreKeys: (serverHasPreKeys) => authClient.persistServerHasPreKeys(serverHasPreKeys),
         sendNodeDirect: (node) => nodeOrchestrator.sendNode(node),
-        takeDanglingReceipts: host.takeDanglingReceipts,
-        requeueDanglingReceipt: host.enqueueDanglingReceipt,
-        shouldQueueDanglingReceipt: host.shouldQueueDanglingReceipt
+        takeDanglingReceipts: () => receiptQueue.take(),
+        requeueDanglingReceipt: (node) => receiptQueue.enqueue(node),
+        shouldQueueDanglingReceipt: (node, error) => receiptQueue.shouldQueue(node, error)
     };
 }
 export function buildWaClientDependencies(input) {
-    const { base, host } = input;
+    const { base, runtime } = input;
     const { options, logger, sessionStore } = base;
+    const receiptQueue = new WaReceiptQueue();
+    const keyShareCoordinator = new WaKeyShareCoordinator();
+    let connectionManager = null;
+    let passiveTasks = null;
+    let mediaConnCacheFallback = null;
+    let scheduleReconnectAfterPairing = () => undefined;
     const nodeTransport = new WaNodeTransport(logger);
     const nodeOrchestrator = new WaNodeOrchestrator({
         sendNode: async (node) => nodeTransport.sendNode(node),
@@ -194,27 +181,39 @@ export function buildWaClientDependencies(input) {
     const keepAlive = new WaKeepAlive({
         logger,
         nodeOrchestrator,
-        getComms: host.getComms,
+        getComms: () => connectionManager?.getComms() ?? null,
         intervalMs: options.keepAliveIntervalMs,
         timeoutMs: options.deadSocketTimeoutMs,
         hostDomain: WA_DEFAULTS.HOST_DOMAIN
     });
     const mediaTransfer = new WaMediaTransferClient({
         logger,
-        defaultTimeoutMs: options.mediaTimeoutMs
+        defaultTimeoutMs: options.mediaTimeoutMs,
+        defaultUploadDispatcher: toProxyDispatcher(options.proxy?.mediaUpload),
+        defaultDownloadDispatcher: toProxyDispatcher(options.proxy?.mediaDownload),
+        defaultUploadAgent: toProxyAgent(options.proxy?.mediaUpload),
+        defaultDownloadAgent: toProxyAgent(options.proxy?.mediaDownload)
     });
     const mediaMessageBuildOptions = {
         logger,
         mediaTransfer,
         iqTimeoutMs: options.iqTimeoutMs,
-        queryWithContext: host.queryWithContext,
-        getMediaConnCache: host.getMediaConnCache,
-        setMediaConnCache: host.setMediaConnCache
+        queryWithContext: runtime.queryWithContext,
+        getMediaConnCache: () => {
+            if (connectionManager) {
+                return connectionManager.getMediaConnCache();
+            }
+            return mediaConnCacheFallback;
+        },
+        setMediaConnCache: (mediaConn) => {
+            mediaConnCacheFallback = mediaConn;
+            connectionManager?.setMediaConnCache(mediaConn);
+        }
     };
     const messageClient = new WaMessageClient({
         logger,
-        sendNode: host.sendNode,
-        query: host.query,
+        sendNode: runtime.sendNode,
+        query: runtime.query,
         defaultAckTimeoutMs: options.messageAckTimeoutMs,
         defaultMaxAttempts: options.messageMaxAttempts,
         defaultRetryDelayMs: options.messageRetryDelayMs
@@ -223,59 +222,156 @@ export function buildWaClientDependencies(input) {
     const signalProtocol = new SignalProtocol(sessionStore.signal, logger);
     const signalDigestSync = new SignalDigestSyncApi({
         logger,
-        query: host.query,
+        query: runtime.query,
         signalStore: sessionStore.signal,
         defaultTimeoutMs: options.signalFetchKeyBundlesTimeoutMs
     });
+    const generateUsyncSid = createUsyncSidGenerator();
     const signalDeviceSync = new SignalDeviceSyncApi({
         logger,
-        query: host.query,
+        query: runtime.query,
         deviceListStore: sessionStore.deviceList,
-        defaultTimeoutMs: options.signalFetchKeyBundlesTimeoutMs
+        defaultTimeoutMs: options.signalFetchKeyBundlesTimeoutMs,
+        generateSid: generateUsyncSid
     });
     const signalIdentitySync = new SignalIdentitySyncApi({
         logger,
-        query: host.query,
+        query: runtime.query,
         signalStore: sessionStore.signal,
         defaultTimeoutMs: options.signalFetchKeyBundlesTimeoutMs
     });
     const signalMissingPreKeysSync = new SignalMissingPreKeysSyncApi({
         logger,
-        query: host.query,
+        query: runtime.query,
         defaultTimeoutMs: options.signalFetchKeyBundlesTimeoutMs
     });
     const signalRotateKey = new SignalRotateKeyApi({
         logger,
-        query: host.query,
+        query: runtime.query,
         signalStore: sessionStore.signal,
         defaultTimeoutMs: options.signalFetchKeyBundlesTimeoutMs
     });
     const signalSessionSync = new SignalSessionSyncApi({
         logger,
-        query: host.query,
+        query: runtime.query,
         defaultTimeoutMs: options.signalFetchKeyBundlesTimeoutMs
     });
-    const authClient = createAuthClient({ options, logger, sessionStore, host });
-    const { getCurrentCredentials, getCurrentMeJid, getCurrentMeLid, getCurrentSignedIdentity } = createCurrentAuthGetters(authClient);
+    const authClient = new WaAuthClient({
+        deviceBrowser: options.deviceBrowser,
+        deviceOsDisplayName: options.deviceOsDisplayName,
+        devicePlatform: options.devicePlatform,
+        requireFullSync: options.requireFullSync,
+        version: options.version
+    }, {
+        logger,
+        authStore: sessionStore.auth,
+        signalStore: sessionStore.signal,
+        socket: {
+            sendNode: runtime.sendNode,
+            query: runtime.query
+        },
+        callbacks: {
+            onQr: (qr, ttlMs) => runtime.emitEvent('auth_qr', { qr, ttlMs }),
+            onPairingCode: (code) => runtime.emitEvent('auth_pairing_code', { code }),
+            onPairingRefresh: (forceManual) => runtime.emitEvent('auth_pairing_refresh', { forceManual }),
+            onPaired: (credentials) => {
+                runtime.emitEvent('auth_paired', { credentials });
+                scheduleReconnectAfterPairing();
+            },
+            onError: (error) => runtime.handleError(error)
+        }
+    });
+    const getCurrentCredentials = authClient.getCurrentCredentials.bind(authClient);
+    const getCurrentMeJid = () => getCurrentCredentials()?.meJid;
+    const getCurrentMeLid = () => getCurrentCredentials()?.meLid;
+    const getCurrentSignedIdentity = () => getCurrentCredentials()?.signedIdentity;
     const groupCoordinator = createGroupCoordinator({
-        queryWithContext: host.queryWithContext
+        queryWithContext: runtime.queryWithContext
     });
-    const messageDispatch = new WaMessageDispatchCoordinator({
-        logger,
-        messageClient,
+    const privacyCoordinator = createPrivacyCoordinator({
+        queryWithContext: runtime.queryWithContext
+    });
+    const profileCoordinator = createProfileCoordinator({
+        queryWithContext: runtime.queryWithContext,
+        generateSid: generateUsyncSid
+    });
+    const businessCoordinator = createBusinessCoordinator({
+        queryWithContext: runtime.queryWithContext
+    });
+    const retryTracker = createOutboundRetryTracker({
         retryStore: sessionStore.retry,
+        logger
+    });
+    const sessionResolver = createSignalSessionResolver({
+        signalProtocol,
+        signalStore: sessionStore.signal,
+        signalIdentitySync,
+        signalSessionSync,
+        logger
+    });
+    const fanoutResolver = createDeviceFanoutResolver({
+        signalDeviceSync,
+        getCurrentMeJid,
+        getCurrentMeLid,
+        logger
+    });
+    const participantsCache = createGroupParticipantsCache({
         participantsStore: sessionStore.participants,
+        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({
+        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 = createAppStateSyncKeyProtocol({
+        publishSignalMessage: (signalInput, publishOptions) => messageDispatch.publishSignalMessage(signalInput, publishOptions),
+        fanoutResolver,
+        getCurrentMeJid,
+        getCurrentMeLid,
+        logger
+    });
+    messageDispatch = new WaMessageDispatchCoordinator({
+        logger,
+        messageClient,
+        retryTracker,
+        sessionResolver,
+        fanoutResolver,
+        participantsCache,
+        appStateSyncKeyProtocol,
         buildMessageContent: async (content) => buildMediaMessageContent(mediaMessageBuildOptions, content),
-        queryGroupParticipantJids: async (groupJid) => (await groupCoordinator.queryGroupMetadata(groupJid)).participants.map((participant) => participant.jid),
         senderKeyManager,
         signalProtocol,
         signalStore: sessionStore.signal,
-        signalDeviceSync,
-        signalIdentitySync,
-        signalSessionSync,
+        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: toError(err).message
+            }));
+        }
     });
     const retryCoordinator = new WaRetryCoordinator({
         logger,
@@ -286,67 +382,330 @@ export function buildWaClientDependencies(input) {
         signalDeviceSync,
         signalMissingPreKeysSync,
         messageClient,
-        sendNode: host.sendNode,
+        sendNode: runtime.sendNode,
         getCurrentMeJid,
         getCurrentMeLid,
         getCurrentSignedIdentity
     });
     const appStateSync = new WaAppStateSyncClient({
         logger,
-        query: host.query,
+        query: runtime.query,
+        getCurrentMeJid,
         defaultTimeoutMs: options.appStateSyncTimeoutMs,
         store: sessionStore.appState,
         onMissingKeys: async ({ keyIds }) => {
             await messageDispatch.requestAppStateSyncKeys(keyIds);
         }
     });
+    const appStateMutations = new WaAppStateMutationCoordinator({
+        logger,
+        messageStore: sessionStore.messages,
+        syncAppState: runtime.syncAppStateWithOptions
+    });
+    connectionManager = new WaConnectionManager({
+        logger,
+        options,
+        authClient,
+        keepAlive,
+        nodeOrchestrator,
+        nodeTransport,
+        getPassiveTasks: () => passiveTasks,
+        clearStoredCredentials: runtime.clearStoredState
+    });
+    if (mediaConnCacheFallback !== null) {
+        connectionManager.setMediaConnCache(mediaConnCacheFallback);
+    }
+    scheduleReconnectAfterPairing = () => connectionManager?.scheduleReconnectAfterPairing();
+    const disconnectWithClientSideEffects = async (reason, isLogout, code) => {
+        keyShareCoordinator.notifyDisconnected();
+        await connectionManager?.disconnect();
+        runtime.emitEvent('connection', {
+            status: 'close',
+            reason,
+            code,
+            isLogout,
+            isNewLogin: false
+        });
+    };
+    const connectWithClientSideEffects = async (reason) => {
+        runtime.resumeIncomingEvents();
+        await connectionManager?.connect(runtime.handleIncomingFrame);
+        runtime.emitEvent('connection', {
+            status: 'open',
+            reason,
+            code: null,
+            isLogout: false,
+            isNewLogin: connectionManager?.wasNewLogin() ?? false
+        });
+    };
+    const clearStoredCredentialsWithClientSideEffects = async () => {
+        await connectionManager?.clearStoredCredentials();
+    };
     const streamControl = createStreamControlHandler({
         logger,
-        getComms: host.getComms,
+        getComms: () => connectionManager?.getComms() ?? null,
         clearPendingQueries: (error) => nodeOrchestrator.clearPending(error),
-        clearMediaConnCache: () => host.setMediaConnCache(null),
-        disconnect: host.disconnect,
-        clearStoredCredentials: host.clearStoredState,
-        connect: host.connect
+        clearMediaConnCache: () => {
+            mediaConnCacheFallback = null;
+            connectionManager?.setMediaConnCache(null);
+        },
+        disconnect: disconnectWithClientSideEffects,
+        clearStoredCredentials: clearStoredCredentialsWithClientSideEffects,
+        connect: connectWithClientSideEffects
     });
-    const incomingMessageAckOptions = createIncomingMessageAckOptions({
+    const incomingMessageAckOptions = {
         logger,
-        host,
-        getCurrentMeJid,
+        sendNode: runtime.sendNode,
+        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(toError(err)));
+        },
+        emitUnhandledStanza: (event) => runtime.emitEvent('stanza_unhandled', event)
+    };
+    const handleClientDirtyBits = (dirtyBits) => handleDirtyBits({
         logger,
-        host,
-        getCurrentCredentials
-    });
+        queryWithContext: runtime.queryWithContext,
+        getCurrentCredentials,
+        syncAppState: runtime.syncAppState,
+        generateUsyncSid
+    }, dirtyBits);
     const incomingNode = new WaIncomingNodeCoordinator({
         logger,
         runtime: createIncomingNodeRuntime({
             logger,
-            host,
+            emitEvent: runtime.emitEvent,
             authClient,
+            connectionManager,
             nodeOrchestrator,
             streamControl,
             mediaMessageBuildOptions,
             retryCoordinator,
             messageDispatch,
+            sendNode: runtime.sendNode,
+            syncAppState: runtime.syncAppState,
+            disconnect: disconnectWithClientSideEffects,
+            clearStoredCredentials: clearStoredCredentialsWithClientSideEffects,
             getCurrentMeJid,
             handleClientDirtyBits,
             incomingMessageAckOptions
         })
     });
-    const passiveTasks = new WaPassiveTasksCoordinator({
+    incomingNode.registerIncomingHandler({
+        tag: WA_NODE_TAGS.NOTIFICATION,
+        subtype: WA_NOTIFICATION_TYPES.ENCRYPT,
+        prepend: true,
+        handler: async (node) => {
+            const firstChild = getFirstNodeChild(node);
+            if (!firstChild) {
+                return false;
+            }
+            const childTag = firstChild.tag;
+            // <count value="N"/> — server prekeys running low
+            if (childTag === 'count') {
+                const ackNode = 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: toError(error).message
+                    });
+                });
+                return true;
+            }
+            // <digest/> — digest key sync
+            if (childTag === 'digest') {
+                const ackNode = 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: toError(error).message
+                    });
+                });
+                return true;
+            }
+            // <identity/> — contact identity key changed
+            if (childTag === 'identity') {
+                const parsed = parseIdentityChangeNotification(node);
+                if (!parsed) {
+                    return false;
+                }
+                const ackNode = buildAckNode({
+                    kind: 'notification',
+                    node,
+                    includeType: false
+                });
+                await runtime.sendNode(ackNode);
+                const address = 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 = toUserJid(meJid);
+                    const fromUser = toUserJid(parsed.fromJid);
+                    if (meUser === fromUser) {
+                        logger.error('self primary identity changed, disconnecting');
+                        void connectionManager?.getComms()?.stopComms();
+                        await disconnectWithClientSideEffects(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 = toUserJid(parsed.fromJid);
+                    await trustedContactToken.reissueOnIdentityChange(userJid).catch((error) => {
+                        logger.warn('identity-change: reissue tc token failed', {
+                            message: 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: WA_NODE_TAGS.NOTIFICATION,
+        subtype: WA_NOTIFICATION_TYPES.DEVICES,
+        prepend: true,
+        handler: async (node) => {
+            const parsed = parseDeviceNotification(node);
+            if (!parsed) {
+                return false;
+            }
+            const ackNode = buildAckNode({
+                kind: 'notification',
+                node,
+                includeType: false
+            });
+            await runtime.sendNode(ackNode);
+            const userJid = toUserJid(parsed.fromJid);
+            if (parsed.action === DEVICE_NOTIFICATION_ACTIONS.REMOVE) {
+                const baseAddress = 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: 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: toError(error).message
+                    });
+                });
+            }
+            // for update notifications, re-sync immediately
+            if (parsed.action === DEVICE_NOTIFICATION_ACTIONS.UPDATE) {
+                signalDeviceSync.syncDeviceList([userJid]).catch((error) => {
+                    logger.warn('devices-notification: sync device list failed', {
+                        message: 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: WA_NODE_TAGS.NOTIFICATION,
+        subtype: 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 = parsePrivacyTokenNotification(node);
+            if (tokens.length === 0) {
+                return false;
+            }
+            await trustedContactToken.handleIncomingToken(fromJid, tokens);
+            const ackNode = buildAckNode({
+                kind: 'notification',
+                node,
+                typeOverride: WA_PRIVACY_TOKEN_NOTIFICATION_TYPE
+            });
+            await runtime.sendNode(ackNode);
+            return true;
+        }
+    });
+    passiveTasks = new WaPassiveTasksCoordinator({
         logger,
         signalStore: sessionStore.signal,
         signalDigestSync,
         signalRotateKey,
         runtime: createPassiveTasksRuntime({
-            host,
+            queryWithContext: runtime.queryWithContext,
             authClient,
             nodeOrchestrator,
+            receiptQueue,
             getCurrentCredentials
         })
     });
@@ -369,9 +728,17 @@ export function buildWaClientDependencies(input) {
         messageDispatch,
         retryCoordinator,
         appStateSync,
+        chatCoordinator: appStateMutations,
         streamControl,
         incomingNode,
         passiveTasks,
-        groupCoordinator
+        groupCoordinator,
+        privacyCoordinator,
+        profileCoordinator,
+        businessCoordinator,
+        receiptQueue,
+        keyShareCoordinator,
+        connectionManager,
+        trustedContactToken
     };
 }