@nocobase/plugin-workflow-request 1.9.0-beta.5 → 1.9.0-beta.7

package/dist/externalVersion.js

@@ -14,11 +14,11 @@ module.exports = {
   "@formily/react": "2.3.0",
   "@formily/antd-v5": "1.2.3",
   "@ant-design/icons": "5.6.1",
-  "@nocobase/client": "1.9.0-beta.5",
-  "@nocobase/plugin-workflow": "1.9.0-beta.5",
+  "@nocobase/client": "1.9.0-beta.7",
+  "@nocobase/plugin-workflow": "1.9.0-beta.7",
   "react-i18next": "11.18.6",
-  "@nocobase/server": "1.9.0-beta.5",
+  "@nocobase/server": "1.9.0-beta.7",
   "axios": "1.7.7",
   "lodash": "4.17.21",
-  "@nocobase/plugin-file-manager": "1.9.0-beta.5"
+  "@nocobase/plugin-file-manager": "1.9.0-beta.7"
 };

package/dist/server/RequestInstruction.js

@@ -161,43 +161,41 @@ class RequestInstruction_default extends import_plugin_workflow.Instruction {
         };
       }
     }
-    const job = processor.saveJob({
+    const { id } = processor.saveJob({
       status: import_plugin_workflow.JOB_STATUS.PENDING,
       nodeId: node.id,
       nodeKey: node.key,
       upstreamId: (prevJob == null ? void 0 : prevJob.id) ?? null
     });
-    request(config, this.workflow.app).then((response) => {
+    await processor.exit();
+    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);
       processor.logger.info(`request (#${node.id}) response success, status: ${response.status}`);
-      job.set({
-        status: import_plugin_workflow.JOB_STATUS.RESOLVED,
-        result: responseSuccess(response, config.onlyData)
-      });
-    }).catch((error) => {
+      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 resposne: ${error.message}`);
+          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}) failed unexpectedly: ${error.message}`);
       }
-      job.set({
-        status: import_plugin_workflow.JOB_STATUS.FAILED,
-        result: responseFailure(error)
-      });
-    }).finally(() => {
-      processor.logger.debug(`request (#${node.id}) ended, resume workflow...`);
-      setTimeout(() => {
-        job.execution = processor.execution;
-        this.workflow.resume(job);
+      jobDone.status = config.ignoreFail ? import_plugin_workflow.JOB_STATUS.RESOLVED : import_plugin_workflow.JOB_STATUS.FAILED;
+      jobDone.result = responseFailure(error);
+    } finally {
+      const job = await this.workflow.app.db.getRepository("jobs").findOne({
+        filterByTk: id
       });
-    });
-    processor.logger.info(`request (#${node.id}) sent to "${config.url}", waiting for response...`);
-    return null;
+      job.set(jobDone);
+      this.workflow.resume(job);
+    }
   }
   async resume(node, job, processor) {
     const { ignoreFail } = node.config;

package/package.json

@@ -4,7 +4,7 @@
   "displayName.zh-CN": "工作流：HTTP 请求节点",
   "description": "Send HTTP requests to any HTTP service for data interaction in workflow.",
   "description.zh-CN": "可用于在工作流中向任意 HTTP 服务发送请求，进行数据交互。",
-  "version": "1.9.0-beta.5",
+  "version": "1.9.0-beta.7",
   "license": "AGPL-3.0",
   "main": "./dist/server/index.js",
   "homepage": "https://docs.nocobase.com/handbook/workflow-request",
@@ -23,7 +23,7 @@
     "@nocobase/server": "1.x",
     "@nocobase/test": "1.x"
   },
-  "gitHead": "9a61c60dd3db5af64244e82447309b0cb17aabb6",
+  "gitHead": "4a5055c973b51611d5db1604aaaf6c1b73b4733c",
   "keywords": [
     "Workflow"
   ]