@nocobase/plugin-workflow-delay 1.9.0-beta.5 → 1.9.0-beta.6

package/dist/externalVersion.js

@@ -11,8 +11,8 @@ module.exports = {
   "react": "18.2.0",
   "antd": "5.24.2",
   "@ant-design/icons": "5.6.1",
-  "@nocobase/plugin-workflow": "1.9.0-beta.5",
-  "@nocobase/client": "1.9.0-beta.5",
+  "@nocobase/plugin-workflow": "1.9.0-beta.6",
+  "@nocobase/client": "1.9.0-beta.6",
   "react-i18next": "11.18.6",
-  "@nocobase/server": "1.9.0-beta.5"
+  "@nocobase/server": "1.9.0-beta.6"
 };

package/dist/server/DelayInstruction.d.ts

@@ -7,15 +7,15 @@
  * For more information, please refer to: https://www.nocobase.com/agreement.
  */
 /// <reference types="node" />
-import WorkflowPlugin, { Processor, Instruction } from '@nocobase/plugin-workflow';
+import WorkflowPlugin, { Processor, Instruction, JobModel } from '@nocobase/plugin-workflow';
 export default class extends Instruction {
     workflow: WorkflowPlugin;
-    timers: Map<number, NodeJS.Timeout>;
+    timers: Map<string, NodeJS.Timeout>;
     constructor(workflow: WorkflowPlugin);
     load: () => Promise<void>;
     unload: () => void;
     schedule(job: any): void;
-    trigger(job: any): Promise<void>;
+    trigger(jobOrId: JobModel | string): Promise<void>;
     run(node: any, prevJob: any, processor: Processor): Promise<any>;
     resume(node: any, prevJob: any, processor: Processor): Promise<any>;
 }

package/dist/server/DelayInstruction.js

@@ -74,25 +74,28 @@ class DelayInstruction_default extends import_plugin_workflow.Instruction {
     this.timers = /* @__PURE__ */ new Map();
   };
   schedule(job) {
-    const now = /* @__PURE__ */ new Date();
-    const createdAt = Date.parse(job.createdAt);
-    const delay = createdAt + job.result - now.getTime();
+    const createdAt = new Date(job.createdAt).getTime();
+    const delay = createdAt + job.result - Date.now();
     if (delay > 0) {
-      const trigger = this.trigger.bind(this, job);
-      this.timers.set(job.id, setTimeout(trigger, delay));
+      const trigger = this.trigger.bind(this, job.id);
+      this.timers.set(job.id.toString(), setTimeout(trigger, delay));
     } else {
       this.trigger(job);
     }
   }
-  async trigger(job) {
+  async trigger(jobOrId) {
+    const { model } = this.workflow.app.db.getCollection("jobs");
+    const job = jobOrId instanceof model ? jobOrId : await this.workflow.app.db.getRepository("jobs").findOne({ filterByTk: jobOrId });
     if (!job.execution) {
       job.execution = await job.getExecution();
     }
     if (job.execution.status === import_plugin_workflow.EXECUTION_STATUS.STARTED) {
       this.workflow.resume(job);
     }
-    if (this.timers.get(job.id)) {
-      this.timers.delete(job.id);
+    const idStr = job.id.toString();
+    if (this.timers.get(idStr)) {
+      clearTimeout(this.timers.get(idStr));
+      this.timers.delete(idStr);
     }
   }
   async run(node, prevJob, processor) {
@@ -104,8 +107,8 @@ class DelayInstruction_default extends import_plugin_workflow.Instruction {
       nodeKey: node.key,
       upstreamId: (prevJob == null ? void 0 : prevJob.id) ?? null
     });
-    job.node = node;
     this.schedule(job);
+    processor.logger.debug(`delay node (${node.id}) will resume after ${duration}ms`);
     return null;
   }
   async resume(node, prevJob, processor) {

package/package.json

@@ -4,7 +4,7 @@
   "displayName.zh-CN": "工作流：延时节点",
   "description": "Could be used in workflow parallel branch for waiting other branches.",
   "description.zh-CN": "可用于工作流并行分支中等待其他分支执行完成。",
-  "version": "1.9.0-beta.5",
+  "version": "1.9.0-beta.6",
   "license": "AGPL-3.0",
   "main": "./dist/server/index.js",
   "homepage": "https://docs.nocobase.com/handbook/workflow-delay",
@@ -21,7 +21,7 @@
     "@nocobase/server": "1.x",
     "@nocobase/test": "1.x"
   },
-  "gitHead": "9a61c60dd3db5af64244e82447309b0cb17aabb6",
+  "gitHead": "ada5e359a91135cb9baf605c04c5c380f067a046",
   "keywords": [
     "Workflow"
   ]