@nocobase/plugin-workflow-request 0.19.0-alpha.3 → 0.19.0-alpha.5

package/dist/externalVersion.js

@@ -1,8 +1,8 @@
 module.exports = {
   "@formily/antd-v5": "1.1.9",
-  "@nocobase/plugin-workflow": "0.19.0-alpha.3",
-  "@nocobase/client": "0.19.0-alpha.3",
+  "@nocobase/plugin-workflow": "0.19.0-alpha.5",
+  "@nocobase/client": "0.19.0-alpha.5",
   "react-i18next": "11.18.6",
-  "@nocobase/server": "0.19.0-alpha.3",
+  "@nocobase/server": "0.19.0-alpha.5",
   "axios": "0.26.1"
 };

package/dist/locale/ko_KR.json

@@ -0,0 +1,22 @@
+{
+  "HTTP request": "HTTP 요청",
+  "Send HTTP request to a URL. You can use the variables in the upstream nodes as request headers, parameters and request body.": 
+    "URL에 HTTP 요청을 보냅니다. 상류 노드의 변수를 요청 헤더, 매개변수 및 요청 본문으로 사용할 수 있습니다.",
+  "HTTP method": "HTTP 메서드",
+  "URL": "주소",
+  "Headers": "헤더",
+  "Add request header": "요청 헤더 추가",
+  "Parameters": "매개변수",
+  "Add parameter": "매개변수 추가",
+  "Body": "본문",
+  "Use variable": "변수 사용",
+  "Format": "형식",
+  "Insert": "삽입",
+  "Timeout config": "시간 초과 설정",
+  "ms": "밀리초",
+  "Input request data": "요청 데이터 입력",
+  "Only support standard JSON data": "표준 JSON 데이터만 지원합니다",
+  "\"Content-Type\" only support \"application/json\", and no need to specify": 
+    "\"Content-Type\" 헤더는 \"application/json\"만 지원하며 지정할 필요가 없습니다",
+  "Ignore failed request and continue workflow": "실패한 요청을 무시하고 워크플로를 계속합니다"
+}

package/dist/server/RequestInstruction.js

@@ -56,12 +56,29 @@ async function request(config) {
 }
 class RequestInstruction_default extends import_plugin_workflow.Instruction {
   async run(node, prevJob, processor) {
+    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);
+        return {
+          status: import_plugin_workflow.JOB_STATUS.RESOLVED,
+          result: response.data
+        };
+      } catch (error) {
+        return {
+          status: import_plugin_workflow.JOB_STATUS.FAILED,
+          result: error.isAxiosError ? error.toJSON() : error.message
+        };
+      }
+    }
     const job = await processor.saveJob({
       status: import_plugin_workflow.JOB_STATUS.PENDING,
       nodeId: node.id,
+      nodeKey: node.key,
       upstreamId: (prevJob == null ? void 0 : prevJob.id) ?? null
     });
