@freelog/freelog-cg-collection 1.2.5 → 1.2.7

package/dist/function-executor/DynamicFunctionExecutor.js

@@ -31,6 +31,12 @@ class DynamicFunctionExecutor extends DefaultFunctionExecutor_1.DefaultFunctionE
         throw new Error("该函数未实现");
     }
     addExecutor(functionName, executor) {
+        if (executor instanceof DefaultFunctionExecutor_1.DefaultFunctionExecutor) {
+            executor.setOutsideApiService(this.outsideApiService);
+        }
+        if (executor instanceof DynamicFunctionExecutor) {
+            executor.setVarContextProxy(this.varContextProxy);
+        }
         this.executorsMap.set(functionName, executor);
     }
     getFunctionCodeMap() {
@@ -49,4 +55,4 @@ class DynamicFunctionExecutor extends DefaultFunctionExecutor_1.DefaultFunctionE
     }
 }
 exports.DynamicFunctionExecutor = DynamicFunctionExecutor;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiRHluYW1pY0Z1bmN0aW9uRXhlY3V0b3IuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvZnVuY3Rpb24tZXhlY3V0b3IvRHluYW1pY0Z1bmN0aW9uRXhlY3V0b3IudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7O0FBQUEsdUVBQWtFO0FBSWxFLE1BQWEsdUJBQXdCLFNBQVEsaURBQXVCO0lBQXBFOztRQUVjLGlCQUFZLEdBQUcsSUFBSSxHQUFHLEVBQTBCLENBQUM7SUFtRC9ELENBQUM7SUEvQ0csWUFBWSxDQUFDLFlBQW9CO1FBQzdCLE9BQU8sSUFBSSxDQUFDLFlBQVksQ0FBQyxHQUFHLENBQUMsWUFBWSxDQUFDLElBQUksSUFBSSxDQUFDLGtCQUFrQixFQUFFLENBQUMsR0FBRyxDQUFDLFlBQVksQ0FBQyxDQUFDO0lBQzlGLENBQUM7SUFFRCxLQUFLLENBQUMsTUFBTSxDQUFDLFlBQW9CLEVBQUUsSUFBVztRQUMxQyxJQUFJLElBQUksQ0FBQyxZQUFZLENBQUMsR0FBRyxDQUFDLFlBQVksQ0FBQyxFQUFFLENBQUM7WUFDdEMsT0FBTyxJQUFJLENBQUMsWUFBWSxDQUFDLEdBQUcsQ0FBQyxZQUFZLENBQUMsQ0FBQyxNQUFNLENBQUMsWUFBWSxFQUFFLElBQUksQ0FBQyxDQUFDO1FBQzFFLENBQUM7UUFDRCxJQUFJLElBQUksQ0FBQyxrQkFBa0IsRUFBRSxDQUFDLEdBQUcsQ0FBQyxZQUFZLENBQUMsRUFBRSxDQUFDO1lBQzlDLElBQUksWUFBWSxHQUFHLElBQUksQ0FBQyxrQkFBa0IsRUFBRSxDQUFDLEdBQUcsQ0FBQyxZQUFZLENBQUMsQ0FBQztZQUMvRCxvQkFBb0I7WUFDcEIsMENBQTBDO1lBQzFDLG9CQUFvQjtZQUNwQiw2Q0FBNkM7WUFDN0MsZUFBZTtZQUNmLDZEQUE2RDtZQUM3RCxRQUFRO1lBQ1IsSUFBSTtZQUNKLG1EQUFtRDtZQUVuRCxPQUFPLE9BQU8sQ0FBQyxLQUFLLENBQUMsSUFBSSxDQUFDLFlBQVksQ0FBQyxFQUFFLElBQUksRUFBRSxJQUFJLENBQUMsQ0FBQztZQUVyRCx1QkFBdUI7UUFDM0IsQ0FBQztRQUVELE1BQU0sSUFBSSxLQUFLLENBQUMsUUFBUSxDQUFDLENBQUM7SUFDOUIsQ0FBQztJQUVELFdBQVcsQ0FBQyxZQUFvQixFQUFFLFFBQXdCO1FBQ3RELElBQUksQ0FBQyxZQUFZLENBQUMsR0FBRyxDQUFDLFlBQVksRUFBRSxRQUFRLENBQUMsQ0FBQztJQUNsRCxDQUFDO0lBRUQsa0JBQWtCO1FBQ2QsT0FBTyxJQUFJLEdBQUcsRUFBa0IsQ0FBQztJQUNyQyxDQUFDO0lBRUQsS0FBSyxDQUFDLGFBQWEsQ0FBQyxPQUFlO1FBQy9CLElBQUksSUFBSSxDQUFDLGVBQWUsSUFBSSxJQUFJLEVBQUUsQ0FBQztZQUMvQixPQUFPLElBQUksQ0FBQyxlQUFlLENBQUMsYUFBYSxDQUFDLE9BQU8sQ0FBQyxDQUFDO1FBQ3ZELENBQUM7YUFBTSxDQUFDO1lBQ0osT0FBTyxLQUFLLENBQUMsYUFBYSxDQUFDLE9BQU8sQ0FBQyxDQUFDO1FBQ3hDLENBQUM7SUFDTCxDQUFDO0lBRUQsa0JBQWtCLENBQUMsZUFBdUM7UUFDdEQsSUFBSSxDQUFDLGVBQWUsR0FBRyxlQUFlLENBQUM7SUFDM0MsQ0FBQztDQUNKO0FBckRELDBEQXFEQyJ9
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiRHluYW1pY0Z1bmN0aW9uRXhlY3V0b3IuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvZnVuY3Rpb24tZXhlY3V0b3IvRHluYW1pY0Z1bmN0aW9uRXhlY3V0b3IudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7O0FBQUEsdUVBQWtFO0FBSWxFLE1BQWEsdUJBQXdCLFNBQVEsaURBQXVCO0lBQXBFOztRQUVjLGlCQUFZLEdBQUcsSUFBSSxHQUFHLEVBQTBCLENBQUM7SUF5RC9ELENBQUM7SUFyREcsWUFBWSxDQUFDLFlBQW9CO1FBQzdCLE9BQU8sSUFBSSxDQUFDLFlBQVksQ0FBQyxHQUFHLENBQUMsWUFBWSxDQUFDLElBQUksSUFBSSxDQUFDLGtCQUFrQixFQUFFLENBQUMsR0FBRyxDQUFDLFlBQVksQ0FBQyxDQUFDO0lBQzlGLENBQUM7SUFFRCxLQUFLLENBQUMsTUFBTSxDQUFDLFlBQW9CLEVBQUUsSUFBVztRQUMxQyxJQUFJLElBQUksQ0FBQyxZQUFZLENBQUMsR0FBRyxDQUFDLFlBQVksQ0FBQyxFQUFFLENBQUM7WUFDdEMsT0FBTyxJQUFJLENBQUMsWUFBWSxDQUFDLEdBQUcsQ0FBQyxZQUFZLENBQUMsQ0FBQyxNQUFNLENBQUMsWUFBWSxFQUFFLElBQUksQ0FBQyxDQUFDO1FBQzFFLENBQUM7UUFDRCxJQUFJLElBQUksQ0FBQyxrQkFBa0IsRUFBRSxDQUFDLEdBQUcsQ0FBQyxZQUFZLENBQUMsRUFBRSxDQUFDO1lBQzlDLElBQUksWUFBWSxHQUFHLElBQUksQ0FBQyxrQkFBa0IsRUFBRSxDQUFDLEdBQUcsQ0FBQyxZQUFZLENBQUMsQ0FBQztZQUMvRCxvQkFBb0I7WUFDcEIsMENBQTBDO1lBQzFDLG9CQUFvQjtZQUNwQiw2Q0FBNkM7WUFDN0MsZUFBZTtZQUNmLDZEQUE2RDtZQUM3RCxRQUFRO1lBQ1IsSUFBSTtZQUNKLG1EQUFtRDtZQUVuRCxPQUFPLE9BQU8sQ0FBQyxLQUFLLENBQUMsSUFBSSxDQUFDLFlBQVksQ0FBQyxFQUFFLElBQUksRUFBRSxJQUFJLENBQUMsQ0FBQztZQUVyRCx1QkFBdUI7UUFDM0IsQ0FBQztRQUVELE1BQU0sSUFBSSxLQUFLLENBQUMsUUFBUSxDQUFDLENBQUM7SUFDOUIsQ0FBQztJQUVELFdBQVcsQ0FBQyxZQUFvQixFQUFFLFFBQXdCO1FBQ3RELElBQUksUUFBUSxZQUFZLGlEQUF1QixFQUFFLENBQUM7WUFDOUMsUUFBUSxDQUFDLG9CQUFvQixDQUFDLElBQUksQ0FBQyxpQkFBaUIsQ0FBQyxDQUFDO1FBQzFELENBQUM7UUFDRCxJQUFJLFFBQVEsWUFBWSx1QkFBdUIsRUFBRSxDQUFDO1lBQzlDLFFBQVEsQ0FBQyxrQkFBa0IsQ0FBQyxJQUFJLENBQUMsZUFBZSxDQUFDLENBQUM7UUFDdEQsQ0FBQztRQUNELElBQUksQ0FBQyxZQUFZLENBQUMsR0FBRyxDQUFDLFlBQVksRUFBRSxRQUFRLENBQUMsQ0FBQztJQUNsRCxDQUFDO0lBRUQsa0JBQWtCO1FBQ2QsT0FBTyxJQUFJLEdBQUcsRUFBa0IsQ0FBQztJQUNyQyxDQUFDO0lBRUQsS0FBSyxDQUFDLGFBQWEsQ0FBQyxPQUFlO1FBQy9CLElBQUksSUFBSSxDQUFDLGVBQWUsSUFBSSxJQUFJLEVBQUUsQ0FBQztZQUMvQixPQUFPLElBQUksQ0FBQyxlQUFlLENBQUMsYUFBYSxDQUFDLE9BQU8sQ0FBQyxDQUFDO1FBQ3ZELENBQUM7YUFBTSxDQUFDO1lBQ0osT0FBTyxLQUFLLENBQUMsYUFBYSxDQUFDLE9BQU8sQ0FBQyxDQUFDO1FBQ3hDLENBQUM7SUFDTCxDQUFDO0lBRUQsa0JBQWtCLENBQUMsZUFBdUM7UUFDdEQsSUFBSSxDQUFDLGVBQWUsR0FBRyxlQUFlLENBQUM7SUFDM0MsQ0FBQztDQUNKO0FBM0RELDBEQTJEQyJ9

