@nocobase/plugin-workflow-javascript 2.4.0-alpha.4 → 2.4.0-alpha.6

package/dist/externalVersion.js

@@ -8,13 +8,13 @@
  */
 
 module.exports = {
-  "@nocobase/client": "2.4.0-alpha.4",
-  "@nocobase/plugin-workflow": "2.4.0-alpha.4",
-  "@nocobase/flow-engine": "2.4.0-alpha.4",
+  "@nocobase/client": "2.4.0-alpha.6",
+  "@nocobase/plugin-workflow": "2.4.0-alpha.6",
+  "@nocobase/flow-engine": "2.4.0-alpha.6",
   "react-i18next": "11.18.6",
-  "@nocobase/client-v2": "2.4.0-alpha.4",
+  "@nocobase/client-v2": "2.4.0-alpha.6",
   "winston": "3.13.0",
-  "@nocobase/server": "2.4.0-alpha.4",
+  "@nocobase/server": "2.4.0-alpha.6",
   "sequelize": "6.35.2",
   "antd": "5.24.2",
   "@emotion/css": "11.13.0",

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-09-06T13:14:35.546Z"}
+{"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-09-15T13:19:16.287Z"}

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-09-06T13:14:36.284Z"}
+{"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-09-15T13:19:16.534Z"}

package/dist/server/TaskConsumer.js

@@ -47,6 +47,9 @@ function getJavaScriptArguments(job) {
 function getErrorMessage(error) {
   return error instanceof Error ? error.message : String(error);
 }
+function isSameClaim(left, right) {
+  return (left == null ? void 0 : left.getTime()) === (right == null ? void 0 : right.getTime());
+}
 function createJobAbortController(workflowPlugin, runningJobs, job, execution) {
   const controller = new AbortController();
   let timeoutGuard = null;
@@ -292,8 +295,14 @@ class TaskConsumer {
             startedAt: job.startedAt
           }
         }
-      ).then(([affected]) => {
-        if (!affected) {
+      ).then(async ([affected]) => {
+        if (affected) {
+          return;
+        }
+        const currentJob = await JobModel.findByPk(job.id, {
+          attributes: ["status", "startedAt"]
+        });
+        if (!currentJob || currentJob.status !== import_plugin_workflow.JOB_STATUS.PENDING || !isSameClaim(currentJob.startedAt, job.startedAt)) {
           abort();
         }
       }).catch((error) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/plugin-workflow-javascript",
-  "version": "2.4.0-alpha.4",
+  "version": "2.4.0-alpha.6",
   "displayName": "Workflow: JavaScript",
   "displayName.zh-CN": "工作流：JavaScript 节点",
   "description": "Execute a piece of JavaScript in an isolated Node.js environment.",
@@ -35,5 +35,5 @@
     "Workflow"
   ],
   "license": "Apache-2.0",
-  "gitHead": "527910882037ce1558ee6b0ef748208b8d6996bb"
+  "gitHead": "1fc4fcd17a0cd79912a642600bdc2103e2104bdb"
 }