@nocobase/plugin-workflow 0.7.6-alpha.2 → 0.7.7-alpha.1

package/lib/server/Plugin.js

@@ -244,6 +244,7 @@ class WorkflowPlugin extends _server().Plugin {
       }, {
         transaction
       });
+      console.log('workflow triggered:', new Date(), workflow.id, execution.id);
       const executed = yield workflow.countExecutions({
         transaction
       }); // NOTE: not to trigger afterUpdate hook here

package/lib/server/triggers/schedule.js

@@ -49,14 +49,20 @@ const SCHEDULE_MODE = {
 };
 exports.SCHEDULE_MODE = SCHEDULE_MODE;
 const ScheduleModes = new Map();
+
+function parseDateWithoutMs(date) {
+  return Math.floor(Date.parse(date) / 1000) * 1000;
+}
+
 ScheduleModes.set(SCHEDULE_MODE.CONSTANT, {
   shouldCache(workflow, now) {
     const _workflow$config = workflow.config,
           startsOn = _workflow$config.startsOn,
           endsOn = _workflow$config.endsOn,
           repeat = _workflow$config.repeat;
-    const timestamp = now.getTime();
-    const startTime = Date.parse(startsOn);
+    const timestamp = now.getTime(); // NOTE: align to second start
+
+    const startTime = parseDateWithoutMs(startsOn);
 
     if (!startTime || startTime > timestamp + this.cacheCycle) {
       return false;
@@ -68,14 +74,14 @@ ScheduleModes.set(SCHEDULE_MODE.CONSTANT, {
       }
 
       if (endsOn) {
-        const endTime = Date.parse(endsOn);
+        const endTime = parseDateWithoutMs(endsOn);
 
         if (!endTime || endTime <= timestamp) {
           return false;
         }
       }
     } else {
-      if (startTime < timestamp) {
+      if (startTime <= timestamp) {
         return false;
       }
     }
@@ -88,8 +94,13 @@ ScheduleModes.set(SCHEDULE_MODE.CONSTANT, {
           startsOn = _workflow$config2.startsOn,
           endsOn = _workflow$config2.endsOn,
           repeat = _workflow$config2.repeat;
-    const timestamp = now.getTime();
-    const startTime = Math.floor(Date.parse(startsOn) / 1000) * 1000;
+    const timestamp = now.getTime(); // NOTE: align to second start
+
+    const startTime = parseDateWithoutMs(startsOn);
+
+    if (!startTime || startTime > timestamp) {
+      return;
+    }
 
     if (repeat) {
       if (typeof repeat === 'number') {
@@ -99,10 +110,10 @@ ScheduleModes.set(SCHEDULE_MODE.CONSTANT, {
       }
 
       if (endsOn) {
-        const endTime = Date.parse(endsOn);
+        const endTime = parseDateWithoutMs(endsOn);
 
         if (!endTime || endTime < timestamp) {
-          return false;
+          return;
         }
       }
     } else {
@@ -121,7 +132,7 @@ ScheduleModes.set(SCHEDULE_MODE.CONSTANT, {
 function getOnTimestampWithOffset(on, now) {
   switch (typeof on) {
     case 'string':
-      return Date.parse(on);
+      return parseDateWithoutMs(on);
 
     case 'object':
       const field = on.field,
@@ -147,7 +158,7 @@ function getOnTimestampWithOffset(on, now) {
 function getDataOptionTime(data, on, dir = 1) {
   switch (typeof on) {
     case 'string':
-      const time = Date.parse(on);
+      const time = parseDateWithoutMs(on);
       return time ? time : null;
 
     case 'object':
@@ -396,11 +407,6 @@ ScheduleModes.set(SCHEDULE_MODE.COLLECTION_FIELD, {
           [_sequelize().Op.and]: conditions
         }
       });
-
-      if (instances.length) {
-        console.log(instances.length, 'rows trigger at', now);
-      }
-
       instances.forEach(item => {
         _this3.plugin.trigger(workflow, {
           date: now,
@@ -543,6 +549,10 @@ class ScheduleTrigger extends _.Trigger {
       var _ref2 = _asyncToGenerator(function* (workflow) {
         const should = yield _this6.shouldCache(workflow, now);
 
+        if (should) {
+          console.log('caching schedule workflow:', workflow.id);
+        }
+
         _this6.setCache(workflow, !should);
       });
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/plugin-workflow",
-  "version": "0.7.6-alpha.2",
+  "version": "0.7.7-alpha.1",
   "main": "lib/index.js",
   "license": "Apache-2.0",
   "licenses": [
@@ -10,17 +10,17 @@
     }
   ],
   "dependencies": {
-    "@nocobase/actions": "0.7.6-alpha.2",
-    "@nocobase/client": "0.7.6-alpha.2",
-    "@nocobase/database": "0.7.6-alpha.2",
-    "@nocobase/server": "0.7.6-alpha.2",
-    "@nocobase/utils": "0.7.6-alpha.2",
+    "@nocobase/actions": "0.7.7-alpha.1",
+    "@nocobase/client": "0.7.7-alpha.1",
+    "@nocobase/database": "0.7.7-alpha.1",
+    "@nocobase/server": "0.7.7-alpha.1",
+    "@nocobase/utils": "0.7.7-alpha.1",
     "cron-parser": "4.4.0",
     "json-templates": "^4.2.0",
     "react-js-cron": "^1.4.0"
   },
   "devDependencies": {
-    "@nocobase/test": "0.7.6-alpha.2"
+    "@nocobase/test": "0.7.7-alpha.1"
   },
-  "gitHead": "2cfccff9d3ff14c521bf317fa7ee4efa18444c92"
+  "gitHead": "f82374e6f9daaf71ba63eaf156468ea7ddc042da"
 }