package/dist/helper/PolicyHelper.js

@@ -191,14 +191,17 @@ class PolicyHelper {
         }
         for (let eventInfo of stateInfo["events"]) {
             let varLocalAtEventList = [];
-            for (let i = 0; i < eventInfo.eventParamList.length; i++) {
-                let eventParam = eventInfo.eventParamList[i];
-                let eventParamConfig = eventInfo["config_params"][i];
-                let varName = eventParamConfig["name"];
-                let varValue = await this.getVarObjValue(eventParam.paramValueObj, varContextCapable);
-                varLocalAtEventList.push({ varName: varName, varValue: varValue });
+            if (eventInfo["type"] == "normal") {
+                for (let i = 0; i < eventInfo.eventParamList.length; i++) {
+                    let eventParam = eventInfo.eventParamList[i];
+                    let eventParamConfig = eventInfo["config_params"][i];
+                    let varName = eventParamConfig["name"];
+                    let varValue = await this.getVarObjValue(eventParam.paramValueObj, varContextCapable);
+                    varLocalAtEventList.push({ varName: varName, varValue: varValue });
+                }
             }
             this.currentStateInfo.currentEventInfos.push({
+                eventType: eventInfo.type,
                 eventCode: eventInfo.eventCode,
                 eventPath: eventInfo.eventPath,
                 eventName: eventInfo.eventName,
@@ -512,4 +515,4 @@ PolicyHelper.noneState = "_none_";
 class PolicyInfoResult {
 }
 exports.PolicyInfoResult = PolicyInfoResult;
-//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"PolicyHelper.js","sourceRoot":"","sources":["../../src/helper/PolicyHelper.ts"],"names":[],"mappings":"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"}
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"PolicyHelper.js","sourceRoot":"","sources":["../../src/helper/PolicyHelper.ts"],"names":[],"mappings":"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"}

package/dist/state-machine/ContractStateMachine.js

@@ -43,11 +43,13 @@ class ContractStateMachine {
             });
             this.initEventNameList.push(initEventName);
             for (let eventInfo of stateInfo["events"]) {
-                stateMachineTransitions.push({
-                    name: eventInfo["eventId"],
-                    from: stateInfo["stateName"],
-                    to: eventInfo["toState"]
-                });
+                if (eventInfo["type"] == "normal") {
+                    stateMachineTransitions.push({
+                        name: eventInfo["eventId"],
+                        from: stateInfo["stateName"],
+                        to: eventInfo["toState"]
+                    });
+                }
             }
         }
         return stateMachineTransitions;
@@ -159,4 +161,4 @@ class ContractStateMachine {
     }
 }
 exports.ContractStateMachine = ContractStateMachine;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiQ29udHJhY3RTdGF0ZU1hY2hpbmUuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvc3RhdGUtbWFjaGluZS9Db250cmFjdFN0YXRlTWFjaGluZS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7QUFBQSx5REFBeUQ7QUFJekQsTUFBYSxvQkFBb0I7SUFBakM7UUFJWSx5QkFBb0IsR0FBRyxRQUFRLENBQUM7UUFFeEMsc0JBQWlCLEdBQWEsRUFBRSxDQUFDO0lBbUxyQyxDQUFDO0lBM0tHLEtBQUssQ0FBQyxLQUFLLENBQUMsTUFBK0M7UUFDdkQsT0FBTyxDQUFDLEdBQUcsQ0FBQyxnQ0FBZ0MsQ0FBQyxDQUFDO1FBRTlDLElBQUksQ0FBQyx1QkFBdUIsR0FBRyxNQUFNLElBQUksQ0FBQywrQkFBK0IsQ0FBQyxNQUFNLENBQUMsYUFBYSxDQUFDLENBQUM7UUFDaEcsSUFBSSxtQkFBbUIsR0FBRztZQUN0Qiw2QkFBNkI7WUFDN0IsV0FBVyxFQUFFLElBQUksQ0FBQyx1QkFBdUI7WUFDekMsT0FBTyxFQUFFO2dCQUNMLGtCQUFrQixFQUFFLElBQUksQ0FBQyxrQkFBa0IsQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUFDO2dCQUN0RCxZQUFZLEVBQUUsSUFBSSxDQUFDLFlBQVksQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUFDO2dCQUMxQyxZQUFZLEVBQUUsSUFBSSxDQUFDLFlBQVksQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUFDO2dCQUMxQyxZQUFZLEVBQUUsSUFBSSxDQUFDLFlBQVksQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUFDO2dCQUMxQyxpQkFBaUIsRUFBRSxJQUFJLENBQUMsaUJBQWlCLENBQUMsSUFBSSxDQUFDLElBQUksQ0FBQztnQkFDcEQsbUJBQW1CLEVBQUUsSUFBSSxDQUFDLG1CQUFtQixDQUFDLElBQUksQ0FBQyxJQUFJLENBQUM7YUFDM0Q7U0FDSixDQUFDO1FBQ0YsWUFBWSxDQUFDLFFBQVEsQ0FBQyxJQUFJLENBQUMsSUFB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
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiQ29udHJhY3RTdGF0ZU1hY2hpbmUuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvc3RhdGUtbWFjaGluZS9Db250cmFjdFN0YXRlTWFjaGluZS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7QUFBQSx5REFBeUQ7QUFJekQsTUFBYSxvQkFBb0I7SUFBakM7UUFJWSx5QkFBb0IsR0FBRyxRQUFRLENBQUM7UUFFeEMsc0JBQWlCLEdBQWEsRUFBRSxDQUFDO0lBcUxyQyxDQUFDO0lBN0tHLEtBQUssQ0FBQyxLQUFLLENBQUMsTUFBK0M7UUFDdkQsT0FBTyxDQUFDLEdBQUcsQ0FBQyxnQ0FBZ0MsQ0FBQyxDQUFDO1FBRTlDLElBQUksQ0FBQyx1QkFBdUIsR0FBRyxNQUFNLElBQUksQ0FBQywrQkFBK0IsQ0FBQyxNQUFNLENBQUMsYUFBYSxDQUFDLENBQUM7UUFDaEcsSUFBSSxtQkFBbUIsR0FBRztZQUN0Qiw2QkFBNkI7WUFDN0IsV0FBVyxFQUFFLElBQUksQ0FBQyx1QkFBdUI7WUFDekMsT0FBTyxFQUFFO2dCQUNMLGtCQUFrQixFQUFFLElBQUksQ0FBQyxrQkFBa0IsQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUFDO2dCQUN0RCxZQUFZLEVBQUUsSUFBSSxDQUFDLFlBQVksQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUFDO2dCQUMxQyxZQUFZLEVBQUUsSUFBSSxDQUFDLFlBQVksQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUFDO2dCQUMxQyxZQUFZLEVBQUUsSUFBSSxDQUFDLFlBQVksQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUFDO2dCQUMxQyxpQkFBaUIsRUFBRSxJQUFJLENBQUMsaUJBQWlCLENBQUMsSUFBSSxDQUFDLElBQUksQ0FBQztnQkFDcEQsbUJBQW1CLEVBQUUsSUFBSSxDQUFDLG1CQUFtQixDQUFDLElBQUksQ0FBQyxJQUFJLENBQUM7YUFDM0Q7U0FDSixDQUFDO1FBQ0YsWUFBWSxDQUFDLFFBQVEsQ0FBQyxJQUFJLENBQUMsSUFB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

