@wireapp/core 34.1.2 → 34.1.4

package/package.json

@@ -3,15 +3,15 @@
     "./src/main/cryptography/AssetCryptography/crypto.node": "./src/main/cryptography/AssetCryptography/crypto.browser.js"
   },
   "dependencies": {
-    "@wireapp/api-client": "^21.0.4",
-    "@wireapp/commons": "^4.4.10",
+    "@wireapp/api-client": "^21.0.5",
+    "@wireapp/commons": "^4.5.0",
     "@wireapp/core-crypto": "0.5.2",
     "@wireapp/cryptobox": "12.8.0",
-    "@wireapp/promise-queue": "^1.3.4",
-    "@wireapp/protocol-messaging": "1.39.0",
-    "@wireapp/store-engine-dexie": "^1.7.11",
+    "@wireapp/promise-queue": "^1.3.5",
+    "@wireapp/protocol-messaging": "^1.39.0",
+    "@wireapp/store-engine-dexie": "^1.7.12",
     "axios": "1.1.2",
-    "bazinga64": "5.11.10",
+    "bazinga64": "5.11.11",
     "hash.js": "1.1.7",
     "http-status-codes": "2.2.0",
     "idb": "7.1.0",
@@ -24,19 +24,18 @@
     "@babel/preset-env": "^7.19.1",
     "@babel/preset-typescript": "^7.18.6",
     "@faker-js/faker": "^7.6.0",
+    "@swc/core": "^1.3.10",
+    "@swc/jest": "^0.2.23",
     "@types/babel__core": "^7",
-    "@types/jest": "29.2.0",
+    "@types/jest": "^29.2.0",
     "@types/long": "4.0.1",
-    "@types/node": "^18.11.2",
     "@types/tough-cookie": "4.0.2",
     "@wireapp/commons": "workspace:^",
     "@wireapp/store-engine-dexie": "workspace:^",
     "commander": "9.4.1",
     "cross-env": "7.0.3",
     "dotenv-defaults": "5.0.2",
-    "fake-indexeddb": "4.0.0",
-    "jest": "29.2.1",
-    "jest-jasmine2": "29.2.1",
+    "jest": "^29.2.1",
     "jest-websocket-mock": "2.4.0",
     "mock-socket": "9.1.5",
     "nock": "13.2.9"
@@ -62,8 +61,9 @@
     "start:echo": "cross-env NODE_DEBUG='@wireapp/core*' node src/demo/echo.js",
     "start:sender": "cross-env NODE_DEBUG='@wireapp/core*' node src/demo/sender.js",
     "test": "jest",
-    "watch": "tsc ---watch"
+    "test:coverage": "jest --coverage",
+    "watch": "tsc --watch"
   },
-  "version": "34.1.2",
-  "gitHead": "b16406e772a8e137de37fbfae5d9f63339d2489c"
+  "version": "34.1.4",
+  "gitHead": "20dbda642036995c302830288c6f317cd38749f5"
 }

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

