@wireapp/core 45.2.1 → 45.2.3

package/lib/messagingProtocols/mls/E2EIdentityService/E2EIServiceExternal.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"E2EIServiceExternal.d.ts","sourceRoot":"","sources":["../../../../src/messagingProtocols/mls/E2EIdentityService/E2EIServiceExternal.ts"],"names":[],"mappings":"AAmBA,OAAO,EAAC,WAAW,EAAC,MAAM,8BAA8B,CAAC;AAIzD,OAAO,EAAC,iBAAiB,EAAC,MAAM,kBAAkB,CAAC;AACnD,OAAO,EAAC,UAAU,EAAE,qBAAqB,EAAE,YAAY,EAAE,YAAY,EAAC,MAAM,sBAAsB,CAAC;AAMnG,OAAO,EAAC,aAAa,EAAC,MAAM,iBAAiB,CAAC;AAC9C,OAAO,EAAC,YAAY,EAAC,MAAM,yBAAyB,CAAC;AAIrD,OAAO,EAAC,sBAAsB,EAAuB,MAAM,+BAA+B,CAAC;AAC3F,OAAO,EAAC,sBAAsB,EAAC,MAAM,sCAAsC,CAAC;AAC5E,OAAO,EAAC,UAAU,EAAC,MAAM,eAAe,CAAC;AAEzC,MAAM,MAAM,cAAc,GAAG,IAAI,CAAC,YAAY,EAAE,MAAM,GAAG,QAAQ,CAAC,GAAG;IACnE,MAAM,CAAC,EAAE,YAAY,CAAC;IACtB,QAAQ,EAAE,MAAM,CAAC;IACjB,eAAe,EAAE,WAAW,CAAC;CAC9B,CAAC;AAEF,KAAK,MAAM,GAAG;IACZ,UAAU,EAAE;QAAC,MAAM,EAAE,MAAM,CAAA;KAAC,CAAC;CAC9B,CAAC;AAGF,qBAAa,mBAAoB,SAAQ,iBAAiB,CAAC,MAAM,CAAC;IAK9D,OAAO,CAAC,QAAQ,CAAC,gBAAgB;IACjC,OAAO,CAAC,QAAQ,CAAC,YAAY;IAC7B,OAAO,CAAC,QAAQ,CAAC,sBAAsB;IACvC,OAAO,CAAC,QAAQ,CAAC,aAAa;IAC9B,OAAO,CAAC,QAAQ,CAAC,UAAU;IAR7B,OAAO,CAAC,YAAY,CAAC,CAAc;IACnC,OAAO,CAAC,QAAQ,CAAC,iBAAiB,CAAiD;gBAGhE,gBAAgB,EAAE,UAAU,EAC5B,YAAY,EAAE,YAAY,EAC1B,sBAAsB,EAAE,sBAAsB,EAC9C,aAAa,EAAE,aAAa,EAC5B,UAAU,EAAE,UAAU;IAU5B,sBAAsB,IAAI,OAAO,CAAC,OAAO,CAAC;IAKhD,gBAAgB;IAIhB,oBAAoB,CAAC,cAAc,EAAE,UAAU,GAAG,OAAO,CAAC,qBAAqB,CAAC;IAIhF,aAAa,IAAI,OAAO,CAAC,OAAO,CAAC;IAI3B,0BAA0B,CACrC,OAAO,EAAE,MAAM,GACd,OAAO,CAAC,GAAG,CAAC,sBAAsB,EAAE,cAAc,EAAE,CAAC,GAAG,SAAS,CAAC;IAsBxD,kBAAkB,CAC7B,OAAO,EAAE,MAAM,EACf,OAAO,EAAE,WAAW,EAAE,GACrB,OAAO,CAAC,GAAG,CAAC,sBAAsB,EAAE,cAAc,EAAE,CAAC,GAAG,SAAS,CAAC;IAwDxD,oBAAoB,CAC/B,OAAO,EAAE,MAAM,EACf,cAAc,EAAE,MAAM,CAAC,MAAM,EAAE,WAAW,CAAC,GAC1C,OAAO,CAAC,cAAc,EAAE,CAAC;IAgBf,oBAAoB,IAAI,OAAO,CAAC,OAAO,CAAC;YAQvC,4BAA4B;IAO1C;;;;;OAKG;IACU,UAAU,CAAC,YAAY,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAM5D,OAAO,KAAK,WAAW,GAKtB;YAEa,+BAA+B;IAK7C;;;;;;;;;;;;OAYG;YACW,0BAA0B;IA6BxC,OAAO,CAAC,4BAA4B;YAStB,+BAA+B;YAQ/B,uBAAuB;YAKvB,0BAA0B;YAI1B,4BAA4B;YAO5B,WAAW;YAkBX,8BAA8B;CAK7C"}
+{"version":3,"file":"E2EIServiceExternal.d.ts","sourceRoot":"","sources":["../../../../src/messagingProtocols/mls/E2EIdentityService/E2EIServiceExternal.ts"],"names":[],"mappings":"AAmBA,OAAO,EAAC,WAAW,EAAC,MAAM,8BAA8B,CAAC;AAIzD,OAAO,EAAC,iBAAiB,EAAC,MAAM,kBAAkB,CAAC;AACnD,OAAO,EAAC,UAAU,EAAE,qBAAqB,EAAE,YAAY,EAAE,YAAY,EAAC,MAAM,sBAAsB,CAAC;AAMnG,OAAO,EAAC,aAAa,EAAC,MAAM,iBAAiB,CAAC;AAC9C,OAAO,EAAC,YAAY,EAAC,MAAM,yBAAyB,CAAC;AAIrD,OAAO,EAAC,sBAAsB,EAAuB,MAAM,+BAA+B,CAAC;AAC3F,OAAO,EAAC,sBAAsB,EAAC,MAAM,sCAAsC,CAAC;AAC5E,OAAO,EAAC,UAAU,EAAC,MAAM,eAAe,CAAC;AAEzC,MAAM,MAAM,cAAc,GAAG,IAAI,CAAC,YAAY,EAAE,MAAM,GAAG,QAAQ,CAAC,GAAG;IACnE,MAAM,CAAC,EAAE,YAAY,CAAC;IACtB,QAAQ,EAAE,MAAM,CAAC;IACjB,eAAe,EAAE,WAAW,CAAC;CAC9B,CAAC;AAEF,KAAK,MAAM,GAAG;IACZ,UAAU,EAAE;QAAC,MAAM,EAAE,MAAM,CAAA;KAAC,CAAC;CAC9B,CAAC;AAGF,qBAAa,mBAAoB,SAAQ,iBAAiB,CAAC,MAAM,CAAC;IAK9D,OAAO,CAAC,QAAQ,CAAC,gBAAgB;IACjC,OAAO,CAAC,QAAQ,CAAC,YAAY;IAC7B,OAAO,CAAC,QAAQ,CAAC,sBAAsB;IACvC,OAAO,CAAC,QAAQ,CAAC,aAAa;IAC9B,OAAO,CAAC,QAAQ,CAAC,UAAU;IAR7B,OAAO,CAAC,YAAY,CAAC,CAAc;IACnC,OAAO,CAAC,QAAQ,CAAC,iBAAiB,CAAiD;gBAGhE,gBAAgB,EAAE,UAAU,EAC5B,YAAY,EAAE,YAAY,EAC1B,sBAAsB,EAAE,sBAAsB,EAC9C,aAAa,EAAE,aAAa,EAC5B,UAAU,EAAE,UAAU;IAU5B,sBAAsB,IAAI,OAAO,CAAC,OAAO,CAAC;IAKhD,gBAAgB;IAIhB,oBAAoB,CAAC,cAAc,EAAE,UAAU,GAAG,OAAO,CAAC,qBAAqB,CAAC;IAIhF,aAAa,IAAI,OAAO,CAAC,OAAO,CAAC;IAI3B,0BAA0B,CACrC,OAAO,EAAE,MAAM,GACd,OAAO,CAAC,GAAG,CAAC,sBAAsB,EAAE,cAAc,EAAE,CAAC,GAAG,SAAS,CAAC;IAsBxD,kBAAkB,CAC7B,OAAO,EAAE,MAAM,EACf,OAAO,EAAE,WAAW,EAAE,GACrB,OAAO,CAAC,GAAG,CAAC,sBAAsB,EAAE,cAAc,EAAE,CAAC,GAAG,SAAS,CAAC;IAwDxD,oBAAoB,CAC/B,OAAO,EAAE,MAAM,EACf,cAAc,EAAE,MAAM,CAAC,MAAM,EAAE,WAAW,CAAC,GAC1C,OAAO,CAAC,cAAc,EAAE,CAAC;IAgBf,oBAAoB,IAAI,OAAO,CAAC,OAAO,CAAC;YAQvC,4BAA4B;IAO1C;;;;;OAKG;IACU,UAAU,CAAC,YAAY,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAM5D,OAAO,KAAK,WAAW,GAKtB;YAEa,+BAA+B;IAK7C;;;;;;;;;;;;OAYG;YACW,0BAA0B;IA6BxC,OAAO,CAAC,4BAA4B;YAStB,+BAA+B;YAQ/B,uBAAuB;YAKvB,0BAA0B;YAI1B,4BAA4B;YAO5B,WAAW;YAkBX,8BAA8B;CAM7C"}