package/index.js

@@ -19,6 +19,7 @@ const {OutsideApiService} = require("./dist/service/OutsideApiService");
 const {GetPostHelper} = require("./dist/helper/GetPostHelper");
 const {ContractStateMachine} = require("./dist/state-machine/ContractStateMachine");
 const {ContractFsmHook} = require("./dist/state-machine/ContractFsmHook");
+const {DynamicFunctionExecutor} = require("./dist/function-executor/DynamicFunctionExecutor");
 
 exports.PolicyHelper = PolicyHelper;
 exports.FunctionHelper = FunctionHelper
@@ -28,6 +29,7 @@ exports.VarContextCapable = VarContextCapable;
 
 exports.DefaultContractDeclarationExecutor = DefaultContractDeclarationExecutor;
 exports.DefaultFunctionExecutor = DefaultFunctionExecutor;
+exports.DynamicFunctionExecutor = DynamicFunctionExecutor;
 
 exports.OutsideApiService = OutsideApiService;
 exports.GetPostHelper = GetPostHelper;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@freelog/freelog-cg-collection",
-  "version": "1.2.5",
+  "version": "1.2.7",
   "main": "index.js",
   "dependencies": {
     "antlr4": "4.8.0",

package/resources/zhaojn.json

@@ -321,6 +321,92 @@
                     ],
                     "eventCode": "V101",
                     "eventId": "b3449b02"
