@nocobase/plugin-workflow-javascript 2.1.0-alpha.39 → 2.1.0-alpha.45

package/dist/externalVersion.js

@@ -13,11 +13,11 @@ module.exports = {
   "antd-style": "3.7.1",
   "@formily/antd-v5": "1.2.3",
   "@ant-design/icons": "5.6.1",
-  "@nocobase/client": "2.1.0-alpha.39",
-  "@nocobase/plugin-workflow": "2.1.0-alpha.39",
+  "@nocobase/client": "2.1.0-alpha.45",
+  "@nocobase/plugin-workflow": "2.1.0-alpha.45",
   "antd": "5.24.2",
-  "@nocobase/flow-engine": "2.1.0-alpha.39",
+  "@nocobase/flow-engine": "2.1.0-alpha.45",
   "react-i18next": "11.18.6",
   "winston": "3.13.0",
-  "@nocobase/server": "2.1.0-alpha.39"
+  "@nocobase/server": "2.1.0-alpha.45"
 };

package/dist/node_modules/joi/package.json

@@ -1 +1 @@
-{"name":"joi","description":"Object schema validation","version":"17.13.3","repository":"git://github.com/hapijs/joi","main":"lib/index.js","types":"lib/index.d.ts","browser":"dist/joi-browser.min.js","files":["lib/**/*","dist/*"],"keywords":["schema","validation"],"dependencies":{"@hapi/hoek":"^9.3.0","@hapi/topo":"^5.1.0","@sideway/address":"^4.1.5","@sideway/formula":"^3.0.1","@sideway/pinpoint":"^2.0.0"},"devDependencies":{"@hapi/bourne":"2.x.x","@hapi/code":"8.x.x","@hapi/joi-legacy-test":"npm:@hapi/joi@15.x.x","@hapi/lab":"^25.1.3","@types/node":"^14.18.63","typescript":"4.3.x"},"scripts":{"prepublishOnly":"cd browser && npm install && npm run build","test":"lab -t 100 -a @hapi/code -L -Y","test-cov-html":"lab -r html -o coverage.html -a @hapi/code"},"license":"BSD-3-Clause","_lastModified":"2026-05-20T01:43:55.914Z"}
+{"name":"joi","description":"Object schema validation","version":"17.13.3","repository":"git://github.com/hapijs/joi","main":"lib/index.js","types":"lib/index.d.ts","browser":"dist/joi-browser.min.js","files":["lib/**/*","dist/*"],"keywords":["schema","validation"],"dependencies":{"@hapi/hoek":"^9.3.0","@hapi/topo":"^5.1.0","@sideway/address":"^4.1.5","@sideway/formula":"^3.0.1","@sideway/pinpoint":"^2.0.0"},"devDependencies":{"@hapi/bourne":"2.x.x","@hapi/code":"8.x.x","@hapi/joi-legacy-test":"npm:@hapi/joi@15.x.x","@hapi/lab":"^25.1.3","@types/node":"^14.18.63","typescript":"4.3.x"},"scripts":{"prepublishOnly":"cd browser && npm install && npm run build","test":"lab -t 100 -a @hapi/code -L -Y","test-cov-html":"lab -r html -o coverage.html -a @hapi/code"},"license":"BSD-3-Clause","_lastModified":"2026-05-29T12:51:13.396Z"}

package/dist/node_modules/winston-transport/package.json

