@nocobase/plugin-workflow-javascript 2.1.41 → 2.1.43

package/dist/externalVersion.js

@@ -13,12 +13,12 @@ module.exports = {
   "antd-style": "3.7.1",
   "@formily/antd-v5": "1.2.3",
   "@ant-design/icons": "5.6.1",
-  "@nocobase/client": "2.1.41",
-  "@nocobase/plugin-workflow": "2.1.41",
+  "@nocobase/client": "2.1.43",
+  "@nocobase/plugin-workflow": "2.1.43",
   "antd": "5.24.2",
-  "@nocobase/flow-engine": "2.1.41",
+  "@nocobase/flow-engine": "2.1.43",
   "react-i18next": "11.18.6",
   "winston": "3.13.0",
-  "@nocobase/server": "2.1.41",
+  "@nocobase/server": "2.1.43",
   "sequelize": "6.35.2"
 };

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-16T05:14:40.186Z"}
+{"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-19T08:55:32.400Z"}

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-16T05:14:40.484Z"}
+{"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-19T08:55:33.092Z"}

package/dist/server/TaskRecovery.js

@@ -35,6 +35,7 @@ var import_constants = require("../common/constants");
 const RECOVERY_BATCH_SIZE = 100;
 const RECOVERY_MAX_SCAN_SIZE = 1e3;
 const RECOVERY_INTERVAL = 6e4;
+const RECOVERY_GRACE_PERIOD = RECOVERY_INTERVAL;
 class TaskRecovery {
   constructor(workflowPlugin, taskQueueChannel) {
     this.workflowPlugin = workflowPlugin;
@@ -85,14 +86,19 @@ class TaskRecovery {
   async republishQueuedJobs() {
     let cursor = null;
     let scanned = 0;
-    const staleBefore = new Date(Date.now() - 12e4);
+    const now = /* @__PURE__ */ new Date();
+    const recoverableBefore = new Date(now.getTime() - RECOVERY_GRACE_PERIOD);
+    const staleBefore = new Date(now.getTime() - 12e4);
     const logger = this.workflowPlugin.getLogger("javascript");
     const JobModel = this.workflowPlugin.db.getModel("jobs");
     while (scanned < RECOVERY_MAX_SCAN_SIZE) {
       const jobs = await JobModel.findAll({
         where: {
           ...cursor == null ? {} : { id: { [import_sequelize.Op.gt]: cursor } },
-          status: import_plugin_workflow.JOB_STATUS.PENDING
+          status: import_plugin_workflow.JOB_STATUS.PENDING,
+          createdAt: {
+            [import_sequelize.Op.lt]: recoverableBefore
+          }
         },
         attributes: ["id", "startedAt", "updatedAt"],
         include: [
@@ -103,6 +109,22 @@ class TaskRecovery {
               type: import_constants.SCRIPT_INSTRUCTION_TYPE
             },
             required: true
+          },
+          {
+            association: "execution",
+            attributes: [],
+            where: {
+              status: import_plugin_workflow.EXECUTION_STATUS.STARTED,
+              [import_sequelize.Op.or]: [
+                { expiresAt: null },
+                {
+                  expiresAt: {
+                    [import_sequelize.Op.gt]: now
+                  }
+                }
+              ]
+            },
+            required: true
           }
         ],
         order: [["id", "ASC"]],

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/plugin-workflow-javascript",
-  "version": "2.1.41",
+  "version": "2.1.43",
   "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": "91c01d0941d758d97d8000d0c8b8a2a48af6c1ae"
+  "gitHead": "7b133bbdf1a7ae7e7b42514f808e6d4fdf0e4a78"
 }