@wireapp/core 32.1.2 → 33.0.0

package/package.json

@@ -3,60 +3,51 @@
     "./src/main/cryptography/AssetCryptography/crypto.node": "./src/main/cryptography/AssetCryptography/crypto.browser.js"
   },
   "dependencies": {
-    "@wireapp/api-client": "^20.6.10",
-    "@wireapp/commons": "^4.4.7",
+    "@wireapp/api-client": "^20.7.0",
+    "@wireapp/commons": "^4.4.9",
     "@wireapp/core-crypto": "0.5.2",
     "@wireapp/cryptobox": "12.8.0",
-    "@wireapp/promise-queue": "^1.3.1",
-    "@wireapp/store-engine-dexie": "^1.7.7",
+    "@wireapp/promise-queue": "^1.3.3",
+    "@wireapp/protocol-messaging": "1.39.0",
+    "@wireapp/store-engine-dexie": "^1.7.9",
     "axios": "^0.27.2",
-    "bazinga64": "5.11.7",
+    "bazinga64": "5.11.9",
     "hash.js": "1.1.7",
-    "http-status-codes": "2.1.4",
-    "idb": "7.0.2",
+    "http-status-codes": "2.2.0",
+    "idb": "7.1.0",
     "logdown": "3.3.1",
     "long": "4.0.0",
-    "protobufjs": "6.11.3",
     "uuidjs": "4.2.12"
   },
   "devDependencies": {
     "@babel/core": "^7.19.1",
     "@babel/preset-env": "^7.19.1",
     "@babel/preset-typescript": "^7.18.6",
+    "@faker-js/faker": "^7.6.0",
     "@open-wc/webpack-import-meta-loader": "0.4.7",
     "@types/babel__core": "^7",
-    "@types/faker": "5.5.7",
-    "@types/jest": "29.0.3",
-    "@types/karma": "6.3.3",
+    "@types/jest": "29.2.0",
     "@types/long": "4.0.1",
-    "@types/node": "^14.18.29",
+    "@types/node": "^18.11.2",
     "@types/tough-cookie": "4.0.2",
     "@wireapp/commons": "workspace:^",
-    "@wireapp/protocol-messaging": "1.38.0",
     "@wireapp/store-engine-dexie": "workspace:^",
-    "commander": "8.0.0",
+    "commander": "9.4.1",
     "cross-env": "7.0.3",
-    "dotenv-defaults": "2.0.2",
-    "fake-indexeddb": "3.1.8",
-    "faker": "5.5.3",
+    "dotenv-defaults": "5.0.2",
+    "fake-indexeddb": "4.0.0",
     "istanbul": "1.1.0-alpha.1",
-    "jest": "29.0.3",
+    "jest": "29.2.1",
     "jest-babel": "1.0.1",
-    "jest-jasmine2": "29.0.3",
+    "jest-jasmine2": "29.2.1",
     "jest-websocket-mock": "2.4.0",
-    "karma": "6.4.1",
-    "karma-chrome-launcher": "3.1.1",
-    "karma-jasmine": "4.0.2",
-    "karma-jasmine-diff-reporter": "2.0.1",
-    "karma-sourcemap-loader": "0.3.8",
-    "karma-spec-reporter": "0.0.34",
     "mock-socket": "9.1.5",
     "nock": "13.2.9",
     "nyc": "15.1.0",
     "rimraf": "3.0.2",
-    "typescript": "4.8.3",
+    "typescript": "4.8.4",
     "webpack": "4.46.0",
-    "webpack-cli": "4.7.2"
+    "webpack-cli": "4.10.0"
   },
   "description": "Wire for Web's communication core.",
   "files": [
@@ -82,6 +73,6 @@
     "test": "jest",
     "watch": "tsc ---watch"
   },
-  "version": "32.1.2",
-  "gitHead": "4f3941eb17937ca87986d4832d7bdd304a1e2dca"
+  "version": "33.0.0",
+  "gitHead": "cc1de9547f2528a14d3d23937a154f58476d2faf"
 }

package/src/main/Account.js

