zapo-js 0.1.1 → 0.2.0

package/dist/appstate/WaAppStateSyncResponseParser.js

@@ -12,6 +12,12 @@ function parseSyncResponse(iqNode) {
     }
     const syncNode = (0, helpers_1.findNodeChild)(iqNode, constants_1.WA_NODE_TAGS.SYNC);
     if (!syncNode) {
+        if (iqNode.attrs.type === constants_1.WA_IQ_TYPES.ERROR) {
+            const errorNode = (0, helpers_1.findNodeChild)(iqNode, constants_1.WA_NODE_TAGS.ERROR);
+            const code = errorNode?.attrs.code ?? 'unknown';
+            const text = errorNode?.attrs.text ?? 'unknown';
+            throw new Error(`sync iq failed (${code}: ${text})`);
+        }
         throw new Error('sync response is missing <sync> node');
     }
     const payloads = [];
@@ -30,11 +36,16 @@ function parseSyncResponse(iqNode) {
             }
             version = parsedVersion;
         }
-        const patchesNode = (0, helpers_1.findNodeChild)(collectionNode, constants_1.WA_NODE_TAGS.PATCHES);
-        const patches = patchesNode
-            ? (0, helpers_1.getNodeChildrenByTag)(patchesNode, constants_1.WA_NODE_TAGS.PATCH).map((node) => _proto_1.proto.SyncdPatch.decode((0, helpers_1.decodeNodeContentBase64OrBytes)(node.content, 'collection.patches.patch')))
-            : [];
-        const snapshotNode = (0, helpers_1.findNodeChild)(collectionNode, constants_1.WA_NODE_TAGS.SNAPSHOT);
+        const [patchesNode, snapshotNode] = (0, helpers_1.findNodeChildrenByTags)(collectionNode, [
+            constants_1.WA_NODE_TAGS.PATCHES,
+            constants_1.WA_NODE_TAGS.SNAPSHOT
+        ]);
+        const patches = [];
+        if (patchesNode) {
+            for (const patchNode of (0, helpers_1.getNodeChildrenByTag)(patchesNode, constants_1.WA_NODE_TAGS.PATCH)) {
+                patches.push(_proto_1.proto.SyncdPatch.decode((0, helpers_1.decodeNodeContentBase64OrBytes)(patchNode.content, 'collection.patches.patch')));
+            }
+        }
         const snapshotReference = snapshotNode
             ? _proto_1.proto.ExternalBlobReference.decode((0, helpers_1.decodeNodeContentBase64OrBytes)(snapshotNode.content, 'collection.snapshot'))
             : undefined;

package/dist/appstate/constants.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.APP_STATE_DEFAULT_COLLECTIONS = exports.APP_STATE_EMPTY_LT_HASH = exports.APP_STATE_POINT_SIZE = exports.APP_STATE_LT_HASH_SIZE = exports.APP_STATE_IV_LENGTH = exports.APP_STATE_MAC_OCTET_LENGTH = exports.APP_STATE_VALUE_MAC_LENGTH = exports.APP_STATE_DERIVED_PATCH_MAC_KEY_END = exports.APP_STATE_DERIVED_SNAPSHOT_MAC_KEY_END = exports.APP_STATE_DERIVED_VALUE_MAC_KEY_END = exports.APP_STATE_DERIVED_VALUE_ENCRYPTION_KEY_END = exports.APP_STATE_DERIVED_INDEX_KEY_END = exports.APP_STATE_DERIVED_KEY_LENGTH = void 0;
+exports.APP_STATE_DEFAULT_COLLECTIONS = exports.APP_STATE_DEFAULT_COLLECTION_VERSION = exports.APP_STATE_EMPTY_LT_HASH = exports.APP_STATE_POINT_SIZE = exports.APP_STATE_LT_HASH_SIZE = exports.APP_STATE_IV_LENGTH = exports.APP_STATE_MAC_OCTET_LENGTH = exports.APP_STATE_VALUE_MAC_LENGTH = exports.APP_STATE_DERIVED_PATCH_MAC_KEY_END = exports.APP_STATE_DERIVED_SNAPSHOT_MAC_KEY_END = exports.APP_STATE_DERIVED_VALUE_MAC_KEY_END = exports.APP_STATE_DERIVED_VALUE_ENCRYPTION_KEY_END = exports.APP_STATE_DERIVED_INDEX_KEY_END = exports.APP_STATE_DERIVED_KEY_LENGTH = void 0;
 const constants_1 = require("../protocol/constants");
 exports.APP_STATE_DERIVED_KEY_LENGTH = 160;
 exports.APP_STATE_DERIVED_INDEX_KEY_END = 32;
@@ -14,10 +14,11 @@ exports.APP_STATE_IV_LENGTH = 16;
 exports.APP_STATE_LT_HASH_SIZE = 128;
 exports.APP_STATE_POINT_SIZE = 2;
 exports.APP_STATE_EMPTY_LT_HASH = new Uint8Array(exports.APP_STATE_LT_HASH_SIZE);