package/lib/messagingProtocols/mls/E2EIdentityService/E2EIServiceExternal.js

@@ -184,7 +184,7 @@ class E2EIServiceExternal extends commons_1.TypedEventEmitter {
         }
     }
     async addCrlDistributionTimer({ expiresAt, url }) {
-        await this.coreDatabase.add('crls', { expiresAt, url }, url);
+        await this.coreDatabase.put('crls', { expiresAt, url }, url);
         this.scheduleCrlDistributionTimer({ expiresAt, url });
     }
     async cancelCrlDistributionTimer(url) {
@@ -209,7 +209,8 @@ class E2EIServiceExternal extends commons_1.TypedEventEmitter {
         }
     }
     async handleNewCrlDistributionPoints(distributionPoints) {
-        for (const distributionPointUrl of distributionPoints) {
+        const uniqueDistributionPoints = Array.from(new Set(distributionPoints));
+        for (const distributionPointUrl of uniqueDistributionPoints) {
             await this.validateCrlDistributionPoint(distributionPointUrl);
         }
     }

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

@@ -684,7 +684,7 @@ class MLSService extends commons_1.TypedEventEmitter {
         const groupId = await groupIdFromConversationId(qualifiedConversationId, event.subconv);
         // We should not receive a message for a group the client is not aware of
         if (!groupId) {
-            throw new Error(`Could not find a group_id for conversation ${qualifiedConversationId.id}@${qualifiedConversationId.domain}`);
+            throw new Error(`Could not find a group_id for conversation ${qualifiedConversationId.id}@${qualifiedConversationId.domain}${event.subconv ? `/subconversation:${event.subconv}` : ''}`);
         }
         return (0, messageAdd_1.queueIncomingMLSMessage)(groupId, () => (0, events_1.handleMLSMessageAdd)({ event, mlsService: this, groupId }));
     }

package/lib/util/LowPrecisionTaskScheduler/LowPrecisionTaskScheduler.d.ts

@@ -1,9 +1,9 @@
 interface IntervalTask {
-    key: string;
     firingDate: number;
     task: () => void;
 }
 interface ScheduleLowPrecisionTaskParams extends IntervalTask {
+    key: string;
     intervalDelay: number;
 }
 interface CancelLowPrecisionTaskParams {

package/lib/util/LowPrecisionTaskScheduler/LowPrecisionTaskScheduler.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"LowPrecisionTaskScheduler.d.ts","sourceRoot":"","sources":["../../../src/util/LowPrecisionTaskScheduler/LowPrecisionTaskScheduler.ts"],"names":[],"mappings":"AAqBA,UAAU,YAAY;IACpB,GAAG,EAAE,MAAM,CAAC;IACZ,UAAU,EAAE,MAAM,CAAC;IACnB,IAAI,EAAE,MAAM,IAAI,CAAC;CAClB;AAED,UAAU,8BAA+B,SAAQ,YAAY;IAC3D,aAAa,EAAE,MAAM,CAAC;CACvB;AAED,UAAU,4BAA4B;IACpC,GAAG,EAAE,MAAM,CAAC;IACZ,aAAa,EAAE,MAAM,CAAC;CACvB;AAkCD,UAAU,4BAA4B;IACpC,GAAG,EAAE,MAAM,CAAC;IACZ,aAAa,EAAE,MAAM,CAAC;CACvB;AAgBD,eAAO,MAAM,yBAAyB;wDAhDmB,8BAA8B;yCAkC7C,4BAA4B;CAcR,CAAC"}
+{"version":3,"file":"LowPrecisionTaskScheduler.d.ts","sourceRoot":"","sources":["../../../src/util/LowPrecisionTaskScheduler/LowPrecisionTaskScheduler.ts"],"names":[],"mappings":"AAqBA,UAAU,YAAY;IACpB,UAAU,EAAE,MAAM,CAAC;IACnB,IAAI,EAAE,MAAM,IAAI,CAAC;CAClB;AAED,UAAU,8BAA+B,SAAQ,YAAY;IAC3D,GAAG,EAAE,MAAM,CAAC;IACZ,aAAa,EAAE,MAAM,CAAC;CACvB;AAED,UAAU,4BAA4B;IACpC,GAAG,EAAE,MAAM,CAAC;IACZ,aAAa,EAAE,MAAM,CAAC;CACvB;AAsCD,UAAU,4BAA4B;IACpC,GAAG,EAAE,MAAM,CAAC;IACZ,aAAa,EAAE,MAAM,CAAC;CACvB;AAmBD,eAAO,MAAM,yBAAyB;wDAvDmB,8BAA8B;yCAsC7C,4BAA4B;CAiBR,CAAC"}

package/lib/util/LowPrecisionTaskScheduler/LowPrecisionTaskScheduler.js

@@ -31,20 +31,21 @@ const addTask = ({ key, firingDate, task, intervalDelay }) => {
     if (existingIntervalId) {
         clearInterval(existingIntervalId);
     }
-    const tasks = ((_b = intervals[intervalDelay]) === null || _b === void 0 ? void 0 : _b.tasks) || [];
-    tasks.push({ key, firingDate, task });
+    const tasks = ((_b = intervals[intervalDelay]) === null || _b === void 0 ? void 0 : _b.tasks) || {};
+    tasks[key] = { firingDate, task };
     const timeoutId = setInterval(async () => {
         var _a;
         const nowTime = new Date().getTime();
         const tasks = (_a = intervals[intervalDelay]) === null || _a === void 0 ? void 0 : _a.tasks;
-        if ((tasks === null || tasks === void 0 ? void 0 : tasks.length) !== 0) {
-            for (const taskData of tasks) {
-                if (nowTime >= taskData.firingDate) {
-                    const { task, key } = taskData;
-                    logger.info(`Executing task with key "${key}"`);
-                    cancelTask({ intervalDelay, key });
-                    task();
-                }
+        if (!tasks) {
+            return;
+        }
+        for (const key in tasks) {
+            if (tasks[key].firingDate <= nowTime) {
+                const { task } = tasks[key];
+                logger.info(`Executing task with key "${key}"`);
+                delete tasks[key];
+                task();
             }
         }
     }, intervalDelay);
@@ -53,11 +54,12 @@ const addTask = ({ key, firingDate, task, intervalDelay }) => {
 };
 const cancelTask = ({ intervalDelay, key }) => {
     if (intervals[intervalDelay]) {
-        const tasks = intervals[intervalDelay].tasks || [];
-        const newTasks = tasks.filter(task => task.key !== key);
+        const tasks = intervals[intervalDelay].tasks || {};
+        const newTasks = Object.assign({}, tasks);
+        delete newTasks[key];
         intervals[intervalDelay].tasks = newTasks;
         logger.info(`Scheduled task with key "${key}" prematurely cleared`);
-        if (newTasks.length === 0) {
+        if (Object.keys(newTasks).length === 0) {
             clearInterval(intervals[intervalDelay].timeoutId);
             delete intervals[intervalDelay];
         }

package/lib/util/LowPrecisionTaskScheduler/LowPrecisionTaskScheduler.test.js

@@ -70,6 +70,25 @@ describe('LowPrecisionTaskScheduler', () => {
         expect(mockedTask1).toHaveBeenCalled();
         expect(mockedTask2).toHaveBeenCalled();
     });
+    it('adding a task with the same delay and key should overwrite the previous task', async () => {
+        const mockedTask1 = jest.fn().mockReturnValue(Promise.resolve('hello task 1'));
+        LowPrecisionTaskScheduler_1.LowPrecisionTaskScheduler.addTask({
+            key: 'same-key',
+            firingDate: 5000,
+            intervalDelay: 1000,
+            task: mockedTask1,
+        });
+        LowPrecisionTaskScheduler_1.LowPrecisionTaskScheduler.addTask({
+            key: 'same-key',
+            firingDate: 7000,
+            intervalDelay: 1000,
+            task: mockedTask1,
+        });
+        await (0, testUtils_1.advanceJestTimersWithPromise)(5000);
+        expect(mockedTask1).not.toHaveBeenCalled();
+        await (0, testUtils_1.advanceJestTimersWithPromise)(2000);
+        expect(mockedTask1).toHaveBeenCalled();
+    });
     it('cancels tasks', async () => {
         const mockedTask3 = jest.fn().mockReturnValue(Promise.resolve('hello task 3'));
         const mockedTask4 = jest.fn().mockReturnValue(Promise.resolve('hello task 4'));

package/package.json

@@ -61,6 +61,6 @@
     "test:coverage": "jest --coverage",
     "watch": "tsc --watch"
   },
-  "version": "45.2.1",
-  "gitHead": "c36966446fba95ec9e32f7815b8d1af99ad3c25f"
+  "version": "45.2.3",
+  "gitHead": "3a3d693ea10b9684892ffe8947eaedf681955136"
 }