@wireapp/core 46.46.6-beta.10.d7a6c4c53 → 46.46.6-beta.14.f6fd03fe6

package/lib/messagingProtocols/mls/MLSService/commitBundleUtil.test.js

@@ -18,7 +18,7 @@
  *
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-const mls_1 = require("@wireapp/protocol-messaging/web/mls");
+const mls_1 = require("@pydio/protocol-messaging/web/mls");
 const bazinga64_1 = require("bazinga64");
 const core_crypto_1 = require("@wireapp/core-crypto");
 const commitBundleUtil_1 = require("./commitBundleUtil");
@@ -26,18 +26,18 @@ describe('toProtobufCommitBundle', () => {
     it('encode commit bundles', () => {
         const payload = {
             commit: Uint8Array.from([0]),
-            welcome: new core_crypto_1.Welcome(Uint8Array.from([1])),
+            welcome: Uint8Array.from([1]),
             groupInfo: {
                 ratchetTreeType: core_crypto_1.RatchetTreeType.Full,
-                payload: new core_crypto_1.GroupInfo(Uint8Array.from([2])),
+                payload: Uint8Array.from([2]),
                 encryptionType: core_crypto_1.GroupInfoEncryptionType.Plaintext,
             },
         };
         const result = (0, commitBundleUtil_1.toProtobufCommitBundle)(payload);
         const { commit, welcome, groupInfoBundle } = mls_1.mls.CommitBundle.decode(result);
         expect(bazinga64_1.Encoder.toBase64(commit)).toEqual(bazinga64_1.Encoder.toBase64(payload.commit));
-        expect(bazinga64_1.Encoder.toBase64(welcome)).toEqual(bazinga64_1.Encoder.toBase64(payload.welcome?.copyBytes()));
-        expect(bazinga64_1.Encoder.toBase64(groupInfoBundle.groupInfo)).toEqual(bazinga64_1.Encoder.toBase64(payload.groupInfo.payload.copyBytes()));
+        expect(bazinga64_1.Encoder.toBase64(welcome)).toEqual(bazinga64_1.Encoder.toBase64(payload.welcome));
+        expect(bazinga64_1.Encoder.toBase64(groupInfoBundle.groupInfo)).toEqual(bazinga64_1.Encoder.toBase64(payload.groupInfo.payload));
         expect(groupInfoBundle.ratchetTreeType).toEqual(mls_1.mls.RatchetTreeType.FULL);
         expect(groupInfoBundle.groupInfoType).toEqual(mls_1.mls.GroupInfoType.PUBLIC_GROUP_STATE);
     });

package/lib/messagingProtocols/mls/conversationRejoinQueue.js

@@ -38,8 +38,8 @@ async function queueConversationRejoin(groupId, rejoinFn) {
     }
 }
 function resumeRejoiningMLSConversations() {
-    sendingQueue.resume();
+    sendingQueue.pause(false);
 }
 function pauseRejoiningMLSConversations() {
-    sendingQueue.pause();
+    sendingQueue.pause(true);
 }

package/lib/messagingProtocols/mls/types.d.ts

@@ -20,4 +20,12 @@ export type HandlePendingProposalsParams = {
     delayInMs: number;
     eventTime: string;
 } & CommonMLS;
+export interface CoreCryptoConfig {
+    /**
+     * path on the public server to the core crypto wasm file.
+     * This file will be downloaded lazily when corecrypto is needed.
+     * It, thus, needs to know where, on the server, the file can be found
+     */
+    wasmFilePath: string;
+}
 //# sourceMappingURL=types.d.ts.map

package/lib/messagingProtocols/mls/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../src/messagingProtocols/mls/types.ts"],"names":[],"mappings":"AAmBA,OAAO,EAAC,WAAW,EAAC,MAAM,8BAA8B,CAAC;AAEzD,MAAM,MAAM,QAAQ,GAAG,MAAM,CAAC;AAE9B,MAAM,MAAM,YAAY,GAAG;IACzB,OAAO,EAAE,CAAC,KAAK,EAAE,UAAU,KAAK,OAAO,CAAC,UAAU,CAAC,CAAC;IACpD,OAAO,EAAE,CAAC,OAAO,EAAE,UAAU,KAAK,OAAO,CAAC,UAAU,CAAC,CAAC;CACvD,CAAC;AAEF,MAAM,WAAW,aAAa;IAC5B;;;;;OAKG;IACH,yBAAyB,EAAE,CAAC,cAAc,EAAE,WAAW,KAAK,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAAC;CACzF;AAED,MAAM,MAAM,SAAS,GAAG;IACtB,OAAO,EAAE,MAAM,CAAC;CACjB,CAAC;AAEF,MAAM,MAAM,4BAA4B,GAAG;IACzC,SAAS,EAAE,MAAM,CAAC;IAClB,SAAS,EAAE,MAAM,CAAC;CACnB,GAAG,SAAS,CAAC"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../src/messagingProtocols/mls/types.ts"],"names":[],"mappings":"AAmBA,OAAO,EAAC,WAAW,EAAC,MAAM,8BAA8B,CAAC;AAEzD,MAAM,MAAM,QAAQ,GAAG,MAAM,CAAC;AAE9B,MAAM,MAAM,YAAY,GAAG;IACzB,OAAO,EAAE,CAAC,KAAK,EAAE,UAAU,KAAK,OAAO,CAAC,UAAU,CAAC,CAAC;IACpD,OAAO,EAAE,CAAC,OAAO,EAAE,UAAU,KAAK,OAAO,CAAC,UAAU,CAAC,CAAC;CACvD,CAAC;AAEF,MAAM,WAAW,aAAa;IAC5B;;;;;OAKG;IACH,yBAAyB,EAAE,CAAC,cAAc,EAAE,WAAW,KAAK,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAAC;CACzF;AAED,MAAM,MAAM,SAAS,GAAG;IACtB,OAAO,EAAE,MAAM,CAAC;CACjB,CAAC;AAEF,MAAM,MAAM,4BAA4B,GAAG;IACzC,SAAS,EAAE,MAAM,CAAC;IAClB,SAAS,EAAE,MAAM,CAAC;CACnB,GAAG,SAAS,CAAC;AAEd,MAAM,WAAW,gBAAgB;IAC/B;;;;OAIG;IACH,YAAY,EAAE,MAAM,CAAC;CACtB"}