@@ -1 +1 @@
-{"name":"winston-transport","description":"Base stream implementations for winston@3 and up.","version":"4.7.0","main":"index.js","browser":"dist/index.js","scripts":{"lint":"eslint test/*.js index.js --resolve-plugins-relative-to ./node_modules/@dabh/eslint-config-populist","pretest":"npm run lint && npm run build","test":"nyc mocha test/*.test.js","report":"nyc report --reporter=lcov","build":"rimraf dist && babel *.js -d ./dist","prepublishOnly":"npm run build"},"repository":{"type":"git","url":"git@github.com:winstonjs/winston-transport.git"},"keywords":["winston","transport","winston3"],"author":"Charlie Robbins <charlie.robbins@gmail.com>","license":"MIT","bugs":{"url":"https://github.com/winstonjs/winston-transport/issues"},"homepage":"https://github.com/winstonjs/winston-transport#readme","dependencies":{"logform":"^2.3.2","readable-stream":"^3.6.0","triple-beam":"^1.3.0"},"devDependencies":{"@types/node":"^20.8.6","abstract-winston-transport":">=0.5.1","assume":"^2.3.0","babel-cli":"^6.26.0","babel-preset-env":"^1.7.0","deep-equal":"^2.0.5","eslint":"^8.8.0","@dabh/eslint-config-populist":"^5.0.0","mocha":"^10.0.0","nyc":"^15.1.0","rimraf":"^5.0.5","winston-compat":"^0.1.5"},"engines":{"node":">= 12.0.0"},"_lastModified":"2026-05-20T01:43:56.555Z"}
+{"name":"winston-transport","description":"Base stream implementations for winston@3 and up.","version":"4.7.0","main":"index.js","browser":"dist/index.js","scripts":{"lint":"eslint test/*.js index.js --resolve-plugins-relative-to ./node_modules/@dabh/eslint-config-populist","pretest":"npm run lint && npm run build","test":"nyc mocha test/*.test.js","report":"nyc report --reporter=lcov","build":"rimraf dist && babel *.js -d ./dist","prepublishOnly":"npm run build"},"repository":{"type":"git","url":"git@github.com:winstonjs/winston-transport.git"},"keywords":["winston","transport","winston3"],"author":"Charlie Robbins <charlie.robbins@gmail.com>","license":"MIT","bugs":{"url":"https://github.com/winstonjs/winston-transport/issues"},"homepage":"https://github.com/winstonjs/winston-transport#readme","dependencies":{"logform":"^2.3.2","readable-stream":"^3.6.0","triple-beam":"^1.3.0"},"devDependencies":{"@types/node":"^20.8.6","abstract-winston-transport":">=0.5.1","assume":"^2.3.0","babel-cli":"^6.26.0","babel-preset-env":"^1.7.0","deep-equal":"^2.0.5","eslint":"^8.8.0","@dabh/eslint-config-populist":"^5.0.0","mocha":"^10.0.0","nyc":"^15.1.0","rimraf":"^5.0.5","winston-compat":"^0.1.5"},"engines":{"node":">= 12.0.0"},"_lastModified":"2026-05-29T12:51:13.683Z"}

package/dist/server/ScriptInstruction.d.ts