+                },
+                {
+                    "type": "normal",
+                    "content": "Event.Time.Relative(1,\"minute\")->AUTH_MEMBER{fun.setLabel({\"label\":\"vip1\",\"ttl\":1800})}",
+                    "config_params": [
+                        {
+                            "name": "elapsed",
+                            "type": "number"
+                        },
+                        {
+                            "name": "timeUnit",
+                            "type": "string"
+                        }
+                    ],
+                    "eventName": "Relative",
+                    "variableChainList": [],
+                    "eventParamList": [
+                        {
+                            "paramValue": "1",
+                            "paramValueObj": {
+                                "expType": "number",
+                                "value": "1",
+                                "variableChainList": []
+                            },
+                            "content": "1"
+                        },
+                        {
+                            "paramValue": "\"minute\"",
+                            "paramValueObj": {
+                                "expType": "string",
+                                "value": "minute",
+                                "variableChainList": []
+                            },
+                            "content": "\"minute\""
+                        }
+                    ],
+                    "toState": "AUTH_MEMBER",
+                    "stateContextArgs": [],
+                    "actions": [
+                        {
+                            "type": "functionCall",
+                            "content": "fun.setLabel({\"label\":\"vip1\",\"ttl\":1800})",
+                            "actionObj": {
+                                "funcName": "setLabel",
+                                "variableChainList": [],
+                                "paramList": [
+                                    {
+                                        "paramValue": "{\"label\":\"vip1\",\"ttl\":1800}",
+                                        "paramValueObj": {
+                                            "expType": "expArgsGroup",
+                                            "paramList": [
+                                                {
+                                                    "paramName": "label",
+                                                    "paramValue": "\"vip1\"",
+                                                    "paramValueObj": {
+                                                        "expType": "string",
+                                                        "value": "vip1"
+                                                    }
+                                                },
+                                                {
+                                                    "paramName": "ttl",
+                                                    "paramValue": "1800",
+                                                    "paramValueObj": {
+                                                        "expType": "number",
+                                                        "value": "1800"
+                                                    }
+                                                }
+                                            ],
+                                            "variableChainList": []
+                                        },
+                                        "content": "{\"label\":\"vip1\",\"ttl\":1800}"
+                                    }
+                                ],
+                                "expType": "functionCall",
+                                "varChain": "fun"
+                            }
+                        }
+                    ],
+                    "eventPath": "Time",
+                    "eventCode": "T201",
+                    "eventId": "04e9cfdc"
+                },
+                {
+                    "type": "terminate",
+                    "content": "terminate",
+                    "eventName": "terminate"
                 }
             ],
             "serviceStateSection": {
@@ -684,109 +770,45 @@
                 },
                 {
                     "type": "normal",
-                    "content": "Event.Time.Schedule(Time.AddTime(Time.GetTime(Time.Now(),\"day\"),1,\"day\"))->AUTH_MEMBER{fun.clearElems(setTemp)}",
+                    "content": "Event.Time.Relative(2,\"minute\")->FINISH",
                     "config_params": [
                         {
-                            "name": "dateTime",
+                            "name": "elapsed",
+                            "type": "number"
+                        },
+                        {
+                            "name": "timeUnit",
                             "type": "string"
                         }
                     ],
-                    "eventName": "Schedule",
+                    "eventName": "Relative",
                     "variableChainList": [],
                     "eventParamList": [
                         {
-                            "paramValue": "Time.AddTime(Time.GetTime(Time.Now(),\"day\"),1,\"day\")",
+                            "paramValue": "2",
                             "paramValueObj": {
-                                "funcName": "AddTime",
-                                "variableChainList": [],
-                                "paramList": [
-                                    {
-                                        "paramValue": "Time.GetTime(Time.Now(),\"day\")",
-                                        "paramValueObj": {
-                                            "funcName": "GetTime",
-                                            "variableChainList": [],
-                                            "paramList": [
-                                                {
-                                                    "paramValue": "Time.Now()",
-                                                    "paramValueObj": {
-                                                        "funcName": "Now",
-                                                        "variableChainList": [],
-                                                        "paramList": [],
-                                                        "expType": "functionCall",
-                                                        "varChain": "Time"
-                                                    },
-                                                    "content": "Time.Now()"
-                                                },
-                                                {
-                                                    "paramValue": "\"day\"",
-                                                    "paramValueObj": {
-                                                        "expType": "string",
-                                                        "value": "day"
-                                                    },
-                                                    "content": "\"day\""
-                                                }
-                                            ],
-                                            "expType": "functionCall",
-                                            "varChain": "Time"
-                                        },
-                                        "content": "Time.GetTime(Time.Now(),\"day\")"
-                                    },
-                                    {
-                                        "paramValue": "1",
-                                        "paramValueObj": {
-                                            "expType": "number",
-                                            "value": "1"
-                                        },
-                                        "content": "1"
-                                    },
-                                    {
-                                        "paramValue": "\"day\"",
-                                        "paramValueObj": {
-                                            "expType": "string",
-                                            "value": "day"
-                                        },
-                                        "content": "\"day\""
-                                    }
-                                ],
-                                "expType": "functionCall",
-                                "varChain": "Time"
+                                "expType": "number",
+                                "value": "2",
+                                "variableChainList": []
                             },
-                            "content": "Time.AddTime(Time.GetTime(Time.Now(),\"day\"),1,\"day\")"
-                        }
-                    ],
-                    "toState": "AUTH_MEMBER",
-                    "stateContextArgs": [],
-                    "actions": [
+                            "content": "2"
+                        },
                         {
-                            "type": "functionCall",
-                            "content": "fun.clearElems(setTemp)",
-                            "actionObj": {
-                                "funcName": "clearElems",
-                                "variableChainList": [
-                                    "setTemp"
-                                ],
-                                "paramList": [
-                                    {
-                                        "paramValue": "setTemp",
-                                        "paramValueObj": {
-                                            "expType": "variableChain",
-                                            "varType": "normal",
-                                            "content": "setTemp",
-                                            "variableChainList": [
-                                                "setTemp"
-                                            ]
-                                        },
-                                        "content": "setTemp"
-                                    }
-                                ],
-                                "expType": "functionCall",
-                                "varChain": "fun"
-                            }
+                            "paramValue": "\"minute\"",
+                            "paramValueObj": {
+                                "expType": "string",
+                                "value": "minute",
+                                "variableChainList": []
+                            },
+                            "content": "\"minute\""
                         }
                     ],
