@wireapp/core 38.10.3 → 38.11.1

package/lib/Account.js

@@ -361,7 +361,7 @@ class Account extends TypedEventEmitter_1.TypedEventEmitter {
                     break;
                 }
             }
-            onEvent(payload, source);
+            await onEvent(payload, source);
         };
         const handleNotification = async (notification, source) => {
             var _a, e_1, _b, _c;

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

@@ -123,7 +123,7 @@ class MLSService extends TypedEventEmitter_1.TypedEventEmitter {
     }
     configureMLSCallbacks(_a) {
         var { groupIdFromConversationId } = _a, coreCryptoCallbacks = __rest(_a, ["groupIdFromConversationId"]);
-        this.coreCryptoClient.registerCallbacks(Object.assign(Object.assign({}, coreCryptoCallbacks), { clientIsExistingGroupUser: (client, otherClients) => {
+        this.coreCryptoClient.registerCallbacks(Object.assign(Object.assign({}, coreCryptoCallbacks), { clientIsExistingGroupUser: (_groupId, client, otherClients) => {
                 const { user } = (0, fullyQualifiedClientIdUtils_1.parseFullQualifiedClientId)(this.textDecoder.decode(client));
                 return otherClients.some(client => {
                     const { user: otherUser } = (0, fullyQualifiedClientIdUtils_1.parseFullQualifiedClientId)(this.textDecoder.decode(client));

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

@@ -1 +1 @@
-{"version":3,"file":"CoreCryptoWrapper.d.ts","sourceRoot":"","sources":["../../../../../src/messagingProtocols/proteus/ProteusService/CryptoClient/CoreCryptoWrapper.ts"],"names":[],"mappings":"AAmBA,OAAO,EAAC,MAAM,EAAC,MAAM,8BAA8B,CAAC;AAGpD,OAAO,EAAC,UAAU,EAAC,MAAM,sBAAsB,CAAC;AAChD,OAAO,KAAK,EAAC,UAAU,EAAC,MAAM,uBAAuB,CAAC;AAEtD,OAAO,EAAC,YAAY,EAAiB,MAAM,sBAAsB,CAAC;AAGlE,OAAO,EAAC,YAAY,EAAC,MAAM,4BAA4B,CAAC;AAExD,KAAK,MAAM,GAAG;IACZ,SAAS,EAAE,MAAM,CAAC;IAClB,YAAY,EAAE,CAAC,OAAO,EAAE,MAAM,EAAE,KAAK,IAAI,CAAC;CAC3C,CAAC;AAEF,wBAAsB,WAAW,CAC/B,WAAW,EAAE,UAAU,EACvB,SAAS,EAAE,UAAU,EACrB,sBAAsB,EAAE,MAAM,EAC9B,EAAE,EAAE,YAAY,EAChB,EAAC,SAAS,EAAE,YAAY,EAAC,EAAE,MAAM,GAChC,OAAO,CAAC,iBAAiB,CAAC,CAQ5B;AAED,qBAAa,iBAAkB,YAAW,YAAY;IAGxC,OAAO,CAAC,QAAQ,CAAC,UAAU;IAFvC,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAgB;gBAEjB,UAAU,EAAE,UAAU,EAAE,EAAE,EAAE,YAAY,EAAE,MAAM,EAAE,MAAM;IAIrF,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;;;;;;;IAiBpD,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;CAGX"}
+{"version":3,"file":"CoreCryptoWrapper.d.ts","sourceRoot":"","sources":["../../../../../src/messagingProtocols/proteus/ProteusService/CryptoClient/CoreCryptoWrapper.ts"],"names":[],"mappings":"AAmBA,OAAO,EAAC,MAAM,EAAC,MAAM,8BAA8B,CAAC;AAGpD,OAAO,EAAC,UAAU,EAAC,MAAM,sBAAsB,CAAC;AAChD,OAAO,KAAK,EAAC,UAAU,EAAC,MAAM,uBAAuB,CAAC;AAEtD,OAAO,EAAC,YAAY,EAAiB,MAAM,sBAAsB,CAAC;AAGlE,OAAO,EAAC,YAAY,EAAC,MAAM,4BAA4B,CAAC;AAExD,KAAK,MAAM,GAAG;IACZ,SAAS,EAAE,MAAM,CAAC;IAClB,YAAY,EAAE,CAAC,OAAO,EAAE,MAAM,EAAE,KAAK,IAAI,CAAC;CAC3C,CAAC;AAEF,wBAAsB,WAAW,CAC/B,WAAW,EAAE,UAAU,EACvB,SAAS,EAAE,UAAU,EACrB,sBAAsB,EAAE,MAAM,EAC9B,EAAE,EAAE,YAAY,EAChB,EAAC,SAAS,EAAE,YAAY,EAAC,EAAE,MAAM,GAChC,OAAO,CAAC,iBAAiB,CAAC,CAO5B;AAED,qBAAa,iBAAkB,YAAW,YAAY;IAGxC,OAAO,CAAC,QAAQ,CAAC,UAAU;IAFvC,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAgB;gBAEjB,UAAU,EAAE,UAAU,EAAE,EAAE,EAAE,YAAY,EAAE,MAAM,EAAE,MAAM;IAIrF,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;;;;;;;IAiBpD,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;CAGX"}

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

@@ -24,8 +24,11 @@ const core_crypto_1 = require("@wireapp/core-crypto");
 const CryptoClient_types_1 = require("./CryptoClient.types");
 const PrekeysTracker_1 = require("./PrekeysTracker");
 async function buildClient(storeEngine, secretKey, coreCryptoWasmFilePath, db, { nbPrekeys, onNewPrekeys }) {
-    const coreCrypto = await core_crypto_1.CoreCrypto.deferredInit(`corecrypto-${storeEngine.storeName}`, bazinga64_1.Encoder.toBase64(secretKey).asString, undefined, // We pass a placeholder entropy data. It will be set later on by calling `reseedRng`
-    coreCryptoWasmFilePath);
+    const coreCrypto = await core_crypto_1.CoreCrypto.deferredInit({
+        databaseName: `corecrypto-${storeEngine.storeName}`,
+        key: bazinga64_1.Encoder.toBase64(secretKey).asString,
+        wasmFilePath: coreCryptoWasmFilePath,
+    });
     return new CoreCryptoWrapper(coreCrypto, db, { nbPrekeys, onNewPrekeys });
 }
 exports.buildClient = buildClient;

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;AAEzD,OAAO,EAAC,eAAe,EAAC,MAAM,oCAAoC,CAAC;AAEnE,eAAO,MAAM,aAAa;;;;;;CAMhB,CAAC;AAwCX,KAAK,UAAU,GAAG;IAAC,QAAQ,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,WAAW,CAAA;CAAC,CAAC;AAC1D,eAAO,MAAM,uBAAuB,eAAgB,UAAU,SAAS,GAAG,KAAG,eAO5E,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;;;;;;CAMhB,CAAC;AAWX,KAAK,UAAU,GAAG;IAAC,QAAQ,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,WAAW,CAAA;CAAC,CAAC;AAC1D,eAAO,MAAM,uBAAuB,eAAgB,UAAU,SAAS,GAAG,KAAG,eAW5E,CAAC"}

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

@@ -27,38 +27,19 @@ exports.ProteusErrors = {
     DuplicateMessage: 209,
     Unknown: 999,
 };
-const CoreCryptoErrorMapping = {
-    InvalidMessage: exports.ProteusErrors.InvalidMessage,
-    RemoteIdentityChanged: exports.ProteusErrors.RemoteIdentityChanged,
-    InvalidSignature: exports.ProteusErrors.InvalidSignature,
-    DuplicateMessage: exports.ProteusErrors.DuplicateMessage,
-    Unknown: exports.ProteusErrors.Unknown,
+const isCoreCryptoError = (error) => {
+    return 'proteusErrorCode' in error;
 };
-const mapCoreCryptoError = (error) => {
-    var _a;
-    return (_a = CoreCryptoErrorMapping[error.message]) !== null && _a !== void 0 ? _a : exports.ProteusErrors.Unknown;
-};
-const getErrorMessage = (code, userId, clientId, error) => {
-    const sender = `${userId.id} (${clientId})`;
-    switch (code) {
-        case exports.ProteusErrors.InvalidMessage:
-            return `Invalid message from ${sender}`;
-        case exports.ProteusErrors.InvalidSignature:
-            return `Invalid signature from ${sender}`;
-        case exports.ProteusErrors.RemoteIdentityChanged:
-            return `Remote identity of ${sender} has changed`;
-        case exports.ProteusErrors.DuplicateMessage:
-            return `Message from ${sender} was decrypted twice`;
-        case exports.ProteusErrors.Unknown:
-            return `Unknown decryption error from ${sender} (${error.message})`;
-        default:
-            return `Unhandled error code "${code}" from ${sender} (${error.message})`;
-    }
+const isCryptoboxError = (error) => {
+    return 'code' in error;
 };
 const generateDecryptionError = (senderInfo, error) => {
-    const { clientId: remoteClientId, userId } = senderInfo;
-    const code = error.code || mapCoreCryptoError(error);
-    const message = getErrorMessage(code, userId, remoteClientId, error);
+    const { clientId, userId } = senderInfo;
+    const sender = `${userId.id} (${clientId})`;
+    const coreCryptoCode = isCoreCryptoError(error) && error.proteusErrorCode;
+    const cryptoboxCode = isCryptoboxError(error) && error.code;
+    const code = coreCryptoCode || cryptoboxCode || exports.ProteusErrors.Unknown;
+    const message = `Decryption error from ${sender} (${error.message})`;
     return new DecryptionError_1.DecryptionError(message, code);
 };
 exports.generateDecryptionError = generateDecryptionError;

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

@@ -22,35 +22,18 @@ const DecryptionErrorGenerator_1 = require("./DecryptionErrorGenerator");
 const DecryptionError_1 = require("../../../../errors/DecryptionError");
 const basePayload = { userId: { id: 'user1', domain: 'domain' }, clientId: 'client1' };
 describe('generateDecryptionError', () => {
-    it('handles unknown decryption error', () => {
-        const message = 'decryption error';
-        const error = (0, DecryptionErrorGenerator_1.generateDecryptionError)(basePayload, new Error(message));
+    it('handles coreCrypto error', () => {
+        const coreCryptoError = { proteusErrorCode: Math.floor(Math.random() * 100), message: 'decryption error' };
+        const error = (0, DecryptionErrorGenerator_1.generateDecryptionError)(basePayload, coreCryptoError);
         expect(error).toBeInstanceOf(DecryptionError_1.DecryptionError);
-        expect(error.message).toBe(`Unknown decryption error from user1 (client1) (${message})`);
-        expect(error.code).toBe(DecryptionErrorGenerator_1.ProteusErrors.Unknown);
+        expect(error.message).toBe(`Decryption error from user1 (client1) (${coreCryptoError.message})`);
+        expect(error.code).toBe(coreCryptoError.proteusErrorCode);
     });
-    it('handles remote identity changed', () => {
-        const error = (0, DecryptionErrorGenerator_1.generateDecryptionError)(basePayload, new Error('RemoteIdentityChanged'));
+    it('handles cryptobox error', () => {
+        const coreCryptoError = { code: Math.floor(Math.random() * 100), message: 'decryption error' };
+        const error = (0, DecryptionErrorGenerator_1.generateDecryptionError)(basePayload, coreCryptoError);
         expect(error).toBeInstanceOf(DecryptionError_1.DecryptionError);
-        expect(error.message).toBe('Remote identity of user1 (client1) has changed');
-        expect(error.code).toBe(DecryptionErrorGenerator_1.ProteusErrors.RemoteIdentityChanged);
-    });
-    it('handles invalid message', () => {
-        const error = (0, DecryptionErrorGenerator_1.generateDecryptionError)(basePayload, new Error('InvalidMessage'));
-        expect(error).toBeInstanceOf(DecryptionError_1.DecryptionError);
-        expect(error.message).toBe('Invalid message from user1 (client1)');
-        expect(error.code).toBe(DecryptionErrorGenerator_1.ProteusErrors.InvalidMessage);
-    });
-    it('handles duplicated message', () => {
-        const error = (0, DecryptionErrorGenerator_1.generateDecryptionError)(basePayload, new Error('DuplicateMessage'));
-        expect(error).toBeInstanceOf(DecryptionError_1.DecryptionError);
-        expect(error.message).toBe('Message from user1 (client1) was decrypted twice');
-        expect(error.code).toBe(DecryptionErrorGenerator_1.ProteusErrors.DuplicateMessage);
-    });
-    it('handles invalid signature', () => {
-        const error = (0, DecryptionErrorGenerator_1.generateDecryptionError)(basePayload, new Error('InvalidSignature'));
-        expect(error).toBeInstanceOf(DecryptionError_1.DecryptionError);
-        expect(error.message).toBe('Invalid signature from user1 (client1)');
-        expect(error.code).toBe(DecryptionErrorGenerator_1.ProteusErrors.InvalidSignature);
+        expect(error.message).toBe(`Decryption error from user1 (client1) (${coreCryptoError.message})`);
+        expect(error.code).toBe(coreCryptoError.code);
     });
 });

package/package.json

@@ -13,7 +13,7 @@
   "dependencies": {
     "@wireapp/api-client": "^22.15.4",
     "@wireapp/commons": "^5.0.4",
-    "@wireapp/core-crypto": "0.6.0-rc.3",
+    "@wireapp/core-crypto": "0.6.0-rc.7",
     "@wireapp/cryptobox": "12.8.0",
     "@wireapp/promise-queue": "^2.1.1",
     "@wireapp/protocol-messaging": "1.44.0",
@@ -60,6 +60,6 @@
     "test:coverage": "jest --coverage",
     "watch": "tsc --watch"
   },
-  "version": "38.10.3",
-  "gitHead": "9cad83be434419e9c4633934e42379ce5fc30144"
+  "version": "38.11.1",
+  "gitHead": "7969fe115696f129aa8e31e27a579a69803ed9b5"
 }