package/lib/messagingProtocols/proteus/EventHandler/events/otrMessageAdd/otrMessageAdd.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"otrMessageAdd.d.ts","sourceRoot":"","sources":["../../../../../../src/messagingProtocols/proteus/EventHandler/events/otrMessageAdd/otrMessageAdd.ts"],"names":[],"mappings":"AAmBA,OAAO,EAAC,8BAA8B,EAAC,MAAM,+BAA+B,CAAC;AAQ7E,OAAO,EAAC,mBAAmB,EAAC,MAAM,6BAA6B,CAAC;AAChE,OAAO,EAAC,cAAc,EAAC,MAAM,yBAAyB,CAAC;AAEvD,UAAU,yBAAyB;IACjC,KAAK,EAAE,8BAA8B,CAAC;IACtC,cAAc,EAAE,cAAc,CAAC;CAChC;AAID,eAAO,MAAM,mBAAmB,+BAG7B,yBAAyB,KAAG,OAAO,CAAC,mBAAmB,CAgCzD,CAAC"}
+{"version":3,"file":"otrMessageAdd.d.ts","sourceRoot":"","sources":["../../../../../../src/messagingProtocols/proteus/EventHandler/events/otrMessageAdd/otrMessageAdd.ts"],"names":[],"mappings":"AAoBA,OAAO,EAAC,8BAA8B,EAAC,MAAM,+BAA+B,CAAC;AAK7E,OAAO,EAAC,mBAAmB,EAAC,MAAM,6BAA6B,CAAC;AAChE,OAAO,EAAC,cAAc,EAAC,MAAM,yBAAyB,CAAC;AAEvD,UAAU,yBAAyB;IACjC,KAAK,EAAE,8BAA8B,CAAC;IACtC,cAAc,EAAE,cAAc,CAAC;CAChC;AAED,eAAO,MAAM,mBAAmB,+BAG7B,yBAAyB,KAAG,OAAO,CAAC,mBAAmB,CA6BzD,CAAC"}

package/lib/messagingProtocols/proteus/EventHandler/events/otrMessageAdd/otrMessageAdd.js

@@ -19,21 +19,16 @@
  */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.handleOtrMessageAdd = void 0;
+const protocol_messaging_1 = require("@pydio/protocol-messaging");
 const bazinga64_1 = require("bazinga64");
-const commons_1 = require("@wireapp/commons");
-const protocol_messaging_1 = require("@wireapp/protocol-messaging");
 const conversation_1 = require("../../../../../conversation");
 const DecryptionError_1 = require("../../../../../errors/DecryptionError");