+                    "toState": "FINISH",
+                    "stateContextArgs": [],
+                    "actions": [],
                     "eventPath": "Time",
-                    "eventCode": "T202",
-                    "eventId": "490d5f83"
+                    "eventCode": "T201",
+                    "eventId": "51f53f20"
                 }
             ],
             "serviceStateSection": {
@@ -1736,6 +1758,18 @@
             "stateContextArgs": [
                 "elems"
             ]
+        },
+        {
+            "stateName": "FINISH",
+            "assignments": [],
+            "events": [
+                {
+                    "type": "terminate",
+                    "content": "terminate",
+                    "eventName": "terminate"
+                }
+            ],
+            "stateContextArgs": []
         }
     ]
 }

package/resources/zhaojn.sc

@@ -21,6 +21,8 @@ Initial None:
 //	Event.Void(not ("vip1" in labels)) -> AUTH_MEMBER
 //	Event.Echo.Labels({"subject":echoSubject, "licensee":contract.licensee, "label":"vip1"}) -> AUTH_VIP1
     Event.Void(not ("vip2" in labels)) -> AUTH_MEMBER{fun.setLabel({"label":"vip2", "ttl":7200})}
+    Event.Time.Relative(1, "minute") -> AUTH_MEMBER{fun.setLabel({"label":"vip1", "ttl":1800})}
+    terminate
 
 AUTH_MEMBER Partial{setUnlocked, setTemp}:
 	Event.Transaction.Pay(amount = unitPrice, elemsNum = 1) -> AUTH_MEMBER{fun.addElements(setUnlocked, contract.licenseeSelectedElems, false)}
