zapo-js 0.1.1 → 0.1.2

package/dist/store/providers/sqlite/sender-key.store.js

@@ -85,18 +85,6 @@ class SenderKeySqliteStore extends BaseSqliteStore_1.BaseSqliteStore {
             device: (0, coercion_1.asNumber)(row.sender_device, 'sender_keys.sender_device')
         });
     }
-    async getDeviceSenderKeyDistribution(groupId, sender) {
-        const db = await this.getConnection();
-        const target = (0, sqlite_1.toSignalAddressParts)(sender);
-        const row = db.get(`SELECT group_id, sender_user, sender_server, sender_device, key_id, timestamp_ms
-             FROM sender_key_distribution
-             WHERE session_id = ?
-               AND group_id = ?
-               AND sender_user = ?
-               AND sender_server = ?
-               AND sender_device = ?`, [this.options.sessionId, groupId, target.user, target.server, target.device]);
-        return row ? (0, sqlite_1.decodeSenderKeyDistributionRow)(row) : null;
-    }
     async getDeviceSenderKeyDistributions(groupId, senders) {
         if (senders.length === 0) {
             return [];
@@ -139,14 +127,29 @@ class SenderKeySqliteStore extends BaseSqliteStore_1.BaseSqliteStore {
         if (participants.length === 0) {
             return 0;
         }
-        return this.withTransaction(async (db) => {
-            let deleted = 0;
-            for (const participant of participants) {
-                const sender = (0, sqlite_1.toSignalAddressParts)(participant);
-                deleted += this.countDelete(db, 'sender_keys', sender, groupId);
-                deleted += this.countDelete(db, 'sender_key_distribution', sender, groupId);
+        return this.withTransaction((db) => {
+            let filters = '';
+            const params = [this.options.sessionId, groupId];
+            for (let index = 0; index < participants.length; index += 1) {
+                if (index > 0) {
+                    filters += ' OR ';
+                }
+                filters += '(sender_user = ? AND sender_server = ? AND sender_device = ?)';
+                const sender = (0, sqlite_1.toSignalAddressParts)(participants[index]);
+                params.push(sender.user, sender.server, sender.device);
             }
-            return deleted;
+            const where = `session_id = ? AND group_id = ? AND (${filters})`;
+            db.run(`DELETE FROM sender_keys WHERE ${where}`, params);
+            const senderCountRow = db.get('SELECT changes() AS total', []);
+            const senderCount = senderCountRow
+                ? (0, coercion_1.asNumber)(senderCountRow.total, 'sender_keys.changes')
+                : 0;
+            db.run(`DELETE FROM sender_key_distribution WHERE ${where}`, params);
+            const distributionCountRow = db.get('SELECT changes() AS total', []);
+            const distributionCount = distributionCountRow
+                ? (0, coercion_1.asNumber)(distributionCountRow.total, 'sender_key_distribution.changes')
+                : 0;
+            return senderCount + distributionCount;
         });
     }
     async clear() {
@@ -160,20 +163,12 @@ class SenderKeySqliteStore extends BaseSqliteStore_1.BaseSqliteStore {
     countDelete(db, table, target, groupId) {
         const whereWithGroup = 'session_id = ? AND sender_user = ? AND sender_server = ? AND sender_device = ? AND group_id = ?';
         const whereAllGroups = 'session_id = ? AND sender_user = ? AND sender_server = ? AND sender_device = ?';
-        const countRow = db.get(`SELECT COUNT(*) AS count
-             FROM ${table}
-             WHERE ${groupId ? whereWithGroup : whereAllGroups}`, groupId
-            ? [this.options.sessionId, target.user, target.server, target.device, groupId]
-            : [this.options.sessionId, target.user, target.server, target.device]);
-        const count = (0, sqlite_1.decodeSqliteCount)(countRow, `${table}.count`);
-        if (count === 0) {
-            return 0;
-        }
         db.run(`DELETE FROM ${table}
              WHERE ${groupId ? whereWithGroup : whereAllGroups}`, groupId
             ? [this.options.sessionId, target.user, target.server, target.device, groupId]
             : [this.options.sessionId, target.user, target.server, target.device]);
-        return count;
+        const row = db.get('SELECT changes() AS total', []);
+        return row ? (0, coercion_1.asNumber)(row.total, `${table}.changes`) : 0;
     }
     upsertSenderKeyDistributionRow(db, record, sender) {
         db.run(`INSERT INTO sender_key_distribution (

package/dist/store/providers/sqlite/signal.store.js

@@ -1,14 +1,24 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.WaSignalSqliteStore = void 0;
+const jid_1 = require("../../../protocol/jid");
 const sqlite_1 = require("../../../signal/store/sqlite");
 const BaseSqliteStore_1 = require("../../providers/sqlite/BaseSqliteStore");
 const coercion_1 = require("../../../util/coercion");
-const signal_address_1 = require("../../../util/signal-address");
 const DEFAULTS = Object.freeze({
     preKeyBatchSize: 500,
     hasSessionBatchSize: 250
 });
+function repeatSqlToken(token, count, separator) {
+    if (count <= 1) {
+        return token;
+    }
+    let out = token;
+    for (let index = 1; index < count; index += 1) {
+        out += separator + token;
+    }
+    return out;
+}
 class WaSignalSqliteStore extends BaseSqliteStore_1.BaseSqliteStore {
     constructor(options, storeOptions = {}) {
         super(options, ['signal']);
@@ -144,7 +154,7 @@ class WaSignalSqliteStore extends BaseSqliteStore_1.BaseSqliteStore {
         for (let start = 0; start < uniqueKeyIds.length; start += this.preKeyBatchSize) {
             const end = Math.min(start + this.preKeyBatchSize, uniqueKeyIds.length);
             const batchLength = end - start;
-            const placeholders = new Array(batchLength).fill('?').join(', ');
+            const placeholders = repeatSqlToken('?', batchLength, ', ');
             const params = [this.options.sessionId];
             for (let index = start; index < end; index += 1) {
                 params.push(uniqueKeyIds[index]);
@@ -216,9 +226,7 @@ class WaSignalSqliteStore extends BaseSqliteStore_1.BaseSqliteStore {
         for (let start = 0; start < targets.length; start += this.hasSessionBatchSize) {
             const end = Math.min(start + this.hasSessionBatchSize, targets.length);
             const batchLength = end - start;
-            const filters = new Array(batchLength)
-                .fill('(user = ? AND server = ? AND device = ?)')
-                .join(' OR ');
+            const filters = repeatSqlToken('(user = ? AND server = ? AND device = ?)', batchLength, ' OR ');
             const params = [this.options.sessionId];
             for (let index = start; index < end; index += 1) {
                 const target = targets[index];
@@ -228,14 +236,14 @@ class WaSignalSqliteStore extends BaseSqliteStore_1.BaseSqliteStore {
                  FROM signal_session
                  WHERE session_id = ? AND (${filters})`, params);
             for (const row of rows) {
-                existingKeys.add((0, signal_address_1.signalAddressKey)({
+                existingKeys.add((0, jid_1.signalAddressKey)({
                     user: (0, coercion_1.asString)(row.user, 'signal_session.user'),
                     server: (0, coercion_1.asString)(row.server, 'signal_session.server'),
                     device: (0, coercion_1.asNumber)(row.device, 'signal_session.device')
                 }));
             }
         }
-        return addresses.map((address) => existingKeys.has((0, signal_address_1.signalAddressKey)(address)));
+        return targets.map((target) => existingKeys.has((0, jid_1.signalAddressKey)(target)));
     }
     async getSession(address) {
         const db = await this.getConnection();
@@ -245,24 +253,50 @@ class WaSignalSqliteStore extends BaseSqliteStore_1.BaseSqliteStore {
              WHERE session_id = ? AND user = ? AND server = ? AND device = ?`, [this.options.sessionId, target.user, target.server, target.device]);
         return row ? (0, sqlite_1.decodeSignalSessionRecord)(row.record) : null;
     }
+    async getSessionsBatch(addresses) {
+        if (addresses.length === 0) {
+            return [];
+        }
+        const db = await this.getConnection();
+        const targets = addresses.map((address) => (0, sqlite_1.toSignalAddressParts)(address));
+        const byAddressKey = new Map();
+        for (let start = 0; start < targets.length; start += this.hasSessionBatchSize) {
+            const end = Math.min(start + this.hasSessionBatchSize, targets.length);
+            const batchLength = end - start;
+            const filters = repeatSqlToken('(user = ? AND server = ? AND device = ?)', batchLength, ' OR ');
+            const params = [this.options.sessionId];
+            for (let index = start; index < end; index += 1) {
+                const target = targets[index];
+                params.push(target.user, target.server, target.device);
+            }
+            const rows = db.all(`SELECT user, server, device, record
+                 FROM signal_session
+                 WHERE session_id = ? AND (${filters})`, params);
+            for (const row of rows) {
+                byAddressKey.set((0, jid_1.signalAddressKey)({
+                    user: (0, coercion_1.asString)(row.user, 'signal_session.user'),
+                    server: (0, coercion_1.asString)(row.server, 'signal_session.server'),
+                    device: (0, coercion_1.asNumber)(row.device, 'signal_session.device')
+                }), (0, sqlite_1.decodeSignalSessionRecord)(row.record));
+            }
+        }
+        return targets.map((target) => byAddressKey.get((0, jid_1.signalAddressKey)(target)) ?? null);
+    }
     async setSession(address, session) {
         const db = await this.getConnection();
         const target = (0, sqlite_1.toSignalAddressParts)(address);
-        db.run(`INSERT INTO signal_session (
-                session_id,
-                user,
-                server,
-                device,
-                record
-            ) VALUES (?, ?, ?, ?, ?)
-            ON CONFLICT(session_id, user, server, device) DO UPDATE SET
-                record=excluded.record`, [
-            this.options.sessionId,
-            target.user,
-            target.server,
-            target.device,
-            (0, sqlite_1.encodeSignalSessionRecord)(session)
-        ]);
+        this.upsertSession(db, target, session);
+    }
+    async setSessionsBatch(entries) {
+        if (entries.length === 0) {
+            return;
+        }
+        await this.withTransaction((db) => {
+            for (let index = 0; index < entries.length; index += 1) {
+                const entry = entries[index];
+                this.upsertSession(db, (0, sqlite_1.toSignalAddressParts)(entry.address), entry.session);
+            }
+        });
     }
     async deleteSession(address) {
         const db = await this.getConnection();
@@ -278,6 +312,35 @@ class WaSignalSqliteStore extends BaseSqliteStore_1.BaseSqliteStore {
              WHERE session_id = ? AND user = ? AND server = ? AND device = ?`, [this.options.sessionId, target.user, target.server, target.device]);
         return row ? (0, sqlite_1.decodeSignalRemoteIdentity)(row.identity_key) : null;
     }
+    async getRemoteIdentities(addresses) {
+        if (addresses.length === 0) {
+            return [];
+        }
+        const db = await this.getConnection();
+        const targets = addresses.map((address) => (0, sqlite_1.toSignalAddressParts)(address));
+        const byAddressKey = new Map();
+        for (let start = 0; start < targets.length; start += this.hasSessionBatchSize) {
+            const end = Math.min(start + this.hasSessionBatchSize, targets.length);
+            const batchLength = end - start;
+            const filters = repeatSqlToken('(user = ? AND server = ? AND device = ?)', batchLength, ' OR ');
+            const params = [this.options.sessionId];
+            for (let index = start; index < end; index += 1) {
+                const target = targets[index];
+                params.push(target.user, target.server, target.device);
+            }
+            const rows = db.all(`SELECT user, server, device, identity_key
+                 FROM signal_identity
+                 WHERE session_id = ? AND (${filters})`, params);
+            for (const row of rows) {
+                byAddressKey.set((0, jid_1.signalAddressKey)({
+                    user: (0, coercion_1.asString)(row.user, 'signal_identity.user'),
+                    server: (0, coercion_1.asString)(row.server, 'signal_identity.server'),
+                    device: (0, coercion_1.asNumber)(row.device, 'signal_identity.device')
+                }), (0, sqlite_1.decodeSignalRemoteIdentity)(row.identity_key));
+            }
+        }
+        return targets.map((target) => byAddressKey.get((0, jid_1.signalAddressKey)(target)) ?? null);
+    }
     async setRemoteIdentity(address, identityKey) {
         const db = await this.getConnection();
         const target = (0, sqlite_1.toSignalAddressParts)(address);
@@ -297,7 +360,9 @@ class WaSignalSqliteStore extends BaseSqliteStore_1.BaseSqliteStore {
     async clear() {
         await this.withTransaction((db) => {
             db.run('DELETE FROM signal_registration WHERE session_id = ?', [this.options.sessionId]);
-            db.run('DELETE FROM signal_signed_prekey WHERE session_id = ?', [this.options.sessionId]);
+            db.run('DELETE FROM signal_signed_prekey WHERE session_id = ?', [
+                this.options.sessionId
+            ]);
             db.run('DELETE FROM signal_prekey WHERE session_id = ?', [this.options.sessionId]);
             db.run('DELETE FROM signal_session WHERE session_id = ?', [this.options.sessionId]);
             db.run('DELETE FROM signal_identity WHERE session_id = ?', [this.options.sessionId]);
@@ -323,6 +388,23 @@ class WaSignalSqliteStore extends BaseSqliteStore_1.BaseSqliteStore {
             record.uploaded === true ? 1 : 0
         ]);
     }
+    upsertSession(db, target, session) {
+        db.run(`INSERT INTO signal_session (
+                session_id,
+                user,
+                server,
+                device,
+                record
+            ) VALUES (?, ?, ?, ?, ?)
+            ON CONFLICT(session_id, user, server, device) DO UPDATE SET
+                record=excluded.record`, [
+            this.options.sessionId,
+            target.user,
+            target.server,
+            target.device,
+            (0, sqlite_1.encodeSignalSessionRecord)(session)
+        ]);
+    }
     ensureMetaRow(db) {
         db.run(`INSERT INTO signal_meta (
                 session_id,

package/dist/store/providers/sqlite/table-names.js

@@ -0,0 +1,113 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.WA_SQLITE_DEFAULT_TABLE_NAMES = void 0;
+exports.resolveSqliteTableNames = resolveSqliteTableNames;
+exports.serializeSqliteTableNames = serializeSqliteTableNames;
+exports.createSqliteTableNameSqlResolver = createSqliteTableNameSqlResolver;
+const SQLITE_TABLE_NAME_PATTERN = /^[A-Za-z_][A-Za-z0-9_]*$/;
+const WA_SQLITE_TABLE_NAME_ORDER = Object.freeze([
+    'wa_migrations',
+    'auth_credentials',
+    'signal_meta',
+    'signal_registration',
+    'signal_signed_prekey',
+    'signal_prekey',
+    'signal_session',
+    'signal_identity',
+    'sender_keys',
+    'sender_key_distribution',
+    'appstate_sync_keys',
+    'appstate_collection_versions',
+    'appstate_collection_index_values',
+    'retry_outbound_messages',
+    'retry_inbound_counters',
+    'mailbox_messages',
+    'mailbox_threads',
+    'mailbox_contacts',
+    'group_participants_cache',
+    'device_list_cache'
+]);
+const WA_SQLITE_ALLOWED_TABLE_NAME_SET = new Set(WA_SQLITE_TABLE_NAME_ORDER);
+const WA_SQLITE_ALLOWED_TABLE_NAME_LIST = WA_SQLITE_TABLE_NAME_ORDER.join(', ');
+exports.WA_SQLITE_DEFAULT_TABLE_NAMES = Object.freeze({
+    wa_migrations: 'wa_migrations',
+    auth_credentials: 'auth_credentials',
+    signal_meta: 'signal_meta',
+    signal_registration: 'signal_registration',
+    signal_signed_prekey: 'signal_signed_prekey',
+    signal_prekey: 'signal_prekey',
+    signal_session: 'signal_session',
+    signal_identity: 'signal_identity',
+    sender_keys: 'sender_keys',
+    sender_key_distribution: 'sender_key_distribution',
+    appstate_sync_keys: 'appstate_sync_keys',
+    appstate_collection_versions: 'appstate_collection_versions',
+    appstate_collection_index_values: 'appstate_collection_index_values',
+    retry_outbound_messages: 'retry_outbound_messages',
+    retry_inbound_counters: 'retry_inbound_counters',
+    mailbox_messages: 'mailbox_messages',
+    mailbox_threads: 'mailbox_threads',
+    mailbox_contacts: 'mailbox_contacts',
+    group_participants_cache: 'group_participants_cache',
+    device_list_cache: 'device_list_cache'
+});
+const DEFAULT_SQLITE_TABLE_NAME_SERIALIZATION = serializeSqliteTableNames(exports.WA_SQLITE_DEFAULT_TABLE_NAMES);
+function normalizeTableName(table, rawValue) {
+    const value = rawValue.trim();
+    if (value.length === 0) {
+        throw new Error(`sqlite tableNames.${table} must be a non-empty string`);
+    }
+    if (!SQLITE_TABLE_NAME_PATTERN.test(value)) {
+        throw new Error(`sqlite tableNames.${table} must match ${SQLITE_TABLE_NAME_PATTERN.toString()}`);
+    }
+    return value;
+}
+function assertNoDuplicateTableNames(tableNames) {
+    const seen = new Set();
+    for (const table of WA_SQLITE_TABLE_NAME_ORDER) {
+        const mapped = tableNames[table];
+        const normalizedMapped = mapped.toLowerCase();
+        if (seen.has(normalizedMapped)) {
+            throw new Error(`sqlite tableNames contains duplicate target "${mapped}"`);
+        }
+        seen.add(normalizedMapped);
+    }
+}
+function resolveSqliteTableNames(overrides) {
+    if (!overrides) {
+        return exports.WA_SQLITE_DEFAULT_TABLE_NAMES;
+    }
+    const entries = Object.entries(overrides);
+    if (entries.length === 0) {
+        return exports.WA_SQLITE_DEFAULT_TABLE_NAMES;
+    }
+    const resolved = {
+        ...exports.WA_SQLITE_DEFAULT_TABLE_NAMES
+    };
+    for (const [table, rawName] of entries) {
+        if (!WA_SQLITE_ALLOWED_TABLE_NAME_SET.has(table)) {
+            throw new Error(`unsupported sqlite tableNames key "${table}". Allowed table names: ${WA_SQLITE_ALLOWED_TABLE_NAME_LIST}`);
+        }
+        if (typeof rawName !== 'string') {
+            throw new Error(`sqlite tableNames.${table} must be a string`);
+        }
+        const tableName = table;
+        resolved[tableName] = normalizeTableName(tableName, rawName);
+    }
+    assertNoDuplicateTableNames(resolved);
+    return Object.freeze(resolved);
+}
+function serializeSqliteTableNames(tableNames) {
+    return WA_SQLITE_TABLE_NAME_ORDER.map((table) => `${table}=${tableNames[table]}`).join(';');
+}
+function escapeRegexToken(value) {
+    return value.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
+}
+function createSqliteTableNameSqlResolver(tableNames) {
+    const serialized = serializeSqliteTableNames(tableNames);
+    if (serialized === DEFAULT_SQLITE_TABLE_NAME_SERIALIZATION) {
+        return (sql) => sql;
+    }
+    const pattern = new RegExp(`\\b(?:${WA_SQLITE_TABLE_NAME_ORDER.map(escapeRegexToken).join('|')})\\b`, 'g');
+    return (sql) => sql.replace(pattern, (token) => tableNames[token] ?? token);
+}

package/dist/store/providers/sqlite/thread.store.js

@@ -23,28 +23,17 @@ class WaThreadSqliteStore extends BaseSqliteStore_1.BaseSqliteStore {
     }
     async upsert(record) {
         const db = await this.getConnection();
-        db.run(`INSERT INTO mailbox_threads (
-                session_id, jid, name, unread_count, archived, pinned,
-                mute_end_ms, marked_as_unread, ephemeral_expiration
-            ) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?)
-            ON CONFLICT(session_id, jid) DO UPDATE SET
-                name=COALESCE(excluded.name, mailbox_threads.name),
-                unread_count=COALESCE(excluded.unread_count, mailbox_threads.unread_count),
-                archived=COALESCE(excluded.archived, mailbox_threads.archived),
-                pinned=COALESCE(excluded.pinned, mailbox_threads.pinned),
-                mute_end_ms=COALESCE(excluded.mute_end_ms, mailbox_threads.mute_end_ms),
-                marked_as_unread=COALESCE(excluded.marked_as_unread, mailbox_threads.marked_as_unread),
-                ephemeral_expiration=COALESCE(excluded.ephemeral_expiration, mailbox_threads.ephemeral_expiration)`, [
-            this.options.sessionId,
-            record.jid,
-            record.name ?? null,
-            record.unreadCount ?? null,
-            record.archived === undefined ? null : record.archived ? 1 : 0,
-            record.pinned ?? null,
-            record.muteEndMs ?? null,
-            record.markedAsUnread === undefined ? null : record.markedAsUnread ? 1 : 0,
-            record.ephemeralExpiration ?? null
-        ]);
+        this.upsertThreadRow(db, record);
+    }
+    async upsertBatch(records) {
+        if (records.length === 0) {
+            return;
+        }
+        await this.withTransaction((db) => {
+            for (const record of records) {
+                this.upsertThreadRow(db, record);
+            }
+        });
     }
     async getByJid(jid) {
         const db = await this.getConnection();
@@ -72,5 +61,29 @@ class WaThreadSqliteStore extends BaseSqliteStore_1.BaseSqliteStore {
         const db = await this.getConnection();
         db.run('DELETE FROM mailbox_threads WHERE session_id = ?', [this.options.sessionId]);
     }
+    upsertThreadRow(db, record) {
+        db.run(`INSERT INTO mailbox_threads (
+                session_id, jid, name, unread_count, archived, pinned,
+                mute_end_ms, marked_as_unread, ephemeral_expiration
+            ) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?)
+            ON CONFLICT(session_id, jid) DO UPDATE SET
+                name=COALESCE(excluded.name, mailbox_threads.name),
+                unread_count=COALESCE(excluded.unread_count, mailbox_threads.unread_count),
+                archived=COALESCE(excluded.archived, mailbox_threads.archived),
+                pinned=COALESCE(excluded.pinned, mailbox_threads.pinned),
+                mute_end_ms=COALESCE(excluded.mute_end_ms, mailbox_threads.mute_end_ms),
+                marked_as_unread=COALESCE(excluded.marked_as_unread, mailbox_threads.marked_as_unread),
+                ephemeral_expiration=COALESCE(excluded.ephemeral_expiration, mailbox_threads.ephemeral_expiration)`, [
+            this.options.sessionId,
+            record.jid,
+            record.name ?? null,
+            record.unreadCount ?? null,
+            record.archived === undefined ? null : record.archived ? 1 : 0,
+            record.pinned ?? null,
+            record.muteEndMs ?? null,
+            record.markedAsUnread === undefined ? null : record.markedAsUnread ? 1 : 0,
+            record.ephemeralExpiration ?? null
+        ]);
+    }
 }
 exports.WaThreadSqliteStore = WaThreadSqliteStore;

package/dist/transport/WaComms.js

@@ -6,8 +6,8 @@ const BoundedTaskQueue_1 = require("../infra/perf/BoundedTaskQueue");
 const constants_1 = require("../protocol/constants");
 const WaNoiseSession_1 = require("./noise/WaNoiseSession");
 const WaWebSocket_1 = require("./WaWebSocket");
-const base64_1 = require("../util/base64");
 const bytes_1 = require("../util/bytes");
+const bytes_2 = require("../util/bytes");
 const primitives_1 = require("../util/primitives");
 const WA_FRAME_HANDLER_QUEUE_MAX_SIZE = 4096;
 const WA_FRAME_HANDLER_MAX_CONCURRENCY = 8;
@@ -30,6 +30,8 @@ class WaComms {
             url: this.config.url,
             urls: this.config.urls,
             protocols: this.config.protocols,
+            dispatcher: this.config.dispatcher,
+            agent: this.config.agent,
             timeoutIntervalMs: this.config.timeoutIntervalMs
         }, logger);
         this.socket.setHandlers({
@@ -80,7 +82,7 @@ class WaComms {
         if (!routingInfo || routingInfo.byteLength === 0) {
             return config;
         }
-        const edValue = (0, base64_1.bytesToBase64UrlSafe)(routingInfo);
+        const edValue = (0, bytes_1.bytesToBase64UrlSafe)(routingInfo);
         const appendEd = (url) => {
             try {
                 const parsed = new URL(url);
@@ -147,9 +149,7 @@ class WaComms {
     startHandlingRequests() {
         this.handlingRequests = true;
         this.logger.debug('comms request handling enabled');
-        this.frameProcessingQueue = this.frameProcessingQueue
-            .catch(() => undefined)
-            .then(async () => this.flushPendingFrames());
+        this.frameProcessingQueue = this.frameProcessingQueue.then(() => this.flushPendingFrames(), () => this.flushPendingFrames());
     }
     async stopComms() {
         this.logger.info('comms stop requested');
@@ -275,9 +275,7 @@ class WaComms {
         });
     }
     onSocketMessage(payload) {
-        this.frameProcessingQueue = this.frameProcessingQueue
-            .catch(() => undefined)
-            .then(async () => this.processSocketPayload(payload));
+        this.frameProcessingQueue = this.frameProcessingQueue.then(() => this.processSocketPayload(payload), () => this.processSocketPayload(payload));
     }
     async processSocketPayload(payload) {
         if (!this.noiseSession) {
@@ -342,7 +340,7 @@ class WaComms {
             this.noiseSession = null;
             throw error;
         }
-        const buffered = await session.pushWireChunk(bytes_1.EMPTY_BYTES);
+        const buffered = await session.pushWireChunk(bytes_2.EMPTY_BYTES);
         this.routeDecodedFrames(buffered);
         this.resumeHandshakeFailures = 0;
         this.lastServerStaticKey = session.getServerStaticKey();
@@ -426,20 +424,19 @@ class WaComms {
     }
     scheduleDecodedFrame(frame) {
         void this.frameHandlerQueue
-            .enqueue(async () => this.onDecodedFrame(frame))
+            .enqueue(() => this.onDecodedFrame(frame))
             .catch((error) => {
-            const normalized = (0, primitives_1.toError)(error);
-            this.logger.error('failed to enqueue decoded frame handler', {
-                message: normalized.message
-            });
-            if (!(error instanceof BoundedTaskQueue_1.BoundedTaskQueueFullError)) {
+            if (error instanceof BoundedTaskQueue_1.BoundedTaskQueueFullError) {
+                this.logger.warn('frame handler queue is full, resuming socket to preserve bounds', {
+                    pending: this.frameHandlerQueue.pending(),
+                    inFlight: this.frameHandlerQueue.inFlight()
+                });
+                void this.closeSocketAndResume();
                 return;
             }
-            this.logger.warn('frame handler queue is full, processing frame inline', {
-                pending: this.frameHandlerQueue.pending(),
-                inFlight: this.frameHandlerQueue.inFlight()
+            this.logger.error('failed to enqueue decoded frame handler', {
+                message: (0, primitives_1.toError)(error).message
             });
-            void this.onDecodedFrame(frame);
         });
     }
     scheduleReconnect() {
@@ -463,12 +460,16 @@ class WaComms {
         this.reconnectTimer = null;
     }
     removeWaiter(reject) {
-        const index = this.waiters.findIndex((entry) => entry.reject === reject);
-        if (index === -1) {
+        for (let index = 0; index < this.waiters.length; index += 1) {
+            const waiter = this.waiters[index];
+            if (waiter.reject !== reject) {
+                continue;
+            }
+            clearTimeout(waiter.timer);
+            this.waiters[index] = this.waiters[this.waiters.length - 1];
+            this.waiters.pop();
             return;
         }
-        const [waiter] = this.waiters.splice(index, 1);
-        clearTimeout(waiter.timer);
     }
     withStickyRoutingCookie(headers) {
         const out = headers ? { ...headers } : {};
@@ -521,11 +522,12 @@ class WaComms {
         }
     }
     drainWaiters(drain) {
-        const waiters = this.waiters.splice(0, this.waiters.length);
-        for (const waiter of waiters) {
+        for (let index = this.waiters.length - 1; index >= 0; index -= 1) {
+            const waiter = this.waiters[index];
             clearTimeout(waiter.timer);
             drain(waiter);
         }
+        this.waiters.length = 0;
     }
 }
 exports.WaComms = WaComms;