@nocobase/plugin-workflow-javascript 2.1.34 → 2.1.35

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.34",
-  "@nocobase/plugin-workflow": "2.1.34",
+  "@nocobase/client": "2.1.35",
+  "@nocobase/plugin-workflow": "2.1.35",
   "antd": "5.24.2",
-  "@nocobase/flow-engine": "2.1.34",
+  "@nocobase/flow-engine": "2.1.35",
   "react-i18next": "11.18.6",
   "winston": "3.13.0",
-  "@nocobase/server": "2.1.34"
+  "@nocobase/server": "2.1.35"
 };

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-08-01T16:25:47.064Z"}
+{"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-08-05T07:47:36.988Z"}

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-08-01T16:25:47.786Z"}
+{"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-08-05T07:47:37.647Z"}

package/dist/server/QuickJs.js

@@ -108,7 +108,7 @@ ${source ?? ""}
     const runResult = context.evalCode(wrappedSource, "script.js");
     const promiseHandle = context.unwrapResult(runResult);
     try {
-      while (true) {
+      for (; ; ) {
         const state = context.getPromiseState(promiseHandle);
         if (state.type === "fulfilled") {
           const valueHandle = state.value;
@@ -138,7 +138,14 @@ ${source ?? ""}
     runtime.dispose();
   }
 }
-main().then((result) => {
+function flushOutput() {
+  const flush = (stream) => new Promise((resolve, reject) => {
+    stream.write("", (error) => error ? reject(error) : resolve());
+  });
+  return Promise.all([flush(process.stdout), flush(process.stderr)]);
+}
+main().then(async (result) => {
+  await flushOutput();
   parentPort.postMessage({ type: "result", result });
 }).catch((error) => {
   throw error;

package/dist/server/ScriptInstruction.js

@@ -46,6 +46,9 @@ var import_winston = __toESM(require("winston"));
 var import_joi = __toESM(require("joi"));
 var import_plugin_workflow = require("@nocobase/plugin-workflow");
 var import_cache_logger = require("./cache-logger");
+function isWorkerResult(message) {
+  return typeof message === "object" && message !== null && "type" in message && message.type === "result";
+}
 class ScriptInstruction extends import_plugin_workflow.Instruction {
   /**
    * Returns the worker script path based on whether WORKFLOW_SCRIPT_MODULES is configured.
@@ -58,45 +61,54 @@ class ScriptInstruction extends import_plugin_workflow.Instruction {
   }
   static async run(source, args, 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 = () => {
-      worker.terminate();
-    };
-    signal == null ? void 0 : signal.addEventListener("abort", abortListener, { once: true });
-    worker.on("message", (message) => {
-      if (message.type === "result") {
-        result = message.result;
-      }
-    });
     worker.stdout.on("data", (data) => {
       logger.info(data.toString());
     });
     worker.stderr.on("data", (data) => {
       logger.error(data.toString());
     });
-    const excution = new Promise((resolve, reject) => {
-      worker.on("error", (error) => {
-        reject(error);
-      });
-      const stdoutPromise = (0, import_node_events.once)(worker.stdout, "close");
-      const stderrPromise = (0, import_node_events.once)(worker.stderr, "close");
-      worker.on("exit", (code) => {
-        Promise.all([stdoutPromise, stderrPromise]).then(() => {
-          if (code !== 0) {
-            reject(new Error(`Worker stopped with exit code ${code}`));
-          }
-          resolve(result);
-        }).catch(reject);
-      });
+    const outputClosed = Promise.all([(0, import_node_events.once)(worker.stdout, "close"), (0, import_node_events.once)(worker.stderr, "close")]);
+    const outcomePromise = new Promise((resolve) => {
+      const finish = (outcome2) => {
+        worker.removeListener("message", messageListener);
+        worker.removeListener("error", errorListener);
+        worker.removeListener("exit", exitListener);
+        signal == null ? void 0 : signal.removeEventListener("abort", abortListener);
+        resolve(outcome2);
+      };
+      const messageListener = (message) => {
+        if (isWorkerResult(message)) {
+          finish({ type: "result", result: message.result });
+        }
+      };
+      const errorListener = (error) => {
+        finish({ type: "error", error });
+      };
+      const exitListener = (code) => {
+        finish({ type: "exit", code });
+      };
+      const abortListener = () => {
+        finish({ type: "aborted" });
+      };
+      worker.on("message", messageListener);
+      worker.once("error", errorListener);
+      worker.once("exit", exitListener);
+      signal == null ? void 0 : signal.addEventListener("abort", abortListener, { once: true });
+      if (signal == null ? void 0 : signal.aborted) {
+        abortListener();
+      }
     });
+    const outcome = await outcomePromise;
     try {
-      await excution;
+      if (outcome.type !== "exit") {
+        await worker.terminate();
+      }
+      await outputClosed;
     } catch (e) {
-      signal == null ? void 0 : signal.removeEventListener("abort", abortListener);
-      if (signal == null ? void 0 : signal.aborted) {
+      if (outcome.type === "aborted" || (signal == null ? void 0 : signal.aborted)) {
         throw signal.reason instanceof Error ? signal.reason : new import_plugin_workflow.WorkflowTimeoutError();
       }
       return {
@@ -104,10 +116,24 @@ class ScriptInstruction extends import_plugin_workflow.Instruction {
         result: e instanceof Error ? e.message : String(e)
       };
     }
-    signal == null ? void 0 : signal.removeEventListener("abort", abortListener);
+    if (outcome.type === "aborted") {
+      throw (signal == null ? void 0 : signal.reason) instanceof Error ? signal.reason : new import_plugin_workflow.WorkflowTimeoutError();
+    }
+    if (outcome.type === "error") {
+      return {
+        status: import_plugin_workflow.JOB_STATUS.ERROR,
+        result: outcome.error.message
+      };
+    }
+    if (outcome.type === "exit" && outcome.code !== 0) {
+      return {
+        status: import_plugin_workflow.JOB_STATUS.ERROR,
+        result: `Worker stopped with exit code ${outcome.code}`
+      };
+    }
     return {
       status: import_plugin_workflow.JOB_STATUS.RESOLVED,
-      result
+      result: outcome.type === "result" ? outcome.result : void 0
     };
   }
   configSchema = import_joi.default.object({
@@ -151,11 +177,17 @@ class ScriptInstruction extends import_plugin_workflow.Instruction {
       upstreamId: (prevJob == null ? void 0 : prevJob.id) ?? null
     });
     processor.logger.info(`script (#${node.id}) has been started, waiting for response...`);
-    await processor.exit();
+    const abortHandle = processor.createBackgroundAbortHandle();
+    try {
+      await processor.exit();
+    } catch (error) {
+      abortHandle.dispose();
+      throw error;
+    }
     const jobResult = {
       status: import_plugin_workflow.JOB_STATUS.PENDING
     };
-    this.constructor.run(content, _args, { timeout, logger: processor.logger, signal: options == null ? void 0 : options.signal }).then((res) => {
+    this.constructor.run(content, _args, { timeout, logger: processor.logger, signal: abortHandle.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;
@@ -178,6 +210,7 @@ class ScriptInstruction extends import_plugin_workflow.Instruction {
       jobResult.status = import_plugin_workflow.JOB_STATUS.ERROR;
       jobResult.result = message;
     }).finally(() => {
+      abortHandle.dispose();
       processor.logger.debug(`script (#${node.id}) ended, resume workflow...`);
       setImmediate(async () => {
         const job = await this.workflow.db.getRepository("jobs").findOne({ filterByTk: id });

package/dist/server/Vm.js

@@ -105,7 +105,14 @@ async function main() {
   const result = script.runInNewContext(context, { timeout: options.timeout });
   return result;
 }
-main().then((result) => {
+function flushOutput() {
+  const flush = (stream) => new Promise((resolve, reject) => {
+    stream.write("", (error) => error ? reject(error) : resolve());
+  });
+  return Promise.all([flush(process.stdout), flush(process.stderr)]);
+}
+main().then(async (result) => {
+  await flushOutput();
   parentPort.postMessage({ type: "result", result });
 }).catch((error) => {
   throw error;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/plugin-workflow-javascript",
-  "version": "2.1.34",
+  "version": "2.1.35",
   "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": "6d4dfdfbde69698ed1c2ed54108a8f6736e56e10"
+  "gitHead": "d844133f9bd61a3506a3be1af25a1cb06dafbc6f"
 }