@@ -28,7 +30,8 @@ AUTH_MEMBER Partial{setUnlocked, setTemp}:
 	Event.Custom.AcceptEvent({"title":"MembershipChange", "subject":echoSubject, "label":"vip1"}) -> AUTH_VIP1
 
 	Event.Custom.WatchAD(elemsNum = 1) -> AUTH_MEMBER{fun.addElements(setTemp, contract.licenseeSelectedElems, false)}
-	Event.Time.Schedule(Time.AddTime(Time.GetTime(Time.Now(), "day"), 1, "day")) -> AUTH_MEMBER{fun.clearElems(setTemp)}
+//	Event.Time.Schedule(Time.AddTime(Time.GetTime(Time.Now(), "day"), 1, "day")) -> AUTH_MEMBER{fun.clearElems(setTemp)}
+	Event.Time.Relative(2, "minute") -> FINISH
 
 AUTH_VIP1 Partial{setUnlocked, setTemp, setFree}:
     let a = 1
@@ -48,3 +51,6 @@ FREE_UNLOCK_ROUTE None[elems]:
 	let freeUnlockedSize = Kit.Array.Size(setFree)
 	Event.Void(freeUnlockedSize < 4) -> AUTH_VIP1{fun.addElements(setFree, elems, false)}
 	Event.Void(freeUnlockedSize >= 4) -> AUTH_VIP1