-const logger = commons_1.LogFactory.getLogger('@wireapp/core/otrMessageAdd');
 const handleOtrMessageAdd = async ({ event, proteusService, }) => {
     try {
         const { from, qualified_from, data: { sender: clientId, text: encodedCiphertext }, } = event;
         const userId = qualified_from || { id: from, domain: '' };
         const messageBytes = bazinga64_1.Decoder.fromBase64(encodedCiphertext).asBytes;
-        const now = Date.now();
-        logger.info('Decrypting OTR message', { userId, clientId, event });
         const decryptedData = await proteusService.decrypt(messageBytes, userId, clientId);
-        logger.info('OTR message decrypted successfully', { userId, clientId, event, duration: Date.now() - now });
         const decodedData = protocol_messaging_1.GenericMessage.decode(decryptedData);
         const isSessionReset = decodedData[conversation_1.GenericMessageType.CLIENT_ACTION] === protocol_messaging_1.ClientAction.RESET_SESSION;
         if (isSessionReset) {
@@ -46,7 +41,6 @@ const handleOtrMessageAdd = async ({ event, proteusService, }) => {
         };
     }
     catch (error) {
-        logger.warn('Failed to decrypt OTR message', { event, error });
         if (error instanceof DecryptionError_1.DecryptionError) {
             return { event, decryptionError: error };
         }

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

@@ -1,22 +1,21 @@
 import { PreKey } from '@wireapp/api-client/lib/auth';
-import { CoreCrypto, CoreCryptoLogLevel } from '@wireapp/core-crypto';
+import { CoreCrypto } from '@wireapp/core-crypto';
 import type { CRUDEngine } from '@wireapp/store-engine';
 import { GeneratedKey } from '../../../../../secretStore/secretKeyGenerator';
-import { CoreCryptoConfig } from '../../../../common.types';
 import { CryptoClient } from '../CryptoClient.types';
 type Config = {
-    generateSecretKey: (keyId: string, keySize: 16 | 32) => Promise<GeneratedKey>;
+    generateSecretKey: (keyId: string) => Promise<GeneratedKey>;
     nbPrekeys: number;
     onNewPrekeys: (prekeys: PreKey[]) => void;
+    wasmFilePath: string;
 };
-type ClientConfig = Omit<Config, 'generateSecretKey'> & {
+type ClientConfig = Omit<Config, 'generateSecretKey' | 'wasmFilePath'> & {
     onWipe: () => Promise<void>;
 };
-export declare const getCoreCryptoDbName: (storeEngine: CRUDEngine) => string;
-export declare const wipeCoreCryptoDb: (storeEngine: CRUDEngine) => Promise<void>;
-export declare function buildClient(storeEngine: CRUDEngine, { generateSecretKey, nbPrekeys, onNewPrekeys }: Config, { wasmFilePath }: CoreCryptoConfig): Promise<CoreCryptoWrapper>;
+export declare function buildClient(storeEngine: CRUDEngine, { wasmFilePath, generateSecretKey, nbPrekeys, onNewPrekeys }: Config): Promise<CoreCryptoWrapper>;
 export declare class CoreCryptoWrapper implements CryptoClient {
     private readonly coreCrypto;
+    private readonly config;
     private readonly prekeyTracker;
     readonly version: string;
     constructor(coreCrypto: CoreCrypto, config: ClientConfig);
@@ -31,7 +30,6 @@ export declare class CoreCryptoWrapper implements CryptoClient {
             key: string;
         };
     }>;
-    setMaxLogLevel(level: CoreCryptoLogLevel): void;
     getFingerprint(): Promise<string>;
     getRemoteFingerprint(sessionId: string): Promise<string>;
     sessionFromMessage(sessionId: string, message: Uint8Array): Promise<Uint8Array>;
@@ -45,6 +43,15 @@ export declare class CoreCryptoWrapper implements CryptoClient {
         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 {};
 //# sourceMappingURL=CoreCryptoWrapper.d.ts.map

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;AAKpD,OAAO,EACL,UAAU,EACV,kBAAkB,EAOnB,MAAM,sBAAsB,CAAC;AAC9B,OAAO,KAAK,EAAC,UAAU,EAAC,MAAM,uBAAuB,CAAC;AAItD,OAAO,EAAoB,YAAY,EAAC,MAAM,+CAA+C,CAAC;AAC9F,OAAO,EAAC,gBAAgB,EAAC,MAAM,0BAA0B,CAAC;AAC1D,OAAO,EAAC,YAAY,EAAC,MAAM,uBAAuB,CAAC;AAEnD,KAAK,MAAM,GAAG;IACZ,iBAAiB,EAAE,CAAC,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,EAAE,GAAG,EAAE,KAAK,OAAO,CAAC,YAAY,CAAC,CAAC;IAC9E,SAAS,EAAE,MAAM,CAAC;IAClB,YAAY,EAAE,CAAC,OAAO,EAAE,MAAM,EAAE,KAAK,IAAI,CAAC;CAC3C,CAAC;AAEF,KAAK,YAAY,GAAG,IAAI,CAAC,MAAM,EAAE,mBAAmB,CAAC,GAAG;IACtD,MAAM,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;CAC7B,CAAC;AAiEF,eAAO,MAAM,mBAAmB,gBAAiB,UAAU,KAAG,MAE7D,CAAC;AAEF,eAAO,MAAM,gBAAgB,gBAAuB,UAAU,KAAG,OAAO,CAAC,IAAI,CAS5E,CAAC;AAGF,wBAAsB,WAAW,CAC/B,WAAW,EAAE,UAAU,EACvB,EAAC,iBAAiB,EAAE,SAAS,EAAE,YAAY,EAAC,EAAE,MAAM,EACpD,EAAC,YAAY,EAAC,EAAE,gBAAgB,GAC/B,OAAO,CAAC,iBAAiB,CAAC,CA0C5B;AAED,qBAAa,iBAAkB,YAAW,YAAY;IAKlD,OAAO,CAAC,QAAQ,CAAC,UAAU;IAJ7B,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAgB;IAC9C,SAAgB,OAAO,EAAE,MAAM,CAAC;gBAGb,UAAU,EAAE,UAAU,EACvC,MAAM,EAAE,YAAY;IAMtB,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;;;;;;;IAqB7C,cAAc,CAAC,KAAK,EAAE,kBAAkB;IAI/C,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;CAS1C"}
+{"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;AAKpD,OAAO,EAAC,UAAU,EAAgD,MAAM,sBAAsB,CAAC;AAC/F,OAAO,KAAK,EAAC,UAAU,EAAC,MAAM,uBAAuB,CAAC;AAItD,OAAO,EAAoB,YAAY,EAAC,MAAM,+CAA+C,CAAC;AAC9F,OAAO,EAAC,YAAY,EAAC,MAAM,uBAAuB,CAAC;AAEnD,KAAK,MAAM,GAAG;IACZ,iBAAiB,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,OAAO,CAAC,YAAY,CAAC,CAAC;IAC5D,SAAS,EAAE,MAAM,CAAC;IAClB,YAAY,EAAE,CAAC,OAAO,EAAE,MAAM,EAAE,KAAK,IAAI,CAAC;IAC1C,YAAY,EAAE,MAAM,CAAC;CACtB,CAAC;AAEF,KAAK,YAAY,GAAG,IAAI,CAAC,MAAM,EAAE,mBAAmB,GAAG,cAAc,CAAC,GAAG;IACvE,MAAM,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;CAC7B,CAAC;AAmBF,wBAAsB,WAAW,CAC/B,WAAW,EAAE,UAAU,EACvB,EAAC,YAAY,EAAE,iBAAiB,EAAE,SAAS,EAAE,YAAY,EAAC,EAAE,MAAM,GACjE,OAAO,CAAC,iBAAiB,CAAC,CAyB5B;AAED,qBAAa,iBAAkB,YAAW,YAAY;IAKlD,OAAO,CAAC,QAAQ,CAAC,UAAU;IAC3B,OAAO,CAAC,QAAQ,CAAC,MAAM;IALzB,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAgB;IAC9C,SAAgB,OAAO,EAAE,MAAM,CAAC;gBAGb,UAAU,EAAE,UAAU,EACtB,MAAM,EAAE,YAAY;IAMvC,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"}

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

@@ -18,7 +18,7 @@
  *
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.CoreCryptoWrapper = exports.wipeCoreCryptoDb = exports.getCoreCryptoDbName = void 0;
+exports.CoreCryptoWrapper = void 0;
 exports.buildClient = buildClient;
 const bazinga64_1 = require("bazinga64");
 const idb_1 = require("idb");
@@ -40,118 +40,57 @@ const coreCryptoLogger = {
         logFunctions[level].call(logger, { message, context });
     },
 };
-const getKey = async (generateSecretKey, keyName, keySize) => {
-    return await generateSecretKey(keyName, keySize);
-};
-const migrateOnceAndGetKey = async (generateSecretKey, coreCryptoDbName) => {
-    const coreCryptoNewKeyId = 'corecrypto-key-v2';
+async function buildClient(storeEngine, { wasmFilePath, generateSecretKey, nbPrekeys, onNewPrekeys }) {
+    let key;
+    const coreCryptoDbName = `corecrypto-${storeEngine.storeName}`;
     const coreCryptoKeyId = 'corecrypto-key';
-    // 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 (!keyNew || !keyOld) {
-        // 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
-        throw new Error('Key not found and could not be generated');
-    }
-    /**
-     * Handles migration and cleanup of encryption keys.
-     *
-     * - If `keyNew` is freshly generated and `keyOld` is not freshly generated:
-     *     - Migrate data from `keyOld` to `keyNew`
-     */
-    if (keyNew.freshlyGenerated && !keyOld.freshlyGenerated) {
-        const databaseKey = new core_crypto_1.DatabaseKey(keyNew.key);
-        await (0, core_crypto_1.migrateDatabaseKeyTypeToBytes)(coreCryptoDbName, bazinga64_1.Encoder.toBase64(keyOld.key).asString, databaseKey);
-    }
-    // Always clean up the old key
-    await keyOld.deleteKey();
-    return {
-        key: new core_crypto_1.DatabaseKey(keyNew.key),
-        deleteKey: keyNew.deleteKey,
-    };
-};
-const getCoreCryptoDbName = (storeEngine) => {
-    return `corecrypto-${storeEngine.storeName}`;
-};
-exports.getCoreCryptoDbName = getCoreCryptoDbName;
-const wipeCoreCryptoDb = async (storeEngine) => {
-    const coreCryptoDbName = (0, exports.getCoreCryptoDbName)(storeEngine);
     try {
-        await coreCryptoInstance?.close();
-        await (0, idb_1.deleteDB)(coreCryptoDbName);
-        logger.log('info', 'CoreCrypto DB wiped successfully');
+        key = await generateSecretKey(coreCryptoKeyId);
     }
     catch (error) {
-        logger.error('error', 'Failed to wipe CoreCrypto DB');
-    }
-};
-exports.wipeCoreCryptoDb = wipeCoreCryptoDb;
-let coreCryptoInstance;
-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 = (0, exports.getCoreCryptoDbName)(storeEngine);
-        // New key format used by coreCrypto
-        let key;
-        try {
-            key = await migrateOnceAndGetKey(generateSecretKey, coreCryptoDbName);
+        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);
         }
-        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, exports.wipeCoreCryptoDb)(storeEngine);
-                key = await migrateOnceAndGetKey(generateSecretKey, coreCryptoDbName);
-            }
-            else {
-                throw error;
-            }
+        else {
+            throw error;
         }
-        coreCryptoInstance = 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(coreCryptoInstance, { nbPrekeys, onNewPrekeys, onWipe: key.deleteKey });
-    })
-        // if the coreCrypto initialization fails, can not use the crypto client and throw an error
-        .catch(async (error) => {
-        logger.error('error', 'CoreCrypto initialization failed', { error });
-        // If the initialization fails, we wipe the coreCrypto DB to start fresh
-        await (0, exports.wipeCoreCryptoDb)(storeEngine);
-        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 });
 }
 class CoreCryptoWrapper {
     coreCrypto;
+    config;
     prekeyTracker;
     version;
     constructor(coreCrypto, config) {
         this.coreCrypto = coreCrypto;
-        this.version = (0, core_crypto_1.version)();
+        this.config = config;
+        this.version = core_crypto_1.CoreCrypto.version();
         this.prekeyTracker = new PrekeysTracker_1.PrekeyTracker(this, config);
     }
     getNativeClient() {
         return this.coreCrypto;
     }
     encrypt(sessions, plainText) {
-        return this.coreCrypto.transaction(cx => cx.proteusEncryptBatched(sessions, plainText));
+        return this.coreCrypto.proteusEncryptBatched(sessions, plainText);
     }
     decrypt(sessionId, message) {
-        return this.coreCrypto.transaction(cx => cx.proteusDecrypt(sessionId, message));
+        return this.coreCrypto.proteusDecrypt(sessionId, message);
     }
     init(nbInitialPrekeys) {
         if (nbInitialPrekeys) {
             this.prekeyTracker.setInitialState(nbInitialPrekeys);
         }
-        return this.coreCrypto.transaction(cx => cx.proteusInit());
+        return this.coreCrypto.proteusInit();
     }
     async create(nbPrekeys, entropy) {
         if (entropy) {
@@ -162,7 +101,7 @@ class CoreCryptoWrapper {
         for (let id = 0; id < nbPrekeys; id++) {
             prekeys.push(await this.newPrekey());
         }
-        const lastPrekeyBytes = await this.coreCrypto.transaction(cx => cx.proteusLastResortPrekey());
+        const lastPrekeyBytes = await this.coreCrypto.proteusLastResortPrekey();
         const lastPrekey = bazinga64_1.Encoder.toBase64(lastPrekeyBytes).asString;
         const lastPrekeyId = core_crypto_1.CoreCrypto.proteusLastResortPrekeyId();
         return {
@@ -170,9 +109,6 @@ class CoreCryptoWrapper {
             lastPrekey: { id: lastPrekeyId, key: lastPrekey },
         };
     }
-    setMaxLogLevel(level) {
-        (0, core_crypto_1.setMaxLogLevel)(level);
-    }
     getFingerprint() {
         return this.coreCrypto.proteusFingerprint();
     }
@@ -181,25 +117,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.transaction(cx => cx.proteusSessionFromMessage(sessionId, message));
+        return this.coreCrypto.proteusSessionFromMessage(sessionId, message);
     }
     sessionFromPrekey(sessionId, prekey) {
-        return this.coreCrypto.transaction(cx => cx.proteusSessionFromPrekey(sessionId, prekey));
+        return this.coreCrypto.proteusSessionFromPrekey(sessionId, prekey);
     }
     sessionExists(sessionId) {
         return this.coreCrypto.proteusSessionExists(sessionId);
     }
     saveSession(sessionId) {
-        return this.coreCrypto.transaction(cx => cx.proteusSessionSave(sessionId));
+        return this.coreCrypto.proteusSessionSave(sessionId);
     }
     deleteSession(sessionId) {
-        return this.coreCrypto.transaction(cx => cx.proteusSessionDelete(sessionId));
+        return this.coreCrypto.proteusSessionDelete(sessionId);
     }
     consumePrekey() {
         return this.prekeyTracker.consumePrekey();
     }
     async newPrekey() {
-        const { id, pkb } = await this.coreCrypto.transaction(cx => cx.proteusNewPrekeyAuto());
+        const { id, pkb } = await this.coreCrypto.proteusNewPrekeyAuto();
         return { id, key: bazinga64_1.Encoder.toBase64(pkb).asString };
     }
     async debugBreakSession(sessionId) {
@@ -209,7 +145,36 @@ 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.transaction(cx => cx.proteusSessionFromPrekey(sessionId, Uint8Array.from(fakePrekey)));
+        await this.coreCrypto.proteusSessionFromPrekey(sessionId, Uint8Array.from(fakePrekey));
+    }
+    async debugResetIdentity() {
+        await this.coreCrypto.wipe();
+    }
+    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());
     }
 }
 exports.CoreCryptoWrapper = CoreCryptoWrapper;

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