-    const config = processor.getParsedValue(node.config, node.id);
     request(config).then((response) => {
       job.set({
         status: import_plugin_workflow.JOB_STATUS.RESOLVED,

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": "0.19.0-alpha.3",
+  "version": "0.19.0-alpha.5",
   "license": "AGPL-3.0",
   "main": "./dist/server/index.js",
   "devDependencies": {
@@ -19,5 +19,5 @@
     "@nocobase/server": "0.x",
     "@nocobase/test": "0.x"
   },
-  "gitHead": "3cee597df101a3f8f0f1e2a6f75fc2dddd02ac74"
+  "gitHead": "580eca25451ec731d17ddef285d0b8c52c48d501"
 }

package/src/locale/ko_KR.json

@@ -0,0 +1,22 @@
+{
+  "HTTP request": "HTTP 요청",
+  "Send HTTP request to a URL. You can use the variables in the upstream nodes as request headers, parameters and request body.": 
+    "URL에 HTTP 요청을 보냅니다. 상류 노드의 변수를 요청 헤더, 매개변수 및 요청 본문으로 사용할 수 있습니다.",
+  "HTTP method": "HTTP 메서드",
+  "URL": "주소",
+  "Headers": "헤더",
+  "Add request header": "요청 헤더 추가",
+  "Parameters": "매개변수",
+  "Add parameter": "매개변수 추가",
+  "Body": "본문",
+  "Use variable": "변수 사용",
+  "Format": "형식",
+  "Insert": "삽입",
+  "Timeout config": "시간 초과 설정",
+  "ms": "밀리초",
+  "Input request data": "요청 데이터 입력",
+  "Only support standard JSON data": "표준 JSON 데이터만 지원합니다",
+  "\"Content-Type\" only support \"application/json\", and no need to specify": 
+    "\"Content-Type\" 헤더는 \"application/json\"만 지원하며 지정할 필요가 없습니다",
+  "Ignore failed request and continue workflow": "실패한 요청을 무시하고 워크플로를 계속합니다"
+}

package/src/server/RequestInstruction.ts

@@ -41,14 +41,33 @@ async function request(config) {
 
 export default class extends Instruction {
   async run(node: FlowNodeModel, prevJob, processor: Processor) {
+    const config = processor.getParsedValue(node.config, node.id) as RequestConfig;
+
+    const { workflow } = processor.execution;
+    const sync = this.workflow.isWorkflowSync(workflow);
+
+    if (sync) {
+      try {
+        const response = await request(config);
+        return {
+          status: JOB_STATUS.RESOLVED,
+          result: response.data,
+        };
+      } catch (error) {
+        return {
+          status: JOB_STATUS.FAILED,
+          result: error.isAxiosError ? error.toJSON() : error.message,
+        };
+      }
+    }
+
     const job = await processor.saveJob({
       status: JOB_STATUS.PENDING,
       nodeId: node.id,
+      nodeKey: node.key,
       upstreamId: prevJob?.id ?? null,
     });
 
-    const config = processor.getParsedValue(node.config, node.id) as RequestConfig;
-
     // eslint-disable-next-line promise/catch-or-return
     request(config)
       .then((response) => {

package/src/server/__tests__/instruction.test.ts

@@ -6,7 +6,7 @@ import bodyParser from 'koa-bodyparser';
 import Database from '@nocobase/database';
 import { MockServer } from '@nocobase/test';
 
-import { EXECUTION_STATUS, JOB_STATUS } from '@nocobase/plugin-workflow';
+import PluginWorkflow, { Processor, EXECUTION_STATUS, JOB_STATUS } from '@nocobase/plugin-workflow';
 import { getApp, sleep } from '@nocobase/plugin-workflow-test';
 
 import { RequestConfig } from '../RequestInstruction';
@@ -349,4 +349,31 @@ describe('workflow > instructions > request', () => {
       server.close();
     });
   });
+
+  describe('sync request', () => {
+    it('sync trigger', async () => {
+      const syncFlow = await WorkflowModel.create({
+        type: 'syncTrigger',
+        enabled: true,
+      });
+      await syncFlow.createNode({
+        type: 'request',
+        config: {
+          url: api.URL_DATA,
+          method: 'GET',
+        } as RequestConfig,
+      });
+
+      const workflowPlugin = app.pm.get(PluginWorkflow) as PluginWorkflow;
+      const processor = (await workflowPlugin.trigger(syncFlow, { data: { title: 't1' } })) as Processor;
+
+      const [execution] = await syncFlow.getExecutions();
+      expect(processor.execution.id).toEqual(execution.id);
+      expect(processor.execution.status).toEqual(execution.status);
+      expect(execution.status).toEqual(EXECUTION_STATUS.RESOLVED);
+      const [job] = await execution.getJobs();
+      expect(job.status).toEqual(JOB_STATUS.RESOLVED);
+      expect(job.result).toEqual({ meta: {}, data: {} });
+    });
+  });
 });