-exports.APP_STATE_DEFAULT_COLLECTIONS = [
+exports.APP_STATE_DEFAULT_COLLECTION_VERSION = 0;
+exports.APP_STATE_DEFAULT_COLLECTIONS = Object.freeze([
     constants_1.WA_APP_STATE_COLLECTIONS.CRITICAL_UNBLOCK_LOW,
     constants_1.WA_APP_STATE_COLLECTIONS.CRITICAL_BLOCK,
     constants_1.WA_APP_STATE_COLLECTIONS.REGULAR_LOW,
     constants_1.WA_APP_STATE_COLLECTIONS.REGULAR,
     constants_1.WA_APP_STATE_COLLECTIONS.REGULAR_HIGH
-];
+]);

package/dist/appstate/{store/sqlite.js → encoding.js}

@@ -4,8 +4,8 @@ exports.encodeAppStateFingerprint = encodeAppStateFingerprint;
 exports.decodeAppStateFingerprint = decodeAppStateFingerprint;
 exports.decodeAppStateSyncKeys = decodeAppStateSyncKeys;
 exports.decodeAppStateCollections = decodeAppStateCollections;
-const _proto_1 = require("../../proto.js");
-const coercion_1 = require("../../util/coercion");
+const _proto_1 = require("../proto.js");
+const coercion_1 = require("../util/coercion");
 function encodeAppStateFingerprint(fingerprint) {
     if (!fingerprint) {
         return null;
@@ -26,12 +26,17 @@ function decodeAppStateFingerprint(raw) {
     }
 }
 function decodeAppStateSyncKeys(rows) {
-    return rows.map((row) => ({
-        keyId: (0, coercion_1.asBytes)(row.key_id, 'appstate_sync_keys.key_id'),
-        keyData: (0, coercion_1.asBytes)(row.key_data, 'appstate_sync_keys.key_data'),
-        timestamp: (0, coercion_1.asNumber)(row.timestamp, 'appstate_sync_keys.timestamp'),
-        fingerprint: decodeAppStateFingerprint(row.fingerprint)
-    }));
+    const decoded = new Array(rows.length);
+    for (let i = 0; i < rows.length; i += 1) {
+        const row = rows[i];
+        decoded[i] = {
+            keyId: (0, coercion_1.asBytes)(row.key_id, 'appstate_sync_keys.key_id'),
+            keyData: (0, coercion_1.asBytes)(row.key_data, 'appstate_sync_keys.key_data'),
+            timestamp: (0, coercion_1.asNumber)(row.timestamp, 'appstate_sync_keys.timestamp'),
+            fingerprint: decodeAppStateFingerprint(row.fingerprint)
+        };
+    }
+    return decoded;
 }
 function decodeAppStateCollections(versionRows, valueRows) {
     const valueMapByCollection = new Map();

package/dist/appstate/index.js

@@ -14,15 +14,17 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.WaAppStateSyncClient = exports.parseSyncResponse = exports.parseCollectionState = exports.WaAppStateMissingKeyError = exports.WaAppStateCrypto = void 0;
+exports.WaAppStateSyncClient = exports.parseSyncResponse = exports.WaAppStateCrypto = exports.decodeAppStateSyncKeys = exports.decodeAppStateCollections = exports.decodeAppStateFingerprint = exports.encodeAppStateFingerprint = void 0;
 __exportStar(require("./constants"), exports);
+var encoding_1 = require("./encoding");
+Object.defineProperty(exports, "encodeAppStateFingerprint", { enumerable: true, get: function () { return encoding_1.encodeAppStateFingerprint; } });
+Object.defineProperty(exports, "decodeAppStateFingerprint", { enumerable: true, get: function () { return encoding_1.decodeAppStateFingerprint; } });
+Object.defineProperty(exports, "decodeAppStateCollections", { enumerable: true, get: function () { return encoding_1.decodeAppStateCollections; } });
+Object.defineProperty(exports, "decodeAppStateSyncKeys", { enumerable: true, get: function () { return encoding_1.decodeAppStateSyncKeys; } });
 __exportStar(require("./utils"), exports);
 var WaAppStateCrypto_1 = require("./WaAppStateCrypto");
 Object.defineProperty(exports, "WaAppStateCrypto", { enumerable: true, get: function () { return WaAppStateCrypto_1.WaAppStateCrypto; } });
-var WaAppStateSyncClient_1 = require("./WaAppStateSyncClient");
-Object.defineProperty(exports, "WaAppStateMissingKeyError", { enumerable: true, get: function () { return WaAppStateSyncClient_1.WaAppStateMissingKeyError; } });
 var WaAppStateSyncResponseParser_1 = require("./WaAppStateSyncResponseParser");
-Object.defineProperty(exports, "parseCollectionState", { enumerable: true, get: function () { return WaAppStateSyncResponseParser_1.parseCollectionState; } });
 Object.defineProperty(exports, "parseSyncResponse", { enumerable: true, get: function () { return WaAppStateSyncResponseParser_1.parseSyncResponse; } });
-var WaAppStateSyncClient_2 = require("./WaAppStateSyncClient");
-Object.defineProperty(exports, "WaAppStateSyncClient", { enumerable: true, get: function () { return WaAppStateSyncClient_2.WaAppStateSyncClient; } });
+var WaAppStateSyncClient_1 = require("./WaAppStateSyncClient");
+Object.defineProperty(exports, "WaAppStateSyncClient", { enumerable: true, get: function () { return WaAppStateSyncClient_1.WaAppStateSyncClient; } });

package/dist/appstate/utils.js

@@ -1,40 +1,22 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.keyIdToHex = keyIdToHex;
 exports.parseCollectionName = parseCollectionName;
-exports.keyDeviceId = keyDeviceId;
 exports.keyEpoch = keyEpoch;
 exports.pickActiveSyncKey = pickActiveSyncKey;
-exports.toNetworkOrder64 = toNetworkOrder64;
 exports.downloadExternalBlobReference = downloadExternalBlobReference;
 const constants_1 = require("../protocol/constants");
-const base64_1 = require("../util/base64");
 const bytes_1 = require("../util/bytes");
-function keyIdToHex(keyId) {
-    return (0, bytes_1.bytesToHex)(keyId);
-}
+const APP_STATE_COLLECTION_NAMES = new Set(Object.values(constants_1.WA_APP_STATE_COLLECTIONS));
 function parseCollectionName(value) {
-    if (!value) {
-        return null;
-    }
-    for (const collection of Object.values(constants_1.WA_APP_STATE_COLLECTIONS)) {
-        if (collection === value) {
-            return collection;
-        }
-    }
-    return null;
+    return value && APP_STATE_COLLECTION_NAMES.has(value) ? value : null;
 }
 function keyDeviceId(keyId) {
-    if (keyId.byteLength < 6) {
-        return null;
-    }
-    return (keyId[0] << 8) | keyId[1];
+    return keyId.byteLength < 6 ? null : (keyId[0] << 8) | keyId[1];
 }
 function keyEpoch(keyId) {
-    if (keyId.byteLength < 6) {
-        return -1;
-    }
-    return new DataView(keyId.buffer, keyId.byteOffset, keyId.byteLength).getUint32(2, false);
+    return keyId.byteLength < 6
+        ? -1
+        : keyId[2] * 16777216 + keyId[3] * 65536 + keyId[4] * 256 + keyId[5];
 }
 function pickActiveSyncKey(keys) {
     let active = null;
@@ -60,20 +42,13 @@ function pickActiveSyncKey(keys) {
     }
     return active;
 }
-function toNetworkOrder64(value) {
-    const out = new Uint8Array(8);
-    const view = new DataView(out.buffer);
-    view.setUint32(0, Math.floor(value / 4294967296), false);
-    view.setUint32(4, value >>> 0, false);
-    return out;
-}
 async function downloadExternalBlobReference(mediaTransfer, reference) {
     if (!reference.directPath) {
         throw new Error('external blob reference is missing directPath');
     }
-    const mediaKey = (0, base64_1.decodeProtoBytes)(reference.mediaKey, 'external blob mediaKey');
-    const fileSha256 = (0, base64_1.decodeProtoBytes)(reference.fileSha256, 'external blob fileSha256');
-    const fileEncSha256 = (0, base64_1.decodeProtoBytes)(reference.fileEncSha256, 'external blob fileEncSha256');
+    const mediaKey = (0, bytes_1.decodeProtoBytes)(reference.mediaKey, 'external blob mediaKey');
+    const fileSha256 = (0, bytes_1.decodeProtoBytes)(reference.fileSha256, 'external blob fileSha256');
+    const fileEncSha256 = (0, bytes_1.decodeProtoBytes)(reference.fileEncSha256, 'external blob fileEncSha256');
     return mediaTransfer.downloadAndDecrypt({
         directPath: reference.directPath,
         mediaType: constants_1.WA_APP_STATE_KEY_TYPES.MD_APP_STATE,

package/dist/auth/WaAuthClient.js

@@ -70,7 +70,7 @@ class WaAuthClient {
                 signalStore: this.signalStore
             });
             this.logger.info('auth client credentials ready', {
-                registered: this.credentials.meJid !== null && this.credentials.meJid !== undefined
+                registered: this.credentials?.meJid !== null && this.credentials?.meJid !== undefined
             });
             return this.credentials;
         });
@@ -80,7 +80,8 @@ class WaAuthClient {
         return (0, WaAuthCredentialsFlow_1.buildCommsConfig)(this.logger, this.requireCredentials(), socketOptions, {
             deviceBrowser: this.options.deviceBrowser,
             deviceOsDisplayName: this.options.deviceOsDisplayName,
-            requireFullSync: this.options.requireFullSync
+            requireFullSync: this.options.requireFullSync,
+            version: this.options.version
         });
     }
     async clearTransientState() {
@@ -90,9 +91,8 @@ class WaAuthClient {
     }
     async clearStoredCredentials() {
         this.logger.warn('auth client clearing stored credentials');
-        await this.authStore.clear();
         this.credentials = null;
-        await this.clearTransientState();
+        await Promise.all([this.authStore.clear(), this.clearTransientState()]);
     }
     async persistServerStaticKey(serverStaticKey) {
         this.logger.debug('persisting server static key', {
@@ -144,51 +144,39 @@ class WaAuthClient {
             }
         });
     }
-    async persistMeLid(meLid) {
-        await this.persistSuccessAttributes({
-            meLid
-        });
-    }
     async persistSuccessAttributes(attributes) {
-        let changes = {};
-        await this.patchCredentials((credentials) => {
-            const nextMeLid = attributes.meLid ?? credentials.meLid;
-            const nextMeDisplayName = attributes.meDisplayName ?? credentials.meDisplayName;
-            const nextCompanionEncStatic = attributes.companionEncStatic ?? credentials.companionEncStatic;
-            const nextLastSuccessTs = attributes.lastSuccessTs ?? credentials.lastSuccessTs;
-            const nextPropsVersion = attributes.propsVersion ?? credentials.propsVersion;
-            const nextAbPropsVersion = attributes.abPropsVersion ?? credentials.abPropsVersion;
-            const nextConnectionLocation = attributes.connectionLocation ?? credentials.connectionLocation;
-            const nextAccountCreationTs = attributes.accountCreationTs ?? credentials.accountCreationTs;
-            changes = {
-                lidChanged: nextMeLid !== credentials.meLid,
-                displayNameChanged: nextMeDisplayName !== credentials.meDisplayName,
-                companionChanged: (credentials.companionEncStatic === undefined) !==
-                    (nextCompanionEncStatic === undefined) ||
-                    (credentials.companionEncStatic !== undefined &&
-                        nextCompanionEncStatic !== undefined &&
-                        !(0, bytes_1.uint8Equal)(credentials.companionEncStatic, nextCompanionEncStatic)),
-                lastSuccessTsChanged: nextLastSuccessTs !== credentials.lastSuccessTs,
-                propsVersionChanged: nextPropsVersion !== credentials.propsVersion,
-                abPropsVersionChanged: nextAbPropsVersion !== credentials.abPropsVersion,
-                connectionLocationChanged: nextConnectionLocation !== credentials.connectionLocation,
-                accountCreationTsChanged: nextAccountCreationTs !== credentials.accountCreationTs
-            };
-            return {
-                ...credentials,
-                meLid: nextMeLid,
-                meDisplayName: nextMeDisplayName,
-                companionEncStatic: nextCompanionEncStatic,
-                lastSuccessTs: nextLastSuccessTs,
-                propsVersion: nextPropsVersion,
-                abPropsVersion: nextAbPropsVersion,
-                connectionLocation: nextConnectionLocation,
-                accountCreationTs: nextAccountCreationTs
-            };
-        }, {
-            shouldPersist: () => Object.values(changes).some(Boolean),
+        let persistDiff;
+        const computeDiff = (current, next) => ({
+            lidChanged: next.meLid !== current.meLid,
+            displayNameChanged: next.meDisplayName !== current.meDisplayName,
+            companionChanged: (current.companionEncStatic === undefined) !==
+                (next.companionEncStatic === undefined) ||
+                (current.companionEncStatic !== undefined &&
+                    next.companionEncStatic !== undefined &&
+                    !(0, bytes_1.uint8Equal)(current.companionEncStatic, next.companionEncStatic)),
+            lastSuccessTsChanged: next.lastSuccessTs !== current.lastSuccessTs,
+            propsVersionChanged: next.propsVersion !== current.propsVersion,
+            abPropsVersionChanged: next.abPropsVersion !== current.abPropsVersion,
+            connectionLocationChanged: next.connectionLocation !== current.connectionLocation,
+            accountCreationTsChanged: next.accountCreationTs !== current.accountCreationTs
+        });
+        await this.patchCredentials((credentials) => ({
+            ...credentials,
+            meLid: attributes.meLid ?? credentials.meLid,
+            meDisplayName: attributes.meDisplayName ?? credentials.meDisplayName,
+            companionEncStatic: attributes.companionEncStatic ?? credentials.companionEncStatic,
+            lastSuccessTs: attributes.lastSuccessTs ?? credentials.lastSuccessTs,
+            propsVersion: attributes.propsVersion ?? credentials.propsVersion,
+            abPropsVersion: attributes.abPropsVersion ?? credentials.abPropsVersion,
+            connectionLocation: attributes.connectionLocation ?? credentials.connectionLocation,
+            accountCreationTs: attributes.accountCreationTs ?? credentials.accountCreationTs
+        }), {
+            shouldPersist: (current, next) => {
+                persistDiff = computeDiff(current, next);
+                return Object.values(persistDiff).some(Boolean);
+            },
             onPersist: () => {
-                this.logger.debug('persisting success attributes', changes);
+                this.logger.debug('persisting success attributes', persistDiff);
             }
         });
     }
@@ -203,24 +191,18 @@ class WaAuthClient {
         return this.runHandled(() => this.pairingFlow.fetchPairingCountryCodeIso());
     }
     async handleIncomingIqSet(node) {
-        return this.runHandled(async () => {
-            this.logger.trace('auth client handleIncomingIqSet', { id: node.attrs.id });
-            return this.pairingFlow.handleIncomingIqSet(node);
-        });
+        this.logger.trace('auth client handleIncomingIqSet', { id: node.attrs.id });
+        return this.runHandled(() => this.pairingFlow.handleIncomingIqSet(node));
     }
     async handleLinkCodeNotification(node) {
-        return this.runHandled(async () => {
-            this.logger.trace('auth client handleLinkCodeNotification', { id: node.attrs.id });
-            return this.pairingFlow.handleLinkCodeNotification(node);
-        });
+        this.logger.trace('auth client handleLinkCodeNotification', { id: node.attrs.id });
+        return this.runHandled(() => this.pairingFlow.handleLinkCodeNotification(node));
     }
     async handleCompanionRegRefreshNotification(node) {
-        return this.runHandled(async () => {
-            this.logger.trace('auth client handleCompanionRegRefreshNotification', {
-                id: node.attrs.id
-            });
-            return this.pairingFlow.handleCompanionRegRefreshNotification(node);
+        this.logger.trace('auth client handleCompanionRegRefreshNotification', {
+            id: node.attrs.id
         });
+        return this.runHandled(() => this.pairingFlow.handleCompanionRegRefreshNotification(node));
     }
     async patchCredentials(buildNext, options = {}) {
         const current = this.requireCredentials();
@@ -243,7 +225,7 @@ class WaAuthClient {
     }
     async updateCredentials(credentials) {
         this.logger.trace('auth client update credentials', {
-            registered: credentials.meJid !== null && credentials.meJid !== undefined
+            registered: credentials?.meJid !== null && credentials?.meJid !== undefined
         });
         this.credentials = credentials;
         await (0, WaAuthCredentialsFlow_1.persistCredentials)({

package/dist/auth/flow/WaAuthCredentialsFlow.js

@@ -9,12 +9,13 @@ const X25519_1 = require("../../crypto/curves/X25519");
 const jid_1 = require("../../protocol/jid");
 const WaAdvSignature_1 = require("../../signal/crypto/WaAdvSignature");
 const utils_1 = require("../../signal/registration/utils");
+const proxy_1 = require("../../transport/proxy");
 const primitives_1 = require("../../util/primitives");
 async function loadOrCreateCredentials(args) {
     args.logger.trace('auth credentials loadOrCreate start');
     const existing = await args.authStore.load();
     if (!existing) {
-        const credentials = await createAndPersistFreshCredentials(args);
+        const credentials = await createFreshAndPersistCredentials(args);
         args.logger.info('created fresh auth credentials');
         return credentials;
     }
@@ -24,7 +25,7 @@ async function loadOrCreateCredentials(args) {
     });
     if (!existing.meJid && !(await hasValidSignedPreKey(args.logger, existing))) {
         args.logger.warn('signed pre-key is invalid, regenerating credentials');
-        const fresh = await createAndPersistFreshCredentials(args);
+        const fresh = await createFreshAndPersistCredentials(args);
         args.logger.info('regenerated credentials due to invalid signed pre-key');
         return fresh;
     }
@@ -39,8 +40,10 @@ async function persistCredentials(args, credentials) {
     await args.authStore.save(credentials);
 }
 function buildCommsConfig(logger, credentials, socketOptions, clientOptions) {
-    const registered = credentials.meJid !== null && credentials.meJid !== undefined;
-    const loginIdentity = registered ? (0, jid_1.getLoginIdentity)(credentials.meJid) : null;
+    const meJid = credentials.meJid;
+    const registered = meJid !== null && meJid !== undefined;
+    const loginIdentity = registered ? (0, jid_1.getLoginIdentity)(meJid) : null;
+    const wsProxy = socketOptions.proxy?.ws;
     logger.debug('building comms config from credentials', {
         registered,
         hasServerStaticKey: credentials.serverStaticKey !== null && credentials.serverStaticKey !== undefined
@@ -49,6 +52,8 @@ function buildCommsConfig(logger, credentials, socketOptions, clientOptions) {
         url: socketOptions.url,
         urls: socketOptions.urls,
         protocols: socketOptions.protocols,
+        dispatcher: (0, proxy_1.toProxyDispatcher)(wsProxy),
+        agent: (0, proxy_1.toProxyAgent)(wsProxy),
         connectTimeoutMs: socketOptions.connectTimeoutMs,
         reconnectIntervalMs: socketOptions.reconnectIntervalMs,
         timeoutIntervalMs: socketOptions.timeoutIntervalMs,
@@ -63,7 +68,8 @@ function buildCommsConfig(logger, credentials, socketOptions, clientOptions) {
                     username: loginIdentity.username,
                     device: loginIdentity.device,
                     deviceBrowser: clientOptions.deviceBrowser,
-                    deviceOsDisplayName: clientOptions.deviceOsDisplayName
+                    deviceOsDisplayName: clientOptions.deviceOsDisplayName,
+                    versionBase: clientOptions.version
                 }
                 : undefined,
             registrationPayloadConfig: !loginIdentity
@@ -72,7 +78,8 @@ function buildCommsConfig(logger, credentials, socketOptions, clientOptions) {
                     signedPreKey: credentials.signedPreKey,
                     deviceBrowser: clientOptions.deviceBrowser,
                     deviceOsDisplayName: clientOptions.deviceOsDisplayName,
-                    requireFullSync: clientOptions.requireFullSync
+                    requireFullSync: clientOptions.requireFullSync,
+                    versionBase: clientOptions.version
                 }
                 : undefined
         }
@@ -93,9 +100,11 @@ async function createFreshCredentials(signalStore, logger) {
         advSecretKey
     };
 }
-async function createAndPersistFreshCredentials(args) {
+async function createFreshAndPersistCredentials(args) {
     const credentials = await createFreshCredentials(args.signalStore, args.logger);
-    await persistFreshCredentials(args, credentials);
+    // Persist credentials first so signal restore never commits state for credentials that failed to save.
+    await args.authStore.save(credentials);
+    await restoreSignalStore(args.signalStore, credentials);
     return credentials;
 }
 async function hasValidSignedPreKey(logger, credentials) {
@@ -113,11 +122,9 @@ async function hasValidSignedPreKey(logger, credentials) {
     }
 }
 async function restoreSignalStore(signalStore, credentials) {
-    await signalStore.setRegistrationInfo(credentials.registrationInfo);
-    await signalStore.setSignedPreKey(credentials.signedPreKey);
-    await signalStore.setServerHasPreKeys(credentials.serverHasPreKeys === true);
-}
-async function persistFreshCredentials(args, credentials) {
-    await args.authStore.save(credentials);
-    await restoreSignalStore(args.signalStore, credentials);
+    await Promise.all([
+        signalStore.setRegistrationInfo(credentials.registrationInfo),
+        signalStore.setSignedPreKey(credentials.signedPreKey),
+        signalStore.setServerHasPreKeys(credentials.serverHasPreKeys === true)
+    ]);
 }

package/dist/auth/index.js

@@ -14,14 +14,7 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.WaAuthSqliteStore = exports.createCompanionHello = exports.completeCompanionFinish = exports.WaAuthClient = exports.getLoginIdentity = void 0;
+exports.WaAuthClient = void 0;
 __exportStar(require("./types"), exports);
-var jid_1 = require("../protocol/jid");
-Object.defineProperty(exports, "getLoginIdentity", { enumerable: true, get: function () { return jid_1.getLoginIdentity; } });
 var WaAuthClient_1 = require("./WaAuthClient");
 Object.defineProperty(exports, "WaAuthClient", { enumerable: true, get: function () { return WaAuthClient_1.WaAuthClient; } });
-var WaPairingCodeCrypto_1 = require("./pairing/WaPairingCodeCrypto");
-Object.defineProperty(exports, "completeCompanionFinish", { enumerable: true, get: function () { return WaPairingCodeCrypto_1.completeCompanionFinish; } });
-Object.defineProperty(exports, "createCompanionHello", { enumerable: true, get: function () { return WaPairingCodeCrypto_1.createCompanionHello; } });
-var auth_store_1 = require("../store/providers/sqlite/auth.store");
-Object.defineProperty(exports, "WaAuthSqliteStore", { enumerable: true, get: function () { return auth_store_1.WaAuthSqliteStore; } });

package/dist/auth/pairing/WaPairingCodeCrypto.js

@@ -49,8 +49,8 @@ async function completeCompanionFinish(args) {
     if (primaryEphemeralPub.length === 0) {
         throw new Error('empty primary ephemeral public key');
     }
-    const sharedEphemeral = await X25519_1.X25519.scalarMult(args.companionEphemeralPrivKey, primaryEphemeralPub);
-    const [bundleSalt, bundleSecret, bundleIv] = await Promise.all([
+    const [sharedEphemeral, bundleSalt, bundleSecret, bundleIv] = await Promise.all([
+        X25519_1.X25519.scalarMult(args.companionEphemeralPrivKey, primaryEphemeralPub),
         (0, _crypto_1.randomBytesAsync)(32),
         (0, _crypto_1.randomBytesAsync)(32),
         (0, _crypto_1.randomBytesAsync)(12)
@@ -62,9 +62,11 @@ async function completeCompanionFinish(args) {
         args.primaryIdentityPub,
         bundleSecret
     ]);
-    const encryptedBundle = await (0, _crypto_1.aesGcmEncrypt)(bundleEncryptionKey, bundleIv, plaintextBundle);
+    const [encryptedBundle, sharedIdentity] = await Promise.all([
+        (0, _crypto_1.aesGcmEncrypt)(bundleEncryptionKey, bundleIv, plaintextBundle),
+        X25519_1.X25519.scalarMult(args.registrationIdentityKeyPair.privKey, args.primaryIdentityPub)
+    ]);
     const wrappedKeyBundle = (0, bytes_1.concatBytes)([bundleSalt, bundleIv, encryptedBundle]);
-    const sharedIdentity = await X25519_1.X25519.scalarMult(args.registrationIdentityKeyPair.privKey, args.primaryIdentityPub);
     const advMaterial = (0, bytes_1.concatBytes)([sharedEphemeral, sharedIdentity, bundleSecret]);
     const advSecret = await (0, _crypto_1.hkdf)(advMaterial, null, constants_2.WA_PAIRING_KDF_INFO.ADV_SECRET, 32);
     return {

package/dist/auth/pairing/WaPairingFlow.js

@@ -7,10 +7,11 @@ const _proto_1 = require("../../proto.js");
 const constants_1 = require("../../protocol/constants");
 const jid_1 = require("../../protocol/jid");
 const WaAdvSignature_1 = require("../../signal/crypto/WaAdvSignature");
+const global_1 = require("../../transport/node/builders/global");
 const pairing_1 = require("../../transport/node/builders/pairing");
 const helpers_1 = require("../../transport/node/helpers");
-const base64_1 = require("../../util/base64");
 const bytes_1 = require("../../util/bytes");
+const bytes_2 = require("../../util/bytes");
 class WaPairingFlow {
     constructor(options) {
         this.opts = options;
@@ -121,7 +122,10 @@ class WaPairingFlow {
             id: node.attrs.id,
             stage: linkCodeNode.attrs.stage
         });
-        await this.opts.socket.sendNode((0, pairing_1.buildNotificationAckNode)(node));
+        await this.opts.socket.sendNode((0, global_1.buildAckNode)({
+            kind: 'notification',
+            node
+        }));
         const stage = linkCodeNode.attrs.stage;
         if (stage === constants_1.WA_SIGNALING.LINK_CODE_STAGE_REFRESH_CODE) {
             const refNode = (0, helpers_1.findNodeChild)(linkCodeNode, constants_1.WA_NODE_TAGS.LINK_CODE_PAIRING_REF);
@@ -129,7 +133,7 @@ class WaPairingFlow {
                 return true;
             }
             const ref = (0, helpers_1.decodeNodeContentUtf8OrBytes)(refNode.content, 'refresh_code.link_code_pairing_ref');
-            if ((0, bytes_1.uint8Equal)(ref, this.pairingSession.ref)) {
+            if ((0, bytes_2.uint8Equal)(ref, this.pairingSession.ref)) {
                 this.opts.logger.info('received pairing refresh notification', {
                     forceManualRefresh: linkCodeNode.attrs.force_manual_refresh === 'true'
                 });
@@ -149,27 +153,29 @@ class WaPairingFlow {
         if (!hasExpectedChild) {
             return false;
         }
-        await this.opts.socket.sendNode((0, pairing_1.buildNotificationAckNode)(node, constants_1.WA_SIGNALING.COMPANION_REG_REFRESH_NOTIFICATION));
+        // Rotate first so we don't ack success before local credential state is durably updated.
         await this.rotateAdvSecret(this.requireCredentials());
+        await this.opts.socket.sendNode((0, global_1.buildAckNode)({
+            kind: 'notification',
+            node,
+            typeOverride: constants_1.WA_SIGNALING.COMPANION_REG_REFRESH_NOTIFICATION
+        }));
         this.opts.logger.info('handled companion_reg_refresh notification');
         this.opts.qrFlow.refreshCurrentQr();
         return true;
     }
     async handlePairDevice(iqNode, pairDeviceNode) {
-        const refs = (0, helpers_1.getNodeChildrenByTag)(pairDeviceNode, constants_1.WA_NODE_TAGS.REF)
-            .map((child) => bytes_1.TEXT_DECODER.decode((0, helpers_1.decodeNodeContentUtf8OrBytes)(child.content, 'pair-device.ref')))
-            .filter((ref) => ref.length > 0);
+        const refs = (0, helpers_1.getNodeChildrenNonEmptyUtf8ByTag)(pairDeviceNode, constants_1.WA_NODE_TAGS.REF, 'pair-device.ref');
+        // Commit adv-secret rotation before sending IQ success to avoid protocol/state divergence.
         await this.rotateAdvSecret(this.requireCredentials());
+        await this.opts.socket.sendNode((0, global_1.buildIqResultNode)(iqNode));
         this.opts.qrFlow.setRefs(refs);
         this.opts.logger.info('pair-device refs updated', { refsCount: refs.length });
-        await this.opts.socket.sendNode((0, pairing_1.buildIqResultNode)(iqNode));
     }
     async handlePairSuccess(iqNode, pairSuccessNode) {
         this.opts.logger.info('processing pair-success node');
         const credentials = this.requireCredentials();
-        const deviceIdentityNode = (0, helpers_1.findNodeChild)(pairSuccessNode, constants_1.WA_NODE_TAGS.DEVICE_IDENTITY);
-        const deviceNode = (0, helpers_1.findNodeChild)(pairSuccessNode, 'device');
-        const platformNode = (0, helpers_1.findNodeChild)(pairSuccessNode, constants_1.WA_NODE_TAGS.PLATFORM);
+        const [deviceIdentityNode, deviceNode, platformNode] = (0, helpers_1.findNodeChildrenByTags)(pairSuccessNode, [constants_1.WA_NODE_TAGS.DEVICE_IDENTITY, 'device', constants_1.WA_NODE_TAGS.PLATFORM]);
         if (!deviceIdentityNode || !deviceNode || !platformNode) {
             this.opts.logger.error('pair-success missing required nodes', {
                 hasDeviceIdentity: !!deviceIdentityNode,
@@ -179,15 +185,15 @@ class WaPairingFlow {
             throw new Error('pair-success stanza is missing required nodes');
         }
         const wrappedIdentity = _proto_1.proto.ADVSignedDeviceIdentityHMAC.decode((0, helpers_1.decodeNodeContentUtf8OrBytes)(deviceIdentityNode.content, 'pair-success.device-identity'));
-        const wrappedDetails = (0, base64_1.decodeProtoBytes)(wrappedIdentity.details, 'ADVSignedDeviceIdentityHMAC.details');
-        const wrappedHmac = (0, base64_1.decodeProtoBytes)(wrappedIdentity.hmac, 'ADVSignedDeviceIdentityHMAC.hmac');
+        const wrappedDetails = (0, bytes_1.decodeProtoBytes)(wrappedIdentity.details, 'ADVSignedDeviceIdentityHMAC.details');
+        const wrappedHmac = (0, bytes_1.decodeProtoBytes)(wrappedIdentity.hmac, 'ADVSignedDeviceIdentityHMAC.hmac');
         const accountType = wrappedIdentity.accountType ?? _proto_1.proto.ADVEncryptionType.E2EE;
         const isHosted = accountType === _proto_1.proto.ADVEncryptionType.HOSTED;
         const hmacInput = isHosted
-            ? (0, bytes_1.concatBytes)([WaAdvSignature_1.ADV_PREFIX_HOSTED_ACCOUNT_SIGNATURE, wrappedDetails])
+            ? (0, bytes_2.concatBytes)([WaAdvSignature_1.ADV_PREFIX_HOSTED_ACCOUNT_SIGNATURE, wrappedDetails])
             : wrappedDetails;
         const expectedHmac = await (0, WaAdvSignature_1.computeAdvIdentityHmac)(credentials.advSecretKey, hmacInput);
-        if (!(0, bytes_1.uint8Equal)(expectedHmac, wrappedHmac)) {
+        if (!(0, bytes_2.uint8Equal)(expectedHmac, wrappedHmac)) {
             this.opts.logger.error('pair-success hmac mismatch');
             throw new Error('pair-success HMAC validation failed');
         }
@@ -234,9 +240,9 @@ class WaPairingFlow {
     }
     async buildPairSuccessResponseIdentity(credentials, wrappedDetails, isHosted) {
         const signedIdentity = _proto_1.proto.ADVSignedDeviceIdentity.decode(wrappedDetails);
-        const details = (0, base64_1.decodeProtoBytes)(signedIdentity.details, 'ADVSignedDeviceIdentity.details');
-        const accountSignature = (0, base64_1.decodeProtoBytes)(signedIdentity.accountSignature, 'ADVSignedDeviceIdentity.accountSignature');
-        const accountSignatureKey = (0, base64_1.decodeProtoBytes)(signedIdentity.accountSignatureKey, 'ADVSignedDeviceIdentity.accountSignatureKey');
+        const details = (0, bytes_1.decodeProtoBytes)(signedIdentity.details, 'ADVSignedDeviceIdentity.details');
+        const accountSignature = (0, bytes_1.decodeProtoBytes)(signedIdentity.accountSignature, 'ADVSignedDeviceIdentity.accountSignature');
+        const accountSignatureKey = (0, bytes_1.decodeProtoBytes)(signedIdentity.accountSignatureKey, 'ADVSignedDeviceIdentity.accountSignatureKey');
         const localIdentity = credentials.registrationInfo.identityKeyPair;
         const validAccountSignature = await (0, WaAdvSignature_1.verifyDeviceIdentityAccountSignature)(details, accountSignature, localIdentity.pubKey, accountSignatureKey, isHosted);
         if (!validAccountSignature) {
@@ -270,14 +276,16 @@ class WaPairingFlow {
         if (pairingSession.attempts > 3) {
             throw new Error('pairing code exceeded maximum primary hello attempts');
         }
-        const refNode = (0, helpers_1.findNodeChild)(linkCodeNode, constants_1.WA_NODE_TAGS.LINK_CODE_PAIRING_REF);
-        const wrappedPrimaryNode = (0, helpers_1.findNodeChild)(linkCodeNode, 'link_code_pairing_wrapped_primary_ephemeral_pub');
-        const primaryIdentityNode = (0, helpers_1.findNodeChild)(linkCodeNode, 'primary_identity_pub');
+        const [refNode, wrappedPrimaryNode, primaryIdentityNode] = (0, helpers_1.findNodeChildrenByTags)(linkCodeNode, [
+            constants_1.WA_NODE_TAGS.LINK_CODE_PAIRING_REF,
+            'link_code_pairing_wrapped_primary_ephemeral_pub',
+            'primary_identity_pub'
+        ]);
         if (!refNode || !wrappedPrimaryNode || !primaryIdentityNode) {
             throw new Error('primary_hello notification is missing fields');
         }
         const ref = (0, helpers_1.decodeNodeContentUtf8OrBytes)(refNode.content, 'primary_hello.link_code_pairing_ref');
-        if (!pairingSession.ref || !(0, bytes_1.uint8Equal)(ref, pairingSession.ref)) {
+        if (!pairingSession.ref || !(0, bytes_2.uint8Equal)(ref, pairingSession.ref)) {
             this.opts.logger.warn('primary_hello ref mismatch ignored');
             return;
         }
@@ -293,10 +301,6 @@ class WaPairingFlow {
             companionEphemeralPrivKey: pairingSession.companionEphemeralKeyPair.privKey,
             registrationIdentityKeyPair: credentials.registrationInfo.identityKeyPair
         });
-        await this.opts.auth.updateCredentials({
-            ...credentials,
-            advSecretKey: finish.advSecret
-        });
         const result = await this.opts.socket.query((0, pairing_1.buildCompanionFinishRequestNode)({
             phoneJid: pairingSession.phoneJid,
             wrappedKeyBundle: finish.wrappedKeyBundle,
@@ -306,6 +310,10 @@ class WaPairingFlow {
         if (result.attrs.type === constants_1.WA_IQ_TYPES.ERROR) {
             throw new Error('companion_finish returned error');
         }
+        await this.opts.auth.updateCredentials({
+            ...credentials,
+            advSecretKey: finish.advSecret
+        });
         pairingSession.finished = true;
         this.opts.logger.info('primary_hello completed with companion_finish success');
     }