+
+FINISH:
+    terminate

package/resources/zhaojn2.json

@@ -60,7 +60,9 @@
         },
         {
             "varName": "labels0",
-            "varValue": -1
+            "varValue": [
+                "vip1"
+            ]
         },
         {
             "varName": "setUnlocked",
@@ -83,20 +85,45 @@
         "varLocalCurrentStateList": [
             {
                 "varName": "labels",
-                "varValue": -1
+                "varValue": [
+                    "vip1"
+                ]
             }
         ],
         "currentEventInfos": [
             {
+                "eventType": "normal",
                 "eventCode": "V101",
                 "eventName": "Void",
                 "eventId": "b3449b02",
                 "varLocalAtEventList": [
                     {
                         "varName": "condition",
-                        "varValue": false
+                        "varValue": true
+                    }
+                ]
+            },
+            {
+                "eventType": "normal",
+                "eventCode": "T201",
+                "eventPath": "Time",
+                "eventName": "Relative",
+                "eventId": "04e9cfdc",
+                "varLocalAtEventList": [
+                    {
+                        "varName": "elapsed",
+                        "varValue": 1
+                    },
+                    {
+                        "varName": "timeUnit",
+                        "varValue": "minute"
                     }
                 ]
+            },
+            {
+                "eventType": "terminate",
+                "eventName": "terminate",
+                "varLocalAtEventList": []
             }
         ]
     }

package/src/function-executor/DynamicFunctionExecutor.ts

