@wireapp/core 40.5.2 → 40.5.3-draft-20-cc.3

package/lib/messagingProtocols/proteus/ProteusService/CryptoClient/CoreCryptoWrapper/CoreCryptoWrapper.d.ts

@@ -1,6 +1,7 @@
 import { PreKey } from '@wireapp/api-client/lib/auth';
 import { CoreCrypto } from '@wireapp/core-crypto';
 import type { CRUDEngine } from '@wireapp/store-engine';
+import { CoreDatabase } from '../../../../../storage/CoreDB';
 import { SecretCrypto } from '../../../../mls/types';
 import { CryptoClient } from '../CryptoClient.types';
 type Config = {
@@ -11,16 +12,16 @@ type Config = {
 type ClientConfig = Config & {
     onWipe: () => Promise<void>;
 };
-export declare function buildClient(storeEngine: CRUDEngine, coreCryptoWasmFilePath: string, { systemCrypto, nbPrekeys, onNewPrekeys }: Config): Promise<CoreCryptoWrapper>;
+export declare function buildClient(storeEngine: CRUDEngine, coreCryptoWasmFilePath: string, db: CoreDatabase, { systemCrypto, nbPrekeys, onNewPrekeys }: Config): Promise<CoreCryptoWrapper>;
 export declare class CoreCryptoWrapper implements CryptoClient {
     private readonly coreCrypto;
     private readonly config;
     private readonly prekeyTracker;
-    constructor(coreCrypto: CoreCrypto, config: ClientConfig);
+    constructor(coreCrypto: CoreCrypto, db: CoreDatabase, config: ClientConfig);
     getNativeClient(): CoreCrypto;
     encrypt(sessions: string[], plainText: Uint8Array): Promise<Map<string, Uint8Array>>;
     decrypt(sessionId: string, message: Uint8Array): Promise<Uint8Array>;
-    init(nbInitialPrekeys?: number): Promise<void>;
+    init(): Promise<void>;
     create(nbPrekeys: number, entropy?: Uint8Array): Promise<{
         prekeys: PreKey[];
         lastPrekey: {
@@ -36,19 +37,13 @@ export declare class CoreCryptoWrapper implements CryptoClient {
     saveSession(sessionId: string): Promise<void>;
     deleteSession(sessionId: string): Promise<void>;
     consumePrekey(): Promise<void>;
-    newPrekey(): Promise<{
+    newPrekey(id: number): Promise<{
         id: number;
         key: string;
     }>;
     debugBreakSession(sessionId: string): Promise<void>;
     debugResetIdentity(): Promise<void>;
     migrateFromCryptobox(dbName: string): Promise<void>;
-    /**
-     * Will call the callback once corecrypto is ready.
-     * @param callback - Function to be called once corecrypto is ready.
-     * @see https://github.com/wireapp/wire-web-packages/pull/4972
-     */
-    private onReady;
     wipe(): Promise<void>;
 }
 export {};

package/lib/messagingProtocols/proteus/ProteusService/CryptoClient/CoreCryptoWrapper/CoreCryptoWrapper.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"CoreCryptoWrapper.d.ts","sourceRoot":"","sources":["../../../../../../src/messagingProtocols/proteus/ProteusService/CryptoClient/CoreCryptoWrapper/CoreCryptoWrapper.ts"],"names":[],"mappings":"AAmBA,OAAO,EAAC,MAAM,EAAC,MAAM,8BAA8B,CAAC;AAIpD,OAAO,EAAc,UAAU,EAAC,MAAM,sBAAsB,CAAC;AAC7D,OAAO,KAAK,EAAC,UAAU,EAAC,MAAM,uBAAuB,CAAC;AAKtD,OAAO,EAAC,YAAY,EAAC,MAAM,uBAAuB,CAAC;AACnD,OAAO,EAAC,YAAY,EAAC,MAAM,uBAAuB,CAAC;AAEnD,KAAK,MAAM,GAAG;IACZ,YAAY,CAAC,EAAE,YAAY,CAAC;IAC5B,SAAS,EAAE,MAAM,CAAC;IAClB,YAAY,EAAE,CAAC,OAAO,EAAE,MAAM,EAAE,KAAK,IAAI,CAAC;CAC3C,CAAC;AAEF,KAAK,YAAY,GAAG,MAAM,GAAG;IAC3B,MAAM,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;CAC7B,CAAC;AAEF,wBAAsB,WAAW,CAC/B,WAAW,EAAE,UAAU,EACvB,sBAAsB,EAAE,MAAM,EAC9B,EAAC,YAAY,EAAE,SAAS,EAAE,YAAY,EAAC,EAAE,MAAM,GAC9C,OAAO,CAAC,iBAAiB,CAAC,CA6B5B;AAED,qBAAa,iBAAkB,YAAW,YAAY;IAGxC,OAAO,CAAC,QAAQ,CAAC,UAAU;IAAc,OAAO,CAAC,QAAQ,CAAC,MAAM;IAF5E,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAgB;gBAEjB,UAAU,EAAE,UAAU,EAAmB,MAAM,EAAE,YAAY;IAI1F,eAAe;IAIf,OAAO,CAAC,QAAQ,EAAE,MAAM,EAAE,EAAE,SAAS,EAAE,UAAU;IAIjD,OAAO,CAAC,SAAS,EAAE,MAAM,EAAE,OAAO,EAAE,UAAU;IAI9C,IAAI,CAAC,gBAAgB,CAAC,EAAE,MAAM;IAOxB,MAAM,CAAC,SAAS,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,UAAU;;;;;;;IAqBpD,cAAc;IAId,oBAAoB,CAAC,SAAS,EAAE,MAAM;IAIhC,kBAAkB,CAAC,SAAS,EAAE,MAAM,EAAE,OAAO,EAAE,UAAU;IAK/D,iBAAiB,CAAC,SAAS,EAAE,MAAM,EAAE,MAAM,EAAE,UAAU;IAIvD,aAAa,CAAC,SAAS,EAAE,MAAM;IAI/B,WAAW,CAAC,SAAS,EAAE,MAAM;IAI7B,aAAa,CAAC,SAAS,EAAE,MAAM;IAI/B,aAAa;IAIP,SAAS;;;;IAKT,iBAAiB,CAAC,SAAS,EAAE,MAAM;IAUnC,kBAAkB;IAIlB,oBAAoB,CAAC,MAAM,EAAE,MAAM;IAIzC;;;;OAIG;IACH,OAAO,CAAC,OAAO;IAgBT,IAAI;CAIX"}
+{"version":3,"file":"CoreCryptoWrapper.d.ts","sourceRoot":"","sources":["../../../../../../src/messagingProtocols/proteus/ProteusService/CryptoClient/CoreCryptoWrapper/CoreCryptoWrapper.ts"],"names":[],"mappings":"AAmBA,OAAO,EAAC,MAAM,EAAC,MAAM,8BAA8B,CAAC;AAIpD,OAAO,EAAC,UAAU,EAAC,MAAM,sBAAsB,CAAC;AAChD,OAAO,KAAK,EAAC,UAAU,EAAC,MAAM,uBAAuB,CAAC;AAKtD,OAAO,EAAC,YAAY,EAAC,MAAM,+BAA+B,CAAC;AAC3D,OAAO,EAAC,YAAY,EAAC,MAAM,uBAAuB,CAAC;AACnD,OAAO,EAAC,YAAY,EAAC,MAAM,uBAAuB,CAAC;AAEnD,KAAK,MAAM,GAAG;IACZ,YAAY,CAAC,EAAE,YAAY,CAAC;IAC5B,SAAS,EAAE,MAAM,CAAC;IAClB,YAAY,EAAE,CAAC,OAAO,EAAE,MAAM,EAAE,KAAK,IAAI,CAAC;CAC3C,CAAC;AAEF,KAAK,YAAY,GAAG,MAAM,GAAG;IAC3B,MAAM,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;CAC7B,CAAC;AAEF,wBAAsB,WAAW,CAC/B,WAAW,EAAE,UAAU,EACvB,sBAAsB,EAAE,MAAM,EAC9B,EAAE,EAAE,YAAY,EAChB,EAAC,YAAY,EAAE,SAAS,EAAE,YAAY,EAAC,EAAE,MAAM,GAC9C,OAAO,CAAC,iBAAiB,CAAC,CA4B5B;AAED,qBAAa,iBAAkB,YAAW,YAAY;IAGxC,OAAO,CAAC,QAAQ,CAAC,UAAU;IAAgC,OAAO,CAAC,QAAQ,CAAC,MAAM;IAF9F,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAgB;gBAEjB,UAAU,EAAE,UAAU,EAAE,EAAE,EAAE,YAAY,EAAmB,MAAM,EAAE,YAAY;IAI5G,eAAe;IAIf,OAAO,CAAC,QAAQ,EAAE,MAAM,EAAE,EAAE,SAAS,EAAE,UAAU;IAIjD,OAAO,CAAC,SAAS,EAAE,MAAM,EAAE,OAAO,EAAE,UAAU;IAI9C,IAAI;IAIE,MAAM,CAAC,SAAS,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,UAAU;;;;;;;IAsBpD,cAAc;IAId,oBAAoB,CAAC,SAAS,EAAE,MAAM;IAIhC,kBAAkB,CAAC,SAAS,EAAE,MAAM,EAAE,OAAO,EAAE,UAAU;IAK/D,iBAAiB,CAAC,SAAS,EAAE,MAAM,EAAE,MAAM,EAAE,UAAU;IAIvD,aAAa,CAAC,SAAS,EAAE,MAAM;IAI/B,WAAW,CAAC,SAAS,EAAE,MAAM;IAI7B,aAAa,CAAC,SAAS,EAAE,MAAM;IAI/B,aAAa;IAIP,SAAS,CAAC,EAAE,EAAE,MAAM;;;;IAKpB,iBAAiB,CAAC,SAAS,EAAE,MAAM;IAUnC,kBAAkB;IAIlB,oBAAoB,CAAC,MAAM,EAAE,MAAM;IAInC,IAAI;CAIX"}

package/lib/messagingProtocols/proteus/ProteusService/CryptoClient/CoreCryptoWrapper/CoreCryptoWrapper.js

@@ -24,7 +24,7 @@ const idb_1 = require("idb");
 const core_crypto_1 = require("@wireapp/core-crypto");
 const PrekeysTracker_1 = require("./PrekeysTracker");
 const secretKeyGenerator_1 = require("./secretKeyGenerator");
-async function buildClient(storeEngine, coreCryptoWasmFilePath, { systemCrypto, nbPrekeys, onNewPrekeys }) {
+async function buildClient(storeEngine, coreCryptoWasmFilePath, db, { systemCrypto, nbPrekeys, onNewPrekeys }) {
     let key;
     const coreCryptoDbName = `corecrypto-${storeEngine.storeName}`;
     const secretKeysDbName = `secrets-${storeEngine.storeName}`;
@@ -52,16 +52,15 @@ async function buildClient(storeEngine, coreCryptoWasmFilePath, { systemCrypto,
         databaseName: coreCryptoDbName,
         key: bazinga64_1.Encoder.toBase64(key.key).asString,
         wasmFilePath: coreCryptoWasmFilePath,
-        ciphersuites: [core_crypto_1.Ciphersuite.MLS_128_DHKEMX25519_AES128GCM_SHA256_Ed25519],
     });
-    return new CoreCryptoWrapper(coreCrypto, { nbPrekeys, onNewPrekeys, onWipe: key.deleteKey });
+    return new CoreCryptoWrapper(coreCrypto, db, { nbPrekeys, onNewPrekeys, onWipe: key.deleteKey });
 }
 exports.buildClient = buildClient;
 class CoreCryptoWrapper {
-    constructor(coreCrypto, config) {
+    constructor(coreCrypto, db, config) {
         this.coreCrypto = coreCrypto;
         this.config = config;
-        this.prekeyTracker = new PrekeysTracker_1.PrekeyTracker(this, config);
+        this.prekeyTracker = new PrekeysTracker_1.PrekeyTracker(this, db, config);
     }
     getNativeClient() {
         return this.coreCrypto;
@@ -72,10 +71,7 @@ class CoreCryptoWrapper {
     decrypt(sessionId, message) {
         return this.coreCrypto.proteusDecrypt(sessionId, message);
     }
-    init(nbInitialPrekeys) {
-        if (nbInitialPrekeys) {
-            this.prekeyTracker.setInitialState(nbInitialPrekeys);
-        }
+    init() {
         return this.coreCrypto.proteusInit();
     }
     async create(nbPrekeys, entropy) {
@@ -85,8 +81,9 @@ class CoreCryptoWrapper {
         await this.init();
         const prekeys = [];
         for (let id = 0; id < nbPrekeys; id++) {
-            prekeys.push(await this.newPrekey());
+            prekeys.push(await this.newPrekey(id));
         }
+        await this.prekeyTracker.setInitialState(prekeys.length);
         const lastPrekeyBytes = await this.coreCrypto.proteusLastResortPrekey();
         const lastPrekey = bazinga64_1.Encoder.toBase64(lastPrekeyBytes).asString;
         const lastPrekeyId = core_crypto_1.CoreCrypto.proteusLastResortPrekeyId();
@@ -120,9 +117,9 @@ class CoreCryptoWrapper {
     consumePrekey() {
         return this.prekeyTracker.consumePrekey();
     }
-    async newPrekey() {
-        const { id, pkb } = await this.coreCrypto.proteusNewPrekeyAuto();
-        return { id, key: bazinga64_1.Encoder.toBase64(pkb).asString };
+    async newPrekey(id) {
+        const key = await this.coreCrypto.proteusNewPrekey(id);
+        return { id, key: bazinga64_1.Encoder.toBase64(key).asString };
     }
     async debugBreakSession(sessionId) {
         const fakePrekey = [
@@ -139,28 +136,9 @@ class CoreCryptoWrapper {
     async migrateFromCryptobox(dbName) {
         return this.coreCrypto.proteusCryptoboxMigrate(dbName);
     }
-    /**
-     * Will call the callback once corecrypto is ready.
-     * @param callback - Function to be called once corecrypto is ready.
-     * @see https://github.com/wireapp/wire-web-packages/pull/4972
-     */
-    onReady(callback) {
-        if (!this.coreCrypto.isLocked()) {
-            return callback();
-        }
-        return new Promise(resolve => {
-            const intervalId = setInterval(async () => {
-                if (!this.coreCrypto.isLocked()) {
-                    clearInterval(intervalId);
-                    await callback();
-                    return resolve();
-                }
-            }, 100);
-        });
-    }
     async wipe() {
         await this.config.onWipe();
-        await this.onReady(() => this.coreCrypto.wipe());
+        return this.coreCrypto.wipe();
     }
 }
 exports.CoreCryptoWrapper = CoreCryptoWrapper;

package/lib/messagingProtocols/proteus/ProteusService/CryptoClient/CoreCryptoWrapper/PrekeysTracker/PrekeysTracker.d.ts

@@ -1,5 +1,6 @@
 import { PreKey } from '@wireapp/api-client/lib/auth';
 import { CryptoClient } from '../..';
+import type { CoreDatabase } from '../../../../../../storage/CoreDB';
 type CoreCryptoPrekeyGenerator = Pick<CryptoClient, 'newPrekey'>;
 interface PrekeysGeneratorConfig {
     /**
@@ -16,10 +17,10 @@ export declare class PrekeyTracker {
     private readonly generator;
     private config;
     private prekeyState;
-    constructor(generator: CoreCryptoPrekeyGenerator, config: PrekeysGeneratorConfig);
+    constructor(generator: CoreCryptoPrekeyGenerator, db: CoreDatabase, config: PrekeysGeneratorConfig);
     private generatePrekeys;
-    setInitialState(nbPrekeys: number): number;
     consumePrekey(): Promise<void>;
+    setInitialState(nbInitialPrekeys: number): Promise<void>;
     private numberOfMissingPrekeys;
 }
 export {};

package/lib/messagingProtocols/proteus/ProteusService/CryptoClient/CoreCryptoWrapper/PrekeysTracker/PrekeysTracker.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"PrekeysTracker.d.ts","sourceRoot":"","sources":["../../../../../../../src/messagingProtocols/proteus/ProteusService/CryptoClient/CoreCryptoWrapper/PrekeysTracker/PrekeysTracker.ts"],"names":[],"mappings":"AAmBA,OAAO,EAAC,MAAM,EAAC,MAAM,8BAA8B,CAAC;AAIpD,OAAO,EAAC,YAAY,EAAC,MAAM,OAAO,CAAC;AAEnC,KAAK,yBAAyB,GAAG,IAAI,CAAC,YAAY,EAAE,WAAW,CAAC,CAAC;AAEjE,UAAU,sBAAsB;IAC9B;;;OAGG;IACH,SAAS,EAAE,MAAM,CAAC;IAClB;;OAEG;IACH,YAAY,EAAE,CAAC,OAAO,EAAE,MAAM,EAAE,KAAK,IAAI,CAAC;CAC3C;AAED,qBAAa,aAAa;IAGZ,OAAO,CAAC,QAAQ,CAAC,SAAS;IAA6B,OAAO,CAAC,MAAM;IAFjF,OAAO,CAAC,WAAW,CAAsB;gBAEZ,SAAS,EAAE,yBAAyB,EAAU,MAAM,EAAE,sBAAsB;YAI3F,eAAe;IAQ7B,eAAe,CAAC,SAAS,EAAE,MAAM;IAI3B,aAAa;IAUnB,OAAO,CAAC,sBAAsB;CAK/B"}
+{"version":3,"file":"PrekeysTracker.d.ts","sourceRoot":"","sources":["../../../../../../../src/messagingProtocols/proteus/ProteusService/CryptoClient/CoreCryptoWrapper/PrekeysTracker/PrekeysTracker.ts"],"names":[],"mappings":"AAmBA,OAAO,EAAC,MAAM,EAAC,MAAM,8BAA8B,CAAC;AAIpD,OAAO,EAAC,YAAY,EAAC,MAAM,OAAO,CAAC;AACnC,OAAO,KAAK,EAAC,YAAY,EAAC,MAAM,kCAAkC,CAAC;AAEnE,KAAK,yBAAyB,GAAG,IAAI,CAAC,YAAY,EAAE,WAAW,CAAC,CAAC;AAEjE,UAAU,sBAAsB;IAC9B;;;OAGG;IACH,SAAS,EAAE,MAAM,CAAC;IAClB;;OAEG;IACH,YAAY,EAAE,CAAC,OAAO,EAAE,MAAM,EAAE,KAAK,IAAI,CAAC;CAC3C;AAED,qBAAa,aAAa;IAItB,OAAO,CAAC,QAAQ,CAAC,SAAS;IAE1B,OAAO,CAAC,MAAM;IALhB,OAAO,CAAC,WAAW,CAAsB;gBAGtB,SAAS,EAAE,yBAAyB,EACrD,EAAE,EAAE,YAAY,EACR,MAAM,EAAE,sBAAsB;YAK1B,eAAe;IASvB,aAAa;IAUb,eAAe,CAAC,gBAAgB,EAAE,MAAM;IAI9C,OAAO,CAAC,sBAAsB;CAK/B"}

package/lib/messagingProtocols/proteus/ProteusService/CryptoClient/CoreCryptoWrapper/PrekeysTracker/PrekeysTracker.js

@@ -21,23 +21,21 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.PrekeyTracker = void 0;
 const PrekeysTracker_store_1 = require("./PrekeysTracker.store");
 class PrekeyTracker {
-    constructor(generator, config) {
+    constructor(generator, db, config) {
         this.generator = generator;
         this.config = config;
-        this.prekeyState = new PrekeysTracker_store_1.PrekeysTrackerStore();
+        this.prekeyState = new PrekeysTracker_store_1.PrekeysTrackerStore(db);
     }
     async generatePrekeys(nb) {
         const prekeys = [];
-        for (let i = 0; i < nb; i++) {
-            prekeys.push(await this.generator.newPrekey());
+        const ids = await this.prekeyState.createIds(nb);
+        for (const id of ids) {
+            prekeys.push(await this.generator.newPrekey(id));
         }
         return prekeys;
     }
-    setInitialState(nbPrekeys) {
-        return this.prekeyState.addPrekeys(nbPrekeys);
-    }
     async consumePrekey() {
-        const nbPrekeys = this.prekeyState.consumePrekey();
+        const nbPrekeys = await this.prekeyState.consumePrekey();
         const missingPrekeys = this.numberOfMissingPrekeys(nbPrekeys);
         if (missingPrekeys > 0) {
             // when the number of local prekeys hit less than a quarter of what it should be, we refill the stock
@@ -45,6 +43,9 @@ class PrekeyTracker {
             this.config.onNewPrekeys(newPrekeys);
         }
     }
+    async setInitialState(nbInitialPrekeys) {
+        await this.prekeyState.createIds(nbInitialPrekeys);
+    }
     numberOfMissingPrekeys(currentNumberOfPrekeys) {
         const threshold = Math.ceil(this.config.nbPrekeys / 2);
         const hasHitThreshold = currentNumberOfPrekeys <= threshold;

package/lib/messagingProtocols/proteus/ProteusService/CryptoClient/CoreCryptoWrapper/PrekeysTracker/PrekeysTracker.store.d.ts

@@ -1,14 +1,19 @@
+import { CoreDatabase } from '../../../../../../storage/CoreDB';
 export declare class PrekeysTrackerStore {
-    private setNbPrekeys;
+    private readonly db;
+    constructor(db: CoreDatabase);
+    private getState;
+    private saveState;
     /**
      * Will mark one prekey as consumed and decrease the total number of prekeys of 1
      * @returns the number of valid prekeys that are left
      */
-    consumePrekey(): number;
+    consumePrekey(): Promise<number>;
+    getNumberOfPrekeys(): Promise<number>;
     /**
-     * Will add to the number of prekeys that are stored
+     * will generate nbIds ids that can be used to store prekeys
      * @param nbIds the number of ids to generate
      */
-    addPrekeys(delta: number): number;
+    createIds(nbIds: number): Promise<number[]>;
 }
 //# sourceMappingURL=PrekeysTracker.store.d.ts.map

package/lib/messagingProtocols/proteus/ProteusService/CryptoClient/CoreCryptoWrapper/PrekeysTracker/PrekeysTracker.store.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"PrekeysTracker.store.d.ts","sourceRoot":"","sources":["../../../../../../../src/messagingProtocols/proteus/ProteusService/CryptoClient/CoreCryptoWrapper/PrekeysTracker/PrekeysTracker.store.ts"],"names":[],"mappings":"AAyBA,qBAAa,mBAAmB;IAC9B,OAAO,CAAC,YAAY;IAMpB;;;OAGG;IACH,aAAa,IAAI,MAAM;IAIvB;;;OAGG;IACH,UAAU,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM;CAGlC"}
+{"version":3,"file":"PrekeysTracker.store.d.ts","sourceRoot":"","sources":["../../../../../../../src/messagingProtocols/proteus/ProteusService/CryptoClient/CoreCryptoWrapper/PrekeysTracker/PrekeysTracker.store.ts"],"names":[],"mappings":"AAmBA,OAAO,EAAC,YAAY,EAAC,MAAM,kCAAkC,CAAC;AAQ9D,qBAAa,mBAAmB;IAClB,OAAO,CAAC,QAAQ,CAAC,EAAE;gBAAF,EAAE,EAAE,YAAY;YAE/B,QAAQ;YAIR,SAAS;IAIvB;;;OAGG;IACG,aAAa,IAAI,OAAO,CAAC,MAAM,CAAC;IAOhC,kBAAkB,IAAI,OAAO,CAAC,MAAM,CAAC;IAK3C;;;OAGG;IACG,SAAS,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC;CAMlD"}

package/lib/messagingProtocols/proteus/ProteusService/CryptoClient/CoreCryptoWrapper/PrekeysTracker/PrekeysTracker.store.js

@@ -19,26 +19,40 @@
  */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.PrekeysTrackerStore = void 0;
-let state = { nbPrekeys: 0 };
+const STATE_PRIMARY_KEY = 'prekeys_state';
 class PrekeysTrackerStore {
-    setNbPrekeys(delta) {
-        const newNbPrekeys = state.nbPrekeys + delta;
-        state = Object.assign(Object.assign({}, state), { nbPrekeys: newNbPrekeys });
-        return newNbPrekeys;
+    constructor(db) {
+        this.db = db;
+    }
+    async getState() {
+        var _a;
+        return (_a = (await this.db.get('prekeys', STATE_PRIMARY_KEY))) !== null && _a !== void 0 ? _a : { nbPrekeys: 0, highestId: 0 };
+    }
+    async saveState(state) {
+        await this.db.put('prekeys', state, STATE_PRIMARY_KEY);
     }
     /**
      * Will mark one prekey as consumed and decrease the total number of prekeys of 1
      * @returns the number of valid prekeys that are left
      */
-    consumePrekey() {
-        return this.setNbPrekeys(-1);
+    async consumePrekey() {
+        const currentState = await this.getState();
+        const newState = Object.assign(Object.assign({}, currentState), { nbPrekeys: currentState.nbPrekeys - 1 });
+        await this.saveState(newState);
+        return newState.nbPrekeys;
+    }
+    async getNumberOfPrekeys() {
+        const currentState = await this.getState();
+        return currentState.nbPrekeys;
     }
     /**
-     * Will add to the number of prekeys that are stored
+     * will generate nbIds ids that can be used to store prekeys
      * @param nbIds the number of ids to generate
      */
-    addPrekeys(delta) {
-        return this.setNbPrekeys(delta);
+    async createIds(nbIds) {
+        const currentState = await this.getState();
+        this.saveState({ nbPrekeys: currentState.highestId + nbIds, highestId: currentState.highestId + nbIds });
+        return Array.from(new Array(nbIds)).map((_, i) => currentState.highestId + 1 + i);
     }
 }
 exports.PrekeysTrackerStore = PrekeysTrackerStore;

package/lib/messagingProtocols/proteus/ProteusService/CryptoClient/CoreCryptoWrapper/PrekeysTracker/PrekeysTracker.test.js

@@ -19,7 +19,9 @@
  */
 Object.defineProperty(exports, "__esModule", { value: true });
 const PrekeysTracker_1 = require("./PrekeysTracker");
+const CoreDB_1 = require("../../../../../../storage/CoreDB");
 describe('PrekeysGenerator', () => {
+    let db;
     const baseConfig = {
         nbPrekeys: 10,
         onNewPrekeys: jest.fn(),
@@ -27,9 +29,15 @@ describe('PrekeysGenerator', () => {
     const mockPrekeyTracker = {
         newPrekey: jest.fn().mockResolvedValue(Uint8Array.from([])),
     };
+    beforeEach(async () => {
+        db = await (0, CoreDB_1.openDB)('test');
+    });
+    afterEach(async () => {
+        await db.clear('prekeys');
+    });
     it('triggers the threshold callback when number of prekeys hits the limit', async () => {
-        const prekeyTracker = new PrekeysTracker_1.PrekeyTracker(mockPrekeyTracker, baseConfig);
-        prekeyTracker.setInitialState(baseConfig.nbPrekeys);
+        const prekeyTracker = new PrekeysTracker_1.PrekeyTracker(mockPrekeyTracker, db, baseConfig);
+        await prekeyTracker.setInitialState(baseConfig.nbPrekeys);
         expect(baseConfig.onNewPrekeys).not.toHaveBeenCalled();
         await prekeyTracker.consumePrekey();
         await prekeyTracker.consumePrekey();

package/lib/messagingProtocols/proteus/ProteusService/CryptoClient/CryptoClient.d.ts

@@ -2,6 +2,7 @@ import { PreKey } from '@wireapp/api-client/lib/auth';
 import type { CRUDEngine } from '@wireapp/store-engine';
 import type { CoreCryptoWrapper } from './CoreCryptoWrapper/CoreCryptoWrapper';
 import type { CryptoboxWrapper } from './CryptoboxWrapper';
+import { CoreDatabase } from '../../../../storage/CoreDB';
 import { SecretCrypto } from '../../../mls/types';
 export declare enum CryptoClientType {
     CORE_CRYPTO = 0,
@@ -17,6 +18,6 @@ type InitConfig = WrapConfig & {
     systemCrypto?: SecretCrypto;
     coreCryptoWasmFilePath?: string;
 };
-export declare function buildCryptoClient(clientType: CryptoClientType, { storeEngine, nbPrekeys, systemCrypto, coreCryptoWasmFilePath, onNewPrekeys }: InitConfig): Promise<CryptoClientDef>;
+export declare function buildCryptoClient(clientType: CryptoClientType, db: CoreDatabase, { storeEngine, nbPrekeys, systemCrypto, coreCryptoWasmFilePath, onNewPrekeys }: InitConfig): Promise<CryptoClientDef>;
 export {};
 //# sourceMappingURL=CryptoClient.d.ts.map

package/lib/messagingProtocols/proteus/ProteusService/CryptoClient/CryptoClient.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"CryptoClient.d.ts","sourceRoot":"","sources":["../../../../../src/messagingProtocols/proteus/ProteusService/CryptoClient/CryptoClient.ts"],"names":[],"mappings":"AAmBA,OAAO,EAAC,MAAM,EAAC,MAAM,8BAA8B,CAAC;AAEpD,OAAO,KAAK,EAAC,UAAU,EAAC,MAAM,uBAAuB,CAAC;AAEtD,OAAO,KAAK,EAAC,iBAAiB,EAAC,MAAM,uCAAuC,CAAC;AAC7E,OAAO,KAAK,EAAC,gBAAgB,EAAC,MAAM,oBAAoB,CAAC;AAEzD,OAAO,EAAC,YAAY,EAAC,MAAM,oBAAoB,CAAC;AAEhD,oBAAY,gBAAgB;IAC1B,WAAW,IAAA;IACX,SAAS,IAAA;CACV;AAED,MAAM,MAAM,eAAe,GACvB,CAAC,gBAAgB,CAAC,SAAS,EAAE,gBAAgB,CAAC,GAC9C,CAAC,gBAAgB,CAAC,WAAW,EAAE,iBAAiB,CAAC,CAAC;AAEtD,KAAK,UAAU,GAAG;IAChB,SAAS,EAAE,MAAM,CAAC;IAClB,YAAY,EAAE,CAAC,OAAO,EAAE,MAAM,EAAE,KAAK,IAAI,CAAC;CAC3C,CAAC;AAEF,KAAK,UAAU,GAAG,UAAU,GAAG;IAC7B,WAAW,EAAE,UAAU,CAAC;IACxB,YAAY,CAAC,EAAE,YAAY,CAAC;IAC5B,sBAAsB,CAAC,EAAE,MAAM,CAAC;CACjC,CAAC;AAEF,wBAAsB,iBAAiB,CACrC,UAAU,EAAE,gBAAgB,EAC5B,EAAC,WAAW,EAAE,SAAS,EAAE,YAAY,EAAE,sBAAsB,EAAE,YAAY,EAAC,EAAE,UAAU,GACvF,OAAO,CAAC,eAAe,CAAC,CAc1B"}
+{"version":3,"file":"CryptoClient.d.ts","sourceRoot":"","sources":["../../../../../src/messagingProtocols/proteus/ProteusService/CryptoClient/CryptoClient.ts"],"names":[],"mappings":"AAmBA,OAAO,EAAC,MAAM,EAAC,MAAM,8BAA8B,CAAC;AAEpD,OAAO,KAAK,EAAC,UAAU,EAAC,MAAM,uBAAuB,CAAC;AAEtD,OAAO,KAAK,EAAC,iBAAiB,EAAC,MAAM,uCAAuC,CAAC;AAC7E,OAAO,KAAK,EAAC,gBAAgB,EAAC,MAAM,oBAAoB,CAAC;AAEzD,OAAO,EAAC,YAAY,EAAC,MAAM,4BAA4B,CAAC;AACxD,OAAO,EAAC,YAAY,EAAC,MAAM,oBAAoB,CAAC;AAEhD,oBAAY,gBAAgB;IAC1B,WAAW,IAAA;IACX,SAAS,IAAA;CACV;AAED,MAAM,MAAM,eAAe,GACvB,CAAC,gBAAgB,CAAC,SAAS,EAAE,gBAAgB,CAAC,GAC9C,CAAC,gBAAgB,CAAC,WAAW,EAAE,iBAAiB,CAAC,CAAC;AAEtD,KAAK,UAAU,GAAG;IAChB,SAAS,EAAE,MAAM,CAAC;IAClB,YAAY,EAAE,CAAC,OAAO,EAAE,MAAM,EAAE,KAAK,IAAI,CAAC;CAC3C,CAAC;AAEF,KAAK,UAAU,GAAG,UAAU,GAAG;IAC7B,WAAW,EAAE,UAAU,CAAC;IACxB,YAAY,CAAC,EAAE,YAAY,CAAC;IAC5B,sBAAsB,CAAC,EAAE,MAAM,CAAC;CACjC,CAAC;AAEF,wBAAsB,iBAAiB,CACrC,UAAU,EAAE,gBAAgB,EAC5B,EAAE,EAAE,YAAY,EAChB,EAAC,WAAW,EAAE,SAAS,EAAE,YAAY,EAAE,sBAAsB,EAAE,YAAY,EAAC,EAAE,UAAU,GACvF,OAAO,CAAC,eAAe,CAAC,CAc1B"}

package/lib/messagingProtocols/proteus/ProteusService/CryptoClient/CryptoClient.js

@@ -46,11 +46,11 @@ var CryptoClientType;
 (function (CryptoClientType) {
     CryptoClientType[CryptoClientType["CORE_CRYPTO"] = 0] = "CORE_CRYPTO";
     CryptoClientType[CryptoClientType["CRYPTOBOX"] = 1] = "CRYPTOBOX";
-})(CryptoClientType || (exports.CryptoClientType = CryptoClientType = {}));
-async function buildCryptoClient(clientType, { storeEngine, nbPrekeys, systemCrypto, coreCryptoWasmFilePath, onNewPrekeys }) {
+})(CryptoClientType = exports.CryptoClientType || (exports.CryptoClientType = {}));
+async function buildCryptoClient(clientType, db, { storeEngine, nbPrekeys, systemCrypto, coreCryptoWasmFilePath, onNewPrekeys }) {
     if (clientType === CryptoClientType.CORE_CRYPTO) {
         const { buildClient } = await Promise.resolve().then(() => __importStar(require('./CoreCryptoWrapper')));
-        const client = await buildClient(storeEngine, coreCryptoWasmFilePath !== null && coreCryptoWasmFilePath !== void 0 ? coreCryptoWasmFilePath : '', {
+        const client = await buildClient(storeEngine, coreCryptoWasmFilePath !== null && coreCryptoWasmFilePath !== void 0 ? coreCryptoWasmFilePath : '', db, {
             systemCrypto,
             nbPrekeys,
             onNewPrekeys,

package/lib/messagingProtocols/proteus/ProteusService/CryptoClient/CryptoClient.types.d.ts

@@ -10,7 +10,7 @@ export interface CryptoClient<T = unknown> {
     /**
      * Will init an already existing client. The client should already exist in the database. If the client doesn't exist, it needs to be created using the `create` method.
      */
-    init(nbPrekeys: number): Promise<void>;
+    init(): Promise<void>;
     /**
      * Will create a new client and store it in the database
      */
@@ -23,7 +23,7 @@ export interface CryptoClient<T = unknown> {
     saveSession(sessionId: string): Promise<void>;
     consumePrekey: () => Promise<void>;
     deleteSession(sessionId: string): Promise<void>;
-    newPrekey(): Promise<PreKey>;
+    newPrekey(id: number): Promise<PreKey>;
     debugBreakSession(sessionId: string): void;
     debugResetIdentity(): Promise<void>;
     /**

package/lib/messagingProtocols/proteus/ProteusService/CryptoClient/CryptoClient.types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"CryptoClient.types.d.ts","sourceRoot":"","sources":["../../../../../src/messagingProtocols/proteus/ProteusService/CryptoClient/CryptoClient.types.ts"],"names":[],"mappings":"AAmBA,OAAO,EAAC,MAAM,EAAC,MAAM,8BAA8B,CAAC;AAEpD,MAAM,MAAM,cAAc,GAAG;IAAC,OAAO,EAAE,MAAM,EAAE,CAAC;IAAC,UAAU,EAAE,MAAM,CAAA;CAAC,CAAC;AAErE,MAAM,WAAW,YAAY,CAAC,CAAC,GAAG,OAAO;IACvC,eAAe,IAAI,CAAC,CAAC;IACrB,OAAO,CAAC,QAAQ,EAAE,MAAM,EAAE,EAAE,SAAS,EAAE,UAAU,GAAG,OAAO,CAAC,GAAG,CAAC,MAAM,EAAE,UAAU,CAAC,CAAC,CAAC;IACrF,OAAO,CAAC,SAAS,EAAE,MAAM,EAAE,OAAO,EAAE,UAAU,GAAG,OAAO,CAAC,UAAU,CAAC,CAAC;IAErE;;OAEG;IACH,IAAI,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAEvC;;OAEG;IACH,MAAM,CAAC,SAAS,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,UAAU,GAAG,OAAO,CAAC,cAAc,CAAC,CAAC;IACzE,cAAc,IAAI,OAAO,CAAC,MAAM,CAAC,CAAC;IAClC,oBAAoB,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;IACzD,kBAAkB,CAAC,SAAS,EAAE,MAAM,EAAE,OAAO,EAAE,UAAU,GAAG,OAAO,CAAC,UAAU,CAAC,CAAC;IAChF,iBAAiB,CAAC,SAAS,EAAE,MAAM,EAAE,MAAM,EAAE,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IACxE,aAAa,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;IACnD,WAAW,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAC9C,aAAa,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;IACnC,aAAa,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAChD,SAAS,IAAI,OAAO,CAAC,MAAM,CAAC,CAAC;IAC7B,iBAAiB,CAAC,SAAS,EAAE,MAAM,GAAG,IAAI,CAAC;IAC3C,kBAAkB,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;IACpC;;OAEG;IACH,oBAAoB,CAAC,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IACrD,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;CACvB"}
+{"version":3,"file":"CryptoClient.types.d.ts","sourceRoot":"","sources":["../../../../../src/messagingProtocols/proteus/ProteusService/CryptoClient/CryptoClient.types.ts"],"names":[],"mappings":"AAmBA,OAAO,EAAC,MAAM,EAAC,MAAM,8BAA8B,CAAC;AAEpD,MAAM,MAAM,cAAc,GAAG;IAAC,OAAO,EAAE,MAAM,EAAE,CAAC;IAAC,UAAU,EAAE,MAAM,CAAA;CAAC,CAAC;AAErE,MAAM,WAAW,YAAY,CAAC,CAAC,GAAG,OAAO;IACvC,eAAe,IAAI,CAAC,CAAC;IACrB,OAAO,CAAC,QAAQ,EAAE,MAAM,EAAE,EAAE,SAAS,EAAE,UAAU,GAAG,OAAO,CAAC,GAAG,CAAC,MAAM,EAAE,UAAU,CAAC,CAAC,CAAC;IACrF,OAAO,CAAC,SAAS,EAAE,MAAM,EAAE,OAAO,EAAE,UAAU,GAAG,OAAO,CAAC,UAAU,CAAC,CAAC;IAErE;;OAEG;IACH,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;IAEtB;;OAEG;IACH,MAAM,CAAC,SAAS,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,UAAU,GAAG,OAAO,CAAC,cAAc,CAAC,CAAC;IACzE,cAAc,IAAI,OAAO,CAAC,MAAM,CAAC,CAAC;IAClC,oBAAoB,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;IACzD,kBAAkB,CAAC,SAAS,EAAE,MAAM,EAAE,OAAO,EAAE,UAAU,GAAG,OAAO,CAAC,UAAU,CAAC,CAAC;IAChF,iBAAiB,CAAC,SAAS,EAAE,MAAM,EAAE,MAAM,EAAE,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IACxE,aAAa,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;IACnD,WAAW,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAC9C,aAAa,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;IACnC,aAAa,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAChD,SAAS,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;IACvC,iBAAiB,CAAC,SAAS,EAAE,MAAM,GAAG,IAAI,CAAC;IAC3C,kBAAkB,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;IACpC;;OAEG;IACH,oBAAoB,CAAC,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IACrD,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;CACvB"}

package/lib/messagingProtocols/proteus/ProteusService/CryptoClient/CryptoboxWrapper.d.ts

@@ -33,7 +33,7 @@ export declare class CryptoboxWrapper implements CryptoClient {
     sessionExists(sessionId: string): Promise<boolean>;
     saveSession(): Promise<void>;
     deleteSession(sessionId: string): Promise<void>;
-    newPrekey(): Promise<{
+    newPrekey(id: number): Promise<{
         id: number;
         key: string;
     }>;

package/lib/messagingProtocols/proteus/ProteusService/CryptoClient/CryptoboxWrapper.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"CryptoboxWrapper.d.ts","sourceRoot":"","sources":["../../../../../src/messagingProtocols/proteus/ProteusService/CryptoClient/CryptoboxWrapper.ts"],"names":[],"mappings":"AAmBA,OAAO,EAAC,MAAM,EAAC,MAAM,8BAA8B,CAAC;AAEpD,OAAO,EAAC,SAAS,EAAC,MAAM,oBAAoB,CAAC;AAE7C,OAAO,EAAC,UAAU,EAAC,MAAM,uBAAuB,CAAC;AAEjD,OAAO,EAAC,YAAY,EAAC,MAAM,sBAAsB,CAAC;AAElD,KAAK,MAAM,GAAG;IACZ,YAAY,EAAE,CAAC,OAAO,EAAE,MAAM,EAAE,KAAK,IAAI,CAAC;CAC3C,CAAC;AAEF,wBAAgB,WAAW,CAAC,WAAW,EAAE,UAAU,EAAE,MAAM,EAAE,MAAM,GAAG;IAAC,SAAS,EAAE,MAAM,CAAA;CAAC,oBAGxF;AAED,qBAAa,gBAAiB,YAAW,YAAY;IACvC,OAAO,CAAC,QAAQ,CAAC,SAAS;gBAAT,SAAS,EAAE,SAAS,EAAE,MAAM,EAAE,MAAM;IAOjE,eAAe;IAIT,OAAO,CAAC,QAAQ,EAAE,MAAM,EAAE,EAAE,SAAS,EAAE,UAAU;IASvD,OAAO,CAAC,SAAS,EAAE,MAAM,EAAE,OAAO,EAAE,UAAU;IAIxC,IAAI;IAIJ,MAAM,CAAC,UAAU,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,UAAU;;;;;;;;;;IAkB/C,cAAc;IAId,oBAAoB,CAAC,SAAS,EAAE,MAAM;IAK5C,kBAAkB,CAAC,SAAS,EAAE,MAAM,EAAE,OAAO,EAAE,UAAU;IAInD,aAAa;IAIb,iBAAiB,CAAC,SAAS,EAAE,MAAM,EAAE,MAAM,EAAE,UAAU;IAIvD,aAAa,CAAC,SAAS,EAAE,MAAM;IAQ/B,WAAW;IAIX,aAAa,CAAC,SAAS,EAAE,MAAM;IAI/B,SAAS;;;;IAKT,iBAAiB,CAAC,SAAS,EAAE,MAAM;IAOnC,kBAAkB;IAIlB,IAAI;CACX"}
+{"version":3,"file":"CryptoboxWrapper.d.ts","sourceRoot":"","sources":["../../../../../src/messagingProtocols/proteus/ProteusService/CryptoClient/CryptoboxWrapper.ts"],"names":[],"mappings":"AAmBA,OAAO,EAAC,MAAM,EAAC,MAAM,8BAA8B,CAAC;AAEpD,OAAO,EAAC,SAAS,EAAC,MAAM,oBAAoB,CAAC;AAE7C,OAAO,EAAC,UAAU,EAAC,MAAM,uBAAuB,CAAC;AAEjD,OAAO,EAAC,YAAY,EAAC,MAAM,sBAAsB,CAAC;AAElD,KAAK,MAAM,GAAG;IACZ,YAAY,EAAE,CAAC,OAAO,EAAE,MAAM,EAAE,KAAK,IAAI,CAAC;CAC3C,CAAC;AAEF,wBAAgB,WAAW,CAAC,WAAW,EAAE,UAAU,EAAE,MAAM,EAAE,MAAM,GAAG;IAAC,SAAS,EAAE,MAAM,CAAA;CAAC,oBAGxF;AAED,qBAAa,gBAAiB,YAAW,YAAY;IACvC,OAAO,CAAC,QAAQ,CAAC,SAAS;gBAAT,SAAS,EAAE,SAAS,EAAE,MAAM,EAAE,MAAM;IAOjE,eAAe;IAIT,OAAO,CAAC,QAAQ,EAAE,MAAM,EAAE,EAAE,SAAS,EAAE,UAAU;IASvD,OAAO,CAAC,SAAS,EAAE,MAAM,EAAE,OAAO,EAAE,UAAU;IAIxC,IAAI;IAIJ,MAAM,CAAC,UAAU,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,UAAU;;;;;;;;;;IAkB/C,cAAc;IAId,oBAAoB,CAAC,SAAS,EAAE,MAAM;IAK5C,kBAAkB,CAAC,SAAS,EAAE,MAAM,EAAE,OAAO,EAAE,UAAU;IAInD,aAAa;IAIb,iBAAiB,CAAC,SAAS,EAAE,MAAM,EAAE,MAAM,EAAE,UAAU;IAIvD,aAAa,CAAC,SAAS,EAAE,MAAM;IAQ/B,WAAW;IAIX,aAAa,CAAC,SAAS,EAAE,MAAM;IAI/B,SAAS,CAAC,EAAE,EAAE,MAAM;;;;IAKpB,iBAAiB,CAAC,SAAS,EAAE,MAAM;IAOnC,kBAAkB;IAIlB,IAAI;CACX"}

package/lib/messagingProtocols/proteus/ProteusService/CryptoClient/CryptoboxWrapper.js

@@ -97,9 +97,9 @@ class CryptoboxWrapper {
     async deleteSession(sessionId) {
         await this.cryptobox.session_delete(sessionId);
     }
-    async newPrekey() {
+    async newPrekey(id) {
         // CryptoBox is generating prekeys internally
-        return { id: 0, key: '' };
+        return { id, key: '' };
     }
     async debugBreakSession(sessionId) {
         const session = await this.cryptobox.session_load(sessionId);

package/lib/messagingProtocols/proteus/ProteusService/ProteusService.d.ts

@@ -1,21 +1,13 @@
 import type { APIClient } from '@wireapp/api-client/lib/APIClient';
 import type { PreKey, Context } from '@wireapp/api-client/lib/auth';
-import type { Conversation, QualifiedOTRRecipients, QualifiedUserClients } from '@wireapp/api-client/lib/conversation';
-import type { QualifiedId, QualifiedUserPreKeyBundleMap } from '@wireapp/api-client/lib/user';
+import type { Conversation, OTRRecipients, QualifiedOTRRecipients, QualifiedUserClients, UserClients } from '@wireapp/api-client/lib/conversation';
+import type { QualifiedId, QualifiedUserPreKeyBundleMap, UserPreKeyBundleMap } from '@wireapp/api-client/lib/user';
 import { CRUDEngine } from '@wireapp/store-engine';
 import { CryptoClient } from './CryptoClient';
 import type { AddUsersToProteusConversationParams, CreateProteusConversationParams, ProteusServiceConfig, SendProteusMessageParams } from './ProteusService.types';
 import { SendResult } from '../../../conversation';
 import type { EventHandlerResult } from '../../common.types';
 import { EventHandlerParams } from '../EventHandler';
-export type EncryptionResult = {
-    /** the encrypted payloads for the clients that have a valid sessions */
-    payloads: QualifiedOTRRecipients;
-    /** user-client that do not have prekeys on backend (deleted clients) */
-    unknowns?: QualifiedUserClients;
-    /** users for whom we could retrieve a prekey and, thus, for which we could not encrypt the message */
-    failed?: QualifiedId[];
-};
 export declare class ProteusService {
     private readonly apiClient;
     private readonly cryptoClient;
@@ -30,7 +22,7 @@ export declare class ProteusService {
      * Get the fingerprint of the local client.
      */
     getLocalFingerprint(): Promise<string>;
-    constructSessionId(userId: QualifiedId, clientId: string): string;
+    constructSessionId(userId: string | QualifiedId, clientId: string, domain?: string): string;
     /**
      * Get the fingerprint of a remote client
      * @param userId ID of user
@@ -40,11 +32,12 @@ export declare class ProteusService {
      */
     getRemoteFingerprint(userId: QualifiedId, clientId: string, prekey?: PreKey): Promise<string>;
     createConversation({ conversationData, otherUserIds, }: CreateProteusConversationParams): Promise<Conversation>;
-    addUsersToConversation({ conversationId, qualifiedUsers }: AddUsersToProteusConversationParams): Promise<import("@wireapp/api-client/lib/event").ConversationMemberJoinEvent>;
-    sendMessage({ userIds, conversationId, nativePush, targetMode, payload, onClientMismatch, }: SendProteusMessageParams): Promise<SendResult>;
+    addUsersToConversation({ conversationId, qualifiedUserIds }: AddUsersToProteusConversationParams): Promise<import("@wireapp/api-client/lib/event").ConversationMemberJoinEvent>;
+    sendMessage({ userIds, sendAsProtobuf, conversationId, nativePush, targetMode, payload, onClientMismatch, }: SendProteusMessageParams): Promise<SendResult>;
     private decrypt;
+    encrypt(plainText: Uint8Array, recipients: UserPreKeyBundleMap | UserClients, domain?: string): Promise<OTRRecipients<Uint8Array>>;
     deleteSession(userId: QualifiedId, clientId: string): Promise<void>;
-    encrypt(plainText: Uint8Array, recipients: QualifiedUserPreKeyBundleMap | QualifiedUserClients): Promise<EncryptionResult>;
+    encryptQualified(plainText: Uint8Array, preKeyBundles: QualifiedUserPreKeyBundleMap | QualifiedUserClients): Promise<QualifiedOTRRecipients>;
     wipe(storeEngine?: CRUDEngine): Promise<void>;
 }
 //# sourceMappingURL=ProteusService.d.ts.map

package/lib/messagingProtocols/proteus/ProteusService/ProteusService.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ProteusService.d.ts","sourceRoot":"","sources":["../../../../src/messagingProtocols/proteus/ProteusService/ProteusService.ts"],"names":[],"mappings":"AAmBA,OAAO,KAAK,EAAC,SAAS,EAAC,MAAM,mCAAmC,CAAC;AACjE,OAAO,KAAK,EAAC,MAAM,EAAE,OAAO,EAAC,MAAM,8BAA8B,CAAC;AAClE,OAAO,KAAK,EACV,YAAY,EAEZ,sBAAsB,EACtB,oBAAoB,EACrB,MAAM,sCAAsC,CAAC;AAC9C,OAAO,KAAK,EAAC,WAAW,EAAE,4BAA4B,EAAC,MAAM,8BAA8B,CAAC;AAI5F,OAAO,EAAC,UAAU,EAAC,MAAM,uBAAuB,CAAC;AAEjD,OAAO,EAAC,YAAY,EAAC,MAAM,gBAAgB,CAAC;AAI5C,OAAO,KAAK,EACV,mCAAmC,EACnC,+BAA+B,EAC/B,oBAAoB,EACpB,wBAAwB,EACzB,MAAM,wBAAwB,CAAC;AAGhC,OAAO,EAA0C,UAAU,EAAC,MAAM,uBAAuB,CAAC;AAE1F,OAAO,KAAK,EAAC,kBAAkB,EAAC,MAAM,oBAAoB,CAAC;AAC3D,OAAO,EAAC,kBAAkB,EAAqB,MAAM,iBAAiB,CAAC;AAWvE,MAAM,MAAM,gBAAgB,GAAG;IAC7B,wEAAwE;IACxE,QAAQ,EAAE,sBAAsB,CAAC;IACjC,wEAAwE;IACxE,QAAQ,CAAC,EAAE,oBAAoB,CAAC;IAChC,sGAAsG;IACtG,MAAM,CAAC,EAAE,WAAW,EAAE,CAAC;CACxB,CAAC;AAEF,qBAAa,cAAc;IAKvB,OAAO,CAAC,QAAQ,CAAC,SAAS;IAC1B,OAAO,CAAC,QAAQ,CAAC,YAAY;IAC7B,OAAO,CAAC,QAAQ,CAAC,MAAM;IANzB,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAiB;IAChD,OAAO,CAAC,QAAQ,CAAC,MAAM,CAA2C;gBAG/C,SAAS,EAAE,SAAS,EACpB,YAAY,EAAE,YAAY,EAC1B,MAAM,EAAE,oBAAoB;IAKlC,WAAW,CAAC,MAAM,EAAE,IAAI,CAAC,kBAAkB,EAAE,OAAO,GAAG,QAAQ,GAAG,QAAQ,CAAC,GAAG,kBAAkB;IAiBhG,UAAU,CAAC,WAAW,EAAE,UAAU,EAAE,OAAO,EAAE,OAAO;IA2B1D,YAAY,CAAC,OAAO,CAAC,EAAE,UAAU;IAIxC;;OAEG;IACI,mBAAmB;IAInB,kBAAkB,CAAC,MAAM,EAAE,WAAW,EAAE,QAAQ,EAAE,MAAM,GAAG,MAAM;IAIxE;;;;;;OAMG;IACU,oBAAoB,CAAC,MAAM,EAAE,WAAW,EAAE,QAAQ,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,MAAM;IAQ3E,kBAAkB,CAAC,EAC9B,gBAAgB,EAChB,YAAY,GACb,EAAE,+BAA+B,GAAG,OAAO,CAAC,YAAY,CAAC;IAiB7C,sBAAsB,CAAC,EAAC,cAAc,EAAE,cAAc,EAAC,EAAE,mCAAmC;IAI5F,WAAW,CAAC,EACvB,OAAO,EACP,cAAc,EACd,UAAU,EACV,UAAU,EACV,OAAO,EACP,gBAAgB,GACjB,EAAE,wBAAwB,GAAG,OAAO,CAAC,UAAU,CAAC;YA6CnC,OAAO;IAuBd,aAAa,CAAC,MAAM,EAAE,WAAW,EAAE,QAAQ,EAAE,MAAM;IAQ7C,OAAO,CAClB,SAAS,EAAE,UAAU,EACrB,UAAU,EAAE,4BAA4B,GAAG,oBAAoB,GAC9D,OAAO,CAAC,gBAAgB,CAAC;IAiBtB,IAAI,CAAC,WAAW,CAAC,EAAE,UAAU;CAMpC"}
+{"version":3,"file":"ProteusService.d.ts","sourceRoot":"","sources":["../../../../src/messagingProtocols/proteus/ProteusService/ProteusService.ts"],"names":[],"mappings":"AAmBA,OAAO,KAAK,EAAC,SAAS,EAAC,MAAM,mCAAmC,CAAC;AACjE,OAAO,KAAK,EAAC,MAAM,EAAE,OAAO,EAAC,MAAM,8BAA8B,CAAC;AAClE,OAAO,KAAK,EACV,YAAY,EAEZ,aAAa,EACb,sBAAsB,EACtB,oBAAoB,EACpB,WAAW,EACZ,MAAM,sCAAsC,CAAC;AAC9C,OAAO,KAAK,EAAC,WAAW,EAAE,4BAA4B,EAAE,mBAAmB,EAAC,MAAM,8BAA8B,CAAC;AAIjH,OAAO,EAAC,UAAU,EAAC,MAAM,uBAAuB,CAAC;AAEjD,OAAO,EAAC,YAAY,EAAC,MAAM,gBAAgB,CAAC;AAI5C,OAAO,KAAK,EACV,mCAAmC,EACnC,+BAA+B,EAC/B,oBAAoB,EACpB,wBAAwB,EACzB,MAAM,wBAAwB,CAAC;AAGhC,OAAO,EAA0C,UAAU,EAAC,MAAM,uBAAuB,CAAC;AAE1F,OAAO,KAAK,EAAC,kBAAkB,EAAC,MAAM,oBAAoB,CAAC;AAC3D,OAAO,EAAC,kBAAkB,EAAqB,MAAM,iBAAiB,CAAC;AAWvE,qBAAa,cAAc;IAKvB,OAAO,CAAC,QAAQ,CAAC,SAAS;IAC1B,OAAO,CAAC,QAAQ,CAAC,YAAY;IAC7B,OAAO,CAAC,QAAQ,CAAC,MAAM;IANzB,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAiB;IAChD,OAAO,CAAC,QAAQ,CAAC,MAAM,CAA2C;gBAG/C,SAAS,EAAE,SAAS,EACpB,YAAY,EAAE,YAAY,EAC1B,MAAM,EAAE,oBAAoB;IAKlC,WAAW,CAAC,MAAM,EAAE,IAAI,CAAC,kBAAkB,EAAE,OAAO,GAAG,QAAQ,GAAG,QAAQ,CAAC,GAAG,kBAAkB;IAiBhG,UAAU,CAAC,WAAW,EAAE,UAAU,EAAE,OAAO,EAAE,OAAO;IA0B1D,YAAY,CAAC,OAAO,CAAC,EAAE,UAAU;IAIxC;;OAEG;IACI,mBAAmB;IAInB,kBAAkB,CAAC,MAAM,EAAE,MAAM,GAAG,WAAW,EAAE,QAAQ,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,MAAM,GAAG,MAAM;IAIlG;;;;;;OAMG;IACU,oBAAoB,CAAC,MAAM,EAAE,WAAW,EAAE,QAAQ,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,MAAM;IAQ3E,kBAAkB,CAAC,EAC9B,gBAAgB,EAChB,YAAY,GACb,EAAE,+BAA+B,GAAG,OAAO,CAAC,YAAY,CAAC;IAiB7C,sBAAsB,CAAC,EAAC,cAAc,EAAE,gBAAgB,EAAC,EAAE,mCAAmC;IAI9F,WAAW,CAAC,EACvB,OAAO,EACP,cAAc,EACd,cAAc,EACd,UAAU,EACV,UAAU,EACV,OAAO,EACP,gBAAgB,GACjB,EAAE,wBAAwB,GAAG,OAAO,CAAC,UAAU,CAAC;YAmDnC,OAAO;IAuBR,OAAO,CAClB,SAAS,EAAE,UAAU,EACrB,UAAU,EAAE,mBAAmB,GAAG,WAAW,EAC7C,MAAM,GAAE,MAAW,GAClB,OAAO,CAAC,aAAa,CAAC,UAAU,CAAC,CAAC;IAc9B,aAAa,CAAC,MAAM,EAAE,WAAW,EAAE,QAAQ,EAAE,MAAM;IAS7C,gBAAgB,CAC3B,SAAS,EAAE,UAAU,EACrB,aAAa,EAAE,4BAA4B,GAAG,oBAAoB,GACjE,OAAO,CAAC,sBAAsB,CAAC;IAW5B,IAAI,CAAC,WAAW,CAAC,EAAE,UAAU;CAMpC"}

package/lib/messagingProtocols/proteus/ProteusService/ProteusService.js

@@ -55,9 +55,8 @@ class ProteusService {
         return handledEvent;
     }
     async initClient(storeEngine, context) {
-        var _a;
         const dbName = storeEngine.storeName;
-        if (context.domain) {
+        if (context.domain && this.config.useQualifiedIds) {
             // We want sessions to be fully qualified from now on
             if (!cryptoMigrationStateStore_1.cryptoMigrationStore.qualifiedSessions.isReady(dbName)) {
                 this.logger.info(`Migrating existing session ids to qualified ids.`);
@@ -77,9 +76,7 @@ class ProteusService {
                 this.logger.error('Client was not able to perform DB migration: ', error);
             }
         }
-        const backendPrekeys = await this.apiClient.api.client.getClientPreKeys((_a = context.clientId) !== null && _a !== void 0 ? _a : '');
-        const totalUsableBackedPrekeys = backendPrekeys.length - 1; // we remove the last resort prekey from the total number of available prekeys
-        return this.cryptoClient.init(totalUsableBackedPrekeys);
+        return this.cryptoClient.init();
     }
     createClient(entropy) {
         return this.cryptoClient.create(this.config.nbPrekeys, entropy);
@@ -90,8 +87,8 @@ class ProteusService {
     getLocalFingerprint() {
         return this.cryptoClient.getFingerprint();
     }
-    constructSessionId(userId, clientId) {
-        return (0, SessionHandler_1.constructSessionId)({ clientId, userId });
+    constructSessionId(userId, clientId, domain) {
+        return (0, SessionHandler_1.constructSessionId)({ clientId, userId, domain, useQualifiedIds: this.config.useQualifiedIds });
     }
     /**
      * Get the fingerprint of a remote client
@@ -119,24 +116,28 @@ class ProteusService {
         }
         return this.apiClient.api.conversation.postConversation(payload);
     }
-    async addUsersToConversation({ conversationId, qualifiedUsers }) {
-        return this.apiClient.api.conversation.postMembers(conversationId, qualifiedUsers);
+    async addUsersToConversation({ conversationId, qualifiedUserIds }) {
+        return this.apiClient.api.conversation.postMembers(conversationId, qualifiedUserIds);
     }
-    async sendMessage({ userIds, conversationId, nativePush, targetMode, payload, onClientMismatch, }) {
-        var _a;
+    async sendMessage({ userIds, sendAsProtobuf, conversationId, nativePush, targetMode, payload, onClientMismatch, }) {
         const messageParams = await (0, getGenericMessageParams_1.getGenericMessageParams)({
             apiClient: this.apiClient,
             sendingClientId: this.apiClient.validatedClientId,
             conversationId,
             genericMessage: payload,
+            useQualifiedIds: this.config.useQualifiedIds,
             options: {
                 userIds,
+                sendAsProtobuf,
                 nativePush,
                 targetMode,
+                onClientMismatch,
             },
         });
-        const { sendingClientId, recipients, plainText, options } = messageParams;
-        const response = await this.messageService.sendMessage(sendingClientId, recipients, plainText, Object.assign(Object.assign({}, options), { onClientMismatch: mismatch => onClientMismatch === null || onClientMismatch === void 0 ? void 0 : onClientMismatch(mismatch, false) }));
+        const { federated, sendingClientId, recipients, plainText, options } = messageParams;
+        const response = federated
+            ? await this.messageService.sendFederatedMessage(sendingClientId, recipients, plainText, Object.assign(Object.assign({}, options), { onClientMismatch: mismatch => onClientMismatch === null || onClientMismatch === void 0 ? void 0 : onClientMismatch(mismatch, false) }))
+            : await this.messageService.sendMessage(sendingClientId, recipients, plainText, Object.assign(Object.assign({}, options), { sendAsProtobuf, onClientMismatch: mismatch => onClientMismatch === null || onClientMismatch === void 0 ? void 0 : onClientMismatch(mismatch, false) }));
         if (!response.canceled) {
             if (!(0, isClearFromMismatch_1.isClearFromMismatch)(response)) {
                 // We warn the consumer that there is a mismatch that did not prevent message sending
@@ -145,11 +146,8 @@ class ProteusService {
             this.logger.log(`Successfully sent Proteus message to conversation '${conversationId.id}'`);
         }
         const sendingState = response.canceled ? conversation_1.MessageSendingState.CANCELED : conversation_1.MessageSendingState.OUTGOING_SENT;
-        const failedToSend = response.failed || Object.keys((_a = response.failed_to_send) !== null && _a !== void 0 ? _a : {}).length > 0
-            ? {
-                queued: response.failed_to_send,
-                failed: response.failed,
-            }
+        const failedToSend = 'failed_to_send' in response && Object.keys(response.failed_to_send).length > 0
+            ? response.failed_to_send
             : undefined;
         return {
             id: payload.messageId,
@@ -180,26 +178,32 @@ class ProteusService {
             throw (0, DecryptionErrorGenerator_1.generateDecryptionError)({ userId, clientId }, error);
         }
     }
+    async encrypt(plainText, recipients, domain = '') {
+        const sessions = await (0, SessionHandler_1.initSessions)({
+            recipients,
+            domain,
+            apiClient: this.apiClient,
+            cryptoClient: this.cryptoClient,
+            logger: this.logger,
+        });
+        const payload = await this.cryptoClient.encrypt(sessions, plainText);
+        return (0, SessionHandler_1.buildEncryptedPayloads)(payload);
+    }
     deleteSession(userId, clientId) {
         return (0, SessionHandler_1.deleteSession)({
             userId,
             clientId,
+            useQualifiedIds: this.config.useQualifiedIds,
             cryptoClient: this.cryptoClient,
         });
     }
-    async encrypt(plainText, recipients) {
-        const { sessions, unknowns, failed } = await (0, SessionHandler_1.initSessions)({
-            recipients,
-            apiClient: this.apiClient,
-            cryptoClient: this.cryptoClient,
-            logger: this.logger,
-        });
-        const payloads = await this.cryptoClient.encrypt(sessions, plainText);
-        return {
-            payloads: (0, SessionHandler_1.buildEncryptedPayloads)(payloads),
-            unknowns,
-            failed,
-        };
+    async encryptQualified(plainText, preKeyBundles) {
+        const qualifiedOTRRecipients = {};
+        for (const [domain, preKeyBundleMap] of Object.entries(preKeyBundles)) {
+            const result = await this.encrypt(plainText, preKeyBundleMap, domain);
+            qualifiedOTRRecipients[domain] = result;
+        }
+        return qualifiedOTRRecipients;
     }
     async wipe(storeEngine) {
         if (storeEngine) {