@logicflow/engine 0.0.2 → 0.0.3

package/CHANGELOG.md

@@ -3,6 +3,18 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [0.0.3](https://github.com/didi/LogicFlow/compare/@logicflow/engine@0.0.2...@logicflow/engine@0.0.3) (2023-08-18)
+
+
+### Bug Fixes
+
+* **engine:** build error when use es-module ([3fbd88a](https://github.com/didi/LogicFlow/commit/3fbd88a8279602b907ab6f3e3a6353a46f64ee8c))
+* **engine:** support es module umd and commonJs ([bb17159](https://github.com/didi/LogicFlow/commit/bb171597725b78b28cc2ad74350ab7728e580158))
+
+
+
+
+
 ## 0.0.2 (2023-08-10)
 
 

package/cjs/FlowModel.js

@@ -70,7 +70,7 @@ var FlowModel = /** @class */ (function () {
         // 流程包含的节点类型
         this.nodeModelMap = nodeModelMap;
         // 需要执行的队列
-        this.executeQueue = [];
+        this.executeList = [];
         // 执行中的任务
         this.executingInstance = null;
         // 外部传入的上下文，最终会传递给每个节点
@@ -85,10 +85,10 @@ var FlowModel = /** @class */ (function () {
             recorder: recorder,
         });
         this.scheduler.on(constant_1.EVENT_INSTANCE_COMPLETE, function (result) {
-            _this.onTaskFinished(result);
+            _this.onExecuteFinished(result);
         });
         this.scheduler.on(constant_1.EVENT_INSTANCE_INTERRUPTED, function (result) {
-            _this.onTaskFinished(result);
+            _this.onExecuteFinished(result);
         });
     }
     FlowModel.prototype.setStartNodeType = function (startNodeType) {
@@ -177,16 +177,12 @@ var FlowModel = /** @class */ (function () {
      * 一个流程存在着两个开始节点，A和B，A和B的下一个节点都是C，C的下两个节点是D和E。
      * 外部分别触发了A和B的执行，那么A和B的执行是串行的（也就是需要A执行完成后再执行B），但是D和E的执行是并行的。
      * 如果希望A和B的执行是并行的，就不能使用同一个流程模型执行，应该初始化两个。
+     * TODO: 去掉此处的对列，直接使用调度器的队列。
      */
     FlowModel.prototype.execute = function (params) {
         return __awaiter(this, void 0, void 0, function () {
             return __generator(this, function (_a) {
-                this.executeQueue.push(params);
-                if (this.isRunning) {
-                    return [2 /*return*/];
-                }
-                this.isRunning = true;
-                this.createExecution();
+                this.createExecution(params);
                 return [2 /*return*/];
             });
         });
@@ -194,31 +190,26 @@ var FlowModel = /** @class */ (function () {
     FlowModel.prototype.resume = function (params) {
         return __awaiter(this, void 0, void 0, function () {
             return __generator(this, function (_a) {
-                this.executeQueue.push(params);
-                if (this.isRunning) {
-                    return [2 /*return*/];
-                }
-                this.isRunning = true;
-                this.createExecution();
+                this.createExecution(params);
                 return [2 /*return*/];
             });
         });
     };
     /**
-     * 创建节点实例, 每个节点实例都会有一个唯一的taskId。
-     * 通过executionId、nodeId、taskId可以唯一确定一个节点的某一次执行。
+     * 创建节点实例, 每个节点实例都会有一个唯一的actionId。
+     * 通过executionId、nodeId、actionId可以唯一确定一个节点的某一次执行。
      * @param nodeId 节点Id
      * @returns 节点示例
      */
-    FlowModel.prototype.createTask = function (nodeId) {
+    FlowModel.prototype.createAction = function (nodeId) {
         var nodeConfig = this.nodeConfigMap.get(nodeId);
         var NodeModel = this.nodeModelMap.get(nodeConfig.type);
-        var task = new NodeModel({
+        var action = new NodeModel({
             nodeConfig: nodeConfig,
             globalData: this.globalData,
             context: this.context,
         });
-        return task;
+        return action;
     };
     /**
      * 更新流程全局数据
@@ -230,17 +221,12 @@ var FlowModel = /** @class */ (function () {
      * 在执行完成后，通知外部此次执行完成。
      * 如果还存在待执行的任务，那么继续执行。
      */
-    FlowModel.prototype.onTaskFinished = function (result) {
-        var callback = this.executingInstance.callback;
-        if (callback) {
-            callback(result);
-        }
-        this.executingInstance = null;
-        if (this.executeQueue.length > 0) {
-            this.createExecution();
-        }
-        else {
-            this.isRunning = false;
+    FlowModel.prototype.onExecuteFinished = function (result) {
+        var index = this.executeList.findIndex(function (i) { return i.executionId === result.executionId; });
+        if (index !== -1) {
+            var callback = this.executeList[index].callback;
+            this.executeList.splice(index, 1);
+            callback && callback(result);
         }
     };
     /**
@@ -250,21 +236,21 @@ var FlowModel = /** @class */ (function () {
      * 若存在nodeId，那么表示从指定节点开始执行。
      * 若都不存在，那么新建一个executionId，从开始节点开始执行。
      */
-    FlowModel.prototype.createExecution = function () {
+    FlowModel.prototype.createExecution = function (execParams) {
         var _this = this;
-        var execParams = this.executeQueue.shift();
-        this.executingInstance = execParams;
+        this.executeList.push(execParams);
         // 如果有taskId，那么表示恢复执行
-        if (execParams.taskId && execParams.executionId && execParams.nodeId) {
+        if (execParams.actionId && execParams.executionId && execParams.nodeId) {
             this.scheduler.resume({
                 executionId: execParams.executionId,
-                taskId: execParams.taskId,
+                actionId: execParams.actionId,
                 nodeId: execParams.nodeId,
                 data: execParams.data,
             });
             return;
         }
-        var executionId = execParams.executionId || ID_1.createExecId();
+        var executionId = ID_1.createExecId();
+        execParams.executionId = executionId;
         if (execParams.nodeId) {
             var nodeConfig = this.nodeConfigMap.get(execParams.nodeId);
             if (!nodeConfig) {
@@ -274,7 +260,7 @@ var FlowModel = /** @class */ (function () {
             this.startNodes = [nodeConfig];
         }
         this.startNodes.forEach(function (startNode) {
-            _this.scheduler.addTask({
+            _this.scheduler.addAction({
                 executionId: executionId,
                 nodeId: startNode.id,
             });

package/cjs/Scheduler.js

@@ -72,7 +72,7 @@ var Scheduler = /** @class */ (function (_super) {
     function Scheduler(config) {
         var _this = _super.call(this) || this;
         _this.nodeQueueMap = new Map();
-        _this.taskRunningMap = new Map();
+        _this.actionRunningMap = new Map();
         _this.flowModel = config.flowModel;
         _this.recorder = config.recorder;
         return _this;
@@ -82,13 +82,13 @@ var Scheduler = /** @class */ (function (_super) {
      * 1. 由流程模型将所有的开始节点添加到队列中。
      * 2. 当一个节点执行完成后，将后续的节点添加到队列中。
      */
-    Scheduler.prototype.addTask = function (nodeParam) {
+    Scheduler.prototype.addAction = function (nodeParam) {
         var executionId = nodeParam.executionId;
         if (!this.nodeQueueMap.has(executionId)) {
             this.nodeQueueMap.set(executionId, []);
         }
-        var currentTaskQueue = this.nodeQueueMap.get(executionId);
-        currentTaskQueue.push(nodeParam);
+        var currentActionQueue = this.nodeQueueMap.get(executionId);
+        currentActionQueue.push(nodeParam);
     };
     /**
      * 调度器执行下一个任务
@@ -98,22 +98,21 @@ var Scheduler = /** @class */ (function (_super) {
      */
     Scheduler.prototype.run = function (runParams) {
         var nodeQueue = this.nodeQueueMap.get(runParams.executionId);
-        if (nodeQueue.length > 0) {
-            this.nodeQueueMap.set(runParams.executionId, []);
-            for (var i = 0; i < nodeQueue.length; i++) {
-                var currentNode = nodeQueue[i];
-                var taskId = ID_1.createTaskId();
-                var taskParam = __assign(__assign({}, currentNode), { taskId: taskId });
-                this.pushTaskToRunningMap(taskParam);
-                this.exec(taskParam);
-            }
+        // 将同一个executionId当前待执行的节点一起执行
+        // 避免出现某一个节点执行时间过长，导致其他节点等待时间过长。
+        while (nodeQueue.length) {
+            var currentNode = nodeQueue.pop();
+            var actionId = ID_1.createActionId();
+            var actionParam = __assign(__assign({}, currentNode), { actionId: actionId });
+            this.pushActionToRunningMap(actionParam);
+            this.exec(actionParam);
         }
-        else if (!this.hasRunningTask(runParams.executionId)) {
-            // 当一个流程在nodeQueueMap和taskRunningMap中都不存在执行的节点时，说明这个流程已经执行完成。
+        if (!this.hasRunningAction(runParams.executionId)) {
+            // 当一个流程在nodeQueueMap和actionRunningMap中都不存在执行的节点时，说明这个流程已经执行完成。
             this.emit(constant_1.EVENT_INSTANCE_COMPLETE, {
                 executionId: runParams.executionId,
                 nodeId: runParams.nodeId,
-                taskId: runParams.taskId,
+                actionId: runParams.actionId,
                 status: constant_1.FlowStatus.COMPLETED,
             });
         }
@@ -128,12 +127,12 @@ var Scheduler = /** @class */ (function (_super) {
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
-                        this.pushTaskToRunningMap({
+                        this.pushActionToRunningMap({
                             executionId: resumeParam.executionId,
                             nodeId: resumeParam.nodeId,
-                            taskId: resumeParam.taskId,
+                            actionId: resumeParam.actionId,
                         });
-                        model = this.flowModel.createTask(resumeParam.nodeId);
+                        model = this.flowModel.createAction(resumeParam.nodeId);
                         return [4 /*yield*/, model.resume(__assign(__assign({}, resumeParam), { next: this.next.bind(this) }))];
                     case 1:
                         _a.sent();
@@ -142,44 +141,44 @@ var Scheduler = /** @class */ (function (_super) {
             });
         });
     };
-    Scheduler.prototype.pushTaskToRunningMap = function (taskParam) {
-        var executionId = taskParam.executionId, taskId = taskParam.taskId;
-        if (!this.taskRunningMap.has(executionId)) {
+    Scheduler.prototype.pushActionToRunningMap = function (actionParam) {
+        var executionId = actionParam.executionId, actionId = actionParam.actionId;
+        if (!this.actionRunningMap.has(executionId)) {
             var runningMap = new Map();
-            this.taskRunningMap.set(executionId, runningMap);
+            this.actionRunningMap.set(executionId, runningMap);
         }
-        this.taskRunningMap.get(executionId).set(taskId, taskParam);
+        this.actionRunningMap.get(executionId).set(actionId, actionParam);
     };
-    Scheduler.prototype.removeTaskFromRunningMap = function (taskParam) {
-        var executionId = taskParam.executionId, taskId = taskParam.taskId;
-        if (!taskId)
+    Scheduler.prototype.removeActionFromRunningMap = function (actionParam) {
+        var executionId = actionParam.executionId, actionId = actionParam.actionId;
+        if (!actionId)
             return;
-        var runningMap = this.taskRunningMap.get(executionId);
+        var runningMap = this.actionRunningMap.get(executionId);
         if (!runningMap)
             return;
-        runningMap.delete(taskId);
+        runningMap.delete(actionId);
     };
-    Scheduler.prototype.hasRunningTask = function (executionId) {
-        var runningMap = this.taskRunningMap.get(executionId);
+    Scheduler.prototype.hasRunningAction = function (executionId) {
+        var runningMap = this.actionRunningMap.get(executionId);
         if (!runningMap)
             return false;
         if (runningMap.size === 0) {
-            this.taskRunningMap.delete(executionId);
+            this.actionRunningMap.delete(executionId);
             return false;
         }
         return true;
     };
-    Scheduler.prototype.exec = function (taskParam) {
+    Scheduler.prototype.exec = function (actionParam) {
         return __awaiter(this, void 0, void 0, function () {
             var model, execResult;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
-                        model = this.flowModel.createTask(taskParam.nodeId);
+                        model = this.flowModel.createAction(actionParam.nodeId);
                         return [4 /*yield*/, model.execute({
-                                executionId: taskParam.executionId,
-                                taskId: taskParam.taskId,
-                                nodeId: taskParam.nodeId,
+                                executionId: actionParam.executionId,
+                                actionId: actionParam.actionId,
+                                nodeId: actionParam.nodeId,
                                 next: this.next.bind(this),
                             })];
                     case 1:
@@ -187,12 +186,12 @@ var Scheduler = /** @class */ (function (_super) {
                         if (execResult && execResult.status === constant_1.FlowStatus.INTERRUPTED) {
                             this.interrupted({
                                 execResult: execResult,
-                                taskParam: taskParam,
+                                actionParam: actionParam,
                             });
-                            this.saveTaskResult({
-                                executionId: taskParam.executionId,
-                                nodeId: taskParam.nodeId,
-                                taskId: taskParam.taskId,
+                            this.saveActionResult({
+                                executionId: actionParam.executionId,
+                                nodeId: actionParam.nodeId,
+                                actionId: actionParam.actionId,
                                 nodeType: execResult.nodeType,
                                 properties: execResult.properties,
                                 outgoing: [],
@@ -201,7 +200,7 @@ var Scheduler = /** @class */ (function (_super) {
                                     detail: execResult.detail,
                                 },
                             });
-                            this.removeTaskFromRunningMap(taskParam);
+                            this.removeActionFromRunningMap(actionParam);
                         }
                         return [2 /*return*/];
                 }
@@ -209,12 +208,12 @@ var Scheduler = /** @class */ (function (_super) {
         });
     };
     Scheduler.prototype.interrupted = function (_a) {
-        var execResult = _a.execResult, taskParam = _a.taskParam;
+        var execResult = _a.execResult, actionParam = _a.actionParam;
         this.emit(constant_1.EVENT_INSTANCE_INTERRUPTED, {
-            executionId: taskParam.executionId,
+            executionId: actionParam.executionId,
             status: constant_1.FlowStatus.INTERRUPTED,
-            nodeId: taskParam.nodeId,
-            taskId: taskParam.taskId,
+            nodeId: actionParam.nodeId,
+            actionId: actionParam.actionId,
             detail: execResult.detail,
         });
     };
@@ -222,24 +221,24 @@ var Scheduler = /** @class */ (function (_super) {
         var _this = this;
         if (data.outgoing && data.outgoing.length > 0) {
             data.outgoing.forEach(function (item) {
-                _this.addTask({
+                _this.addAction({
                     executionId: data.executionId,
                     nodeId: item.target,
                 });
             });
         }
-        this.saveTaskResult(data);
-        this.removeTaskFromRunningMap(data);
+        this.saveActionResult(data);
+        this.removeActionFromRunningMap(data);
         this.run({
             executionId: data.executionId,
             nodeId: data.nodeId,
-            taskId: data.taskId,
+            actionId: data.actionId,
         });
     };
-    Scheduler.prototype.saveTaskResult = function (data) {
-        this.recorder.addTask({
+    Scheduler.prototype.saveActionResult = function (data) {
+        this.recorder.addActionRecord({
             executionId: data.executionId,
-            taskId: data.taskId,
+            actionId: data.actionId,
             nodeId: data.nodeId,
             nodeType: data.nodeType,
             timestamp: Date.now(),

package/cjs/constant/constant.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.TaskStatus = exports.FlowStatus = exports.EVENT_INSTANCE_INTERRUPTED = exports.EVENT_INSTANCE_COMPLETE = exports.BASE_START_NODE = void 0;
+exports.ActionStatus = exports.FlowStatus = exports.EVENT_INSTANCE_INTERRUPTED = exports.EVENT_INSTANCE_COMPLETE = exports.BASE_START_NODE = void 0;
 // baseType
 exports.BASE_START_NODE = 'start';
 // event name
@@ -14,10 +14,10 @@ var FlowStatus;
     FlowStatus["RUNNING"] = "running";
     FlowStatus["ERROR"] = "error";
 })(FlowStatus = exports.FlowStatus || (exports.FlowStatus = {}));
-// task status
-var TaskStatus;
-(function (TaskStatus) {
-    TaskStatus["SUCCESS"] = "success";
-    TaskStatus["ERROR"] = "error";
-    TaskStatus["INTERRUPTED"] = "interrupted";
-})(TaskStatus = exports.TaskStatus || (exports.TaskStatus = {}));
+// action status
+var ActionStatus;
+(function (ActionStatus) {
+    ActionStatus["SUCCESS"] = "success";
+    ActionStatus["ERROR"] = "error";
+    ActionStatus["INTERRUPTED"] = "interrupted";
+})(ActionStatus = exports.ActionStatus || (exports.ActionStatus = {}));

package/cjs/expression/browserVm.js

@@ -36,33 +36,41 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
     }
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.runInBrowserContext = void 0;
+exports.runInContext = exports.createContext = exports.runInBrowserContext = void 0;
 var LogCode_1 = require("../constant/LogCode");
+var createContext = function (globalData) {
+    var iframe = document.createElement('iframe');
+    iframe.style.display = 'none';
+    if (!document || !document.body) {
+        console.error(LogCode_1.getErrorMsg(LogCode_1.ErrorCode.NO_DOCUMENT_BODY));
+    }
+    var iframeWindow = iframe.contentWindow;
+    iframeWindow.parent = null;
+    Object.keys(globalData).forEach(function (key) {
+        iframeWindow[key] = globalData[key];
+    });
+    return iframeWindow;
+};
+exports.createContext = createContext;
+var runInContext = function (code, context) {
+    try {
+        var iframeEval = context.eval;
+        iframeEval.call(context, code);
+    }
+    catch (e) {
+        console.warn(LogCode_1.getWarningMsg(LogCode_1.WarningCode.EXPRESSION_EXEC_ERROR), { code: code, context: context, e: e });
+    }
+    return context;
+};
+exports.runInContext = runInContext;
 var runInBrowserContext = function (code, globalData) {
     if (globalData === void 0) { globalData = {}; }
     return __awaiter(void 0, void 0, void 0, function () {
-        var iframe, iframeWindow, iframeEval, res;
+        var context;
         return __generator(this, function (_a) {
-            iframe = document.createElement('iframe');
-            iframe.style.display = 'none';
-            if (!document || !document.body) {
-                console.error(LogCode_1.getErrorMsg(LogCode_1.ErrorCode.NO_DOCUMENT_BODY));
-            }
-            document.body.appendChild(iframe);
-            iframeWindow = iframe.contentWindow;
-            iframeEval = iframeWindow.eval;
-            Object.keys(globalData).forEach(function (key) {
-                iframeWindow[key] = globalData[key];
-            });
-            res = null;
-            try {
-                res = iframeEval.call(iframeWindow, code);
-            }
-            catch (e) {
-                console.warn(LogCode_1.getWarningMsg(LogCode_1.WarningCode.EXPRESSION_EXEC_ERROR), { code: code, globalData: globalData, e: e });
-            }
-            document.body.removeChild(iframe);
-            return [2 /*return*/, res];
+            context = createContext(globalData);
+            runInContext(code, context);
+            return [2 /*return*/, context];
         });
     });
 };

package/cjs/expression/nodeVm.js

@@ -37,7 +37,7 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.runInNewContext = void 0;
-// import vm from 'node:vm';
+/* eslint-disable global-require */
 var vm = require('vm');
 var runInNewContext = function (code, globalData) {
     if (globalData === void 0) { globalData = {}; }

package/cjs/index.js

@@ -54,11 +54,12 @@ exports.StartNode = StartNode_1.default;
 var TaskNode_1 = require("./nodes/TaskNode");
 exports.TaskNode = TaskNode_1.default;
 var recorder_1 = require("./recorder");
+var ID_1 = require("./util/ID");
 var Engine = /** @class */ (function () {
-    function Engine() {
+    function Engine(options) {
         this.nodeModelMap = new Map();
+        this.id = ID_1.createEngineId();
         this.recorder = new recorder_1.default();
-        // register node
         this.register({
             type: StartNode_1.default.nodeTypeName,
             model: StartNode_1.default,
@@ -67,10 +68,11 @@ var Engine = /** @class */ (function () {
             type: TaskNode_1.default.nodeTypeName,
             model: TaskNode_1.default,
         });
+        this.context = (options === null || options === void 0 ? void 0 : options.context) || {};
     }
     /**
      * 注册节点
-     * @param nodeConfig { type: 'custom-node', model: Class }
+     * @param nodeConfig { type: 'custom-node', model: NodeClass }
      */
     Engine.prototype.register = function (nodeConfig) {
         this.nodeModelMap.set(nodeConfig.type, nodeConfig.model);
@@ -80,8 +82,8 @@ var Engine = /** @class */ (function () {
      * 注意：由于执行记录不会主动删除，所以需要自行清理。
      * nodejs环境建议自定义为持久化存储。
      * engine.setCustomRecorder({
-     *   async addTask(task) {}
-     *   async getTask(taskId) {}
+     *   async addActionRecord(task) {}
+     *   async getTask(actionId) {}
      *   async getExecutionTasks(executionId) {}
      *   clear() {}
      * });
@@ -93,11 +95,11 @@ var Engine = /** @class */ (function () {
      * 加载流程图数据
      */
     Engine.prototype.load = function (_a) {
-        var graphData = _a.graphData, _b = _a.startNodeType, startNodeType = _b === void 0 ? 'StartNode' : _b, _c = _a.globalData, globalData = _c === void 0 ? {} : _c, _d = _a.context, context = _d === void 0 ? {} : _d;
+        var graphData = _a.graphData, _b = _a.startNodeType, startNodeType = _b === void 0 ? 'StartNode' : _b, _c = _a.globalData, globalData = _c === void 0 ? {} : _c;
         this.flowModel = new FlowModel_1.default({
             nodeModelMap: this.nodeModelMap,
             recorder: this.recorder,
-            context: context,
+            context: this.context,
             globalData: globalData,
             startNodeType: startNodeType,
         });
@@ -124,6 +126,12 @@ var Engine = /** @class */ (function () {
             });
         });
     };
+    /**
+     * 恢复执行
+     * 注意此方法只能恢复节点后面的执行，不能恢复流程其他分支的执行。
+     * 同理，中断执行也只能中断节点后面的执行，不会中断其他分支的执行。
+     * 在实际项目中，如果存在中断节点，建议流程所有的节点都是排他网关，这样可以保证执行的过程不存在分支。
+     */
     Engine.prototype.resume = function (resumeParam) {
         return __awaiter(this, void 0, void 0, function () {
             var _this = this;
@@ -143,18 +151,35 @@ var Engine = /** @class */ (function () {
             var tasks, records, i;
             return __generator(this, function (_a) {
                 switch (_a.label) {
-                    case 0: return [4 /*yield*/, this.recorder.getExecutionTasks(executionId)];
+                    case 0: return [4 /*yield*/, this.recorder.getExecutionActions(executionId)];
                     case 1:
                         tasks = _a.sent();
+                        if (!tasks) {
+                            return [2 /*return*/, null];
+                        }
                         records = [];
                         for (i = 0; i < tasks.length; i++) {
-                            records.push(this.recorder.getTask(tasks[i]));
+                            records.push(this.recorder.getActionRecord(tasks[i]));
                         }
                         return [2 /*return*/, Promise.all(records)];
                 }
             });
         });
     };
+    Engine.prototype.getGlobalData = function () {
+        var _a;
+        return (_a = this.flowModel) === null || _a === void 0 ? void 0 : _a.globalData;
+    };
+    Engine.prototype.setGlobalData = function (data) {
+        if (this.flowModel) {
+            this.flowModel.globalData = data;
+        }
+    };
+    Engine.prototype.updateGlobalData = function (data) {
+        if (this.flowModel) {
+            Object.assign(this.flowModel.globalData, data);
+        }
+    };
     return Engine;
 }());
 exports.Engine = Engine;

package/cjs/nodes/BaseNode.js

@@ -67,13 +67,13 @@ var BaseNode = /** @class */ (function () {
         this.incoming = nodeConfig.incoming;
         this.nodeId = nodeConfig.id;
         this.type = nodeConfig.type;
-        this.properties = nodeConfig.properties;
+        this.properties = nodeConfig.properties || {};
         this.context = context;
         this.globalData = globalData;
         this.baseType = 'base';
     }
     /**
-     * 节点的每一次执行都会生成一个唯一的taskId
+     * 节点的每一次执行都会生成一个唯一的actionId
      */
     BaseNode.prototype.execute = function (params) {
         return __awaiter(this, void 0, void 0, function () {
@@ -82,18 +82,18 @@ var BaseNode = /** @class */ (function () {
                 switch (_a.label) {
                     case 0: return [4 /*yield*/, this.action({
                             executionId: params.executionId,
-                            taskId: params.taskId,
+                            actionId: params.actionId,
                             nodeId: this.nodeId,
                         })];
                     case 1:
                         r = _a.sent();
-                        if (!(!r || r.status === constant_1.TaskStatus.SUCCESS)) return [3 /*break*/, 3];
+                        if (!(!r || r.status === constant_1.ActionStatus.SUCCESS)) return [3 /*break*/, 3];
                         return [4 /*yield*/, this.getOutgoing()];
                     case 2:
                         outgoing = _a.sent();
                         params.next({
                             executionId: params.executionId,
-                            taskId: params.taskId,
+                            actionId: params.actionId,
                             nodeId: this.nodeId,
                             nodeType: this.type,
                             properties: this.properties,
@@ -104,7 +104,7 @@ var BaseNode = /** @class */ (function () {
                             status: r && r.status,
                             detail: r && r.detail,
                             executionId: params.executionId,
-                            taskId: params.taskId,
+                            actionId: params.actionId,
                             nodeId: this.nodeId,
                             nodeType: this.type,
                             properties: this.properties,
@@ -128,14 +128,14 @@ var BaseNode = /** @class */ (function () {
                         return [4 /*yield*/, this.onResume({
                                 executionId: params.executionId,
                                 nodeId: params.nodeId,
-                                taskId: params.taskId,
+                                actionId: params.actionId,
                                 data: params.data,
                             })];
                     case 2:
                         _a.sent();
                         params.next({
                             executionId: params.executionId,
-                            taskId: params.taskId,
+                            actionId: params.actionId,
                             nodeId: this.nodeId,
                             nodeType: this.type,
                             properties: this.properties,
@@ -213,7 +213,7 @@ var BaseNode = /** @class */ (function () {
      * 节点的执行逻辑
      * @overridable 可以自定义节点重写此方法。
      * @param params.executionId 流程执行记录ID
-     * @param params.taskId 此节点执行记录ID
+     * @param params.actionId 此节点执行记录ID
      * @param params.nodeId 节点ID
      */
     BaseNode.prototype.action = function (params) {
@@ -227,7 +227,7 @@ var BaseNode = /** @class */ (function () {
      * 节点的重新恢复执行逻辑
      * @overridable 可以自定义节点重写此方法。
      * @param params.executionId 流程执行记录ID
-     * @param params.taskId 此节点执行记录ID
+     * @param params.actionId 此节点执行记录ID
      * @param params.nodeId 节点ID
      */
     BaseNode.prototype.onResume = function (params) {