@@ -312,8 +312,8 @@ class Account extends events_1.EventEmitter {
         const coreCryptoKeyId = 'corecrypto-key';
         const { CoreCrypto } = await Promise.resolve().then(() => __importStar(require('@wireapp/core-crypto')));
         const dbName = this.generateSecretsDbName(context);
-        const secretStore = mlsConfig.secretsCrypto
-            ? await (0, encryptedStore_1.createCustomEncryptedStore)(dbName, mlsConfig.secretsCrypto)
+        const secretStore = mlsConfig.systemCrypto
+            ? await (0, encryptedStore_1.createCustomEncryptedStore)(dbName, mlsConfig.systemCrypto)
             : await (0, encryptedStore_1.createEncryptedStore)(dbName);
         let key = await secretStore.getsecretValue(coreCryptoKeyId);
         let isNewMLSDevice = false;

package/src/main/cryptography/AssetCryptography/index.d.ts

@@ -3,6 +3,6 @@ import { EncryptedAsset } from './EncryptedAsset';
 interface EncryptOptions extends CipherOptions {
     plainText: Uint8Array;
 }
-export declare const decryptAsset: ({ cipherText, keyBytes, sha256, }: EncryptedAsset) => Promise<Uint8Array>;
+export declare const decryptAsset: ({ cipherText, keyBytes, sha256: referenceSha256, }: EncryptedAsset) => Promise<Uint8Array>;
 export declare const encryptAsset: ({ plainText, algorithm }: EncryptOptions) => Promise<EncryptedAsset>;
 export {};

package/src/main/mls/types.d.ts

@@ -18,7 +18,7 @@ export interface MLSConfig<T = any> {
      * encrypt/decrypt function pair that will be called before storing/fetching secrets in the secrets database.
      * If not provided will use the built in encryption mechanism
      */
-    secretsCrypto?: SecretCrypto<T>;
+    systemCrypto?: SecretCrypto<T>;
     /**
      * path on the public server to the core crypto wasm file.
      * This file will be downloaded lazily when corecrypto is needed.

package/src/main/notification/NotificationService.js

@@ -71,6 +71,7 @@ const NotificationDatabaseRepository_1 = require("./NotificationDatabaseReposito
 const protocol_messaging_1 = require("@wireapp/protocol-messaging");
 const bazinga64_1 = require("bazinga64");
 const TaskScheduler_1 = require("../util/TaskScheduler/TaskScheduler");
+const mls_1 = require("../mls");
 const LowPrecisionTaskScheduler_1 = require("../util/LowPrecisionTaskScheduler/LowPrecisionTaskScheduler");
 const keyPackagesStatusStore_1 = require("../mls/keyPackagesStatusStore/keyPackagesStatusStore");
 const keyMaterialUpdatesStore_1 = require("../mls/keyMaterialUpdatesStore");
@@ -260,7 +261,12 @@ class NotificationService extends events_1.EventEmitter {
                 const encryptedData = bazinga64_1.Decoder.fromBase64(event.data).asBytes;
                 const groupId = await this.getGroupIdFromConversationId((_a = event.qualified_conversation) !== null && _a !== void 0 ? _a : { id: event.conversation, domain: '' });
                 const groupIdBytes = bazinga64_1.Decoder.fromBase64(groupId).asBytes;
-                const { proposals, commitDelay, message } = await this.mlsService.decryptMessage(groupIdBytes, encryptedData);
+                const { proposals, commitDelay, message, senderClientId: encodedSenderClientId, } = await this.mlsService.decryptMessage(groupIdBytes, encryptedData);
+                if (encodedSenderClientId) {
+                    const decoder = new TextDecoder();
+                    const senderClientId = decoder.decode((0, mls_1.optionalToUint8Array)(encodedSenderClientId));
+                    event.senderClientId = senderClientId;
+                }
                 // Check if the message includes proposals
                 if (typeof commitDelay === 'number' || proposals.length > 0) {
                     // we are dealing with a proposal, add a task to process this proposal later on
@@ -283,7 +289,10 @@ class NotificationService extends events_1.EventEmitter {
                  * @todo Find a proper solution to add mappedEvent to this return
                  * otherwise event.data will be base64 raw data of the received event
                  */
-                return { event, decryptedData };
+                return {
+                    event,
+                    decryptedData,
+                };
             // Encrypted Proteus events
             case Events.CONVERSATION_EVENT.OTR_MESSAGE_ADD: {
                 if (dryRun) {

package/src/main/test/PayloadHelper.js

@@ -22,7 +22,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.mockUserPayload = exports.getUrlParameter = exports.getUUID = void 0;
-const faker_1 = __importDefault(require("faker"));
+const faker_1 = require("@faker-js/faker");
 const uuidjs_1 = __importDefault(require("uuidjs"));
 function getUUID() {
     return uuidjs_1.default.genV4().toString();
@@ -41,7 +41,7 @@ function mockUserPayload(userId) {
         assets: [],
         id: userId,
         locale: 'en',
-        name: faker_1.default.name.findName(),
+        name: faker_1.faker.name.fullName(),
         picture: [
             {
                 content_length: 263345,