zapo-js 0.1.2 → 0.3.0

package/dist/signal/api/SignalDeviceSyncApi.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.SignalDeviceSyncApi = void 0;
+const PromiseDedup_1 = require("../../infra/perf/PromiseDedup");
 const constants_1 = require("../../protocol/constants");
 const jid_1 = require("../../protocol/jid");
 const usync_1 = require("../../transport/node/builders/usync");
@@ -9,6 +10,7 @@ const query_1 = require("../../transport/node/query");
 const usync_2 = require("../../transport/node/usync");
 class SignalDeviceSyncApi {
     constructor(options) {
+        this.syncDedup = new PromiseDedup_1.PromiseDedup();
         this.logger = options.logger;
         this.query = options.query;
         this.deviceListStore = options.deviceListStore;
@@ -17,11 +19,15 @@ class SignalDeviceSyncApi {
         this.hostDomain = options.hostDomain ?? constants_1.WA_DEFAULTS.HOST_DOMAIN;
         this.generateSid = options.generateSid ?? (0, usync_2.createUsyncSidGenerator)();
     }
-    async syncDeviceList(userJids, timeoutMs = this.defaultTimeoutMs) {
+    syncDeviceList(userJids, timeoutMs = this.defaultTimeoutMs) {
         const normalizedUsers = this.normalizeUsers(userJids);
         if (normalizedUsers.length === 0) {
-            return [];
+            return Promise.resolve([]);
         }
+        const dedupKey = normalizedUsers.join(',');
+        return this.syncDedup.run(dedupKey, () => this.syncDeviceListInternal(normalizedUsers, timeoutMs));
+    }
+    async syncDeviceListInternal(normalizedUsers, timeoutMs) {
         const nowMs = Date.now();
         const cachedByUser = new Map();
         const usersToQuery = this.deviceListStore
@@ -126,16 +132,19 @@ class SignalDeviceSyncApi {
     }
     async collectUsersToQuery(normalizedUsers, nowMs, cachedByUser, store) {
         const records = await store.getUserDevicesBatch(normalizedUsers, nowMs);
-        const usersToQuery = [];
+        const usersToQuery = new Array(normalizedUsers.length);
+        let usersToQueryCount = 0;
         for (let index = 0; index < normalizedUsers.length; index += 1) {
             const userJid = normalizedUsers[index];
             const record = records[index];
             if (!record) {
-                usersToQuery.push(userJid);
+                usersToQuery[usersToQueryCount] = userJid;
+                usersToQueryCount += 1;
                 continue;
             }
             cachedByUser.set(userJid, record.deviceJids);
         }
+        usersToQuery.length = usersToQueryCount;
         return usersToQuery;
     }
     makeDeviceSyncRequest(userJids, sid) {
@@ -204,7 +213,8 @@ class SignalDeviceSyncApi {
         }
         const requestedSet = new Set(requestedUsers);
         const userNodes = (0, helpers_1.getNodeChildrenByTag)(listNode, constants_1.WA_NODE_TAGS.USER);
-        const parsed = [];
+        const parsed = new Array(userNodes.length);
+        let parsedCount = 0;
         for (let index = 0; index < userNodes.length; index += 1) {
             const userNode = userNodes[index];
             const userJid = userNode.attrs.jid;
@@ -215,11 +225,13 @@ class SignalDeviceSyncApi {
             if (!requestedSet.has(normalizedUserJid)) {
                 continue;
             }
-            parsed.push({
+            parsed[parsedCount] = {
                 jid: normalizedUserJid,
-                deviceJids: this.parseUserDeviceJids(userNode, normalizedUserJid)
-            });
+                deviceJids: this.parseUserDeviceJids(userNode, userJid, normalizedUserJid)
+            };
+            parsedCount += 1;
         }
+        parsed.length = parsedCount;
         return parsed;
     }
     parseLidSyncResponse(node, requestedUsers) {
@@ -234,7 +246,8 @@ class SignalDeviceSyncApi {
         }
         const requestedSet = new Set(requestedUsers);
         const userNodes = (0, helpers_1.getNodeChildrenByTag)(listNode, constants_1.WA_NODE_TAGS.USER);
-        const parsed = [];
+        const parsed = new Array(userNodes.length);
+        let parsedCount = 0;
         for (let index = 0; index < userNodes.length; index += 1) {
             const userNode = userNodes[index];
             const userJid = userNode.attrs.jid;
@@ -253,7 +266,8 @@ class SignalDeviceSyncApi {
             const lidNode = (0, helpers_1.findNodeChild)(userNode, constants_1.WA_NODE_TAGS.LID);
             const contactNode = (0, helpers_1.findNodeChild)(userNode, constants_1.WA_NODE_TAGS.CONTACT);
             if (!lidNode) {
-                parsed.push(this.buildLidSyncResult(normalizedUserJid, normalizedPhoneJid, contactNode, null));
+                parsed[parsedCount] = this.buildLidSyncResult(normalizedUserJid, normalizedPhoneJid, contactNode, null);
+                parsedCount += 1;
                 continue;
             }
             const errorNode = (0, helpers_1.findNodeChild)(lidNode, constants_1.WA_NODE_TAGS.ERROR);
@@ -263,12 +277,15 @@ class SignalDeviceSyncApi {
                     code: errorNode.attrs.code,
                     text: errorNode.attrs.text
                 });
-                parsed.push(this.buildLidSyncResult(normalizedUserJid, normalizedPhoneJid, contactNode, null));
+                parsed[parsedCount] = this.buildLidSyncResult(normalizedUserJid, normalizedPhoneJid, contactNode, null);
+                parsedCount += 1;
                 continue;
             }
             const lidJid = lidNode.attrs.val ? this.normalizeUserJid(lidNode.attrs.val) : null;
-            parsed.push(this.buildLidSyncResult(normalizedUserJid, normalizedPhoneJid, contactNode, lidJid));
+            parsed[parsedCount] = this.buildLidSyncResult(normalizedUserJid, normalizedPhoneJid, contactNode, lidJid);
+            parsedCount += 1;
         }
+        parsed.length = parsedCount;
         return parsed;
     }
     buildLidSyncResult(jid, phoneJid, contactNode, lidJid) {
@@ -294,7 +311,7 @@ class SignalDeviceSyncApi {
         }
         return contactNode.attrs.type === 'in';
     }
-    parseUserDeviceJids(userNode, userJid) {
+    parseUserDeviceJids(userNode, rawUserJid, normalizedUserJid) {
         const devicesNode = (0, helpers_1.findNodeChild)(userNode, constants_1.WA_NODE_TAGS.DEVICES);
         if (!devicesNode) {
             return [];
@@ -302,7 +319,7 @@ class SignalDeviceSyncApi {
         const errorNode = (0, helpers_1.findNodeChild)(devicesNode, constants_1.WA_NODE_TAGS.ERROR);
         if (errorNode) {
             this.logger.warn('signal device sync user error', {
-                jid: userJid,
+                jid: normalizedUserJid,
                 code: errorNode.attrs.code,
                 text: errorNode.attrs.text
             });
@@ -312,7 +329,11 @@ class SignalDeviceSyncApi {
         if (!deviceListNode) {
             return [];
         }
-        const parsedUser = (0, jid_1.splitJid)(userJid);
+        const parsedNormalizedUser = (0, jid_1.splitJid)(normalizedUserJid);
+        const rawAtIndex = rawUserJid.indexOf('@');
+        const rawServer = rawAtIndex >= 1 && rawAtIndex < rawUserJid.length - 1
+            ? rawUserJid.slice(rawAtIndex + 1)
+            : parsedNormalizedUser.server;
         const dedup = new Set();
         for (const deviceNode of (0, helpers_1.getNodeChildrenByTag)(deviceListNode, 'device')) {
             const parsedId = deviceNode.attrs.id
@@ -321,16 +342,17 @@ class SignalDeviceSyncApi {
             if (!Number.isSafeInteger(parsedId) || parsedId < 0) {
                 continue;
             }
-            dedup.add(this.toDeviceJid(parsedUser.user, parsedUser.server, parsedId));
-        }
-        const deviceJids = [];
-        for (const jid of dedup.values()) {
-            deviceJids.push(jid);
+            const isHostedDevice = (0, jid_1.isHostedDeviceId)(parsedId) || deviceNode.attrs.is_hosted === 'true';
+            dedup.add((0, jid_1.buildDeviceJid)(parsedNormalizedUser.user, parsedNormalizedUser.server, parsedId, {
+                rawServer,
+                isHosted: isHostedDevice
+            }));
         }
-        return deviceJids;
+        return Array.from(dedup);
     }
     normalizeUsers(userJids) {
-        const normalized = [];
+        const normalized = new Array(userJids.length);
+        let normalizedCount = 0;
         const dedup = new Set();
         for (let index = 0; index < userJids.length; index += 1) {
             const normalizedJid = this.normalizeUserJid(userJids[index]);
@@ -338,19 +360,17 @@ class SignalDeviceSyncApi {
                 continue;
             }
             dedup.add(normalizedJid);
-            normalized.push(normalizedJid);
+            normalized[normalizedCount] = normalizedJid;
+            normalizedCount += 1;
         }
+        normalized.length = normalizedCount;
         return normalized;
     }
     normalizeUserJid(jid) {
-        const address = (0, jid_1.parseSignalAddressFromJid)(jid);
-        return `${address.user}@${address.server}`;
-    }
-    toDeviceJid(user, server, deviceId) {
-        if (deviceId === 0) {
-            return `${user}@${server}`;
-        }
-        return `${user}:${deviceId}@${server}`;
+        return (0, jid_1.toUserJid)(jid, {
+            canonicalizeSignalServer: true,
+            hostDomain: this.hostDomain
+        });
     }
 }
 exports.SignalDeviceSyncApi = SignalDeviceSyncApi;

package/dist/signal/api/SignalDigestSyncApi.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.SignalDigestSyncApi = void 0;
 const _crypto_1 = require("../../crypto/index.js");
+const keys_1 = require("../../crypto/core/keys");
 const constants_1 = require("../../protocol/constants");
 const codec_1 = require("../api/codec");
 const constants_2 = require("../api/constants");
@@ -13,12 +14,15 @@ class SignalDigestSyncApi {
         this.logger = options.logger;
         this.query = options.query;
         this.signalStore = options.signalStore;
+        this.preKeyStore = options.preKeyStore;
         this.defaultTimeoutMs =
             options.defaultTimeoutMs ?? constants_1.WA_DEFAULTS.SIGNAL_FETCH_KEY_BUNDLES_TIMEOUT_MS;
         this.hostDomain = options.hostDomain ?? constants_1.WA_DEFAULTS.HOST_DOMAIN;
     }
-    async validateLocalKeyBundle(timeoutMs = this.defaultTimeoutMs) {
-        this.logger.debug('signal digest query request', { timeoutMs });
+    async validateLocalKeyBundle(prefetchedOrTimeout, timeoutMs = this.defaultTimeoutMs) {
+        const prefetched = typeof prefetchedOrTimeout === 'number' ? undefined : prefetchedOrTimeout;
+        const effectiveTimeoutMs = typeof prefetchedOrTimeout === 'number' ? prefetchedOrTimeout : timeoutMs;
+        this.logger.debug('signal digest query request', { timeoutMs: effectiveTimeoutMs });
         const response = await this.query({
             tag: constants_1.WA_NODE_TAGS.IQ,
             attrs: {
@@ -32,7 +36,7 @@ class SignalDigestSyncApi {
                     attrs: {}
                 }
             ]
-        }, timeoutMs);
+        }, effectiveTimeoutMs);
         if (response.tag !== constants_1.WA_NODE_TAGS.IQ) {
             throw new Error(`invalid signal digest response tag: ${response.tag}`);
         }
@@ -61,10 +65,12 @@ class SignalDigestSyncApi {
                 preKeyCount: digest.preKeyIds.length
             };
         }
-        const [registrationInfo, signedPreKey] = await Promise.all([
-            this.signalStore.getRegistrationInfo(),
-            this.signalStore.getSignedPreKey()
-        ]);
+        const [registrationInfo, signedPreKey] = prefetched
+            ? [prefetched.registrationInfo, prefetched.signedPreKey]
+            : await Promise.all([
+                this.signalStore.getRegistrationInfo(),
+                this.signalStore.getSignedPreKey()
+            ]);
         if (!registrationInfo || !signedPreKey) {
             return {
                 valid: false,
@@ -81,7 +87,7 @@ class SignalDigestSyncApi {
                 preKeyCount: digest.preKeyIds.length
             };
         }
-        if (!(0, bytes_1.uint8Equal)(registrationInfo.identityKeyPair.pubKey, digest.identity)) {
+        if (!(0, bytes_1.uint8Equal)((0, keys_1.toRawPubKey)(registrationInfo.identityKeyPair.pubKey), (0, keys_1.toRawPubKey)(digest.identity))) {
             return {
                 valid: false,
                 shouldReupload: true,
@@ -90,7 +96,7 @@ class SignalDigestSyncApi {
             };
         }
         if (signedPreKey.keyId !== digest.signedKey.id ||
-            !(0, bytes_1.uint8Equal)(signedPreKey.keyPair.pubKey, digest.signedKey.publicKey) ||
+            !(0, bytes_1.uint8Equal)((0, keys_1.toRawPubKey)(signedPreKey.keyPair.pubKey), (0, keys_1.toRawPubKey)(digest.signedKey.publicKey)) ||
             !(0, bytes_1.uint8Equal)(signedPreKey.signature, digest.signedKey.signature)) {
             return {
                 valid: false,
@@ -99,10 +105,10 @@ class SignalDigestSyncApi {
                 preKeyCount: digest.preKeyIds.length
             };
         }
-        const preKeys = await this.signalStore.getPreKeysById(digest.preKeyIds);
+        const preKeys = await this.preKeyStore.getPreKeysById(digest.preKeyIds);
         const bytesToHash = [
-            registrationInfo.identityKeyPair.pubKey,
-            signedPreKey.keyPair.pubKey,
+            (0, keys_1.toRawPubKey)(registrationInfo.identityKeyPair.pubKey),
+            (0, keys_1.toRawPubKey)(signedPreKey.keyPair.pubKey),
             signedPreKey.signature
         ];
         for (let index = 0; index < preKeys.length; index += 1) {
@@ -115,7 +121,7 @@ class SignalDigestSyncApi {
                     preKeyCount: digest.preKeyIds.length
                 };
             }
-            bytesToHash.push(preKey.keyPair.pubKey);
+            bytesToHash.push((0, keys_1.toRawPubKey)(preKey.keyPair.pubKey));
         }
         const localHash = (await (0, _crypto_1.sha1)((0, bytes_1.concatBytes)(bytesToHash))).subarray(0, digest.hash.byteLength);
         if (!(0, bytes_1.uint8Equal)(localHash, digest.hash)) {
@@ -164,11 +170,11 @@ class SignalDigestSyncApi {
         const signedKeyId = (0, codec_1.parseUint)((0, codec_1.decodeExactLength)(signedKeyIdNode.content, 'signal digest skey.id', constants_2.SIGNAL_KEY_ID_LENGTH), 'signal digest skey.id');
         const signedKeyPublicKey = (0, codec_1.decodeExactLength)(signedKeyValueNode.content, 'signal digest skey.value', constants_2.SIGNAL_KEY_DATA_LENGTH);
         const signedKeySignature = (0, codec_1.decodeExactLength)(signedKeySignatureNode.content, 'signal digest skey.signature', constants_2.SIGNAL_SIGNATURE_LENGTH);
-        const preKeyIds = [];
         const listChildren = (0, helpers_1.getNodeChildren)(listNode);
+        const preKeyIds = new Array(listChildren.length);
         for (let index = 0; index < listChildren.length; index += 1) {
             const child = listChildren[index];
-            preKeyIds.push((0, codec_1.parseUint)((0, codec_1.decodeExactLength)(child.content, `signal digest list[${index}]`, constants_2.SIGNAL_KEY_ID_LENGTH), `signal digest list[${index}]`));
+            preKeyIds[index] = (0, codec_1.parseUint)((0, codec_1.decodeExactLength)(child.content, `signal digest list[${index}]`, constants_2.SIGNAL_KEY_ID_LENGTH), `signal digest list[${index}]`);
         }
         const hash = (0, helpers_1.decodeNodeContentBase64OrBytes)(hashNode.content, 'signal digest hash');
         return {

package/dist/signal/api/SignalIdentitySyncApi.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.SignalIdentitySyncApi = void 0;
 const keys_1 = require("../../crypto/core/keys");
+const PromiseDedup_1 = require("../../infra/perf/PromiseDedup");
 const constants_1 = require("../../protocol/constants");
 const jid_1 = require("../../protocol/jid");
 const codec_1 = require("../api/codec");
@@ -10,24 +11,32 @@ const helpers_1 = require("../../transport/node/helpers");
 const query_1 = require("../../transport/node/query");
 class SignalIdentitySyncApi {
     constructor(options) {
+        this.syncDedup = new PromiseDedup_1.PromiseDedup();
         this.logger = options.logger;
         this.query = options.query;
-        this.signalStore = options.signalStore;
+        this.identityStore = options.identityStore;
         this.defaultTimeoutMs =
             options.defaultTimeoutMs ?? constants_1.WA_DEFAULTS.SIGNAL_FETCH_KEY_BUNDLES_TIMEOUT_MS;
         this.hostDomain = options.hostDomain ?? constants_1.WA_DEFAULTS.HOST_DOMAIN;
     }
-    async syncIdentityKeys(targetJids, timeoutMs = this.defaultTimeoutMs) {
-        const normalizedTargets = [];
+    syncIdentityKeys(targetJids, timeoutMs = this.defaultTimeoutMs) {
+        const dedupKey = `${timeoutMs}:${targetJids.join(',')}`;
+        return this.syncDedup.run(dedupKey, () => this.syncIdentityKeysInternal(targetJids, timeoutMs));
+    }
+    async syncIdentityKeysInternal(targetJids, timeoutMs) {
+        const normalizedTargets = new Array(targetJids.length);
+        let normalizedTargetsCount = 0;
         const dedup = new Set();
         for (let index = 0; index < targetJids.length; index += 1) {
-            const normalized = (0, jid_1.normalizeDeviceJid)(targetJids[index]);
+            const normalized = (0, jid_1.canonicalizeSignalJid)(targetJids[index], this.hostDomain);
             if (dedup.has(normalized)) {
                 continue;
             }
             dedup.add(normalized);
-            normalizedTargets.push(normalized);
+            normalizedTargets[normalizedTargetsCount] = normalized;
+            normalizedTargetsCount += 1;
         }
+        normalizedTargets.length = normalizedTargetsCount;
         if (normalizedTargets.length === 0) {
             return [];
         }
@@ -60,8 +69,8 @@ class SignalIdentitySyncApi {
             ]
         }, timeoutMs);
         const entries = this.parseIdentitySyncResponse(response, normalizedTargets);
-        const { signalStore } = this;
-        if (signalStore && entries.length > 0) {
+        const { identityStore } = this;
+        if (identityStore && entries.length > 0) {
             const identities = new Array(entries.length);
             for (let index = 0; index < entries.length; index += 1) {
                 const entry = entries[index];
@@ -70,7 +79,7 @@ class SignalIdentitySyncApi {
                     identityKey: (0, keys_1.toSerializedPubKey)(entry.identity)
                 };
             }
-            await signalStore.setRemoteIdentities(identities);
+            await identityStore.setRemoteIdentities(identities);
         }
         this.logger.debug('signal identity sync success', {
             requested: normalizedTargets.length,
@@ -86,10 +95,13 @@ class SignalIdentitySyncApi {
         }
         const requested = new Set(requestedJids);
         const userNodes = (0, helpers_1.getNodeChildrenByTag)(listNode, constants_1.WA_NODE_TAGS.USER);
-        const parsed = [];
+        const parsed = new Array(userNodes.length);
+        let parsedCount = 0;
         for (let index = 0; index < userNodes.length; index += 1) {
             const userNode = userNodes[index];
-            const jid = userNode.attrs.jid ? (0, jid_1.normalizeDeviceJid)(userNode.attrs.jid) : '';
+            const jid = userNode.attrs.jid
+                ? (0, jid_1.canonicalizeSignalJid)(userNode.attrs.jid, this.hostDomain)
+                : '';
             if (!jid || !requested.has(jid)) {
                 continue;
             }
@@ -112,18 +124,21 @@ class SignalIdentitySyncApi {
                 ? (0, codec_1.parseUint)((0, codec_1.decodeExactLength)(typeNode.content, 'identity sync type', constants_2.SIGNAL_KEY_BUNDLE_TYPE_LENGTH), 'identity sync type')
                 : undefined;
             if (parsedType === undefined) {
-                parsed.push({
+                parsed[parsedCount] = {
                     jid,
                     identity
-                });
+                };
+                parsedCount += 1;
                 continue;
             }
-            parsed.push({
+            parsed[parsedCount] = {
                 jid,
                 identity,
                 type: parsedType
-            });
+            };
+            parsedCount += 1;
         }
+        parsed.length = parsedCount;
         return parsed;
     }
 }

package/dist/signal/api/SignalMissingPreKeysSyncApi.js

@@ -6,8 +6,12 @@ const jid_1 = require("../../protocol/jid");
 const codec_1 = require("../api/codec");
 const constants_2 = require("../api/constants");
 const prekeys_1 = require("../api/prekeys");
+const result_map_1 = require("../api/result-map");
 const helpers_1 = require("../../transport/node/helpers");
 const query_1 = require("../../transport/node/query");
+function isMissingPreKeysUserResultPreferred(result) {
+    return 'devices' in result;
+}
 class SignalMissingPreKeysSyncApi {
     constructor(options) {
         this.logger = options.logger;
@@ -38,31 +42,38 @@ class SignalMissingPreKeysSyncApi {
         }
         const users = (0, helpers_1.getNodeChildrenByTag)(listNode, constants_1.WA_NODE_TAGS.USER);
         const parsedByJid = new Map();
+        const parsedByCanonicalJid = new Map();
         for (let index = 0; index < users.length; index += 1) {
             const userNode = users[index];
             const userJid = userNode.attrs.jid;
             if (!userJid) {
                 continue;
             }
+            const canonicalUserJid = (0, jid_1.toUserJid)(userJid, {
+                canonicalizeSignalServer: true
+            });
             const userErrorNode = (0, helpers_1.findNodeChild)(userNode, constants_1.WA_NODE_TAGS.ERROR);
             if (userErrorNode) {
                 const parsedCode = Number.parseInt(userErrorNode.attrs.code ?? '', 10);
-                parsedByJid.set(userJid, {
+                (0, result_map_1.registerParsedResultByRawAndCanonicalKey)(parsedByJid, parsedByCanonicalJid, userJid, canonicalUserJid, {
                     userJid,
                     errorCode: Number.isSafeInteger(parsedCode) ? parsedCode : undefined,
                     errorText: userErrorNode.attrs.text ?? userErrorNode.attrs.type ?? 'unknown'
-                });
+                }, isMissingPreKeysUserResultPreferred);
                 continue;
             }
-            parsedByJid.set(userJid, {
+            (0, result_map_1.registerParsedResultByRawAndCanonicalKey)(parsedByJid, parsedByCanonicalJid, userJid, canonicalUserJid, {
                 userJid,
-                devices: this.parseUserDevices(userNode, userJid)
-            });
+                devices: this.parseUserDevices(userNode, canonicalUserJid)
+            }, isMissingPreKeysUserResultPreferred);
         }
         const results = new Array(requestedTargets.length);
         for (let index = 0; index < requestedTargets.length; index += 1) {
             const target = requestedTargets[index];
-            results[index] = parsedByJid.get(target.userJid) ?? {
+            results[index] = parsedByJid.get(target.userJid) ??
+                parsedByCanonicalJid.get((0, jid_1.toUserJid)(target.userJid, {
+                    canonicalizeSignalServer: true
+                })) ?? {
                 userJid: target.userJid,
                 errorText: 'missing user in key_fetch response'
             };

package/dist/signal/api/SignalRotateKeyApi.js

@@ -13,11 +13,13 @@ class SignalRotateKeyApi {
         this.defaultTimeoutMs = options.defaultTimeoutMs ?? constants_1.WA_DEFAULTS.IQ_TIMEOUT_MS;
     }
     async rotateSignedPreKey(timeoutMs = this.defaultTimeoutMs) {
-        const registrationInfo = await this.signalStore.getRegistrationInfo();
+        const [registrationInfo, currentSignedPreKey] = await Promise.all([
+            this.signalStore.getRegistrationInfo(),
+            this.signalStore.getSignedPreKey()
+        ]);
         if (!registrationInfo) {
             throw new Error('signal rotate key requires registration info');
         }
-        const currentSignedPreKey = await this.signalStore.getSignedPreKey();
         const nextSignedPreKey = await (0, keygen_1.generateSignedPreKey)(currentSignedPreKey ? currentSignedPreKey.keyId + 1 : 1, registrationInfo.identityKeyPair.privKey);
         await this.signalStore.setSignedPreKey(nextSignedPreKey);
         this.logger.info('signal signed prekey uploading', {

package/dist/signal/api/SignalSessionSyncApi.js

@@ -2,10 +2,15 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.SignalSessionSyncApi = void 0;
 const constants_1 = require("../../protocol/constants");
+const jid_1 = require("../../protocol/jid");
 const codec_1 = require("../api/codec");
 const constants_2 = require("../api/constants");
+const result_map_1 = require("../api/result-map");
 const helpers_1 = require("../../transport/node/helpers");
 const query_1 = require("../../transport/node/query");
+function isKeyBundleResultPreferred(result) {
+    return 'bundle' in result;
+}
 class SignalSessionSyncApi {
     constructor(options) {
         this.logger = options.logger;
@@ -44,9 +49,11 @@ class SignalSessionSyncApi {
                 reasonIdentity: (previous?.reasonIdentity ?? false) || target.reasonIdentity === true
             });
         }
-        const mergedTargets = [];
+        const mergedTargets = new Array(targetByJid.size);
+        let mergedTargetsCount = 0;
         for (const target of targetByJid.values()) {
-            mergedTargets.push(target);
+            mergedTargets[mergedTargetsCount] = target;
+            mergedTargetsCount += 1;
         }
         const userNodes = new Array(mergedTargets.length);
         for (let index = 0; index < mergedTargets.length; index += 1) {
@@ -90,6 +97,7 @@ class SignalSessionSyncApi {
             throw new Error('key bundle response list is empty');
         }
         const parsedByJid = new Map();
+        const parsedByCanonicalJid = new Map();
         for (let index = 0; index < userNodes.length; index += 1) {
             const userNode = userNodes[index];
             const jid = userNode.attrs.jid;
@@ -98,24 +106,25 @@ class SignalSessionSyncApi {
             }
             const userErrorNode = (0, helpers_1.findNodeChild)(userNode, constants_1.WA_NODE_TAGS.ERROR);
             if (userErrorNode) {
-                parsedByJid.set(jid, {
+                (0, result_map_1.registerParsedResultByRawAndCanonicalKey)(parsedByJid, parsedByCanonicalJid, jid, (0, jid_1.canonicalizeSignalJid)(jid, this.hostDomain), {
                     jid,
                     errorCode: userErrorNode.attrs.code,
                     errorText: userErrorNode.attrs.text ?? 'unknown'
-                });
+                }, isKeyBundleResultPreferred);
                 continue;
             }
             const parsed = this.parseUserKeyBundle(userNode);
-            parsedByJid.set(jid, {
+            (0, result_map_1.registerParsedResultByRawAndCanonicalKey)(parsedByJid, parsedByCanonicalJid, jid, (0, jid_1.canonicalizeSignalJid)(jid, this.hostDomain), {
                 jid,
                 bundle: parsed.bundle,
                 ...(parsed.deviceIdentity ? { deviceIdentity: parsed.deviceIdentity } : {})
-            });
+            }, isKeyBundleResultPreferred);
         }
         const output = new Array(requestedTargets.length);
         for (let index = 0; index < requestedTargets.length; index += 1) {
             const target = requestedTargets[index];
-            output[index] = parsedByJid.get(target.jid) ?? {
+            output[index] = parsedByJid.get(target.jid) ??
+                parsedByCanonicalJid.get((0, jid_1.canonicalizeSignalJid)(target.jid, this.hostDomain)) ?? {
                 jid: target.jid,
                 errorText: 'missing key bundle user in response'
             };

package/dist/signal/api/result-map.js

@@ -0,0 +1,13 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.registerParsedResultByRawAndCanonicalKey = registerParsedResultByRawAndCanonicalKey;
+function mergePreferredParsedResult(target, key, next, isPreferred) {
+    const current = target.get(key);
+    if (!current || !isPreferred(current)) {
+        target.set(key, next);
+    }
+}
+function registerParsedResultByRawAndCanonicalKey(parsedByRawKey, parsedByCanonicalKey, rawKey, canonicalKey, result, isPreferred) {
+    mergePreferredParsedResult(parsedByRawKey, rawKey, result, isPreferred);
+    mergePreferredParsedResult(parsedByCanonicalKey, canonicalKey, result, isPreferred);
+}

package/dist/signal/constants.js

@@ -1,14 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.SIGNAL_PREFIX = exports.WHISPER_GROUP_INFO = exports.CHAIN_KEY_LABEL = exports.MESSAGE_KEY_LABEL = exports.SENDER_KEY_FUTURE_MESSAGES_MAX = exports.FUTURE_MESSAGES_MAX = exports.MAX_UNUSED_KEYS = exports.MAX_PREV_SESSIONS = exports.SIGNATURE_SIZE = exports.SIGNAL_MAC_SIZE = exports.KEY_TYPE_CURVE25519 = exports.SERIALIZED_PUB_KEY_PREFIX = exports.SIGNAL_GROUP_VERSION = exports.SIGNAL_VERSION = void 0;
-const constants_1 = require("../crypto/core/constants");
+exports.SIGNAL_PREFIX = exports.WHISPER_GROUP_INFO = exports.CHAIN_KEY_LABEL = exports.MESSAGE_KEY_LABEL = exports.SENDER_KEY_FUTURE_MESSAGES_MAX = exports.FUTURE_MESSAGES_MAX = exports.MAX_UNUSED_KEYS = exports.MAX_PREV_SESSIONS = exports.SIGNAL_MAC_SIZE = exports.SIGNAL_GROUP_VERSION = exports.SIGNAL_VERSION = void 0;
 const bytes_1 = require("../util/bytes");
 exports.SIGNAL_VERSION = 3;
 exports.SIGNAL_GROUP_VERSION = 3;
-exports.SERIALIZED_PUB_KEY_PREFIX = constants_1.SERIALIZED_PUB_KEY_PREFIX;
-exports.KEY_TYPE_CURVE25519 = 5;
 exports.SIGNAL_MAC_SIZE = 8;
-exports.SIGNATURE_SIZE = 64;
 exports.MAX_PREV_SESSIONS = 40;
 exports.MAX_UNUSED_KEYS = 2000;
 exports.FUTURE_MESSAGES_MAX = 2000;