@@ -2,16 +2,19 @@ import { AddProposalArgs, ConversationConfiguration, ConversationId, CoreCrypto,
 import { APIClient } from '@wireapp/api-client';
 import { QualifiedUsers } from '../../conversation';
 import { MLSCallbacks, MLSConfig } from '../types';
+import { PostMlsMessageResponse } from '@wireapp/api-client/src/conversation';
+import logdown from 'logdown';
 export declare const optionalToUint8Array: (array: Uint8Array | []) => Uint8Array;
 export declare class MLSService {
     readonly config: MLSConfig | undefined;
     private readonly apiClient;
     private readonly coreCryptoClientProvider;
+    logger: logdown.Logger;
     groupIdFromConversationId?: MLSCallbacks['groupIdFromConversationId'];
     constructor(config: MLSConfig | undefined, apiClient: APIClient, coreCryptoClientProvider: () => CoreCrypto | undefined);
     private get coreCryptoClient();
     private uploadCommitBundle;
-    addUsersToExistingConversation(groupId: Uint8Array, invitee: Invitee[]): Promise<import("@wireapp/api-client/src/conversation").PostMlsMessageResponse | null>;
+    addUsersToExistingConversation(groupId: Uint8Array, invitee: Invitee[]): Promise<PostMlsMessageResponse | null>;
     configureMLSCallbacks({ groupIdFromConversationId, ...coreCryptoCallbacks }: MLSCallbacks): void;
     getKeyPackagesPayload(qualifiedUsers: QualifiedUsers[]): Promise<Invitee[]>;
     getEpoch(groupId: Uint8Array): Promise<number>;
@@ -31,9 +34,9 @@ export declare class MLSService {
      * @param generateCommit The function that will generate a coreCrypto CommitBundle
      */
     private processCommitAction;
-    updateKeyingMaterial(conversationId: ConversationId): Promise<import("@wireapp/api-client/src/conversation").PostMlsMessageResponse | null>;
+    updateKeyingMaterial(conversationId: ConversationId): Promise<PostMlsMessageResponse | null>;
     createConversation(conversationId: ConversationId, configuration?: ConversationConfiguration): Promise<any>;
-    removeClientsFromConversation(conversationId: ConversationId, clientIds: Uint8Array[]): Promise<import("@wireapp/api-client/src/conversation").PostMlsMessageResponse | null>;
+    removeClientsFromConversation(conversationId: ConversationId, clientIds: Uint8Array[]): Promise<PostMlsMessageResponse | null>;
     commitPendingProposals(groupId: ConversationId): Promise<void>;
     conversationExists(conversationId: ConversationId): Promise<boolean>;
     clientValidKeypackagesCount(): Promise<number>;

package/src/main/mls/MLSService/MLSService.js

@@ -28,11 +28,15 @@ var __rest = (this && this.__rest) || function (s, e) {
         }
     return t;
 };
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.MLSService = exports.optionalToUint8Array = void 0;
 const bazinga64_1 = require("bazinga64");
 const messageSender_1 = require("../../conversation/message/messageSender");
 const fullyQualifiedClientIdUtils_1 = require("../../util/fullyQualifiedClientIdUtils");
+const logdown_1 = __importDefault(require("logdown"));
 //@todo: this function is temporary, we wait for the update from core-crypto side
 //they are returning regular array instead of Uint8Array for commit and welcome messages
 const optionalToUint8Array = (array) => {
@@ -44,6 +48,7 @@ class MLSService {
         this.config = config;
         this.apiClient = apiClient;
         this.coreCryptoClientProvider = coreCryptoClientProvider;
+        this.logger = (0, logdown_1.default)('@wireapp/core/MLSService');
     }
     get coreCryptoClient() {
         const client = this.coreCryptoClientProvider();
@@ -59,6 +64,9 @@ class MLSService {
                 //@todo: it's temporary - we wait for core-crypto fix to return the actual Uint8Array instead of regular array
                 (0, exports.optionalToUint8Array)(commit));
                 await this.coreCryptoClient.commitAccepted(groupId);
+                const newEpoch = await this.getEpoch(groupId);
+                const groupIdStr = bazinga64_1.Encoder.toBase64(groupId).asString;
+                this.logger.log(`Commit have been accepted for group "${groupIdStr}". New epoch is "${newEpoch}"`);
                 if (welcome) {
                     // If the commit went well, we can send the Welcome
                     //@todo: it's temporary - we wait for core-crypto fix to return the actual Uint8Array instead of regular array
@@ -82,7 +90,7 @@ class MLSService {
                 const { user } = (0, fullyQualifiedClientIdUtils_1.parseFullQualifiedClientId)(decoder.decode(client));
                 return otherClients.some(client => {
                     const { user: otherUser } = (0, fullyQualifiedClientIdUtils_1.parseFullQualifiedClientId)(decoder.decode(client));
-                    return otherUser === user;
+                    return otherUser.toLowerCase() === user.toLowerCase();
                 });
             } }));
         this.groupIdFromConversationId = groupIdFromConversationId;

package/src/main/util/TaskScheduler/TaskScheduler.js

@@ -43,8 +43,9 @@ const addTask = ({ task, firingDate, key }) => {
         cancelTask(key);
     }
     const timeout = setTimeout(async () => {
-        await task();
+        logger.info(`Executing task with key "${key}"`);
         delete activeTimeouts[key];
+        await task();
     }, delay > 0 ? delay : 0);
     // add the task to the list of active tasks
     activeTimeouts[key] = timeout;