@@ -27,6 +27,7 @@ export default class ScriptInstruction extends Instruction {
     static run(source: any, args: any, options: {
         logger: Logger;
         timeout?: number;
+        signal?: AbortSignal;
     }): Promise<{
         status: -2;
         result: any;
@@ -35,7 +36,9 @@ export default class ScriptInstruction extends Instruction {
         result: any;
     }>;
     configSchema: Joi.ObjectSchema<any>;
-    run(node: FlowNodeModel, prevJob: any, processor: Processor): Promise<{
+    run(node: FlowNodeModel, prevJob: any, processor: Processor, options?: {
+        signal?: AbortSignal;
+    }): Promise<{
         result: any;
         status: -2 | 1;
     }>;

package/dist/server/ScriptInstruction.js

@@ -58,11 +58,15 @@ class ScriptInstruction extends import_plugin_workflow.Instruction {
     return import_node_path.default.join(__dirname, hasModules ? "Vm.js" : "QuickJs.js");
   }
   static async run(source, args, options) {
-    const { logger, timeout } = options;
+    const { logger, timeout, signal } = options;
     let result;
     const worker = new import_node_worker_threads.Worker(this.workerScript, {
       workerData: { source, args, options: timeout ? { timeout } : {} }
     });
+    const abortListener = () => {
+      void worker.terminate();
+    };
+    signal == null ? void 0 : signal.addEventListener("abort", abortListener, { once: true });
     worker.on("message", (message) => {
       if (message.type === "result") {
         result = message.result;
@@ -92,12 +96,16 @@ class ScriptInstruction extends import_plugin_workflow.Instruction {
     try {
       await excution;
     } catch (e) {
-      console.log(e);
+      signal == null ? void 0 : signal.removeEventListener("abort", abortListener);
+      if (signal == null ? void 0 : signal.aborted) {
+        throw signal.reason instanceof Error ? signal.reason : new import_plugin_workflow.WorkflowTimeoutError();
+      }
       return {
         status: import_plugin_workflow.JOB_STATUS.ERROR,
         result: e.message
       };
     }
+    signal == null ? void 0 : signal.removeEventListener("abort", abortListener);
     return {
       status: import_plugin_workflow.JOB_STATUS.RESOLVED,
       result
@@ -114,7 +122,7 @@ class ScriptInstruction extends import_plugin_workflow.Instruction {
       })
     ).optional()
   });
-  async run(node, prevJob, processor) {
+  async run(node, prevJob, processor, options) {
     const { content = "", continue: cont, timeout } = node.config;
     const args = processor.getParsedValue(node.config.arguments ?? [], node.id);
     const _args = args.reduce((pre, item) => ({ ...pre, [item.name]: item.value }), {});
@@ -124,7 +132,8 @@ class ScriptInstruction extends import_plugin_workflow.Instruction {
     if (sync) {
       const result = await this.constructor.run(content, _args, {
         timeout,
-        logger: processor.logger
+        logger: processor.logger,
+        signal: options == null ? void 0 : options.signal
       });
       if (result.status === import_plugin_workflow.JOB_STATUS.RESOLVED) {
         processor.logger.info(`run script test success, node id: ${node.id},the result is ${result.result}`);
@@ -147,7 +156,7 @@ class ScriptInstruction extends import_plugin_workflow.Instruction {
     const jobResult = {
       status: import_plugin_workflow.JOB_STATUS.PENDING
     };
-    this.constructor.run(content, _args, { timeout, logger: processor.logger }).then((res) => {
+    this.constructor.run(content, _args, { timeout, logger: processor.logger, signal: options == null ? void 0 : options.signal }).then((res) => {
       if (res.status === import_plugin_workflow.JOB_STATUS.RESOLVED) {
         processor.logger.info(`script (#${node.id}) get result success`);
         jobResult.status = import_plugin_workflow.JOB_STATUS.RESOLVED;
@@ -172,7 +181,13 @@ class ScriptInstruction extends import_plugin_workflow.Instruction {
       processor.logger.debug(`script (#${node.id}) ended, resume workflow...`);
       setImmediate(async () => {
         const job = await this.workflow.db.getRepository("jobs").findOne({ filterByTk: id });
+        const execution = await job.getExecution();
+        if (execution.status !== 0) {
+          processor.logger.warn(`script (#${node.id}) result discarded because execution (${execution.id}) is ended`);
+          return;
+        }
         job.set(jobResult);
+        job.execution = execution;
         this.workflow.resume(job);
       });
     });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/plugin-workflow-javascript",
-  "version": "2.1.0-alpha.39",
+  "version": "2.1.0-alpha.45",
   "displayName": "Workflow: JavaScript",
   "displayName.zh-CN": "工作流：JavaScript 节点",
   "description": "Execute a piece of JavaScript in an isolated Node.js environment.",
@@ -33,5 +33,5 @@
     "Workflow"
   ],
   "license": "Apache-2.0",
-  "gitHead": "d06ed6b97030866c00e7ce40c9e1bcc773ebf12c"
+  "gitHead": "e9e24987e12d0ad10a5db8815b1e1b7b447f1938"
 }