@@ -30,5 +30,11 @@ 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;CAC5C"}
+{"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"}

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

@@ -8,10 +8,15 @@ export declare const ProteusErrors: {
     readonly DuplicateMessage: 209;
     readonly Unknown: 999;
 };
+export declare const CORE_CRYPTO_PROTEUS_ERROR_NAMES: {
+    ProteusErrorSessionNotFound: string;
+    ProteusErrorRemoteIdentityChanged: string;
+    ProteusErrorDuplicateMessage: string;
+};
 type SenderInfo = {
     clientId: string;
     userId: QualifiedId;
 };
-export declare const generateDecryptionError: (senderInfo: SenderInfo, error: unknown) => DecryptionError;
+export declare const generateDecryptionError: (senderInfo: SenderInfo, error: any) => DecryptionError;
 export {};
 //# sourceMappingURL=DecryptionErrorGenerator.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"DecryptionErrorGenerator.d.ts","sourceRoot":"","sources":["../../../../../src/messagingProtocols/proteus/ProteusService/DecryptionErrorGenerator/DecryptionErrorGenerator.ts"],"names":[],"mappings":"AAmBA,OAAO,EAAC,WAAW,EAAC,MAAM,8BAA8B,CAAC;AAUzD,OAAO,EAAC,eAAe,EAAC,MAAM,oCAAoC,CAAC;AAEnE,eAAO,MAAM,aAAa;;;;;;;CAOhB,CAAC;AAUX,KAAK,UAAU,GAAG;IAAC,QAAQ,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,WAAW,CAAA;CAAC,CAAC;AA8B1D,eAAO,MAAM,uBAAuB,eAAgB,UAAU,SAAS,OAAO,KAAG,eAWhF,CAAC"}