@@ -37,6 +37,12 @@ export class DynamicFunctionExecutor extends DefaultFunctionExecutor {
     }
 
     addExecutor(functionName: string, executor: FunctionInvoke): void {
+        if (executor instanceof DefaultFunctionExecutor) {
+            executor.setOutsideApiService(this.outsideApiService);
+        }
+        if (executor instanceof DynamicFunctionExecutor) {
+            executor.setVarContextProxy(this.varContextProxy);
+        }
         this.executorsMap.set(functionName, executor);
     }
 

package/src/helper/PolicyHelper.ts

@@ -237,14 +237,17 @@ export class PolicyHelper implements VarContextCapable<any>, Calculator, Functio
 
         for (let eventInfo of stateInfo["events"]) {
             let varLocalAtEventList = [];
-            for (let i = 0; i < eventInfo.eventParamList.length; i++) {
-                let eventParam = eventInfo.eventParamList[i];
-                let eventParamConfig = eventInfo["config_params"][i];
-                let varName = eventParamConfig["name"];
-                let varValue = await this.getVarObjValue(eventParam.paramValueObj, varContextCapable);
-                varLocalAtEventList.push({varName: varName, varValue: varValue});
+            if (eventInfo["type"] == "normal") {
+                for (let i = 0; i < eventInfo.eventParamList.length; i++) {
+                    let eventParam = eventInfo.eventParamList[i];
+                    let eventParamConfig = eventInfo["config_params"][i];
+                    let varName = eventParamConfig["name"];
+                    let varValue = await this.getVarObjValue(eventParam.paramValueObj, varContextCapable);
+                    varLocalAtEventList.push({varName: varName, varValue: varValue});
+                }
             }
             this.currentStateInfo.currentEventInfos.push({
+                eventType: eventInfo.type,
                 eventCode: eventInfo.eventCode,
                 eventPath: eventInfo.eventPath,
                 eventName: eventInfo.eventName,

package/src/state-machine/ContractStateMachine.ts

@@ -59,11 +59,13 @@ export class ContractStateMachine {
             this.initEventNameList.push(initEventName);
 
             for (let eventInfo of stateInfo["events"]) {
-                stateMachineTransitions.push({
-                    name: eventInfo["eventId"],
-                    from: stateInfo["stateName"],
-                    to: eventInfo["toState"]
-                })
+                if (eventInfo["type"] == "normal") {
+                    stateMachineTransitions.push({
+                        name: eventInfo["eventId"],
+                        from: stateInfo["stateName"],
+                        to: eventInfo["toState"]
+                    })
+                }
             }
         }
 

package/test/function-executor/query/QueryEchoServiceLabels.ts

@@ -1,10 +1,9 @@
-import {DefaultFunctionExecutor} from "../../../src/function-executor/DefaultFunctionExecutor";
+import {DynamicFunctionExecutor} from "../../../src/function-executor/DynamicFunctionExecutor";
 
-export class QueryEchoServiceLabels extends DefaultFunctionExecutor {
+export class QueryEchoServiceLabels extends DynamicFunctionExecutor {
 
     async invoke(functionName: string, args: any[]): Promise<string[]> {
         console.debug(`invoke 【QueryEchoServiceLabels】functionName = ${functionName} args = ${args}`);
-
         return ["vip1"];
     }
 }

package/test/library/ObjectTest.test.ts

@@ -4,8 +4,8 @@ describe("test/library/ObjectTest.test.ts", () => {
     it("assign", async () => {
         let a = {title: "hello"};
         let b = {name: "b"};
-        let result = Object.assign(a, b);
-        console.log(result);
+        Object.assign(a, b);
+        console.log(a);
     });
 
     it("defineProperty", async () => {

package/test/state-machine/ContractStateMachineTest.test.ts

@@ -12,7 +12,7 @@ describe("test/state-machine/ContractStateMachineTest.test.ts", () => {
         let source = JSON.parse(fs.readFileSync("./resources/zhaojn.json", "utf-8"));
 
         let policyHelper = new PolicyHelper(source);
-        // policyHelper.addExecutor("Query", "Query.EchoService.Labels", new QueryEchoServiceLabels());
+        policyHelper.addExecutor("Query", "Query.EchoService.Labels", new QueryEchoServiceLabels());
         policyHelper.setVarGlobalList(JSON.parse(fs.readFileSync("./resources/test/var_context_list.json", "utf-8")));
         policyHelper.setGetPostInvoke(new CustomGetPostHelper());
         policyHelper.setApiAddressMulti(JSON.parse(fs.readFileSync("./resources/test/api_address_list.json", "utf-8")));