zapo-js 0.1.0 → 0.1.2

package/dist/esm/store/providers/memory/signal.store.js

@@ -1,6 +1,6 @@
+import { signalAddressKey } from '../../../protocol/jid.js';
 import { resolvePositive } from '../../../util/coercion.js';
 import { setBoundedMapEntry } from '../../../util/collections.js';
-import { signalAddressKey } from '../../../util/signal-address.js';
 const DEFAULT_SIGNAL_STORE_LIMITS = Object.freeze({
     preKeys: 4096,
     sessions: 8192,
@@ -126,15 +126,27 @@ export class WaSignalMemoryStore {
     async getSession(address) {
         return this.signalSessions.get(signalAddressKey(address)) ?? null;
     }
+    async getSessionsBatch(addresses) {
+        return addresses.map((address) => this.signalSessions.get(signalAddressKey(address)) ?? null);
+    }
     async setSession(address, session) {
         setBoundedMapEntry(this.signalSessions, signalAddressKey(address), session, this.maxSessions);
     }
+    async setSessionsBatch(entries) {
+        for (let index = 0; index < entries.length; index += 1) {
+            const entry = entries[index];
+            setBoundedMapEntry(this.signalSessions, signalAddressKey(entry.address), entry.session, this.maxSessions);
+        }
+    }
     async deleteSession(address) {
         this.signalSessions.delete(signalAddressKey(address));
     }
     async getRemoteIdentity(address) {
         return this.remoteIdentities.get(signalAddressKey(address)) ?? null;
     }
+    async getRemoteIdentities(addresses) {
+        return addresses.map((address) => this.remoteIdentities.get(signalAddressKey(address)) ?? null);
+    }
     async setRemoteIdentity(address, identityKey) {
         setBoundedMapEntry(this.remoteIdentities, signalAddressKey(address), identityKey, this.maxRemoteIdentities);
     }

package/dist/esm/store/providers/memory/thread.store.js

@@ -11,6 +11,11 @@ export class WaThreadMemoryStore {
     async upsert(record) {
         setBoundedMapEntry(this.threads, record.jid, record, this.maxThreads);
     }
+    async upsertBatch(records) {
+        for (const record of records) {
+            setBoundedMapEntry(this.threads, record.jid, record, this.maxThreads);
+        }
+    }
     async getByJid(jid) {
         return this.threads.get(jid) ?? null;
     }

package/dist/esm/store/providers/sqlite/appstate.store.js

@@ -2,8 +2,18 @@ import { APP_STATE_EMPTY_LT_HASH } from '../../../appstate/constants.js';
 import { decodeAppStateCollections, decodeAppStateFingerprint, decodeAppStateSyncKeys, encodeAppStateFingerprint } from '../../../appstate/store/sqlite.js';
 import { keyEpoch, pickActiveSyncKey } from '../../../appstate/utils.js';
 import { BaseSqliteStore } from '../../providers/sqlite/BaseSqliteStore.js';
-import { uint8Equal } from '../../../util/bytes.js';
+import { bytesToHex, uint8Equal } from '../../../util/bytes.js';
 import { asBytes, asNumber, asString } from '../../../util/coercion.js';
+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;
+}
 export class WaAppStateSqliteStore extends BaseSqliteStore {
     constructor(options) {
         super(options, ['appState']);
@@ -85,6 +95,25 @@ export class WaAppStateSqliteStore extends BaseSqliteStore {
         }
         return asBytes(row.key_data, 'appstate_sync_keys.key_data');
     }
+    async getSyncKeyDataBatch(keyIds) {
+        if (keyIds.length === 0) {
+            return [];
+        }
+        const db = await this.getConnection();
+        const uniqueKeyIds = [
+            ...new Map(keyIds.map((keyId) => [bytesToHex(keyId), keyId])).values()
+        ];
+        const placeholders = repeatSqlToken('?', uniqueKeyIds.length, ', ');
+        const params = [this.options.sessionId, ...uniqueKeyIds];
+        const rows = db.all(`SELECT key_id, key_data
+             FROM appstate_sync_keys
+             WHERE session_id = ? AND key_id IN (${placeholders})`, params);
+        const byKeyHex = new Map();
+        for (const row of rows) {
+            byKeyHex.set(bytesToHex(asBytes(row.key_id, 'appstate_sync_keys.key_id')), asBytes(row.key_data, 'appstate_sync_keys.key_data'));
+        }
+        return keyIds.map((keyId) => byKeyHex.get(bytesToHex(keyId)) ?? null);
+    }
     async getActiveSyncKey() {
         const db = await this.getConnection();
         const rows = db.all(`SELECT key_id, key_data, timestamp, fingerprint
@@ -109,6 +138,7 @@ export class WaAppStateSqliteStore extends BaseSqliteStore {
              WHERE session_id = ? AND collection = ?`, [this.options.sessionId, collection]);
         if (!versionRow) {
             return {
+                initialized: false,
                 version: 0,
                 hash: APP_STATE_EMPTY_LT_HASH,
                 indexValueMap: new Map()
@@ -122,11 +152,62 @@ export class WaAppStateSqliteStore extends BaseSqliteStore {
             indexValueMap.set(asString(row.index_mac_hex, 'appstate_collection_index_values.index_mac_hex'), asBytes(row.value_mac, 'appstate_collection_index_values.value_mac'));
         }
         return {
+            initialized: true,
             version: asNumber(versionRow.version, 'appstate_collection_versions.version'),
             hash: asBytes(versionRow.hash, 'appstate_collection_versions.hash'),
             indexValueMap
         };
     }
+    async getCollectionStates(collections) {
+        if (collections.length === 0) {
+            return [];
+        }
+        const db = await this.getConnection();
+        const uniqueCollections = [...new Set(collections)];
+        const placeholders = repeatSqlToken('?', uniqueCollections.length, ', ');
+        const params = [this.options.sessionId, ...uniqueCollections];
+        const versionRows = db.all(`SELECT collection, version, hash
+             FROM appstate_collection_versions
+             WHERE session_id = ? AND collection IN (${placeholders})`, params);
+        const valueRows = db.all(`SELECT collection, index_mac_hex, value_mac
+             FROM appstate_collection_index_values
+             WHERE session_id = ? AND collection IN (${placeholders})`, params);
+        const versionsByCollection = new Map();
+        for (const row of versionRows) {
+            const collection = asString(row.collection, 'appstate_collection_versions.collection');
+            versionsByCollection.set(collection, {
+                version: asNumber(row.version, 'appstate_collection_versions.version'),
+                hash: asBytes(row.hash, 'appstate_collection_versions.hash')
+            });
+        }
+        const indexValueMaps = new Map();
+        for (const row of valueRows) {
+            const collection = asString(row.collection, 'appstate_collection_index_values.collection');
+            const map = indexValueMaps.get(collection);
+            const targetMap = map ?? new Map();
+            targetMap.set(asString(row.index_mac_hex, 'appstate_collection_index_values.index_mac_hex'), asBytes(row.value_mac, 'appstate_collection_index_values.value_mac'));
+            if (!map) {
+                indexValueMaps.set(collection, targetMap);
+            }
+        }
+        return collections.map((collection) => {
+            const version = versionsByCollection.get(collection);
+            if (!version) {
+                return {
+                    initialized: false,
+                    version: 0,
+                    hash: APP_STATE_EMPTY_LT_HASH,
+                    indexValueMap: new Map()
+                };
+            }
+            return {
+                initialized: true,
+                version: version.version,
+                hash: version.hash,
+                indexValueMap: indexValueMaps.get(collection) ?? new Map()
+            };
+        });
+    }
     async setCollectionStates(updates) {
         if (updates.length === 0) {
             return;

package/dist/esm/store/providers/sqlite/connection.js

@@ -1,3 +1,4 @@
+import { createSqliteTableNameSqlResolver, resolveSqliteTableNames, serializeSqliteTableNames } from '../../providers/sqlite/table-names.js';
 import { toSafeNumber } from '../../../util/primitives.js';
 import { isBunRuntime } from '../../../util/runtime.js';
 const BETTER_SQLITE3_MODULE = 'better-sqlite3';
@@ -51,21 +52,22 @@ function statementFor(db, sql) {
     }
     return statement;
 }
-function wrapConnection(db, driver, onClose) {
+function wrapConnection(db, driver, resolveSql, onClose) {
     const statementCache = new Map();
     const cachedStatementFor = (sql) => {
-        const cached = statementCache.get(sql);
+        const resolvedSql = resolveSql(sql);
+        const cached = statementCache.get(resolvedSql);
         if (cached) {
             return cached;
         }
-        const statement = statementFor(db, sql);
-        statementCache.set(sql, statement);
+        const statement = statementFor(db, resolvedSql);
+        statementCache.set(resolvedSql, statement);
         return statement;
     };
     return {
         driver,
         exec(sql) {
-            db.exec(sql);
+            db.exec(resolveSql(sql));
         },
         run(sql, params) {
             const statement = cachedStatementFor(sql);
@@ -159,7 +161,7 @@ function closeDatabaseSafely(db) {
         return;
     }
 }
-async function openBetterSqlite(options, onClose) {
+async function openBetterSqlite(options, resolveSql, onClose) {
     let loaded;
     try {
         loaded = await import(BETTER_SQLITE3_MODULE);
@@ -176,9 +178,9 @@ async function openBetterSqlite(options, onClose) {
         closeDatabaseSafely(db);
         throw error;
     }
-    return wrapConnection(db, 'better-sqlite3', onClose);
+    return wrapConnection(db, 'better-sqlite3', resolveSql, onClose);
 }
-async function openBunSqlite(options, onClose) {
+async function openBunSqlite(options, resolveSql, onClose) {
     let loaded;
     try {
         loaded = await import(BUN_SQLITE_MODULE);
@@ -201,7 +203,7 @@ async function openBunSqlite(options, onClose) {
         closeDatabaseSafely(db);
         throw error;
     }
-    return wrapConnection(db, 'bun', onClose);
+    return wrapConnection(db, 'bun', resolveSql, onClose);
 }
 function resolveDriver(requested) {
     if (requested && requested !== 'auto') {
@@ -211,15 +213,18 @@ function resolveDriver(requested) {
 }
 export async function openSqliteConnection(options) {
     const driver = resolveDriver(options.driver);
+    const resolvedTableNames = resolveSqliteTableNames(options.tableNames);
+    const resolveSql = createSqliteTableNameSqlResolver(resolvedTableNames);
     const normalizedOptions = {
         ...options,
         driver,
-        pragmas: mergePragmas(options.pragmas)
+        pragmas: mergePragmas(options.pragmas),
+        tableNames: resolvedTableNames
     };
     const cacheKey = `${driver}|${options.path}|${Object.entries(normalizedOptions.pragmas ?? {})
         .sort(([left], [right]) => left.localeCompare(right))
         .map(([key, value]) => `${key}=${String(value)}`)
-        .join(';')}`;
+        .join(';')}|${serializeSqliteTableNames(resolvedTableNames)}`;
     const cached = SQLITE_CONNECTION_CACHE.get(cacheKey);
     if (cached) {
         return cached;
@@ -228,8 +233,8 @@ export async function openSqliteConnection(options) {
         SQLITE_CONNECTION_CACHE.delete(cacheKey);
     };
     const created = driver === 'bun'
-        ? openBunSqlite(normalizedOptions, onClose)
-        : openBetterSqlite(normalizedOptions, onClose);
+        ? openBunSqlite(normalizedOptions, resolveSql, onClose)
+        : openBetterSqlite(normalizedOptions, resolveSql, onClose);
     const guarded = created.catch((error) => {
         SQLITE_CONNECTION_CACHE.delete(cacheKey);
         throw error;

package/dist/esm/store/providers/sqlite/contact.store.js

@@ -16,6 +16,37 @@ export class WaContactSqliteStore extends BaseSqliteStore {
     }
     async upsert(record) {
         const db = await this.getConnection();
+        this.upsertContactRow(db, record);
+    }
+    async upsertBatch(records) {
+        if (records.length === 0) {
+            return;
+        }
+        await this.withTransaction((db) => {
+            for (const record of records) {
+                this.upsertContactRow(db, record);
+            }
+        });
+    }
+    async getByJid(jid) {
+        const db = await this.getConnection();
+        const row = db.get(`SELECT jid, display_name, push_name, lid, phone_number, last_updated_ms
+             FROM mailbox_contacts
+             WHERE session_id = ? AND jid = ?`, [this.options.sessionId, jid]);
+        return row ? decodeContactRow(row) : null;
+    }
+    async deleteByJid(jid) {
+        const db = await this.getConnection();
+        db.run(`DELETE FROM mailbox_contacts
+             WHERE session_id = ? AND jid = ?`, [this.options.sessionId, jid]);
+        const row = db.get('SELECT changes() AS total', []);
+        return row ? Number(row.total) : 0;
+    }
+    async clear() {
+        const db = await this.getConnection();
+        db.run('DELETE FROM mailbox_contacts WHERE session_id = ?', [this.options.sessionId]);
+    }
+    upsertContactRow(db, record) {
         db.run(`INSERT INTO mailbox_contacts (
                 session_id,
                 jid,
@@ -40,22 +71,4 @@ export class WaContactSqliteStore extends BaseSqliteStore {
             record.lastUpdatedMs
         ]);
     }
-    async getByJid(jid) {
-        const db = await this.getConnection();
-        const row = db.get(`SELECT jid, display_name, push_name, lid, phone_number, last_updated_ms
-             FROM mailbox_contacts
-             WHERE session_id = ? AND jid = ?`, [this.options.sessionId, jid]);
-        return row ? decodeContactRow(row) : null;
-    }
-    async deleteByJid(jid) {
-        const db = await this.getConnection();
-        db.run(`DELETE FROM mailbox_contacts
-             WHERE session_id = ? AND jid = ?`, [this.options.sessionId, jid]);
-        const row = db.get('SELECT changes() AS total', []);
-        return row ? Number(row.total) : 0;
-    }
-    async clear() {
-        const db = await this.getConnection();
-        db.run('DELETE FROM mailbox_contacts WHERE session_id = ?', [this.options.sessionId]);
-    }
 }

package/dist/esm/store/providers/sqlite/device-list.store.js

@@ -10,13 +10,6 @@ export class WaDeviceListSqliteStore extends BaseSqliteStore {
         this.ttlMs = ttlMs;
         this.batchSize = resolvePositive(batchSize, DEFAULTS.batchSize, 'deviceList.sqlite.batchSize');
     }
-    getTtlMs() {
-        return this.ttlMs;
-    }
-    async upsertUserDevices(snapshot) {
-        const db = await this.getConnection();
-        this.upsertUserDevicesRow(db, snapshot);
-    }
     async upsertUserDevicesBatch(snapshots) {
         if (snapshots.length === 0) {
             return;
@@ -27,26 +20,6 @@ export class WaDeviceListSqliteStore extends BaseSqliteStore {
             }
         });
     }
-    async getUserDevices(userJid, nowMs = Date.now()) {
-        const db = await this.getConnection();
-        const row = db.get(`SELECT user_jid, device_jids_json, updated_at_ms, expires_at_ms
-             FROM device_list_cache
-             WHERE session_id = ? AND user_jid = ?`, [this.options.sessionId, userJid]);
-        if (!row) {
-            return null;
-        }
-        const expiresAtMs = asNumber(row.expires_at_ms, 'device_list_cache.expires_at_ms');
-        if (expiresAtMs <= nowMs) {
-            db.run(`DELETE FROM device_list_cache
-                 WHERE session_id = ? AND user_jid = ?`, [this.options.sessionId, userJid]);
-            return null;
-        }
-        return {
-            userJid: asString(row.user_jid, 'device_list_cache.user_jid'),
-            deviceJids: decodeDeviceJids(row.device_jids_json),
-            updatedAtMs: asNumber(row.updated_at_ms, 'device_list_cache.updated_at_ms')
-        };
-    }
     async getUserDevicesBatch(userJids, nowMs = Date.now()) {
         if (userJids.length === 0) {
             return [];
@@ -58,7 +31,7 @@ export class WaDeviceListSqliteStore extends BaseSqliteStore {
             for (let start = 0; start < uniqueUserJids.length; start += this.batchSize) {
                 const end = Math.min(start + this.batchSize, uniqueUserJids.length);
                 const batchLength = end - start;
-                const placeholders = new Array(batchLength).fill('?').join(', ');
+                const placeholders = '?, '.repeat(batchLength).slice(0, -2);
                 const params = [this.options.sessionId];
                 for (let index = start; index < end; index += 1) {
                     params.push(uniqueUserJids[index]);
@@ -130,7 +103,7 @@ export class WaDeviceListSqliteStore extends BaseSqliteStore {
         for (let start = 0; start < userJids.length; start += this.batchSize) {
             const end = Math.min(start + this.batchSize, userJids.length);
             const batchLength = end - start;
-            const placeholders = new Array(batchLength).fill('?').join(', ');
+            const placeholders = '?, '.repeat(batchLength).slice(0, -2);
             const params = [this.options.sessionId];
             for (let index = start; index < end; index += 1) {
                 params.push(userJids[index]);
@@ -146,10 +119,9 @@ function decodeDeviceJids(raw) {
     if (!Array.isArray(parsed)) {
         throw new Error('device_list_cache.device_jids_json must be an array');
     }
-    return parsed.filter((entry) => {
-        if (typeof entry !== 'string') {
-            throw new Error('device_list_cache.device_jids_json entry must be string');
-        }
-        return true;
-    });
+    const deviceJids = new Array(parsed.length);
+    for (let index = 0; index < parsed.length; index += 1) {
+        deviceJids[index] = asString(parsed[index], 'device_list_cache.device_jids_json entry');
+    }
+    return deviceJids;
 }

package/dist/esm/store/providers/sqlite/message.store.js

@@ -20,38 +20,17 @@ export class WaMessageSqliteStore extends BaseSqliteStore {
     }
     async upsert(record) {
         const db = await this.getConnection();
-        db.run(`INSERT INTO mailbox_messages (
-                session_id,
-                message_id,
-                thread_jid,
-                sender_jid,
-                participant_jid,
-                from_me,
-                timestamp_ms,
-                enc_type,
-                plaintext,
-                message_bytes
-            ) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
-            ON CONFLICT(session_id, message_id) DO UPDATE SET
-                thread_jid=excluded.thread_jid,
-                sender_jid=excluded.sender_jid,
-                participant_jid=excluded.participant_jid,
-                from_me=excluded.from_me,
-                timestamp_ms=excluded.timestamp_ms,
-                enc_type=excluded.enc_type,
-                plaintext=excluded.plaintext,
-                message_bytes=excluded.message_bytes`, [
-            this.options.sessionId,
-            record.id,
-            record.threadJid,
-            record.senderJid ?? null,
-            record.participantJid ?? null,
-            record.fromMe ? 1 : 0,
-            record.timestampMs ?? null,
-            record.encType ?? null,
-            record.plaintext ?? null,
-            record.messageBytes ?? null
-        ]);
+        this.upsertMessageRow(db, record);
+    }
+    async upsertBatch(records) {
+        if (records.length === 0) {
+            return;
+        }
+        await this.withTransaction((db) => {
+            for (const record of records) {
+                this.upsertMessageRow(db, record);
+            }
+        });
     }
     async getById(id) {
         const db = await this.getConnection();
@@ -116,4 +95,38 @@ export class WaMessageSqliteStore extends BaseSqliteStore {
         const db = await this.getConnection();
         db.run('DELETE FROM mailbox_messages WHERE session_id = ?', [this.options.sessionId]);
     }
+    upsertMessageRow(db, record) {
+        db.run(`INSERT INTO mailbox_messages (
+                session_id,
+                message_id,
+                thread_jid,
+                sender_jid,
+                participant_jid,
+                from_me,
+                timestamp_ms,
+                enc_type,
+                plaintext,
+                message_bytes
+            ) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
+            ON CONFLICT(session_id, message_id) DO UPDATE SET
+                thread_jid=excluded.thread_jid,
+                sender_jid=excluded.sender_jid,
+                participant_jid=excluded.participant_jid,
+                from_me=excluded.from_me,
+                timestamp_ms=excluded.timestamp_ms,
+                enc_type=excluded.enc_type,
+                plaintext=excluded.plaintext,
+                message_bytes=excluded.message_bytes`, [
+            this.options.sessionId,
+            record.id,
+            record.threadJid,
+            record.senderJid ?? null,
+            record.participantJid ?? null,
+            record.fromMe ? 1 : 0,
+            record.timestampMs ?? null,
+            record.encType ?? null,
+            record.plaintext ?? null,
+            record.messageBytes ?? null
+        ]);
+    }
 }

package/dist/esm/store/providers/sqlite/migrations.js

@@ -293,7 +293,7 @@ function isMigrationAlreadyAppliedRace(error) {
     if (!(error instanceof Error)) {
         return false;
     }
-    return error.message.includes('UNIQUE constraint failed: wa_migrations.id');
+    return /UNIQUE constraint failed: [A-Za-z_][A-Za-z0-9_]*\.id/.test(error.message);
 }
 function ensureMigrationTable(db) {
     db.exec(`

package/dist/esm/store/providers/sqlite/participants.store.js

@@ -6,9 +6,6 @@ export class WaParticipantsSqliteStore extends BaseSqliteStore {
         super(options, ['participants']);
         this.ttlMs = ttlMs;
     }
-    getTtlMs() {
-        return this.ttlMs;
-    }
     async upsertGroupParticipants(snapshot) {
         const db = await this.getConnection();
         db.run(`INSERT INTO group_participants_cache (
@@ -76,10 +73,5 @@ function decodeParticipants(raw) {
     if (!Array.isArray(parsed)) {
         throw new Error('group_participants_cache.participants_json must be an array');
     }
-    return parsed.filter((entry) => {
-        if (typeof entry !== 'string') {
-            throw new Error('group_participants_cache.participants_json entry must be string');
-        }
-        return true;
-    });
+    return parsed.map((entry) => asString(entry, 'group_participants_cache.participants_json entry'));
 }

package/dist/esm/store/providers/sqlite/retry.store.js

@@ -113,12 +113,18 @@ export class WaRetrySqliteStore extends BaseSqliteStore {
     }
     async cleanupExpired(nowMs) {
         return this.withTransaction(async (db) => {
-            const outboundCount = this.countRows(db, 'retry_outbound_messages', nowMs);
-            const inboundCount = this.countRows(db, 'retry_inbound_counters', nowMs);
             db.run(`DELETE FROM retry_outbound_messages
                  WHERE session_id = ? AND expires_at_ms <= ?`, [this.options.sessionId, nowMs]);
+            const outboundCountRow = db.get('SELECT changes() AS total', []);
+            const outboundCount = outboundCountRow
+                ? asNumber(outboundCountRow.total, 'retry_outbound_messages.changes')
+                : 0;
             db.run(`DELETE FROM retry_inbound_counters
                  WHERE session_id = ? AND expires_at_ms <= ?`, [this.options.sessionId, nowMs]);
+            const inboundCountRow = db.get('SELECT changes() AS total', []);
+            const inboundCount = inboundCountRow
+                ? asNumber(inboundCountRow.total, 'retry_inbound_counters.changes')
+                : 0;
             return outboundCount + inboundCount;
         });
     }
@@ -132,13 +138,4 @@ export class WaRetrySqliteStore extends BaseSqliteStore {
             ]);
         });
     }
-    countRows(db, table, nowMs) {
-        const row = db.get(`SELECT COUNT(*) AS total
-             FROM ${table}
-             WHERE session_id = ? AND expires_at_ms <= ?`, [this.options.sessionId, nowMs]);
-        if (!row) {
-            return 0;
-        }
-        return asNumber(row.total, `${table}.count`);
-    }
 }

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

@@ -1,4 +1,4 @@
-import { decodeSenderKeyDistributionRow, decodeSenderKeyRecord, decodeSqliteCount, encodeSenderKeyRecord, toSignalAddressParts } from '../../../signal/store/sqlite.js';
+import { decodeSenderKeyDistributionRow, decodeSenderKeyRecord, encodeSenderKeyRecord, toSignalAddressParts } from '../../../signal/store/sqlite.js';
 import { BaseSqliteStore } from '../../providers/sqlite/BaseSqliteStore.js';
 import { asNumber, asString, resolvePositive } from '../../../util/coercion.js';
 const DEFAULTS = Object.freeze({
@@ -82,18 +82,6 @@ export class SenderKeySqliteStore extends BaseSqliteStore {
             device: asNumber(row.sender_device, 'sender_keys.sender_device')
         });
     }
-    async getDeviceSenderKeyDistribution(groupId, sender) {
-        const db = await this.getConnection();
-        const target = 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 ? decodeSenderKeyDistributionRow(row) : null;
-    }
     async getDeviceSenderKeyDistributions(groupId, senders) {
         if (senders.length === 0) {
             return [];
@@ -136,14 +124,29 @@ export class SenderKeySqliteStore extends BaseSqliteStore {
         if (participants.length === 0) {
             return 0;
         }
-        return this.withTransaction(async (db) => {
-            let deleted = 0;
-            for (const participant of participants) {
-                const sender = 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 = 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
+                ? 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
+                ? asNumber(distributionCountRow.total, 'sender_key_distribution.changes')
+                : 0;
+            return senderCount + distributionCount;
         });
     }
     async clear() {
@@ -157,20 +160,12 @@ export class SenderKeySqliteStore extends 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 = 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 ? asNumber(row.total, `${table}.changes`) : 0;
     }
     upsertSenderKeyDistributionRow(db, record, sender) {
         db.run(`INSERT INTO sender_key_distribution (