+{"version":3,"file":"DecryptionErrorGenerator.d.ts","sourceRoot":"","sources":["../../../../../src/messagingProtocols/proteus/ProteusService/DecryptionErrorGenerator/DecryptionErrorGenerator.ts"],"names":[],"mappings":"AAmBA,OAAO,EAAC,WAAW,EAAC,MAAM,8BAA8B,CAAC;AAIzD,OAAO,EAAC,eAAe,EAAC,MAAM,oCAAoC,CAAC;AAEnE,eAAO,MAAM,aAAa;;;;;;;CAOhB,CAAC;AAYX,eAAO,MAAM,+BAA+B;;;;CAI3C,CAAC;AAEF,KAAK,UAAU,GAAG;IAAC,QAAQ,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,WAAW,CAAA;CAAC,CAAC;AA0B1D,eAAO,MAAM,uBAAuB,eAAgB,UAAU,SAAS,GAAG,KAAG,eAS5E,CAAC"}

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

@@ -18,8 +18,7 @@
  *
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.generateDecryptionError = exports.ProteusErrors = void 0;
-const core_crypto_1 = require("@wireapp/core-crypto");
+exports.generateDecryptionError = exports.CORE_CRYPTO_PROTEUS_ERROR_NAMES = exports.ProteusErrors = void 0;
 const DecryptionError_1 = require("../../../../errors/DecryptionError");
 exports.ProteusErrors = {
     SessionNotFound: 102,
@@ -29,36 +28,40 @@ exports.ProteusErrors = {
     DuplicateMessage: 209,
     Unknown: 999,
 };
-const isCryptoboxError = (error) => typeof error?.code === 'number';
-const hasProteusErrorCode = (error) => typeof error?.proteusErrorCode === 'number';
+const isCoreCryptoError = (error) => {
+    return 'proteusErrorCode' in error;
+};
+const isCryptoboxError = (error) => {
+    return 'code' in error;
+};
+exports.CORE_CRYPTO_PROTEUS_ERROR_NAMES = {
+    ProteusErrorSessionNotFound: 'ProteusErrorSessionNotFound',
+    ProteusErrorRemoteIdentityChanged: 'ProteusErrorRemoteIdentityChanged',
+    ProteusErrorDuplicateMessage: 'ProteusErrorDuplicateMessage',
+};
 function getErrorCode(error) {
-    if ((0, core_crypto_1.isProteusSessionNotFoundError)(error)) {
+    if (isCoreCryptoError(error) && typeof error.proteusErrorCode === 'number') {
+        return error.proteusErrorCode;
+    }
+    if (isCryptoboxError(error) && typeof error.code === 'number') {
+        return error.code;
+    }
+    if (error.name === exports.CORE_CRYPTO_PROTEUS_ERROR_NAMES.ProteusErrorSessionNotFound) {
         return exports.ProteusErrors.SessionNotFound;
     }
-    if ((0, core_crypto_1.isProteusRemoteIdentityChangedError)(error)) {
+    if (error.name === exports.CORE_CRYPTO_PROTEUS_ERROR_NAMES.ProteusErrorRemoteIdentityChanged) {
         return exports.ProteusErrors.RemoteIdentityChanged;
     }
-    if ((0, core_crypto_1.isProteusDuplicateMessageError)(error)) {
+    if (error.name === exports.CORE_CRYPTO_PROTEUS_ERROR_NAMES.ProteusErrorDuplicateMessage) {
         return exports.ProteusErrors.DuplicateMessage;
     }
-    if ((0, core_crypto_1.isProteusError)(error, core_crypto_1.ProteusErrorType.Other)) {
-        return exports.ProteusErrors.Unknown;
-    }
-    if (hasProteusErrorCode(error)) {
-        return error.proteusErrorCode;
-    }
-    if (isCryptoboxError(error)) {
-        return error.code;
-    }
     return exports.ProteusErrors.Unknown;
 }
 const generateDecryptionError = (senderInfo, error) => {
     const { clientId, userId } = senderInfo;
     const sender = `${userId.id} (${clientId})`;
     const code = getErrorCode(error);
-    const name = error?.name;
-    const text = error?.message ?? String(error);
-    const message = `Decryption error from ${sender} (name: ${name}) (message: ${text})`;
+    const message = `Decryption error from ${sender} (name: ${error.name}) (message: ${error.message})`;
     return new DecryptionError_1.DecryptionError(message, code);
 };
 exports.generateDecryptionError = generateDecryptionError;

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

@@ -20,13 +20,11 @@ export declare class ProteusService {
     private readonly apiClient;
     private readonly cryptoClient;
     private readonly config;
-    private readonly storeEngine;
     private readonly messageService;
     private readonly logger;
-    private readonly dbName;
-    constructor(apiClient: APIClient, cryptoClient: CryptoClient, config: ProteusServiceConfig, storeEngine: CRUDEngine);
+    constructor(apiClient: APIClient, cryptoClient: CryptoClient, config: ProteusServiceConfig);
     handleOtrMessageAddEvent(event: ConversationOtrMessageAddEvent): Promise<HandledEventPayload>;
-    initClient(context: Context): Promise<void>;
+    initClient(storeEngine: CRUDEngine, context: Context): Promise<void>;
     createClient(entropy?: Uint8Array): Promise<import("./CryptoClient").InitialPrekeys>;
     /**
      * Get the fingerprint of the local client.
@@ -52,6 +50,6 @@ export declare class ProteusService {
     consumePrekey(): Promise<void>;
     deleteSession(userId: QualifiedId, clientId: string): Promise<void>;
     encrypt(plainText: Uint8Array, recipients: QualifiedUserPreKeyBundleMap | QualifiedUserClients): Promise<EncryptionResult>;
-    wipe(): Promise<void>;
+    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,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;IAgBjC,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"}
+{"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"}

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

@@ -37,17 +37,13 @@ class ProteusService {
     apiClient;
     cryptoClient;
     config;
-    storeEngine;
     messageService;
     logger = commons_1.LogFactory.getLogger('@wireapp/core/ProteusService');
-    dbName;
-    constructor(apiClient, cryptoClient, config, storeEngine) {
+    constructor(apiClient, cryptoClient, config) {
         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)({
@@ -55,16 +51,30 @@ class ProteusService {
             proteusService: this,
         });
     }
-    async initClient(context) {
+    async initClient(storeEngine, context) {
+        const dbName = storeEngine.storeName;
         if (context.domain) {
             // We want sessions to be fully qualified from now on
-            if (!cryptoMigrationStateStore_1.cryptoMigrationStore.qualifiedSessions.isReady(this.dbName)) {
+            if (!cryptoMigrationStateStore_1.cryptoMigrationStore.qualifiedSessions.isReady(dbName)) {
                 this.logger.info(`Migrating existing session ids to qualified ids.`);
-                await (0, sessionIdMigrator_1.migrateToQualifiedSessionIds)(this.storeEngine, context.domain);
-                cryptoMigrationStateStore_1.cryptoMigrationStore.qualifiedSessions.markAsReady(this.dbName);
+                await (0, sessionIdMigrator_1.migrateToQualifiedSessionIds)(storeEngine, context.domain);
+                cryptoMigrationStateStore_1.cryptoMigrationStore.qualifiedSessions.markAsReady(dbName);
                 this.logger.info(`Successfully migrated session ids to qualified ids.`);
             }
         }
+        if (!cryptoMigrationStateStore_1.cryptoMigrationStore.coreCrypto.isReady(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);
+                this.logger.info(`Successfully migrated from cryptobox to corecrypto (took ${Date.now() - startTime}ms).`);
+            }
+            catch (error) {
+                this.logger.error('Client was not able to perform DB migration: ', error);
+                throw error;
+            }
+        }
         const backendPrekeys = await this.apiClient.api.client.getClientPreKeys(context.clientId ?? '');
         const totalUsableBackedPrekeys = backendPrekeys.length - 1; // we remove the last resort prekey from the total number of available prekeys
         return this.cryptoClient.init(totalUsableBackedPrekeys);
@@ -261,8 +271,11 @@ class ProteusService {
             failed,
         };
     }
-    async wipe() {
-        await (0, identityClearer_1.deleteIdentity)(this.storeEngine);
+    async wipe(storeEngine) {
+        if (storeEngine) {
+            await (0, identityClearer_1.deleteIdentity)(storeEngine);
+        }
+        return this.cryptoClient.wipe();
     }
 }
 exports.ProteusService = ProteusService;

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

@@ -5,5 +5,4 @@ export declare const buildProteusService: () => Promise<[ProteusService, {
     apiClient: APIClient;
     cryptoClient: CryptoClient;
 }]>;
-export declare const cleanupProteusServiceMocks: () => void;
 //# sourceMappingURL=ProteusService.mocks.d.ts.map