@nocobase/plugin-workflow-request-interceptor 2.1.0-beta.10 → 2.1.0-beta.12

package/dist/externalVersion.js

@@ -8,13 +8,13 @@
  */
 
 module.exports = {
-  "@nocobase/client": "2.1.0-beta.10",
-  "@nocobase/plugin-workflow": "2.1.0-beta.10",
+  "@nocobase/client": "2.1.0-beta.12",
+  "@nocobase/plugin-workflow": "2.1.0-beta.12",
   "@formily/react": "2.3.7",
   "react": "18.2.0",
-  "@nocobase/flow-engine": "2.1.0-beta.10",
-  "@nocobase/server": "2.1.0-beta.10",
+  "@nocobase/flow-engine": "2.1.0-beta.12",
+  "@nocobase/server": "2.1.0-beta.12",
   "lodash": "4.17.21",
-  "@nocobase/plugin-error-handler": "2.1.0-beta.10",
-  "@nocobase/data-source-manager": "2.1.0-beta.10"
+  "@nocobase/plugin-error-handler": "2.1.0-beta.12",
+  "@nocobase/data-source-manager": "2.1.0-beta.12"
 };

package/dist/server/RequestInterceptionTrigger.js

@@ -101,10 +101,19 @@ class RequestInterceptionTrigger extends import_plugin_workflow.Trigger {
       }
       return aIndex - bIndex;
     });
-    for (const workflow of localWorkflows.concat(globalWorkflows)) {
-      if (!workflow.config.global && !triggerWorkflowsMap.has(workflow.key)) {
-        continue;
-      }
+    const syncWorkflows = localWorkflows.filter((workflow) => triggerWorkflowsMap.has(workflow.key)).concat(globalWorkflows);
+    for (const [index, workflow] of syncWorkflows.entries()) {
+      const syncLogMeta = {
+        workflowId: workflow.id,
+        workflowKey: workflow.key,
+        workflowTitle: workflow.title,
+        resourceName,
+        actionName,
+        currentSyncOrder: index + 1,
+        totalSyncWorkflows: syncWorkflows.length,
+        remainingSyncWorkflows: syncWorkflows.length - index - 1
+      };
+      context.logger.debug("[Workflow pre-action]: executing sync workflow", syncLogMeta);
       const processor = await this.workflow.trigger(
         workflow,
         {
@@ -119,25 +128,49 @@ class RequestInterceptionTrigger extends import_plugin_workflow.Trigger {
         { httpContext: context }
       );
       if (!processor) {
-        return context.throw(500);
+        context.logger.error(
+          "[Workflow pre-action]: sync workflow trigger failed before execution created",
+          syncLogMeta
+        );
+        return context.throw(500, "Workflow on your action failed, please contact the administrator");
       }
       const { lastSavedJob, nodesMap } = processor;
       const lastNode = nodesMap.get(lastSavedJob == null ? void 0 : lastSavedJob.nodeId);
       if (processor.execution.status === import_plugin_workflow.EXECUTION_STATUS.RESOLVED) {
         if ((lastNode == null ? void 0 : lastNode.type) === "end") {
+          context.logger.debug("[Workflow pre-action]: sync workflow ended request chain on end node", {
+            ...syncLogMeta,
+            ...(0, import_plugin_workflow.getWorkflowExecutionLogMeta)(workflow, processor)
+          });
           return;
         }
+        context.logger.debug("[Workflow pre-action]: sync workflow finished successfully", {
+          ...syncLogMeta,
+          ...(0, import_plugin_workflow.getWorkflowExecutionLogMeta)(workflow, processor)
+        });
         continue;
       }
       if (processor.execution.status < import_plugin_workflow.EXECUTION_STATUS.STARTED) {
         if ((lastNode == null ? void 0 : lastNode.type) !== "end") {
+          context.logger.error("[Workflow pre-action]: sync workflow failed", {
+            ...syncLogMeta,
+            ...(0, import_plugin_workflow.getWorkflowExecutionLogMeta)(workflow, processor)
+          });
           return context.throw(500, "Workflow on your action failed, please contact the administrator");
         }
+        context.logger.warn("[Workflow pre-action]: sync workflow intercepted request on end node", {
+          ...syncLogMeta,
+          ...(0, import_plugin_workflow.getWorkflowExecutionLogMeta)(workflow, processor)
+        });
         const err = new RequestInterceptionError("Request is intercepted by workflow");
         err.status = 400;
         err.messages = context.state.messages;
         return context.throw(err.status, err);
       }
+      context.logger.error("[Workflow pre-action]: sync workflow is still pending after trigger", {
+        ...syncLogMeta,
+        ...(0, import_plugin_workflow.getWorkflowExecutionLogMeta)(workflow, processor)
+      });
       return context.throw(500, "Workflow on your action hangs, please contact the administrator");
     }
     await next();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/plugin-workflow-request-interceptor",
-  "version": "2.1.0-beta.10",
+  "version": "2.1.0-beta.12",
   "displayName": "Workflow: Pre-action event",
   "displayName.zh-CN": "工作流：操作前事件",
   "description": "Triggered before the execution of a request initiated through an action button or API, such as before adding, updating, or deleting data. Suitable for data validation and logic judgment before action, and the request could be rejected by using the \"End process\" node.",
@@ -27,6 +27,6 @@
   "keywords": [
     "Workflow"
   ],
-  "gitHead": "f7e467710d4748f7089b779494b220025b39bc02",
+  "gitHead": "25cee9643f42f850afc4adc33c55a56850ac730d",
   "license": "Apache-2.0"
 }