@nocobase/plugin-workflow-request 2.1.0-beta.37 → 2.1.0-beta.38

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-beta.37",
-  "@nocobase/plugin-workflow": "2.1.0-beta.37",
+  "@nocobase/client": "2.1.0-beta.38",
+  "@nocobase/plugin-workflow": "2.1.0-beta.38",
   "react-i18next": "11.18.6",
-  "@nocobase/server": "2.1.0-beta.37",
+  "@nocobase/server": "2.1.0-beta.38",
   "axios": "1.7.7",
   "lodash": "4.18.1",
-  "@nocobase/plugin-file-manager": "2.1.0-beta.37",
-  "@nocobase/utils": "2.1.0-beta.37"
+  "@nocobase/plugin-file-manager": "2.1.0-beta.38",
+  "@nocobase/utils": "2.1.0-beta.38"
 };

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-26T00:46:22.707Z"}
+{"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-29T02:54:09.920Z"}

package/dist/server/RequestInstruction.d.ts

@@ -8,7 +8,7 @@
  */
 import Joi from 'joi';
 import { AxiosRequestConfig } from 'axios';
-import { Processor, Instruction, FlowNodeModel } from '@nocobase/plugin-workflow';
+import { Processor, Instruction, FlowNodeModel, JobModel } from '@nocobase/plugin-workflow';
 export interface Header {
     name: string;
     value: string;
@@ -21,19 +21,21 @@ export type RequestInstructionConfig = Pick<AxiosRequestConfig, 'url' | 'method'
 };
 export default class extends Instruction {
     configSchema: Joi.ObjectSchema<any>;
-    run(node: FlowNodeModel, prevJob: any, processor: Processor): Promise<{
+    run(node: FlowNodeModel, prevJob: JobModel, processor: Processor, options?: {
+        signal?: AbortSignal;
+    }): Promise<{
         status: 1;
         result: any;
     } | {
-        status: 1 | -1;
+        status: 1 | -3 | -1;
         result: Record<string, any>;
     }>;
-    resume(node: FlowNodeModel, job: any, processor: Processor): Promise<any>;
+    resume(node: FlowNodeModel, job: JobModel, processor: Processor): Promise<JobModel>;
     test(config: RequestInstructionConfig): Promise<{
         status: 1;
         result: any;
     } | {
-        status: 1 | -1;
+        status: 1 | -3 | -1;
         result: Record<string, any>;
     }>;
 }

package/dist/server/RequestInstruction.js

@@ -95,6 +95,9 @@ function createInvalidUrlError(cause) {
   return error;
 }
 function validateUrl(url) {
+  if (!url) {
+    throw createInvalidUrlError();
+  }
   try {
     const parsed = new URL(url);
     if (parsed.protocol !== "http:" && parsed.protocol !== "https:") {
@@ -104,7 +107,7 @@ function validateUrl(url) {
     throw createInvalidUrlError(error);
   }
 }
-async function request(config, app) {
+async function request(config, app, signal) {
   const { url, method = "POST", contentType = "application/json", data, timeout = 5e3 } = config;
   validateUrl(url);
   const headers = (config.headers ?? []).reduce((result, header) => {
@@ -128,6 +131,7 @@ async function request(config, app) {
     headers,
     params,
     timeout,
+    signal,
     ...method.toLowerCase() !== "get" && data != null ? {
       data: transformer ? await transformer(data) : data
     } : {}
@@ -157,6 +161,12 @@ function responseFailure(error) {
   }
   return result;
 }
+function failureStatus(config, error) {
+  if (config.ignoreFail) {
+    return import_plugin_workflow.JOB_STATUS.RESOLVED;
+  }
+  return (error == null ? void 0 : error.code) === "ECONNABORTED" ? import_plugin_workflow.JOB_STATUS.ABORTED : import_plugin_workflow.JOB_STATUS.FAILED;
+}
 const METHODS = ["GET", "POST", "PUT", "PATCH", "DELETE"];
 const CONTENT_TYPES = [
   "application/json",
@@ -201,13 +211,13 @@ class RequestInstruction_default extends import_plugin_workflow.Instruction {
     ignoreFail: import_joi.default.boolean().default(false),
     onlyData: import_joi.default.boolean().default(false)
   });
-  async run(node, prevJob, processor) {
+  async run(node, prevJob, processor, options) {
     const config = processor.getParsedValue(node.config, node.id);
     const { workflow } = processor.execution;
     const sync = this.workflow.isWorkflowSync(workflow);
     if (sync) {
       try {
-        const response = await request(config, this.workflow.app);
+        const response = await request(config, this.workflow.app, options == null ? void 0 : options.signal);
         return {
           status: import_plugin_workflow.JOB_STATUS.RESOLVED,
           result: responseSuccess(response, config.onlyData)
@@ -215,7 +225,7 @@ class RequestInstruction_default extends import_plugin_workflow.Instruction {
       } catch (error) {
         logFailureDebug(this.workflow.app.logger, error);
         return {
-          status: config.ignoreFail ? import_plugin_workflow.JOB_STATUS.RESOLVED : import_plugin_workflow.JOB_STATUS.FAILED,
+          status: failureStatus(config, error),
           result: responseFailure(error)
         };
       }
@@ -230,7 +240,7 @@ class RequestInstruction_default extends import_plugin_workflow.Instruction {
     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);
+      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);
@@ -247,14 +257,20 @@ class RequestInstruction_default extends import_plugin_workflow.Instruction {
         processor.logger.error(`request (#${node.id}) failed unexpectedly: ${error.message}`);
       }
       logFailureDebug(processor.logger, error);
-      jobDone.status = config.ignoreFail ? import_plugin_workflow.JOB_STATUS.RESOLVED : import_plugin_workflow.JOB_STATUS.FAILED;
+      jobDone.status = failureStatus(config, error);
       jobDone.result = responseFailure(error);
     } finally {
       const job = await this.workflow.app.db.getRepository("jobs").findOne({
         filterByTk: id
       });
-      job.set(jobDone);
-      this.workflow.resume(job);
+      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`);
+      }
     }
   }
   async resume(node, job, processor) {
@@ -274,7 +290,7 @@ class RequestInstruction_default extends import_plugin_workflow.Instruction {
     } catch (error) {
       logFailureDebug(this.workflow.app.logger, error);
       return {
-        status: config.ignoreFail ? import_plugin_workflow.JOB_STATUS.RESOLVED : import_plugin_workflow.JOB_STATUS.FAILED,
+        status: failureStatus(config, error),
         result: responseFailure(error)
       };
     }

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-beta.37",
+  "version": "2.1.0-beta.38",
   "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": "7132e5b83ecc0e42b54715eaf1429c72bcef34ae",
+  "gitHead": "d1c585108ff6e51c17b0b52bacb1a2d621d9c119",
   "keywords": [
     "Workflow"
   ]