@nocobase/plugin-workflow-request 2.1.0-alpha.46 → 2.1.0-alpha.47

package/dist/externalVersion.js

@@ -14,12 +14,12 @@ module.exports = {
   "@formily/react": "2.3.7",
   "@formily/antd-v5": "1.2.3",
   "@ant-design/icons": "5.6.1",
-  "@nocobase/client": "2.1.0-alpha.46",
-  "@nocobase/plugin-workflow": "2.1.0-alpha.46",
+  "@nocobase/client": "2.1.0-alpha.47",
+  "@nocobase/plugin-workflow": "2.1.0-alpha.47",
   "react-i18next": "11.18.6",
-  "@nocobase/server": "2.1.0-alpha.46",
+  "@nocobase/server": "2.1.0-alpha.47",
   "axios": "1.7.7",
   "lodash": "4.18.1",
-  "@nocobase/plugin-file-manager": "2.1.0-alpha.46",
-  "@nocobase/utils": "2.1.0-alpha.46"
+  "@nocobase/plugin-file-manager": "2.1.0-alpha.47",
+  "@nocobase/utils": "2.1.0-alpha.47"
 };

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-06-04T11:31:24.519Z"}
+{"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-06-08T04:03:02.706Z"}

package/dist/server/RequestInstruction.js

@@ -44,6 +44,9 @@ var import_lodash = require("lodash");
 var import_plugin_workflow = require("@nocobase/plugin-workflow");
 var import_plugin_file_manager = __toESM(require("@nocobase/plugin-file-manager"));
 var import_utils = require("@nocobase/utils");
+function toRequestError(error) {
+  return error instanceof Error ? error : new Error(String(error));
+}
 function getContentTypeTransformer(mimeType, app) {
   switch (mimeType) {
     case "text/plain":
@@ -237,41 +240,55 @@ class RequestInstruction_default extends import_plugin_workflow.Instruction {
       upstreamId: (prevJob == null ? void 0 : prevJob.id) ?? null
     });
     await processor.exit();
+    const abortHandle = processor.createBackgroundAbortHandle();
     const jobDone = { status: import_plugin_workflow.JOB_STATUS.PENDING };
-    try {
-      processor.logger.info(`request (#${node.id}) sent to "${config.url}", waiting for response...`);
-      const response = await request(config, this.workflow.app, options == null ? void 0 : options.signal);
-      processor.logger.info(`request (#${node.id}) response success, status: ${response.status}`);
-      jobDone.status = import_plugin_workflow.JOB_STATUS.RESOLVED;
-      jobDone.result = responseSuccess(response, config.onlyData);
-    } catch (error) {
-      if (error.isAxiosError) {
-        if (error.response) {
-          processor.logger.info(`request (#${node.id}) failed with response, status: ${error.response.status}`);
-        } else if (error.request) {
-          processor.logger.error(`request (#${node.id}) failed without response: ${error.message}`);
+    const settleRequest = async () => {
+      try {
+        processor.logger.info(`request (#${node.id}) sent to "${config.url}", waiting for response...`);
+        const response = await request(config, this.workflow.app, abortHandle.signal);
+        processor.logger.info(`request (#${node.id}) response success, status: ${response.status}`);
+        jobDone.status = import_plugin_workflow.JOB_STATUS.RESOLVED;
+        jobDone.result = responseSuccess(response, config.onlyData);
+      } catch (caught) {
+        const error = toRequestError(caught);
+        if (error.isAxiosError) {
+          if (error.response) {
+            processor.logger.info(`request (#${node.id}) failed with response, status: ${error.response.status}`);
+          } else if (error.request) {
+            processor.logger.error(`request (#${node.id}) failed without response: ${error.message}`);
+          } else {
+            processor.logger.error(`request (#${node.id}) initiation failed: ${error.message}`);
+          }
         } else {
-          processor.logger.error(`request (#${node.id}) initiation failed: ${error.message}`);
+          processor.logger.error(`request (#${node.id}) failed unexpectedly: ${error.message}`);
+        }
+        logFailureDebug(processor.logger, error);
+        jobDone.status = abortHandle.signal.aborted ? import_plugin_workflow.JOB_STATUS.ABORTED : failureStatus(config, error);
+        jobDone.result = responseFailure(error);
+      } finally {
+        abortHandle.dispose();
+        const job = await this.workflow.app.db.getRepository("jobs").findOne({
+          filterByTk: id
+        });
+        const execution = await job.getExecution();
+        const aborted = await this.workflow.abortExecutionIfExpired(execution);
+        if (!aborted) {
+          await execution.reload();
+          await job.reload();
+        }
+        if (!aborted && execution.status === import_plugin_workflow.EXECUTION_STATUS.STARTED && job.status === import_plugin_workflow.JOB_STATUS.PENDING) {
+          job.set(jobDone);
+          job.execution = execution;
+          this.workflow.resume(job);
+        } else {
+          processor.logger.warn(`request (#${node.id}) result discarded because execution (${execution.id}) is ended`);
         }
-      } else {
-        processor.logger.error(`request (#${node.id}) failed unexpectedly: ${error.message}`);
-      }
-      logFailureDebug(processor.logger, error);
-      jobDone.status = failureStatus(config, error);
-      jobDone.result = responseFailure(error);
-    } finally {
-      const job = await this.workflow.app.db.getRepository("jobs").findOne({
-        filterByTk: id
-      });
-      const execution = await job.getExecution();
-      if (!execution.status) {
-        job.set(jobDone);
-        job.execution = execution;
-        this.workflow.resume(job);
-      } else {
-        processor.logger.warn(`request (#${node.id}) result discarded because execution (${execution.id}) is ended`);
       }
-    }
+    };
+    settleRequest().catch((caught) => {
+      const error = toRequestError(caught);
+      processor.logger.error(`request (#${node.id}) async settling failed: ${error.message}`, { error });
+    });
   }
   async resume(node, job, processor) {
     const { ignoreFail } = node.config;

package/package.json

@@ -6,7 +6,7 @@
   "description": "Send HTTP requests to any HTTP service for data interaction in workflow.",
   "description.ru-RU": "Отправляет HTTP-запросы к любому HTTP-сервису для взаимодействия с данными в рабочем процессе.",
   "description.zh-CN": "可用于在工作流中向任意 HTTP 服务发送请求，进行数据交互。",
-  "version": "2.1.0-alpha.46",
+  "version": "2.1.0-alpha.47",
   "license": "Apache-2.0",
   "main": "./dist/server/index.js",
   "homepage": "https://docs.nocobase.com/handbook/workflow-request",
@@ -27,7 +27,7 @@
     "@nocobase/server": "2.x",
     "@nocobase/test": "2.x"
   },
-  "gitHead": "42b269944cdd1908d7a848c0af4936fe94c03bb7",
+  "gitHead": "66196b57f9043ea0ac6ebdafbc732bfb98af1396",
   "keywords": [
     "Workflow"
   ]