@ldsg/workflow 0.3.10 → 0.3.17

package/dist/resource.js

@@ -6,8 +6,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.WorkflowResource = void 0;
 const resource_1 = require("@ldsg/resource");
 const lodash_1 = __importDefault(require("lodash"));
-const evaluate_variables_1 = require("./utils/evaluate-variables");
-const get_execution_levels_1 = require("./utils/get-execution-levels");
+const execute_workflow_1 = require("./utils/execute-workflow");
 class WorkflowResource extends resource_1.Resource {
     constructor() {
         super(...arguments);
@@ -57,80 +56,21 @@ class WorkflowResource extends resource_1.Resource {
             return res;
         };
         this.execute = async (params) => {
-            const { context, presetWorkflowVariables = {}, variables: workflowInputVariables } = params;
+            const { context, presetWorkflowVariables, variables, traceContext } = params;
             const { getWorkflowData, settings: { startWorkflowNodeResourceId, endWorkflowNodeResourceId } } = this;
-            const workflowVariablesMap = new Map(Object.entries(presetWorkflowVariables));
             const { workflowData } = getWorkflowData();
-            const { nodes } = workflowData;
-            const startNode = nodes.find((value) => value.id === startWorkflowNodeResourceId);
-            const endNode = nodes.find((value) => value.id === endWorkflowNodeResourceId);
-            if (!startNode || !endNode) {
-                throw new Error('invalid workflow nodes');
-            }
-            const { executionLevels } = (0, get_execution_levels_1.getExecutionLevels)({
+            const { nodes, edges } = workflowData;
+            return (0, execute_workflow_1.executeWorkflow)({
+                context,
+                endWorkflowNodeResourceId,
+                nodes,
+                edges,
+                presetWorkflowVariables,
+                startWorkflowNodeResourceId,
+                variables,
                 workflowData,
-                startNode,
-                endNode
+                traceContext
             });
-            if (executionLevels.length < 1) {
-                throw new Error('invalid workflow execution levels');
-            }
-            let workflowOutputVariables;
-            // 按层级执行，同一层级的节点可以并行执行
-            for (let levelIndex = 0; levelIndex < executionLevels.length; levelIndex++) {
-                const currentLevel = executionLevels[levelIndex];
-                // 并行执行当前层级的所有节点
-                const levelPromises = currentLevel.map(async (node) => {
-                    const { id, propertiesSchema, execute: nodeExecute } = node;
-                    const workflowVariables = Object.fromEntries(workflowVariablesMap);
-                    // 输入变量从工作流变量中使用表达式获取
-                    const workflowNodePropertiesInputSchema = lodash_1.default.get(propertiesSchema, 'properties.input');
-                    const workflowNodePropertiesOutputSchema = lodash_1.default.get(propertiesSchema, 'properties.output');
-                    if (!lodash_1.default.isObject(workflowNodePropertiesInputSchema) ||
-                        !lodash_1.default.isObject(workflowNodePropertiesOutputSchema)) {
-                        throw new Error('invalid workflow node properties schema');
-                    }
-                    /**
-                     * 对于开始节点，不忽略 input 表达式，但替换工作流内部变量为工作流输入变量。
-                     */
-                    const workflowNodeInputExpressionEvaluateInput = levelIndex === 0 ? workflowInputVariables : workflowVariables;
-                    const { variables: workflowNodeInputVariables } = await (0, evaluate_variables_1.evaluateVariables)({
-                        jsonSchema: workflowNodePropertiesInputSchema,
-                        variables: workflowNodeInputExpressionEvaluateInput
-                    });
-                    const { variables: workflowNodeOutputExpressionEvaluateInput } = await nodeExecute({
-                        context,
-                        variables: workflowNodeInputVariables
-                    });
-                    /**
-                     * 输出变量从结果中使用表达式获取
-                     * 对于结束节点，不忽略 output 表达式，但表达式固定为取返回变量。
-                     */
-                    const { variables: workflowNodeOutputVariables } = await (0, evaluate_variables_1.evaluateVariables)({
-                        jsonSchema: workflowNodePropertiesOutputSchema,
-                        variables: workflowNodeOutputExpressionEvaluateInput
-                    });
-                    const res = {
-                        nodeId: id,
-                        variables: workflowNodeOutputVariables
-                    };
-                    return res;
-                });
-                // 等待当前层级的所有节点执行完成
-                const levelResults = await Promise.all(levelPromises);
-                // 将当前层级的结果更新到工作流变量映射中
-                levelResults.forEach((result) => {
-                    workflowVariablesMap.set(result.nodeId, result.variables);
-                    // 如果是结束节点，保存输出变量
-                    if (result.nodeId === endNode.id) {
-                        workflowOutputVariables = result.variables;
-                    }
-                });
-            }
-            const res = {
-                variables: workflowOutputVariables
-            };
-            return res;
         };
         this.getWorkflowInfo = () => {
             const { execute } = this;

package/dist/types/json_schema_with_expression_extension.d.ts

@@ -9,6 +9,7 @@ export interface JSONSchemaWithExpressionExtension extends Omit<JSONSchema7, 'ty
         [key: string]: JSONSchemaWithExpressionExtension;
     };
     items?: JSONSchemaWithExpressionExtension;
+    prefixItems?: JSONSchemaWithExpressionExtension[];
     'x-expression'?: string;
     'x-expression-const'?: string;
     'x-expression-default'?: string;

package/dist/types/json_schema_with_expression_extension.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"json_schema_with_expression_extension.d.ts","sourceRoot":"","sources":["../../src/types/json_schema_with_expression_extension.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,mBAAmB,EAAE,MAAM,aAAa,CAAC;AAE/D,MAAM,MAAM,qCAAqC,GAAG,mBAAmB,GAAG,KAAK,CAAC;AAEhF;;GAEG;AACH,MAAM,WAAW,iCACf,SAAQ,IAAI,CAAC,WAAW,EAAE,MAAM,GAAG,OAAO,GAAG,YAAY,CAAC;IAC1D,IAAI,CAAC,EAAE,qCAAqC,CAAC;IAE7C,UAAU,CAAC,EAAE;QACX,CAAC,GAAG,EAAE,MAAM,GAAG,iCAAiC,CAAC;KAClD,CAAC;IAEF,KAAK,CAAC,EAAE,iCAAiC,CAAC;IAE1C,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,oBAAoB,CAAC,EAAE,MAAM,CAAC;IAC9B,sBAAsB,CAAC,EAAE,MAAM,CAAC;CACjC"}
+{"version":3,"file":"json_schema_with_expression_extension.d.ts","sourceRoot":"","sources":["../../src/types/json_schema_with_expression_extension.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,mBAAmB,EAAE,MAAM,aAAa,CAAC;AAE/D,MAAM,MAAM,qCAAqC,GAAG,mBAAmB,GAAG,KAAK,CAAC;AAEhF;;GAEG;AACH,MAAM,WAAW,iCACf,SAAQ,IAAI,CAAC,WAAW,EAAE,MAAM,GAAG,OAAO,GAAG,YAAY,CAAC;IAC1D,IAAI,CAAC,EAAE,qCAAqC,CAAC;IAE7C,UAAU,CAAC,EAAE;QACX,CAAC,GAAG,EAAE,MAAM,GAAG,iCAAiC,CAAC;KAClD,CAAC;IAEF,KAAK,CAAC,EAAE,iCAAiC,CAAC;IAE1C,WAAW,CAAC,EAAE,iCAAiC,EAAE,CAAC;IAElD,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,oBAAoB,CAAC,EAAE,MAAM,CAAC;IAC9B,sBAAsB,CAAC,EAAE,MAAM,CAAC;CACjC"}

package/dist/types/node.d.ts

@@ -17,6 +17,10 @@ export interface WorkflowNodeExecuteRes<Variables = any> {
      * 由工作流节点向工作流内输入
      */
     variables: Variables;
+    /**
+     * （输出）端口 ID
+     */
+    portId?: string;
 }
 /**
  * 工作流执行方法

package/dist/types/node.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"node.d.ts","sourceRoot":"","sources":["../../src/types/node.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iCAAiC,EAAE,MAAM,yCAAyC,CAAC;AAE5F,MAAM,MAAM,2BAA2B,GAAG,MAAM,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;AAErE,MAAM,WAAW,yBAAyB,CAAC,SAAS,GAAG,GAAG,EAAE,OAAO,GAAG,GAAG;IACvE;;OAEG;IACH,OAAO,EAAE,OAAO,CAAC;IAEjB;;;OAGG;IACH,SAAS,EAAE,SAAS,CAAC;CACtB;AAED,MAAM,WAAW,sBAAsB,CAAC,SAAS,GAAG,GAAG;IACrD;;;OAGG;IACH,SAAS,EAAE,SAAS,CAAC;CACtB;AAED;;;GAGG;AACH,MAAM,MAAM,mBAAmB,CAAC,SAAS,GAAG,GAAG,EAAE,OAAO,GAAG,GAAG,IAAI,CAChE,MAAM,EAAE,yBAAyB,CAAC,SAAS,EAAE,OAAO,CAAC,KAClD,OAAO,CAAC,sBAAsB,CAAC,SAAS,CAAC,CAAC,CAAC;AAEhD,MAAM,WAAW,gBAAgB;IAC/B;;OAEG;IACH,EAAE,EAAE,MAAM,CAAC;IAEX;;;OAGG;IACH,gBAAgB,EAAE,iCAAiC,CAAC;IAEpD;;;OAGG;IACH,OAAO,EAAE,mBAAmB,CAAC;CAC9B;AAED,MAAM,WAAW,sBAAsB;IACrC;;OAEG;IACH,gBAAgB,EAAE,gBAAgB,CAAC;CACpC;AAED,MAAM,MAAM,mBAAmB,GAAG,MAAM,sBAAsB,CAAC"}
+{"version":3,"file":"node.d.ts","sourceRoot":"","sources":["../../src/types/node.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iCAAiC,EAAE,MAAM,yCAAyC,CAAC;AAE5F,MAAM,MAAM,2BAA2B,GAAG,MAAM,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;AAErE,MAAM,WAAW,yBAAyB,CAAC,SAAS,GAAG,GAAG,EAAE,OAAO,GAAG,GAAG;IACvE;;OAEG;IACH,OAAO,EAAE,OAAO,CAAC;IAEjB;;;OAGG;IACH,SAAS,EAAE,SAAS,CAAC;CACtB;AAED,MAAM,WAAW,sBAAsB,CAAC,SAAS,GAAG,GAAG;IACrD;;;OAGG;IACH,SAAS,EAAE,SAAS,CAAC;IAErB;;OAEG;IACH,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB;AAED;;;GAGG;AACH,MAAM,MAAM,mBAAmB,CAAC,SAAS,GAAG,GAAG,EAAE,OAAO,GAAG,GAAG,IAAI,CAChE,MAAM,EAAE,yBAAyB,CAAC,SAAS,EAAE,OAAO,CAAC,KAClD,OAAO,CAAC,sBAAsB,CAAC,SAAS,CAAC,CAAC,CAAC;AAEhD,MAAM,WAAW,gBAAgB;IAC/B;;OAEG;IACH,EAAE,EAAE,MAAM,CAAC;IAEX;;;OAGG;IACH,gBAAgB,EAAE,iCAAiC,CAAC;IAEpD;;;OAGG;IACH,OAAO,EAAE,mBAAmB,CAAC;CAC9B;AAED,MAAM,WAAW,sBAAsB;IACrC;;OAEG;IACH,gBAAgB,EAAE,gBAAgB,CAAC;CACpC;AAED,MAAM,MAAM,mBAAmB,GAAG,MAAM,sBAAsB,CAAC"}

package/dist/types/workflow.d.ts

@@ -18,6 +18,11 @@ export interface WorkflowExecuteParams {
      * 预设工作流变量
      */
     presetWorkflowVariables?: Record<string, WorkflowVariables>;
+    /**
+     * OpenTelemetry 追踪上下文
+     * 用于将工作流执行与请求 trace 关联
+     */
+    traceContext?: any;
 }
 export interface WorkflowExecuteRes {
     /**

package/dist/types/workflow.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"workflow.d.ts","sourceRoot":"","sources":["../../src/types/workflow.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,QAAQ,CAAC;AAC1C,OAAO,EAAE,gBAAgB,EAAE,MAAM,QAAQ,CAAC;AAC1C,OAAO,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAC;AAEhD,MAAM,WAAW,YAAY;IAC3B,KAAK,EAAE,gBAAgB,EAAE,CAAC;IAC1B,KAAK,EAAE,gBAAgB,EAAE,CAAC;CAC3B;AAED,MAAM,WAAW,qBAAqB;IACpC;;OAEG;IACH,OAAO,EAAE,GAAG,CAAC;IAEb;;OAEG;IACH,SAAS,EAAE,iBAAiB,CAAC;IAE7B;;OAEG;IACH,uBAAuB,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,iBAAiB,CAAC,CAAC;CAC7D;AAED,MAAM,WAAW,kBAAkB;IACjC;;OAEG;IACH,SAAS,EAAE,iBAAiB,CAAC;CAC9B;AAED;;;GAGG;AACH,MAAM,MAAM,eAAe,GAAG,CAAC,MAAM,EAAE,qBAAqB,KAAK,OAAO,CAAC,kBAAkB,CAAC,CAAC;AAE7F,MAAM,WAAW,YAAY;IAC3B,OAAO,EAAE,eAAe,CAAC;CAC1B"}
+{"version":3,"file":"workflow.d.ts","sourceRoot":"","sources":["../../src/types/workflow.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,QAAQ,CAAC;AAC1C,OAAO,EAAE,gBAAgB,EAAE,MAAM,QAAQ,CAAC;AAC1C,OAAO,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAC;AAEhD,MAAM,WAAW,YAAY;IAC3B,KAAK,EAAE,gBAAgB,EAAE,CAAC;IAC1B,KAAK,EAAE,gBAAgB,EAAE,CAAC;CAC3B;AAED,MAAM,WAAW,qBAAqB;IACpC;;OAEG;IACH,OAAO,EAAE,GAAG,CAAC;IAEb;;OAEG;IACH,SAAS,EAAE,iBAAiB,CAAC;IAE7B;;OAEG;IACH,uBAAuB,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,iBAAiB,CAAC,CAAC;IAE5D;;;OAGG;IACH,YAAY,CAAC,EAAE,GAAG,CAAC;CACpB;AAED,MAAM,WAAW,kBAAkB;IACjC;;OAEG;IACH,SAAS,EAAE,iBAAiB,CAAC;CAC9B;AAED;;;GAGG;AACH,MAAM,MAAM,eAAe,GAAG,CAAC,MAAM,EAAE,qBAAqB,KAAK,OAAO,CAAC,kBAAkB,CAAC,CAAC;AAE7F,MAAM,WAAW,YAAY;IAC3B,OAAO,EAAE,eAAe,CAAC;CAC1B"}

package/dist/utils/evaluate-variables/utils/get-data-with-json-schema-and-input/resolve-json-schema.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"resolve-json-schema.d.ts","sourceRoot":"","sources":["../../../../../src/utils/evaluate-variables/utils/get-data-with-json-schema-and-input/resolve-json-schema.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,iCAAiC,EAAE,MAAM,mBAAmB,CAAC;AAEtE,UAAU,uBAAuB;IAC/B;;OAEG;IACH,KAAK,EAAE,GAAG,CAAC;IAEX;;OAEG;IACH,UAAU,EAAE,iCAAiC,CAAC;IAE9C;;OAEG;IACH,MAAM,CAAC,EAAE,GAAG,CAAC;CACd;AAED,UAAU,oBAAoB;IAC5B;;OAEG;IACH,IAAI,CAAC,EAAE,GAAG,CAAC;CACZ;AAED,KAAK,iBAAiB,GAAG,CAAC,MAAM,EAAE,uBAAuB,KAAK,OAAO,CAAC,oBAAoB,CAAC,CAAC;AAE5F,eAAO,MAAM,iBAAiB,EAAE,iBAkF/B,CAAC"}
+{"version":3,"file":"resolve-json-schema.d.ts","sourceRoot":"","sources":["../../../../../src/utils/evaluate-variables/utils/get-data-with-json-schema-and-input/resolve-json-schema.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,iCAAiC,EAAE,MAAM,mBAAmB,CAAC;AAEtE,UAAU,uBAAuB;IAC/B;;OAEG;IACH,KAAK,EAAE,GAAG,CAAC;IAEX;;OAEG;IACH,UAAU,EAAE,iCAAiC,CAAC;IAE9C;;OAEG;IACH,MAAM,CAAC,EAAE,GAAG,CAAC;CACd;AAED,UAAU,oBAAoB;IAC5B;;OAEG;IACH,IAAI,CAAC,EAAE,GAAG,CAAC;CACZ;AAED,KAAK,iBAAiB,GAAG,CAAC,MAAM,EAAE,uBAAuB,KAAK,OAAO,CAAC,oBAAoB,CAAC,CAAC;AAE5F,eAAO,MAAM,iBAAiB,EAAE,iBAiH/B,CAAC"}

package/dist/utils/evaluate-variables/utils/get-data-with-json-schema-and-input/resolve-json-schema.js

@@ -9,7 +9,7 @@ const lodash_1 = __importDefault(require("lodash"));
 const resolveJsonSchema = async (params) => {
     var _a;
     const { input, jsonSchema, source } = params;
-    const { type: jsonSchemaType, 'x-expression': jsonSchemaExpression, const: jsonSchemaConst } = jsonSchema;
+    const { type: jsonSchemaType, 'x-expression': jsonSchemaExpression, const: jsonSchemaConst, prefixItems: jsonSchemaPrefixItems } = jsonSchema;
     let data;
     /**
      * 若常量值存在，则直接返回
@@ -51,7 +51,30 @@ const resolveJsonSchema = async (params) => {
                 break;
             }
             case 'array': {
-                throw new Error('unsupported array type');
+                /**
+                 * 如果 prefixItems 存在，则转为数组结果
+                 */
+                if (jsonSchemaPrefixItems) {
+                    if (jsonSchemaPrefixItems.length > 0) {
+                        const itemsDataPromises = jsonSchemaPrefixItems.map(async (prefixItem) => {
+                            const resolveJsonSchemaRes = await (0, exports.resolveJsonSchema)({
+                                jsonSchema: prefixItem,
+                                input,
+                                source
+                            });
+                            return resolveJsonSchemaRes.data;
+                        });
+                        const itemsData = await Promise.all(itemsDataPromises);
+                        data = itemsData;
+                    }
+                    else {
+                        /**
+                         * 空数组时，初始化为空数组
+                         */
+                        data = [];
+                    }
+                }
+                break;
             }
             case 'boolean':
             case 'integer':

package/dist/utils/execute-workflow.d.ts

@@ -0,0 +1,22 @@
+import { WorkflowData, WorkflowExecuteRes, WorkflowNodeInfo, WorkflowVariables } from '../types';
+export interface ExecuteWorkflowParams {
+    context: any;
+    endWorkflowNodeResourceId: string;
+    nodes: WorkflowNodeInfo[];
+    edges: WorkflowData['edges'];
+    presetWorkflowVariables?: Record<string, WorkflowVariables>;
+    startWorkflowNodeResourceId: string;
+    variables: any;
+    workflowData: WorkflowData;
+    traceContext?: any;
+}
+export interface NodeExecutionResult {
+    nodeId: string;
+    variables: any;
+    portId?: string;
+}
+/**
+ * 执行工作流
+ */
+export declare function executeWorkflow(params: ExecuteWorkflowParams): Promise<WorkflowExecuteRes>;
+//# sourceMappingURL=execute-workflow.d.ts.map

package/dist/utils/execute-workflow.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"execute-workflow.d.ts","sourceRoot":"","sources":["../../src/utils/execute-workflow.ts"],"names":[],"mappings":"AAEA,OAAO,EACL,YAAY,EACZ,kBAAkB,EAClB,gBAAgB,EAChB,iBAAiB,EAElB,MAAM,UAAU,CAAC;AAqBlB,MAAM,WAAW,qBAAqB;IACpC,OAAO,EAAE,GAAG,CAAC;IACb,yBAAyB,EAAE,MAAM,CAAC;IAClC,KAAK,EAAE,gBAAgB,EAAE,CAAC;IAC1B,KAAK,EAAE,YAAY,CAAC,OAAO,CAAC,CAAC;IAC7B,uBAAuB,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,iBAAiB,CAAC,CAAC;IAC5D,2BAA2B,EAAE,MAAM,CAAC;IACpC,SAAS,EAAE,GAAG,CAAC;IACf,YAAY,EAAE,YAAY,CAAC;IAC3B,YAAY,CAAC,EAAE,GAAG,CAAC;CACpB;AAED,MAAM,WAAW,mBAAmB;IAClC,MAAM,EAAE,MAAM,CAAC;IACf,SAAS,EAAE,GAAG,CAAC;IACf,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB;AAgKD;;GAEG;AACH,wBAAsB,eAAe,CAAC,MAAM,EAAE,qBAAqB,GAAG,OAAO,CAAC,kBAAkB,CAAC,CAsHhG"}

package/dist/utils/execute-workflow.js

@@ -0,0 +1,212 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.executeWorkflow = executeWorkflow;
+const api_1 = __importDefault(require("@opentelemetry/api"));
+const lodash_1 = __importDefault(require("lodash"));
+const evaluate_variables_1 = require("./evaluate-variables");
+const tracer = api_1.default.trace.getTracer('workspace');
+/**
+ * 安全的 JSON 序列化，处理循环引用
+ */
+function safeStringify(obj) {
+    const seen = new WeakSet();
+    return JSON.stringify(obj, (key, value) => {
+        if (typeof value === 'object' && value !== null) {
+            if (seen.has(value)) {
+                return '[Circular Reference]';
+            }
+            seen.add(value);
+        }
+        return value;
+    });
+}
+/**
+ * 执行单个工作流节点
+ */
+async function executeNode(node, context, workflowVariablesMap, isFirstLevel, workflowInputVariables) {
+    const { id, propertiesSchema, execute: nodeExecute } = node;
+    const workflowVariables = Object.fromEntries(workflowVariablesMap);
+    // 输入变量从工作流变量中使用表达式获取
+    const workflowNodePropertiesInputSchema = lodash_1.default.get(propertiesSchema, 'properties.input');
+    const workflowNodePropertiesOutputSchema = lodash_1.default.get(propertiesSchema, 'properties.output');
+    /**
+     * 对于开始节点，不忽略 input 表达式，但替换工作流内部变量为工作流输入变量。
+     */
+    const workflowNodeInputExpressionEvaluateInput = isFirstLevel ? workflowInputVariables : workflowVariables;
+    let workflowNodeInputVariables = {};
+    if (workflowNodePropertiesInputSchema) {
+        const { variables } = await (0, evaluate_variables_1.evaluateVariables)({
+            jsonSchema: workflowNodePropertiesInputSchema,
+            variables: workflowNodeInputExpressionEvaluateInput
+        });
+        workflowNodeInputVariables = variables;
+    }
+    const { variables: workflowNodeOutputExpressionEvaluateInput, portId } = await nodeExecute({
+        context,
+        variables: workflowNodeInputVariables
+    });
+    /**
+     * 输出变量从结果中使用表达式获取
+     * 对于结束节点，不忽略 output 表达式，但表达式固定为取返回变量。
+     */
+    let workflowNodeOutputVariables = {};
+    if (workflowNodePropertiesOutputSchema) {
+        const { variables } = await (0, evaluate_variables_1.evaluateVariables)({
+            jsonSchema: workflowNodePropertiesOutputSchema,
+            variables: workflowNodeOutputExpressionEvaluateInput
+        });
+        workflowNodeOutputVariables = variables;
+    }
+    return {
+        nodeId: id,
+        variables: workflowNodeOutputVariables,
+        portId
+    };
+}
+/**
+ * 查找下一个需要执行的节点集合
+ */
+function findNextNodeIds(levelResults, edges, visitedNodes, completedNodePredecessors, activatedEdges, endNodeId) {
+    const nextNodeIds = [];
+    const nextLevelNodesSet = new Set();
+    let workflowOutputVariables;
+    levelResults.forEach((result) => {
+        if (!result) {
+            return;
+        }
+        const { nodeId, variables, portId } = result;
+        // 标记节点为已访问
+        visitedNodes.add(nodeId);
+        // 保存变量
+        // workflowVariablesMap.set(nodeId, variables);
+        // 如果是结束节点，保存输出变量
+        if (nodeId === endNodeId) {
+            workflowOutputVariables = variables;
+        }
+        // 查找从当前节点出发的连线
+        const outgoingEdges = edges.filter((edge) => edge.sourceWorkflowNodeResourceId === nodeId);
+        // 根据 portId 过滤连线
+        const matchedEdges = portId
+            ? outgoingEdges.filter((edge) => edge.sourceWorkflowNodePortId === portId)
+            : outgoingEdges.filter((edge) => !edge.sourceWorkflowNodePortId);
+        // 处理匹配的连线的目标节点
+        matchedEdges.forEach((edge) => {
+            const targetNodeId = edge.targetWorkflowNodeResourceId;
+            // 如果目标节点已访问，跳过
+            if (visitedNodes.has(targetNodeId)) {
+                return;
+            }
+            // 记录该目标节点已完成的前驱节点
+            if (!completedNodePredecessors.has(targetNodeId)) {
+                completedNodePredecessors.set(targetNodeId, new Set());
+            }
+            completedNodePredecessors.get(targetNodeId).add(nodeId);
+            // 记录激活的边（源节点 -> 目标节点）
+            if (!activatedEdges.has(targetNodeId)) {
+                activatedEdges.set(targetNodeId, new Set());
+            }
+            activatedEdges.get(targetNodeId).add(nodeId);
+            // 查找目标节点的所有可能的入边（用于计算需要等待多少个前驱节点）
+            const incomingEdges = edges.filter((edge) => edge.targetWorkflowNodeResourceId === targetNodeId);
+            // 计算实际需要等待的前驱节点数量
+            // 对于每个前驱节点，检查是否有至少一条激活的入边
+            const allPredecessorIds = new Set(incomingEdges.map((edge) => edge.sourceWorkflowNodeResourceId));
+            let requiredPredecessorCount = 0;
+            allPredecessorIds.forEach((predecessorId) => {
+                // 检查该前驱节点是否有激活的入边指向当前节点
+                const hasActivatedEdge = incomingEdges.some((e) => {
+                    var _a;
+                    return e.sourceWorkflowNodeResourceId === predecessorId &&
+                        ((_a = activatedEdges.get(targetNodeId)) === null || _a === void 0 ? void 0 : _a.has(predecessorId));
+                });
+                if (hasActivatedEdge) {
+                    requiredPredecessorCount++;
+                }
+            });
+            // 只有当所有需要等待的前驱节点都完成时，才加入下一轮执行
+            const completedPredecessors = completedNodePredecessors.get(targetNodeId);
+            if (completedPredecessors.size === requiredPredecessorCount) {
+                // 避免重复添加同一个节点到下一层
+                if (!nextLevelNodesSet.has(targetNodeId)) {
+                    nextLevelNodesSet.add(targetNodeId);
+                    nextNodeIds.push(targetNodeId);
+                }
+            }
+        });
+    });
+    return { nextNodeIds, workflowOutputVariables };
+}
+/**
+ * 执行工作流
+ */
+async function executeWorkflow(params) {
+    const { context, endWorkflowNodeResourceId, nodes, edges, presetWorkflowVariables = {}, startWorkflowNodeResourceId, variables: workflowInputVariables, traceContext } = params;
+    // 使用传入的 traceContext 或当前活跃的 context 来创建 span
+    const parentContext = traceContext || api_1.default.context.active();
+    const executeWorkflowSpan = tracer.startSpan('execute-workflow', undefined, parentContext);
+    const workflowVariablesMap = new Map(Object.entries(presetWorkflowVariables));
+    const startNode = nodes.find((value) => value.id === startWorkflowNodeResourceId);
+    const endNode = nodes.find((value) => value.id === endWorkflowNodeResourceId);
+    if (!startNode || !endNode) {
+        throw new Error('invalid workflow nodes');
+    }
+    let workflowOutputVariables;
+    // 使用动态执行，根据 portId 决定下一步执行哪些节点
+    let currentNodeIds = [startNode.id];
+    const visitedNodes = new Set();
+    const completedNodePredecessors = new Map();
+    // 记录每个节点被激活的入边（源节点ID -> 目标节点ID的集合）
+    const activatedEdges = new Map();
+    let isFirstLevel = true;
+    while (currentNodeIds.length > 0) {
+        // 去重当前节点集合（避免重复执行）
+        const uniqueNodeIds = [...new Set(currentNodeIds)];
+        // 并行执行当前节点集合
+        const levelPromises = uniqueNodeIds.map(async (nodeId) => {
+            // 跳过已访问的节点（避免循环执行）
+            if (visitedNodes.has(nodeId)) {
+                return null;
+            }
+            const ctx = api_1.default.trace.setSpan(parentContext, executeWorkflowSpan);
+            const span = tracer.startSpan(nodeId, undefined, ctx);
+            const node = nodes.find((value) => value.id === nodeId);
+            if (!node) {
+                throw new Error(`node not found: ${nodeId}`);
+            }
+            span.addEvent('execution workflow node');
+            const res = await executeNode(node, context, workflowVariablesMap, isFirstLevel, workflowInputVariables);
+            const { portId: outputPortId } = res;
+            span.setAttributes({
+                currentNodeId: nodeId,
+                outputPortId
+            });
+            span.end();
+            return res;
+        });
+        // 等待当前节点集合执行完成，如果任何节点失败则抛出异常
+        const levelResults = await Promise.all(levelPromises);
+        // 保存执行结果中的变量到 workflowVariablesMap
+        levelResults.forEach((result) => {
+            if (result) {
+                workflowVariablesMap.set(result.nodeId, result.variables);
+            }
+        });
+        // 根据执行结果和 portId 查找下一个节点集合
+        const { nextNodeIds, workflowOutputVariables: tempOutputVariables } = findNextNodeIds(levelResults, edges, visitedNodes, completedNodePredecessors, activatedEdges, endNode.id);
+        if (tempOutputVariables !== undefined) {
+            workflowOutputVariables = tempOutputVariables;
+        }
+        // 更新当前节点集合
+        currentNodeIds = nextNodeIds;
+        // 标记已过第一轮执行
+        isFirstLevel = false;
+    }
+    const res = {
+        variables: workflowOutputVariables
+    };
+    executeWorkflowSpan.end();
+    return res;
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ldsg/workflow",
-  "version": "0.3.10",
+  "version": "0.3.17",
   "description": "",
   "keywords": [],
   "license": "MIT",
@@ -11,14 +11,15 @@
     "dist/"
   ],
   "dependencies": {
+    "@opentelemetry/api": "~1.9.0",
     "json-schema": "0.4.0",
     "json-schema-default": "^1.0.2",
     "jsonata": "^2.0.6",
     "lodash": "^4.17.21",
-    "@ldsg/resource": "0.3.10",
-    "@ldsg/resource-definition": "0.3.10",
-    "@ldsg/constants": "0.3.10",
-    "@ldsg/handler": "0.3.10"
+    "@ldsg/constants": "0.3.17",
+    "@ldsg/handler": "0.3.17",
+    "@ldsg/resource": "0.3.17",
+    "@ldsg/resource-definition": "0.3.17"
   },
   "devDependencies": {
     "@types/fs-extra": "^11.0.4",
@@ -31,13 +32,14 @@
     "ts-jest": "^29.1.5",
     "ts-node": "^10.9.2",
     "typescript": "^5.8.3",
-    "@ldsg/types": "0.3.10"
+    "@ldsg/types": "0.3.17"
   },
   "publishConfig": {
     "access": "public"
   },
   "scripts": {
     "build": "tsc --project tsconfig.build.json",
-    "clean": "rm -rf dist"
+    "clean": "rm -rf dist",
+    "test": "jest"
   }
 }

package/dist/utils/evaluate-variables/index.test.d.ts

@@ -1,2 +0,0 @@
-export {};
-//# sourceMappingURL=index.test.d.ts.map

package/dist/utils/evaluate-variables/index.test.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"index.test.d.ts","sourceRoot":"","sources":["../../../src/utils/evaluate-variables/index.test.ts"],"names":[],"mappings":""}