@wireapp/core 42.9.1 → 42.9.2

package/lib/util/LowPrecisionTaskScheduler/LowPrecisionTaskScheduler.js

@@ -39,11 +39,11 @@ const addTask = ({ key, firingDate, task, intervalDelay }) => {
         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 >= firingDate) {
+                if (nowTime >= taskData.firingDate) {
                     const { task, key } = taskData;
                     logger.info(`Executing task with key "${key}"`);
-                    task();
                     cancelTask({ intervalDelay, key });
+                    task();
                 }
             }
         }

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

@@ -1 +1 @@
-{"version":3,"file":"RecurringTaskScheduler.d.ts","sourceRoot":"","sources":["../../../src/util/RecurringTaskScheduler/RecurringTaskScheduler.ts"],"names":[],"mappings":"AA0BA,UAAU,UAAU;IAClB,KAAK,EAAE,MAAM,CAAC;IACd,IAAI,EAAE,MAAM,IAAI,CAAC;IACjB,GAAG,EAAE,MAAM,CAAC;CACb;AAED,wBAAgB,qBAAqB,CAAC,EAAC,KAAK,EAAE,IAAI,EAAE,GAAG,EAAC,EAAE,UAAU,QAoBnE;AAED,wBAAgB,mBAAmB,CAAC,OAAO,EAAE,MAAM,QAGlD"}
+{"version":3,"file":"RecurringTaskScheduler.d.ts","sourceRoot":"","sources":["../../../src/util/RecurringTaskScheduler/RecurringTaskScheduler.ts"],"names":[],"mappings":"AA0BA,UAAU,UAAU;IAClB,KAAK,EAAE,MAAM,CAAC;IACd,IAAI,EAAE,MAAM,IAAI,CAAC;IACjB,GAAG,EAAE,MAAM,CAAC;CACb;AAED,wBAAgB,qBAAqB,CAAC,EAAC,KAAK,EAAE,IAAI,EAAE,GAAG,EAAC,EAAE,UAAU,QAqBnE;AAED,wBAAgB,mBAAmB,CAAC,OAAO,EAAE,MAAM,QAIlD"}

package/lib/util/RecurringTaskScheduler/RecurringTaskScheduler.js

@@ -24,13 +24,13 @@ const RecurringTaskScheduler_store_1 = require("./RecurringTaskScheduler.store")
 const LowPrecisionTaskScheduler_1 = require("../LowPrecisionTaskScheduler");
 const TaskScheduler_1 = require("../TaskScheduler");
 function registerRecurringTask({ every, task, key }) {
-    var _a;
-    const lastFireDate = (_a = (0, RecurringTaskScheduler_store_1.loadState)(key)) !== null && _a !== void 0 ? _a : Date.now();
+    const firingDate = (0, RecurringTaskScheduler_store_1.loadState)(key) || Date.now() + every;
+    (0, RecurringTaskScheduler_store_1.saveState)(key, firingDate);
     const taskConfig = {
-        firingDate: lastFireDate + every,
+        firingDate,
         key,
-        task() {
-            (0, RecurringTaskScheduler_store_1.saveState)(key, Date.now());
+        task: () => {
+            (0, RecurringTaskScheduler_store_1.deleteState)(key);
             task();
             registerRecurringTask({ every, task, key });
         },
@@ -46,6 +46,7 @@ function registerRecurringTask({ every, task, key }) {
 }
 exports.registerRecurringTask = registerRecurringTask;
 function cancelRecurringTask(taskKey) {
+    (0, RecurringTaskScheduler_store_1.deleteState)(taskKey);
     TaskScheduler_1.TaskScheduler.cancelTask(taskKey);
     LowPrecisionTaskScheduler_1.LowPrecisionTaskScheduler.cancelTask({ intervalDelay: commons_1.TimeUtil.TimeInMillis.MINUTE, key: taskKey });
 }

package/lib/util/RecurringTaskScheduler/RecurringTaskScheduler.test.js

@@ -36,6 +36,20 @@ describe('RecurringTaskScheduler', () => {
         jest.advanceTimersByTime(commons_1.TimeUtil.TimeInMillis.MINUTE + 1);
         expect(task).toHaveBeenCalledTimes(2);
     });
+    it('resumes a task after re-registering a recurring task', () => {
+        const task = jest.fn();
+        // it should fire in a minute
+        (0, RecurringTaskScheduler_1.registerRecurringTask)({ every: commons_1.TimeUtil.TimeInMillis.MINUTE, task, key: 'test-task2' });
+        jest.advanceTimersByTime(commons_1.TimeUtil.TimeInMillis.MINUTE / 2);
+        // re-register the task
+        (0, RecurringTaskScheduler_1.registerRecurringTask)({ every: commons_1.TimeUtil.TimeInMillis.MINUTE, task, key: 'test-task2' });
+        // only 30s have passed, so the task should not have fired yet
+        expect(task).toHaveBeenCalledTimes(0);
+        // advance the timer by another 30s (so we have 1 minute in total)
+        jest.advanceTimersByTime(commons_1.TimeUtil.TimeInMillis.MINUTE / 2);
+        // the task should have fired once after a minute from the beginning even if we re-registered it
+        expect(task).toHaveBeenCalledTimes(1);
+    });
     it('cancel a task before it is run', () => {
         const task = jest.fn();
         const testKey = 'test-task-1';

package/package.json

@@ -60,6 +60,6 @@
     "test:coverage": "jest --coverage",
     "watch": "tsc --watch"
   },
-  "version": "42.9.1",
-  "gitHead": "f5b75f463f8b59a270e195176905d12f6eaa23c7"
+  "version": "42.9.2",
+  "gitHead": "8c7762276ee1d4563f2cfd02d0017fb8ad3f95a3"
 }