@wireapp/core 46.23.14 → 46.24.0

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

@@ -40,57 +40,100 @@ const coreCryptoLogger = {
         logFunctions[level].call(logger, { message, context });
     },
 };
-async function buildClient(storeEngine, { wasmFilePath, generateSecretKey, nbPrekeys, onNewPrekeys }) {
-    let key;
-    const coreCryptoDbName = `corecrypto-${storeEngine.storeName}`;
+const getKey = async (generateSecretKey, keyName, keySize) => {
+    return await generateSecretKey(keyName, keySize);
+};
+const migrateOnceAndGetKey = async (generateSecretKey, coreCryptoDbName) => {
+    const coreCryptoNewKeyId = 'corecrypto-key-v2';
     const coreCryptoKeyId = 'corecrypto-key';
-    try {
-        key = await generateSecretKey(coreCryptoKeyId);
-    }
-    catch (error) {
-        if (error instanceof secretKeyGenerator_1.CorruptedKeyError) {
-            // If we are dealing with a corrupted key, we wipe the key and the coreCrypto DB to start fresh
-            await (0, idb_1.deleteDB)(coreCryptoDbName);
-            key = await generateSecretKey(coreCryptoKeyId);
+    // We retrieve the old key if it exists or generate a new one
+    const keyOld = await getKey(generateSecretKey, coreCryptoKeyId, 16);
+    // We retrieve the new key if it exists or generate a new one
+    const keyNew = await getKey(generateSecretKey, coreCryptoNewKeyId, 32);
+    // If we dont retreive any key, we throw an error
+    // This should not happen since we generate a new key if it does not exist
+    if (!keyNew || !keyOld) {
+        throw new Error('Key not found and could not be generated');
+    }
+    /**
+     * If the old key is freshly generated we dont need to migrate and return the new key
+     * If the old key exists and the new key is freshly generated, we need to migrate and then return the new key (This should only happen once !!!!)
+     * If the old key exists and the new key exists we return the new key
+     */
+    if (!keyOld.freshlyGenerated && keyNew.freshlyGenerated) {
+        // Create the new key in the format used by coreCrypto
+        const databaseKey = new core_crypto_1.DatabaseKey(keyNew.key);
+        // Run the migration
+        await (0, core_crypto_1.migrateDatabaseKeyTypeToBytes)(coreCryptoDbName, bazinga64_1.Encoder.toBase64(keyOld.key).asString, databaseKey);
+        // delete the old key, it will be freshly generated in the next call and ensure we dont run the migration again
+        await keyOld.deleteKey();
+    }
+    return {
+        key: new core_crypto_1.DatabaseKey(keyNew.key),
+        deleteKey: keyNew.deleteKey,
+    };
+};
+async function buildClient(storeEngine, { generateSecretKey, nbPrekeys, onNewPrekeys }, { wasmFilePath }) {
+    return (
+    // We need to initialize the coreCrypto package with the path to the wasm file
+    // before we can use it. This is a one time operation and should be done
+    // before we create the CoreCrypto instance.
+    (0, core_crypto_1.initWasmModule)(wasmFilePath)
+        .then(async (output) => {
+        logger.log('info', 'CoreCrypto initialized', { output });
+        const coreCryptoDbName = `corecrypto-${storeEngine.storeName}`;
+        // New key format used by coreCrypto
+        let key;
+        try {
+            key = await migrateOnceAndGetKey(generateSecretKey, coreCryptoDbName);
         }
-        else {
-            throw error;
+        catch (error) {
+            if (error instanceof secretKeyGenerator_1.CorruptedKeyError) {
+                // If we are dealing with a corrupted key, we wipe the key and the coreCrypto DB to start fresh
+                await (0, idb_1.deleteDB)(coreCryptoDbName);
+                key = await migrateOnceAndGetKey(generateSecretKey, coreCryptoDbName);
+            }
+            else {
+                throw error;
+            }
         }
-    }
-    const coreCrypto = await core_crypto_1.CoreCrypto.deferredInit({
-        databaseName: coreCryptoDbName,
-        key: bazinga64_1.Encoder.toBase64(key.key).asString,
-        wasmFilePath,
-    });
-    (0, core_crypto_1.setLogger)(coreCryptoLogger);
-    (0, core_crypto_1.setMaxLogLevel)(core_crypto_1.CoreCryptoLogLevel.Info);
-    return new CoreCryptoWrapper(coreCrypto, { nbPrekeys, onNewPrekeys, onWipe: key.deleteKey });
+        const coreCrypto = await core_crypto_1.CoreCrypto.deferredInit({
+            databaseName: coreCryptoDbName,
+            key: key.key,
+        });
+        (0, core_crypto_1.setLogger)(coreCryptoLogger);
+        (0, core_crypto_1.setMaxLogLevel)(core_crypto_1.CoreCryptoLogLevel.Info);
+        return new CoreCryptoWrapper(coreCrypto, { nbPrekeys, onNewPrekeys, onWipe: key.deleteKey });
+    })
+        // if the coreCrypto initialization fails, can not use the crypto client and throw an error
+        .catch(error => {
+        logger.error('error', 'CoreCrypto initialization failed', { error });
+        throw error;
+    }));
 }
 class CoreCryptoWrapper {
     coreCrypto;
-    config;
     prekeyTracker;
     version;
     constructor(coreCrypto, config) {
         this.coreCrypto = coreCrypto;
-        this.config = config;
-        this.version = core_crypto_1.CoreCrypto.version();
+        this.version = (0, core_crypto_1.version)();
         this.prekeyTracker = new PrekeysTracker_1.PrekeyTracker(this, config);
     }
     getNativeClient() {
         return this.coreCrypto;
     }
     encrypt(sessions, plainText) {
-        return this.coreCrypto.proteusEncryptBatched(sessions, plainText);
+        return this.coreCrypto.transaction(cx => cx.proteusEncryptBatched(sessions, plainText));
     }
     decrypt(sessionId, message) {
-        return this.coreCrypto.proteusDecrypt(sessionId, message);
+        return this.coreCrypto.transaction(cx => cx.proteusDecrypt(sessionId, message));
     }
     init(nbInitialPrekeys) {
         if (nbInitialPrekeys) {
             this.prekeyTracker.setInitialState(nbInitialPrekeys);
         }
-        return this.coreCrypto.proteusInit();
+        return this.coreCrypto.transaction(cx => cx.proteusInit());
     }
     async create(nbPrekeys, entropy) {
         if (entropy) {
@@ -101,7 +144,7 @@ class CoreCryptoWrapper {
         for (let id = 0; id < nbPrekeys; id++) {
             prekeys.push(await this.newPrekey());
         }
-        const lastPrekeyBytes = await this.coreCrypto.proteusLastResortPrekey();
+        const lastPrekeyBytes = await this.coreCrypto.transaction(cx => cx.proteusLastResortPrekey());
         const lastPrekey = bazinga64_1.Encoder.toBase64(lastPrekeyBytes).asString;
         const lastPrekeyId = core_crypto_1.CoreCrypto.proteusLastResortPrekeyId();
         return {
@@ -117,25 +160,25 @@ class CoreCryptoWrapper {
     }
     async sessionFromMessage(sessionId, message) {
         await this.consumePrekey(); // we need to mark a prekey as consumed since if we create a session from a message, it means the sender has consumed one of our prekeys
-        return this.coreCrypto.proteusSessionFromMessage(sessionId, message);
+        return this.coreCrypto.transaction(cx => cx.proteusSessionFromMessage(sessionId, message));
     }
     sessionFromPrekey(sessionId, prekey) {
-        return this.coreCrypto.proteusSessionFromPrekey(sessionId, prekey);
+        return this.coreCrypto.transaction(cx => cx.proteusSessionFromPrekey(sessionId, prekey));
     }
     sessionExists(sessionId) {
         return this.coreCrypto.proteusSessionExists(sessionId);
     }
     saveSession(sessionId) {
-        return this.coreCrypto.proteusSessionSave(sessionId);
+        return this.coreCrypto.transaction(cx => cx.proteusSessionSave(sessionId));
     }
     deleteSession(sessionId) {
-        return this.coreCrypto.proteusSessionDelete(sessionId);
+        return this.coreCrypto.transaction(cx => cx.proteusSessionDelete(sessionId));
     }
     consumePrekey() {
         return this.prekeyTracker.consumePrekey();
     }
     async newPrekey() {
-        const { id, pkb } = await this.coreCrypto.proteusNewPrekeyAuto();
+        const { id, pkb } = await this.coreCrypto.transaction(cx => cx.proteusNewPrekeyAuto());
         return { id, key: bazinga64_1.Encoder.toBase64(pkb).asString };
     }
     async debugBreakSession(sessionId) {
@@ -145,36 +188,10 @@ class CoreCryptoWrapper {
             200, 16, 166, 184, 70, 21, 81, 43, 80, 21, 231, 182, 142, 51, 220, 131, 162, 11, 255, 162, 74, 78, 162, 95, 156,
             131, 48, 203, 5, 77, 122, 4, 246,
         ];
-        await this.coreCrypto.proteusSessionFromPrekey(sessionId, Uint8Array.from(fakePrekey));
-    }
-    async debugResetIdentity() {
-        await this.coreCrypto.wipe();
+        await this.coreCrypto.transaction(cx => cx.proteusSessionFromPrekey(sessionId, Uint8Array.from(fakePrekey)));
     }
     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.transaction(cx => cx.proteusCryptoboxMigrate(dbName));
     }
 }
 exports.CoreCryptoWrapper = CoreCryptoWrapper;

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

@@ -30,11 +30,9 @@ export interface CryptoClient<T = unknown> {
     deleteSession(sessionId: string): Promise<void>;
     newPrekey(): Promise<PreKey>;
     debugBreakSession(sessionId: string): void;
-    debugResetIdentity(): Promise<void>;
     /**
      * Will migrate the database from a different client type
      */
     migrateFromCryptobox?(dbName: string): Promise<void>;
-    wipe(): Promise<void>;
 }
 //# sourceMappingURL=CryptoClient.types.d.ts.map

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,oBAAY,gBAAgB;IAC1B,WAAW,IAAA;IACX,SAAS,IAAA;CACV;AAED,MAAM,WAAW,YAAY,CAAC,CAAC,GAAG,OAAO;IACvC,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IACzB,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,oBAAY,gBAAgB;IAC1B,WAAW,IAAA;IACX,SAAS,IAAA;CACV;AAED,MAAM,WAAW,YAAY,CAAC,CAAC,GAAG,OAAO;IACvC,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IACzB,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;;OAEG;IACH,oBAAoB,CAAC,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;CACtD"}

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

@@ -20,11 +20,13 @@ export declare class ProteusService {
     private readonly apiClient;
     private readonly cryptoClient;
     private readonly config;
+    private readonly storeEngine;
     private readonly messageService;
     private readonly logger;
-    constructor(apiClient: APIClient, cryptoClient: CryptoClient, config: ProteusServiceConfig);
+    private readonly dbName;
+    constructor(apiClient: APIClient, cryptoClient: CryptoClient, config: ProteusServiceConfig, storeEngine: CRUDEngine);
     handleOtrMessageAddEvent(event: ConversationOtrMessageAddEvent): Promise<HandledEventPayload>;
-    initClient(storeEngine: CRUDEngine, context: Context): Promise<void>;
+    initClient(context: Context): Promise<void>;
     createClient(entropy?: Uint8Array): Promise<import("./CryptoClient").InitialPrekeys>;
     /**
      * Get the fingerprint of the local client.
@@ -50,6 +52,6 @@ export declare class ProteusService {
     consumePrekey(): Promise<void>;
     deleteSession(userId: QualifiedId, clientId: string): Promise<void>;
     encrypt(plainText: Uint8Array, recipients: QualifiedUserPreKeyBundleMap | QualifiedUserClients): Promise<EncryptionResult>;
-    wipe(storeEngine?: CRUDEngine): Promise<void>;
+    wipe(): 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,EAGL,eAAe,EACf,sBAAsB,EACtB,oBAAoB,EACrB,MAAM,sCAAsC,CAAC;AAC9C,OAAO,KAAK,EAAC,8BAA8B,EAAC,MAAM,+BAA+B,CAAC;AAClF,OAAO,KAAK,EAAC,WAAW,EAAE,4BAA4B,EAAC,MAAM,8BAA8B,CAAC;AAG5F,OAAO,EAAC,UAAU,EAAC,MAAM,uBAAuB,CAAC;AAEjD,OAAO,EAAC,YAAY,EAAC,MAAM,gBAAgB,CAAC;AAI5C,OAAO,KAAK,EACV,mCAAmC,EACnC,oBAAoB,EACpB,wBAAwB,EACzB,MAAM,wBAAwB,CAAC;AAIhC,OAAO,EAEL,iCAAiC,EAEjC,UAAU,EACV,uBAAuB,EACxB,MAAM,uBAAuB,CAAC;AAG/B,OAAO,EAAC,mBAAmB,EAAC,MAAM,uBAAuB,CAAC;AAY1D,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,CAAwD;gBAG5D,SAAS,EAAE,SAAS,EACpB,YAAY,EAAE,YAAY,EAC1B,MAAM,EAAE,oBAAoB;IAKlC,wBAAwB,CAAC,KAAK,EAAE,8BAA8B,GAAG,OAAO,CAAC,mBAAmB,CAAC;IAO7F,UAAU,CAAC,WAAW,EAAE,UAAU,EAAE,OAAO,EAAE,OAAO;IA6B1D,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,gBAAgB,EAAE,eAAe,GAAG,OAAO,CAAC,iCAAiC,CAAC;IAwC9G;;;OAGG;IACU,sBAAsB,CAAC,EAClC,cAAc,EACd,cAAc,GACf,EAAE,mCAAmC,GAAG,OAAO,CAAC,uBAAuB,CAAC;IAoD5D,WAAW,CAAC,EACvB,OAAO,EACP,cAAc,EACd,UAAU,EACV,UAAU,EACV,OAAO,EACP,gBAAgB,GACjB,EAAE,wBAAwB,GAAG,OAAO,CAAC,UAAU,CAAC;IA6CpC,OAAO,CAAC,aAAa,EAAE,UAAU,EAAE,MAAM,EAAE,WAAW,EAAE,QAAQ,EAAE,MAAM;IAuB9E,aAAa,IAAI,OAAO,CAAC,IAAI,CAAC;IAI9B,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,EAGL,eAAe,EACf,sBAAsB,EACtB,oBAAoB,EACrB,MAAM,sCAAsC,CAAC;AAC9C,OAAO,KAAK,EAAC,8BAA8B,EAAC,MAAM,+BAA+B,CAAC;AAClF,OAAO,KAAK,EAAC,WAAW,EAAE,4BAA4B,EAAC,MAAM,8BAA8B,CAAC;AAG5F,OAAO,EAAC,UAAU,EAAC,MAAM,uBAAuB,CAAC;AAEjD,OAAO,EAAC,YAAY,EAAC,MAAM,gBAAgB,CAAC;AAI5C,OAAO,KAAK,EACV,mCAAmC,EACnC,oBAAoB,EACpB,wBAAwB,EACzB,MAAM,wBAAwB,CAAC;AAIhC,OAAO,EAEL,iCAAiC,EAEjC,UAAU,EACV,uBAAuB,EACxB,MAAM,uBAAuB,CAAC;AAG/B,OAAO,EAAC,mBAAmB,EAAC,MAAM,uBAAuB,CAAC;AAY1D,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;IAMvB,OAAO,CAAC,QAAQ,CAAC,SAAS;IAC1B,OAAO,CAAC,QAAQ,CAAC,YAAY;IAC7B,OAAO,CAAC,QAAQ,CAAC,MAAM;IACvB,OAAO,CAAC,QAAQ,CAAC,WAAW;IAR9B,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAiB;IAChD,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAwD;IAC/E,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAS;gBAGb,SAAS,EAAE,SAAS,EACpB,YAAY,EAAE,YAAY,EAC1B,MAAM,EAAE,oBAAoB,EAC5B,WAAW,EAAE,UAAU;IAM7B,wBAAwB,CAAC,KAAK,EAAE,8BAA8B,GAAG,OAAO,CAAC,mBAAmB,CAAC;IAO7F,UAAU,CAAC,OAAO,EAAE,OAAO;IA4BjC,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,gBAAgB,EAAE,eAAe,GAAG,OAAO,CAAC,iCAAiC,CAAC;IAwC9G;;;OAGG;IACU,sBAAsB,CAAC,EAClC,cAAc,EACd,cAAc,GACf,EAAE,mCAAmC,GAAG,OAAO,CAAC,uBAAuB,CAAC;IAoD5D,WAAW,CAAC,EACvB,OAAO,EACP,cAAc,EACd,UAAU,EACV,UAAU,EACV,OAAO,EACP,gBAAgB,GACjB,EAAE,wBAAwB,GAAG,OAAO,CAAC,UAAU,CAAC;IA6CpC,OAAO,CAAC,aAAa,EAAE,UAAU,EAAE,MAAM,EAAE,WAAW,EAAE,QAAQ,EAAE,MAAM;IAuB9E,aAAa,IAAI,OAAO,CAAC,IAAI,CAAC;IAI9B,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;CAGX"}

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

@@ -37,13 +37,17 @@ class ProteusService {
     apiClient;
     cryptoClient;
     config;
+    storeEngine;
     messageService;
     logger = commons_1.LogFactory.getLogger('@wireapp/core/ProteusService');
-    constructor(apiClient, cryptoClient, config) {
+    dbName;
+    constructor(apiClient, cryptoClient, config, storeEngine) {
         this.apiClient = apiClient;
         this.cryptoClient = cryptoClient;
         this.config = config;
+        this.storeEngine = storeEngine;
         this.messageService = new MessageService_1.MessageService(this.apiClient, this);
+        this.dbName = storeEngine.storeName;
     }
     async handleOtrMessageAddEvent(event) {
         return (0, events_1.handleOtrMessageAdd)({
@@ -51,23 +55,22 @@ class ProteusService {
             proteusService: this,
         });
     }
-    async initClient(storeEngine, context) {
-        const dbName = storeEngine.storeName;
+    async initClient(context) {
         if (context.domain) {
             // We want sessions to be fully qualified from now on
-            if (!cryptoMigrationStateStore_1.cryptoMigrationStore.qualifiedSessions.isReady(dbName)) {
+            if (!cryptoMigrationStateStore_1.cryptoMigrationStore.qualifiedSessions.isReady(this.dbName)) {
                 this.logger.info(`Migrating existing session ids to qualified ids.`);
-                await (0, sessionIdMigrator_1.migrateToQualifiedSessionIds)(storeEngine, context.domain);
-                cryptoMigrationStateStore_1.cryptoMigrationStore.qualifiedSessions.markAsReady(dbName);
+                await (0, sessionIdMigrator_1.migrateToQualifiedSessionIds)(this.storeEngine, context.domain);
+                cryptoMigrationStateStore_1.cryptoMigrationStore.qualifiedSessions.markAsReady(this.dbName);
                 this.logger.info(`Successfully migrated session ids to qualified ids.`);
             }
         }
-        if (!cryptoMigrationStateStore_1.cryptoMigrationStore.coreCrypto.isReady(dbName) && this.cryptoClient.migrateFromCryptobox) {
+        if (!cryptoMigrationStateStore_1.cryptoMigrationStore.coreCrypto.isReady(this.dbName) && this.cryptoClient.migrateFromCryptobox) {
             this.logger.info(`Migrating from cryptobox to corecrypto.`);
             try {
                 const startTime = Date.now();
-                await this.cryptoClient.migrateFromCryptobox(dbName);
-                cryptoMigrationStateStore_1.cryptoMigrationStore.coreCrypto.markAsReady(dbName);
+                await this.cryptoClient.migrateFromCryptobox(this.dbName);
+                cryptoMigrationStateStore_1.cryptoMigrationStore.coreCrypto.markAsReady(this.dbName);
                 this.logger.info(`Successfully migrated from cryptobox to corecrypto (took ${Date.now() - startTime}ms).`);
             }
             catch (error) {
@@ -271,11 +274,8 @@ class ProteusService {
             failed,
         };
     }
-    async wipe(storeEngine) {
-        if (storeEngine) {
-            await (0, identityClearer_1.deleteIdentity)(storeEngine);
-        }
-        return this.cryptoClient.wipe();
+    async wipe() {
+        await (0, identityClearer_1.deleteIdentity)(this.storeEngine);
     }
 }
 exports.ProteusService = ProteusService;

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

@@ -1 +1 @@
-{"version":3,"file":"ProteusService.mocks.d.ts","sourceRoot":"","sources":["../../../../src/messagingProtocols/proteus/ProteusService/ProteusService.mocks.ts"],"names":[],"mappings":"AAqBA,OAAO,EAAC,SAAS,EAAC,MAAM,qBAAqB,CAAC;AAE9C,OAAO,EAAC,YAAY,EAAC,MAAM,gBAAgB,CAAC;AAE5C,OAAO,EAAC,cAAc,EAAC,MAAM,kBAAkB,CAAC;AAIhD,eAAO,MAAM,mBAAmB,QAAa,OAAO,CAClD,CAAC,cAAc,EAAE;IAAC,SAAS,EAAE,SAAS,CAAC;IAAC,YAAY,EAAE,YAAY,CAAA;CAAC,CAAC,CAgBrE,CAAC"}
+{"version":3,"file":"ProteusService.mocks.d.ts","sourceRoot":"","sources":["../../../../src/messagingProtocols/proteus/ProteusService/ProteusService.mocks.ts"],"names":[],"mappings":"AAqBA,OAAO,EAAC,SAAS,EAAC,MAAM,qBAAqB,CAAC;AAE9C,OAAO,EAAC,YAAY,EAAC,MAAM,gBAAgB,CAAC;AAE5C,OAAO,EAAC,cAAc,EAAC,MAAM,kBAAkB,CAAC;AAKhD,eAAO,MAAM,mBAAmB,QAAa,OAAO,CAClD,CAAC,cAAc,EAAE;IAAC,SAAS,EAAE,SAAS,CAAC;IAAC,YAAY,EAAE,YAAY,CAAA;CAAC,CAAC,CAwBrE,CAAC"}

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

@@ -24,6 +24,7 @@ const api_client_1 = require("@wireapp/api-client");
 const CoreCryptoWrapper_1 = require("./CryptoClient/CoreCryptoWrapper/CoreCryptoWrapper");
 const ProteusService_1 = require("./ProteusService");
 const PayloadHelper_1 = require("../../../test/PayloadHelper");
+const StoreHelper_1 = require("../../../test/StoreHelper");
 const buildProteusService = async () => {
     const apiClient = new api_client_1.APIClient({ urls: api_client_1.APIClient.BACKEND.STAGING });
     apiClient.context = {
@@ -32,9 +33,10 @@ const buildProteusService = async () => {
         clientId: (0, PayloadHelper_1.getUUID)(),
     };
     const cryptoClient = new CoreCryptoWrapper_1.CoreCryptoWrapper({}, {});
+    const storeEngine = await (0, StoreHelper_1.createMemoryEngine)('proteus-service-test');
     const proteusService = new ProteusService_1.ProteusService(apiClient, cryptoClient, {
         nbPrekeys: 0,
-    });
+    }, storeEngine);
     return [proteusService, { apiClient, cryptoClient }];
 };
 exports.buildProteusService = buildProteusService;

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

@@ -72,6 +72,9 @@ const prepareProteusService = async () => {
         .mockImplementation(data => Promise.resolve(data));
     return proteusService;
 };
+afterAll(() => {
+    jest.clearAllTimers();
+});
 describe('sendGenericMessage', () => {
     describe('targetted messages', () => {
         it(`indicates when sending was canceled`, async () => {

package/lib/messagingProtocols/proteus/Utility/SessionHandler/SessionHandler.test.js

@@ -59,6 +59,9 @@ describe('SessionHandler', () => {
     beforeAll(() => {
         jest.spyOn(apiClient.api.user, 'postMultiPreKeyBundles').mockImplementation(generatePrekeys);
     });
+    afterAll(() => {
+        jest.clearAllTimers();
+    });
     describe('constructSessionId', () => {
         describe('constructs a session ID', () => {
             it('without a domain', () => {

package/lib/secretStore/secretKeyGenerator.d.ts

@@ -4,6 +4,7 @@ export declare class CorruptedKeyError extends Error {
 export type GeneratedKey = {
     key: Uint8Array;
     deleteKey: () => Promise<void>;
+    freshlyGenerated: boolean;
 };
 /**
  * Will generate (or retrieve) a secret key from the database.

package/lib/secretStore/secretKeyGenerator.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"secretKeyGenerator.d.ts","sourceRoot":"","sources":["../../src/secretStore/secretKeyGenerator.ts"],"names":[],"mappings":"AAmBA,OAAO,EAAC,cAAc,EAAC,MAAM,kBAAkB,CAAC;AAEhD,qBAAa,iBAAkB,SAAQ,KAAK;CAAG;AAE/C,MAAM,MAAM,YAAY,GAAG;IACzB,GAAG,EAAE,UAAU,CAAC;IAChB,SAAS,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;CAChC,CAAC;AAEF;;GAEG;AACH,wBAAsB,iBAAiB,CAAC,EACtC,KAAK,EACL,OAAY,EACZ,SAAS,GACV,EAAE;IACD,wGAAwG;IACxG,KAAK,EAAE,MAAM,CAAC;IACd,kCAAkC;IAClC,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,sDAAsD;IACtD,SAAS,EAAE,cAAc,CAAC,GAAG,CAAC,CAAC;CAChC,GAAG,OAAO,CAAC,YAAY,CAAC,CA8BxB"}
+{"version":3,"file":"secretKeyGenerator.d.ts","sourceRoot":"","sources":["../../src/secretStore/secretKeyGenerator.ts"],"names":[],"mappings":"AAmBA,OAAO,EAAC,cAAc,EAAC,MAAM,kBAAkB,CAAC;AAEhD,qBAAa,iBAAkB,SAAQ,KAAK;CAAG;AAE/C,MAAM,MAAM,YAAY,GAAG;IACzB,GAAG,EAAE,UAAU,CAAC;IAChB,SAAS,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;IAC/B,gBAAgB,EAAE,OAAO,CAAC;CAC3B,CAAC;AAEF;;GAEG;AACH,wBAAsB,iBAAiB,CAAC,EACtC,KAAK,EACL,OAAY,EACZ,SAAS,GACV,EAAE;IACD,wGAAwG;IACxG,KAAK,EAAE,MAAM,CAAC;IACd,kCAAkC;IAClC,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,sDAAsD;IACtD,SAAS,EAAE,cAAc,CAAC,GAAG,CAAC,CAAC;CAChC,GAAG,OAAO,CAAC,YAAY,CAAC,CAgCxB"}

package/lib/secretStore/secretKeyGenerator.js

@@ -27,6 +27,7 @@ exports.CorruptedKeyError = CorruptedKeyError;
  * Will generate (or retrieve) a secret key from the database.
  */
 async function generateSecretKey({ keyId, keySize = 16, secretsDb, }) {
+    let freshlyGenerated = false;
     try {
         let key;
         try {
@@ -48,8 +49,9 @@ async function generateSecretKey({ keyId, keySize = 16, secretsDb, }) {
             }, true, ['encrypt', 'decrypt']);
             key = new Uint8Array(await crypto.subtle.exportKey('raw', key));
             await secretsDb.saveSecretValue(keyId, key);
+            freshlyGenerated = true;
         }
-        return { key, deleteKey: () => secretsDb.deleteSecretValue(keyId) };
+        return { key, deleteKey: () => secretsDb.deleteSecretValue(keyId), freshlyGenerated };
     }
     catch (error) {
         throw error;

package/lib/test/StoreHelper.d.ts

@@ -0,0 +1,2 @@
+export declare function createMemoryEngine(storeName?: string): Promise<any>;
+//# sourceMappingURL=StoreHelper.d.ts.map

package/lib/test/StoreHelper.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"StoreHelper.d.ts","sourceRoot":"","sources":["../../src/test/StoreHelper.ts"],"names":[],"mappings":"AAqBA,wBAAsB,kBAAkB,CAAC,SAAS,SAAuB,gBAIxE"}

package/lib/test/StoreHelper.js

@@ -0,0 +1,27 @@
+"use strict";
+/*
+ * Wire
+ * Copyright (C) 2022 Wire Swiss GmbH
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see http://www.gnu.org/licenses/.
+ *
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.createMemoryEngine = createMemoryEngine;
+const { MemoryEngine } = require('@wireapp/store-engine');
+async function createMemoryEngine(storeName = `temp-${Date.now()}`) {
+    const engine = new MemoryEngine();
+    await engine.init(storeName);
+    return engine;
+}

package/package.json

@@ -11,16 +11,16 @@
     "./lib/cryptography/AssetCryptography/crypto.node": "./lib/cryptography/AssetCryptography/crypto.browser.js"
   },
   "dependencies": {
-    "@wireapp/api-client": "^27.56.0",
+    "@wireapp/api-client": "^27.56.1",
     "@wireapp/commons": "^5.4.2",
-    "@wireapp/core-crypto": "3.1.1",
+    "@wireapp/core-crypto": "7.0.1",
     "@wireapp/cryptobox": "12.8.0",
     "@wireapp/priority-queue": "^2.1.11",
     "@wireapp/promise-queue": "^2.3.12",
     "@wireapp/protocol-messaging": "1.52.0",
-    "@wireapp/store-engine": "5.1.11",
+    "@wireapp/store-engine": "^5.1.11",
     "axios": "1.7.9",
-    "bazinga64": "^6.3.11",
+    "bazinga64": "^6.4.0",
     "deepmerge-ts": "6.0.0",
     "hash.js": "1.1.7",
     "http-status-codes": "2.3.0",
@@ -61,6 +61,6 @@
     "test:coverage": "jest --coverage",
     "watch": "tsc --watch"
   },
-  "version": "46.23.14",
-  "gitHead": "dc0f5cc25fc91ee984b85382cd1572e65b6eb483"
+  "version": "46.24.0",
+  "gitHead": "47ba145ff0a7401ee8dfec9d600878785f85620b"
 }