@wireapp/core 34.1.3 → 34.1.4

package/package.json

@@ -64,6 +64,6 @@
     "test:coverage": "jest --coverage",
     "watch": "tsc --watch"
   },
-  "version": "34.1.3",
-  "gitHead": "1944c0993e0b7117d3334ffb381556d08a049ddf"
+  "version": "34.1.4",
+  "gitHead": "20dbda642036995c302830288c6f317cd38749f5"
 }

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

@@ -3,11 +3,13 @@ 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();

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;