@nocobase/plugin-workflow 0.7.4-alpha.7 → 0.7.6-alpha.1

package/lib/server/triggers/schedule.js

@@ -56,23 +56,26 @@ ScheduleModes.set(SCHEDULE_MODE.CONSTANT, {
           endsOn = _workflow$config.endsOn,
           repeat = _workflow$config.repeat;
     const timestamp = now.getTime();
+    const startTime = Date.parse(startsOn);
 
-    if (startsOn) {
-      const startTime = Date.parse(startsOn);
-
-      if (!startTime || startTime > timestamp + this.cacheCycle) {
-        return false;
-      }
+    if (!startTime || startTime > timestamp + this.cacheCycle) {
+      return false;
+    }
 
+    if (repeat) {
       if (typeof repeat === 'number' && repeat > this.cacheCycle && (timestamp - startTime) % repeat > this.cacheCycle) {
         return false;
       }
-    }
 
-    if (endsOn) {
-      const endTime = Date.parse(endsOn);
+      if (endsOn) {
+        const endTime = Date.parse(endsOn);
 
-      if (!endTime || endTime <= timestamp) {
+        if (!endTime || endTime <= timestamp) {
+          return false;
+        }
+      }
+    } else {
+      if (startTime < timestamp) {
         return false;
       }
     }
@@ -80,40 +83,45 @@ ScheduleModes.set(SCHEDULE_MODE.CONSTANT, {
     return true;
   },
 
-  trigger(workflow, date) {
+  trigger(workflow, now) {
     const _workflow$config2 = workflow.config,
           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;
 
-    if (startsOn && typeof repeat === 'number') {
-      const startTime = Math.floor(Date.parse(startsOn) / 1000) * 1000;
+    if (repeat) {
+      if (typeof repeat === 'number') {
+        if (Math.round(timestamp - startTime) % repeat) {
+          return;
+        }
+      }
 
-      if (Math.round(date.getTime() - startTime) % repeat) {
+      if (endsOn) {
+        const endTime = Date.parse(endsOn);
+
+        if (!endTime || endTime < timestamp) {
+          return false;
+        }
+      }
+    } else {
+      if (startTime !== timestamp) {
         return;
       }
     }
 
     return this.plugin.trigger(workflow, {
-      date
+      date: now
     });
   }
 
 });
 
-function getDateRangeFilter(on, now, dir) {
-  const timestamp = now.getTime();
-  const op = dir < 0 ? _sequelize().Op.lt : _sequelize().Op.gte;
-
+function getOnTimestampWithOffset(on, now) {
   switch (typeof on) {
     case 'string':
-      const time = Date.parse(on);
-
-      if (!time || (dir < 0 ? timestamp < time : time <= timestamp)) {
-        return null;
-      }
-
-      break;
+      return Date.parse(on);
 
     case 'object':
       const field = on.field,
@@ -123,20 +131,17 @@ function getDateRangeFilter(on, now, dir) {
             unit = _on$unit === void 0 ? 1000 : _on$unit;
 
       if (!field) {
-        return {};
+        return null;
       }
 
-      return {
-        [field]: {
-          [op]: new Date(timestamp + offset * unit * dir)
-        }
-      };
+      const timestamp = now.getTime(); // onDate + offset > now
+      // onDate > now - offset
+
+      return timestamp - offset * unit;
 
     default:
-      break;
+      return null;
   }
-
-  return {};
 }
 
 function getDataOptionTime(data, on, dir = 1) {
@@ -151,7 +156,7 @@ function getDataOptionTime(data, on, dir = 1) {
             offset = _on$offset2 === void 0 ? 0 : _on$offset2,
             _on$unit2 = on.unit,
             unit = _on$unit2 === void 0 ? 1000 : _on$unit2;
-      return data[field] ? data[field].getTime() - offset * unit * dir : null;
+      return data.get(field) ? data.get(field).getTime() - offset * unit * dir : null;
 
     default:
       return null;
@@ -189,49 +194,49 @@ ScheduleModes.set(SCHEDULE_MODE.COLLECTION_FIELD, {
     const event = `${collection}.afterSave`;
     const name = getHookId(workflow, event);
 
-    if (!this.events.has(name)) {
-      // NOTE: toggle cache depends on new date
-      const listener = /*#__PURE__*/function () {
-        var _ref = _asyncToGenerator(function* (data, options) {
-          const now = new Date();
-          now.setMilliseconds(0);
-          const timestamp = now.getTime();
-          const startTime = getDataOptionTime(data, startsOn);
-          const endTime = getDataOptionTime(data, endsOn, -1);
-
-          if (!startTime && !repeat) {
-            return;
-          }
+    if (this.events.has(name)) {
+      return;
+    } // NOTE: toggle cache depends on new date
 
-          if (startTime && startTime > timestamp + _this.cacheCycle) {
-            return;
-          }
 
-          if (endTime && endTime <= timestamp) {
-            return;
-          }
+    const listener = /*#__PURE__*/function () {
+      var _ref = _asyncToGenerator(function* (data, options) {
+        const now = new Date();
+        now.setMilliseconds(0);
+        const timestamp = now.getTime();
+        const startTime = getDataOptionTime(data, startsOn);
+        const endTime = getDataOptionTime(data, endsOn, -1);
 
-          if (!nextInCycle.call(_this, workflow, now)) {
-            return;
-          }
+        if (!startTime && !repeat) {
+          return;
+        }
 
-          if (typeof repeat === 'number' && repeat > _this.cacheCycle && (timestamp - startTime) % repeat > _this.cacheCycle) {
-            return;
-          }
+        if (startTime && startTime > timestamp + _this.cacheCycle) {
+          return;
+        }
 
-          console.log('set cache', now);
+        if (endTime && endTime <= timestamp) {
+          return;
+        }
 
-          _this.setCache(workflow);
-        });
+        if (!matchNext.call(_this, workflow, now)) {
+          return;
+        }
 
-        return function listener(_x, _x2) {
-          return _ref.apply(this, arguments);
-        };
-      }();
+        if (typeof repeat === 'number' && repeat > _this.cacheCycle && (timestamp - startTime) % repeat > _this.cacheCycle) {
+          return;
+        }
 
-      this.events.set(name, listener);
-      this.plugin.app.db.on(`${collection}.afterSave`, listener);
-    }
+        _this.setCache(workflow);
+      });
+
+      return function listener(_x, _x2) {
+        return _ref.apply(this, arguments);
+      };
+    }();
+
+    this.events.set(name, listener);
+    this.plugin.app.db.on(event, listener);
   },
 
   off(workflow) {
@@ -242,7 +247,7 @@ ScheduleModes.set(SCHEDULE_MODE.COLLECTION_FIELD, {
     if (this.events.has(name)) {
       const listener = this.events.get(name);
       this.events.delete(name);
-      this.plugin.app.db.off(`${collection}.afterSave`, listener);
+      this.plugin.app.db.off(event, listener);
     }
   },
 
@@ -250,34 +255,60 @@ ScheduleModes.set(SCHEDULE_MODE.COLLECTION_FIELD, {
     var _this2 = this;
 
     return _asyncToGenerator(function* () {
+      const db = _this2.plugin.app.db;
       const _workflow$config4 = workflow.config,
             startsOn = _workflow$config4.startsOn,
             endsOn = _workflow$config4.endsOn,
             repeat = _workflow$config4.repeat,
             collection = _workflow$config4.collection;
-      const starts = getDateRangeFilter(startsOn, now, -1);
+      const timestamp = now.getTime();
+      const startTimestamp = getOnTimestampWithOffset(startsOn, now);
 
-      if (!starts || !Object.keys(starts).length) {
+      if (!startTimestamp) {
         return false;
       }
 
-      const ends = getDateRangeFilter(endsOn, now, 1);
+      const conditions = [{
+        [startsOn.field]: {
+          [_sequelize().Op.lt]: new Date(startTimestamp + _this2.cacheCycle)
+        }
+      }]; // when repeat is number, means repeat after startsOn
+      // (now - startsOn) % repeat <= cacheCycle
 
-      if (!ends) {
-        return false;
-      }
+      if (repeat) {
+        const tsFn = DialectTimestampFnMap[db.options.dialect];
 
-      const conditions = [starts, ends].filter(item => Boolean(Object.keys(item).length)); // when repeat is number, means repeat after startsOn
-      // (now - startsOn) % repeat <= cacheCycle
+        if (typeof repeat === 'number' && repeat > _this2.cacheCycle && tsFn) {
+          conditions.push((0, _sequelize().where)((0, _sequelize().fn)('MOD', (0, _sequelize().literal)(`${Math.round(timestamp / 1000)} - ${tsFn(startsOn.field)}`), Math.round(repeat / 1000)), {
+            [_sequelize().Op.lt]: Math.round(_this2.cacheCycle / 1000)
+          })); // conditions.push(literal(`mod(${timestamp} - ${tsFn(startsOn.field)} * 1000, ${repeat}) < ${this.cacheCycle}`));
+        }
 
-      const db = _this2.plugin.app.db;
-      const tsFn = DialectTimestampFnMap[db.options.dialect];
+        if (endsOn) {
+          const endTimestamp = getOnTimestampWithOffset(endsOn, now);
 
-      if (repeat && typeof repeat === 'number' && repeat > _this2.cacheCycle && tsFn) {
-        const uts = now.getTime();
-        conditions.push((0, _sequelize().where)((0, _sequelize().fn)('MOD', (0, _sequelize().literal)(`${Math.round(uts / 1000)} - ${tsFn(startsOn.field)}`), Math.round(repeat / 1000)), {
-          [_sequelize().Op.lt]: Math.round(_this2.cacheCycle / 1000)
-        })); // conditions.push(literal(`mod(${uts} - ${tsFn(startsOn.field)} * 1000, ${repeat}) < ${this.cacheCycle}`));
+          if (!endTimestamp) {
+            return false;
+          }
+
+          if (typeof endsOn === 'string') {
+            if (endTimestamp <= timestamp) {
+              return false;
+            }
+          } else {
+            conditions.push({
+              [endsOn.field]: {
+                [_sequelize().Op.gte]: new Date(endTimestamp + _this2.interval)
+              }
+            });
+          }
+        }
+      } else {
+        conditions.push({
+          [startsOn.field]: {
+            [_sequelize().Op.gte]: new Date(startTimestamp)
+          }
+        });
       }
 
       const _db$getCollection = db.getCollection(collection),
@@ -292,35 +323,29 @@ ScheduleModes.set(SCHEDULE_MODE.COLLECTION_FIELD, {
     })();
   },
 
-  trigger(workflow, date) {
+  trigger(workflow, now) {
     var _this3 = this;
 
     return _asyncToGenerator(function* () {
-      var _startsOn$offset, _startsOn$unit;
-
       const _workflow$config5 = workflow.config,
-            collection = _workflow$config5.collection,
             startsOn = _workflow$config5.startsOn,
+            repeat = _workflow$config5.repeat,
             endsOn = _workflow$config5.endsOn,
-            repeat = _workflow$config5.repeat;
+            collection = _workflow$config5.collection;
+      const timestamp = now.getTime();
+      const startTimestamp = getOnTimestampWithOffset(startsOn, now);
 
-      if (typeof startsOn !== 'object') {
-        return;
+      if (!startTimestamp) {
+        return false;
       }
 
-      const timestamp = date.getTime();
-      const startTimestamp = timestamp - ((_startsOn$offset = startsOn.offset) !== null && _startsOn$offset !== void 0 ? _startsOn$offset : 0) * ((_startsOn$unit = startsOn.unit) !== null && _startsOn$unit !== void 0 ? _startsOn$unit : 1000);
-      const conditions = [];
+      const conditions = [{
+        [startsOn.field]: {
+          [_sequelize().Op.lt]: new Date(startTimestamp + _this3.interval)
+        }
+      }];
 
-      if (!repeat) {
-        // startsOn exactly equal to now in 1s
-        conditions.push({
-          [startsOn.field]: {
-            [_sequelize().Op.gte]: new Date(startTimestamp),
-            [_sequelize().Op.lt]: new Date(startTimestamp + 1000)
-          }
-        });
-      } else {
+      if (repeat) {
         // startsOn not after now
         conditions.push({
           [startsOn.field]: {
@@ -335,32 +360,32 @@ ScheduleModes.set(SCHEDULE_MODE.COLLECTION_FIELD, {
           })); // conditions.push(literal(`MOD(CAST(${timestamp} AS BIGINT) - CAST((FLOOR(${tsFn(startsOn.field)}) AS BIGINT) * 1000), ${repeat}) = 0`));
         }
 
-        switch (typeof endsOn) {
-          case 'string':
-            const endTime = Date.parse(endsOn);
-
-            if (!endTime || endTime <= timestamp) {
-              return;
-            }
-
-            break;
+        if (endsOn) {
+          const endTimestamp = getOnTimestampWithOffset(endsOn, now);
 
-          case 'object':
-            if (endsOn.field) {
-              var _endsOn$offset, _endsOn$unit;
+          if (!endTimestamp) {
+            return false;
+          }
 
-              conditions.push({
-                [endsOn.field]: {
-                  [_sequelize().Op.gte]: new Date(timestamp - ((_endsOn$offset = endsOn.offset) !== null && _endsOn$offset !== void 0 ? _endsOn$offset : 0) * ((_endsOn$unit = endsOn.unit) !== null && _endsOn$unit !== void 0 ? _endsOn$unit : 1000) + 1000)
-                }
-              });
+          if (typeof endsOn === 'string') {
+            if (endTimestamp <= timestamp) {
+              return false;
             }
-
-            break;
-
-          default:
-            break;
+          } else {
+            conditions.push({
+              [endsOn.field]: {
+                [_sequelize().Op.gte]: new Date(endTimestamp + _this3.interval)
+              }
+            });
+          }
         }
+      } else {
+        // startsOn exactly equal to now in 1s
+        conditions.push({
+          [startsOn.field]: {
+            [_sequelize().Op.gte]: new Date(startTimestamp)
+          }
+        });
       }
 
       const _this3$plugin$app$db$ = _this3.plugin.app.db.getCollection(collection),
@@ -373,12 +398,12 @@ ScheduleModes.set(SCHEDULE_MODE.COLLECTION_FIELD, {
       });
 
       if (instances.length) {
-        console.log(instances.length, 'rows trigger at', date);
+        console.log(instances.length, 'rows trigger at', now);
       }
 
       instances.forEach(item => {
         _this3.plugin.trigger(workflow, {
-          date,
+          date: now,
           data: item.get()
         });
       });
@@ -387,24 +412,16 @@ ScheduleModes.set(SCHEDULE_MODE.COLLECTION_FIELD, {
 
 });
 
-function nextInCycle(workflow, now) {
+function matchNext(workflow, now, range = this.cacheCycle) {
   const repeat = workflow.config.repeat; // no repeat means no need to rerun
   // but if in current cycle, should be put in cache
   // no repeat but in current cycle means startsOn has been configured
   // so we need to more info to determine if necessary config items
 
-  if (!repeat) {
+  if (typeof repeat !== 'string') {
     return true;
   }
 
-  switch (typeof repeat) {
-    case 'string':
-      break;
-
-    default:
-      return true;
-  }
-
   const currentDate = new Date(now);
   currentDate.setMilliseconds(-1);
   const timestamp = now.getTime();
@@ -415,7 +432,7 @@ function nextInCycle(workflow, now) {
 
   let next = interval.next(); // NOTE: cache all workflows will be matched in current cycle
 
-  if (next.getTime() - timestamp <= this.cacheCycle) {
+  if (next.getTime() - timestamp <= range) {
     return true;
   }
 
@@ -452,18 +469,20 @@ class ScheduleTrigger extends _.Trigger {
   }
 
   init() {
-    if (!this.timer) {
-      const now = new Date(); // NOTE: assign to this.timer to avoid duplicated initialization
-
-      this.timer = setTimeout(() => {
-        this.timer = setInterval(this.run, this.interval); // initially trigger
-        // this.onTick(now);
-      }, // NOTE:
-      //  try to align to system time on each second starts,
-      //  after at least 1 second initialized for anything to get ready.
-      //  so jobs in 2 seconds will be missed at first start.
-      1000 - now.getMilliseconds());
+    if (this.timer) {
+      return;
     }
+
+    const now = new Date(); // NOTE: assign to this.timer to avoid duplicated initialization
+
+    this.timer = setTimeout(() => {
+      this.timer = setInterval(this.run, this.interval); // initially trigger
+      // this.onTick(now);
+    }, // NOTE:
+    //  try to align to system time on each second starts,
+    //  after at least 1 second initialized for anything to get ready.
+    //  so jobs in 2 seconds will be missed at first start.
+    1000 - now.getMilliseconds());
   }
 
   onTick(now) {
@@ -631,13 +650,10 @@ class ScheduleTrigger extends _.Trigger {
 }
 
 exports.default = ScheduleTrigger;
-ScheduleTrigger.CacheRules = [// ({ enabled }) => enabled,
-({
+ScheduleTrigger.CacheRules = [({
   config,
   allExecuted
-}) => config.limit ? allExecuted < config.limit : true, ({
-  config
-}) => ['repeat', 'startsOn'].some(key => config[key]), nextInCycle, function (workflow, now) {
+}) => (config.limit ? allExecuted < config.limit : true) && config.startsOn, matchNext, function (workflow, now) {
   const mode = workflow.config.mode;
   const modeHandlers = ScheduleModes.get(mode);
   return modeHandlers.shouldCache.call(this, workflow, now);
@@ -645,28 +661,6 @@ ScheduleTrigger.CacheRules = [// ({ enabled }) => enabled,
 ScheduleTrigger.TriggerRules = [({
   config,
   allExecuted
-}) => config.limit ? allExecuted < config.limit : true, ({
-  config
-}) => ['repeat', 'startsOn'].some(key => config[key]), function (workflow, now) {
-  const repeat = workflow.config.repeat;
-
-  if (typeof repeat !== 'string') {
-    return true;
-  }
-
-  const currentDate = new Date(now);
-  currentDate.setMilliseconds(-1);
-  const timestamp = now.getTime();
-
-  const interval = _cronParser().default.parseExpression(repeat, {
-    currentDate
-  });
-
-  let next = interval.next();
-
-  if (next.getTime() === timestamp) {
-    return true;
-  }
-
-  return false;
+}) => (config.limit ? allExecuted < config.limit : true) && config.startsOn, function (workflow, now) {
+  return matchNext.call(this, workflow, now, 0);
 }];

package/package.json

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