runner-runtime 1.0.47 → 1.0.49

package/events/index.js

@@ -3,7 +3,7 @@ const atomicSleep = require("atomic-sleep"),
     aTools = require("apipost-tools"),
     JSON5 = require('json5'),
     _ = require('lodash'),
-    { returnBoolean, variableReplace } = require('../libs/utils');
+    { returnBoolean, variableReplace, convertEndRuntimeState } = require('../libs/utils');
 const executeApi = require('./api'),
     executeWait = require('./wait');
 
@@ -17,37 +17,54 @@ const events = {
     assert_visual: executeApi,
     sql: executeApi,
     wait: executeWait, //  ok
-    if: async (event, option, callback, eventRuntimeData, eventResultList) => {  //  ok
+    if: async (event, option, callback, eventRuntimeData, eventResultList) => {  //  ok 
         try {
             const { data, children } = event;
             const exp = variableReplace(data?.var, eventRuntimeData?.variables, option),
                 compare = data?.compare, value = variableReplace(data?.value, eventRuntimeData?.variables, option);
-
-            if (returnBoolean(exp, compare, value)) {
-                if (_.isArray(children) && !_.isEmpty(children)) {
-                    const { iterationData } = option;
-                    await iterationEvent(children, _.assign(_.cloneDeep(option), { iterationDataArr: [iterationData] }), callback, eventRuntimeData, eventResultList)
-                }
-
-                return ({
-                    action: 'ifConditionSuccess',
-                    condition: { var: exp, compare, value },
-                    current_event_id: event?.event_id
-                });
-            } else {
-                return ({
-                    action: 'ifConditionFailed',
-                    condition: { var: exp, compare, value },
-                    current_event_id: event?.event_id
-                })
+            const isMatched = returnBoolean(exp, compare, value);
+            const runtimeState = convertEndRuntimeState(eventRuntimeData, event?.event_id) || {}
+            const finalIfData = {
+                action: 'request',
+                data: _.assign(
+                    {
+                        data: {
+                            isMatched,
+                            condition: {
+                                leftValue: {
+                                    variable: data?.var,
+                                    value: exp
+                                },
+                                compare,
+                                rightValue: {
+                                    variable: data?.value,
+                                    value: value
+                                }
+                            }
+                        }
+                    },
+                    _.pick(runtimeState, ['startTime', 'endTime', 'currentVariables']),
+                    _.pick(event, ['project_id', 'test_id', 'event_id', 'type']),
+                    _.pick(_.get(eventRuntimeData, event?.event_id), ['iteration_id']),
+                )
+            };
+
+            eventResultList.push(finalIfData?.data)
+            callback(finalIfData);
+
+            if (isMatched && _.isArray(children) && !_.isEmpty(children)) {
+                const { iterationData } = option;
+                await iterationEvent(children, _.assign(_.cloneDeep(option), { iterationDataArr: [iterationData] }), callback, eventRuntimeData, eventResultList)
             }
         } catch (e) {
-            return ({
+            throw ({
                 action: 'stystemError',
                 message: String(e),
-                current_event_id: event?.event_id
+                event_id: event?.event_id
             })
         }
+
+        return;
     },
     begin: async (event, option, callback, eventRuntimeData, eventResultList) => {  //  ok
         try {
@@ -62,18 +79,15 @@ const events = {
                     await iterationEvent(children, option, callback, eventRuntimeData, eventResultList)
                 }
             }
-
-            return ({
-                action: 'beginComplete',
-                current_event_id: event?.event_id
-            });
         } catch (e) {
-            return ({
+            throw ({
                 action: 'stystemError',
                 message: String(e),
-                current_event_id: event?.event_id
+                event_id: event?.event_id
             })
         }
+
+        return;
     },
     loop: async (event, option, callback, eventRuntimeData, eventResultList) => { // ok
         try {
@@ -213,68 +227,58 @@ const events = {
                     }
                 }
             }
-
-            return ({
-                action: 'loopComplete',
-                current_event_id: event?.event_id
-            });
         } catch (e) {
-            return ({
+            throw ({
                 action: 'stystemError',
                 message: String(e),
-                current_event_id: event?.event_id
+                event_id: event?.event_id
             })
         }
+
+        return;
     }
 };
 
 // 调度器核心函数，用于递归执行具体场景步骤
-const executeEvent = (event, option, callback, eventRuntimeData, eventResultList) => {
-    return new Promise((resolve, reject) => {
-        if (_.isUndefined(event.event_id) && option?.scene === 'http_request') {
-            _.set(event, 'event_id', _.get(event, 'data.target_id'))
-        }
-        // console.log(option?.scene)
-        _.assign(eventRuntimeData?.variables?.iterationData, _.get(option, 'iterationData'))
-        _.set(eventRuntimeData, [event.event_id, 'iteration_id'], aTools.snowflakeId());
-
-        const eventCall = _.get(events, `${event?.type}`);
-
-        if (_.isFunction(eventCall)) {
-            try {
-                eventCall(event, option, callback, eventRuntimeData, eventResultList).then((data) => {
-                    resolve(data);
-
-                    const { total, scene } = option;
-                    if (scene == 'auto_test' && _.isInteger(event?.progress)) {
-                        callback({
-                            action: 'process',
-                            data: {
-                                processCurrentCount: event?.progress + 1,
-                                processTotalCount: total,
-                                event_id: event?.event_id,
-                                testing_id: event?.test_id,
-                            }
-                        })
+const executeEvent = async (event, option, callback, eventRuntimeData, eventResultList) => {
+    if (_.isUndefined(event.event_id) && option?.scene === 'http_request') {
+        _.set(event, 'event_id', _.get(event, 'data.target_id'))
+    }
+
+    _.assign(eventRuntimeData?.variables?.iterationData, _.get(option, 'iterationData'))
+    _.set(eventRuntimeData, [event.event_id, 'iteration_id'], aTools.snowflakeId());
+
+    const eventCall = _.get(events, `${event?.type}`);
+
+    if (_.isFunction(eventCall)) {
+        const { total, scene } = option;
+
+        // 增加控制器开始时间
+        _.set(eventRuntimeData, [event.event_id, 'iteration', 'startTime'], Date.now());
+
+        // 增加初始化变量
+        const { environment = {}, variables = {}, _globals = {}, iterationData = {} } = _.get(eventRuntimeData, 'variables', {});
+        _.set(eventRuntimeData, [event.event_id, 'iteration', 'startVariables'], _.cloneDeep({ environment, variables, iterationData, globals: _globals }));
+
+        try {
+            await eventCall(event, option, callback, eventRuntimeData, eventResultList);
+            if (scene == 'auto_test' && _.isInteger(event?.progress)) {
+                callback({
+                    action: 'process',
+                    data: {
+                        processCurrentCount: event?.progress + 1,
+                        processTotalCount: total,
+                        event_id: event?.event_id,
+                        testing_id: event?.test_id,
                     }
                 })
-            } catch (e) { // 中止跳出执行的系统错误
-                if (_.toInteger(option?.ignore_error) < 1) {
-                    reject({
-                        action: 'stystemError',
-                        message: String(e),
-                        current_event_id: event?.event_id
-                    })
-                }
             }
-        } else {
-            reject({
-                action: 'warningError',
-                message: `This function \`${event?.type}\` is not currently supported.`,
-                current_event_id: event?.event_id
-            })
+        } catch (e) { // 中止跳出执行的系统错误
+            if (_.toInteger(option?.ignore_error) < 1) {
+                throw (e)
+            }
         }
-    })
+    }
 }
 
 const iterationEvent = async (events, option, callback, eventRuntimeData, eventResultList) => {
@@ -290,17 +294,14 @@ const iterationEvent = async (events, option, callback, eventRuntimeData, eventR
         const iterationData = iterationDataArr.shift() || {};
         try {
             const { sleep } = option;
-            const data = await executeEvent(event, { ...option, iterationData }, callback, eventRuntimeData, eventResultList);
-            callback(data);
+            await executeEvent(event, { ...option, iterationData }, callback, eventRuntimeData, eventResultList);
 
             if (_.toInteger(sleep) > 0) {
                 atomicSleep(sleep);
             }
         } catch (e) {
-            callback(e);
-
-            if (_.includes(ABORT_RECURSION_ERROR, e?.action)) {
-                throw new Error(String(e?.message));
+            if (_.toInteger(option?.ignore_error) < 1) {
+                throw (e)
             }
         }
 

package/events/wait.js

@@ -2,26 +2,37 @@ const atomicSleep = require("atomic-sleep"),
     _ = require('lodash');
 const { variableReplace } = require("../libs/utils");
 
-module.exports = (event, option, callback, eventRuntimeData,eventResultList) => {
-    return new Promise((resolve) => {
-        try {
-            const sleep = _.toInteger(variableReplace(event?.data?.sleep, eventRuntimeData?.variables, option)) || 0;
+module.exports = async (event, option, callback, eventRuntimeData, eventResultList) => {
+    try {
+        const sleep = _.toInteger(variableReplace(event?.data?.sleep, eventRuntimeData?.variables, option)) || 0;
+        const runtimeState = convertEndRuntimeState(eventRuntimeData, event?.event_id) || {}
+        const finalWaitData = {
+            action: 'request',
+            data: _.assign(
+                {
+                    data: {
+                        sleep
+                    }
+                },
+                _.pick(runtimeState, ['startTime', 'endTime', 'currentVariables']),
+                _.pick(event, ['project_id', 'test_id', 'event_id', 'type']),
+                _.pick(_.get(eventRuntimeData, event?.event_id), ['iteration_id']),
+            )
+        };
 
-            if (sleep > 0) {
-                atomicSleep(sleep)
-            }
+        eventResultList.push(finalWaitData?.data)
+        callback(finalWaitData);
 
-            resolve({
-                action: 'sleep',
-                sleep,
-                current_event_id: event?.event_id
-            })
-        } catch (e) {
-            resolve({
-                action: 'stystemError',
-                message: String(e),
-                current_event_id: event?.event_id
-            })
+        if (sleep > 0) {
+            atomicSleep(sleep)
         }
-    });
+    } catch (e) {
+        throw({
+            action: 'stystemError',
+            message: String(e),
+            event_id: event?.event_id
+        })
+    }
+
+    return;
 }

package/index.js

@@ -14,6 +14,7 @@ const run = async (events, option, callback) => {
     const eventRuntimeData = {
         variables: {
             environment: {},
+            variables: {},
             globals: {},
             _globals: {},
             iterationData: {},
@@ -40,11 +41,8 @@ const run = async (events, option, callback) => {
 
         if (_.isObject(event) && _.has(event, 'type')) {
             try {
-                const data = await executeEvent(event, _.assign(eventOptions, { iterationData: {} }), callback, eventRuntimeData, eventResultList);
-                callback(data)
+                await executeEvent(event, _.assign(eventOptions, { iterationData: {} }), callback, eventRuntimeData, eventResultList);
             } catch (e) {
-                callback(e);
-
                 if (_.includes(ABORT_RECURSION_ERROR, e?.action)) {
                     throw new Error(String(e?.message));
                 }
@@ -62,14 +60,11 @@ const run = async (events, option, callback) => {
         if (!_.isEmpty(finalEvents)) {
             const total = _.size(finalEvents);
             await iterationEvent(finalEvents, _.assign(eventOptions, { iterationDataArr, total }), callback, eventRuntimeData, eventResultList);
-        } else {
-            callback({
-                action: 'emptyEvents'
-            })
         }
 
         const tempVars = _.pick(_.get(eventRuntimeData, 'variables'), ['environment', '_globals']);
 
+        // 最后返回报告
         callback({
             action: 'complete',
             data: _.assign(

package/libs/utils.js

@@ -314,7 +314,7 @@ const getCaseInsensitive = (object, keyToFind) => {
 
 const variableReplace = (str, variables, option) => {
     const AllVars = getInsideVariables();
-    ["variables", "globals", "_globals", "environment"].forEach((varName) => {
+    ["globals", "_globals", "environment", "variables"].forEach((varName) => {
         _.assign(AllVars, _.get(variables, `${varName}`))
     })
 
@@ -331,139 +331,44 @@ const variableReplace = (str, variables, option) => {
     }
 }
 
-// const createPipeServer = () => {
-//     const net = require('net');
-//     const fs = require('fs');
-//     const path = require('path');
-//     const { DatabaseQuery } = require('database-query');
-//     const mainProcessSocketPath = path.join(__dirname, 'my_socket.sock');
-//     _.set(process, 'env.main_process_socket_path', mainProcessSocketPath);
-
-//     // 如果套接字文件已存在，删除它
-//     if (fs.existsSync(mainProcessSocketPath)) {
-//         fs.unlinkSync(mainProcessSocketPath);
-//     }
-
-//     const server = net.createServer((socket) => {
-//         socket.on('data', async (stream) => {
-//             const { action, data } = JSON.parse(String(Buffer.from(stream)));
-//             try {
-//                 switch (action) {
-//                     case 'queryDatabase':
-//                         const { dbconfig, query } = data;
-//                         const result = await DatabaseQuery(dbconfig, query);
-//                         socket.write(JSON.stringify(result));
-//                         break;
-//                     case 'execute':
-//                         const { execSync } = require('child_process');
-//                         const { file, args, option } = data;
-//                         const ext = file.split('.').pop().toLowerCase();
-//                         let command;
-//                         try {
-//                             switch (ext) {
-//                                 case 'jar':
-//                                     const jarPath = path.resolve(__dirname, `jar-main-1.0-SNAPSHOT.jar`);
-//                                     const { className, method } = option || {};
-//                                     if (_.isObject(option)) {
-//                                         if (_.isString(className) && _.isString(method)) {
-//                                             let para = new Buffer(JSON.stringify({ methodName: method, args: args })).toString("base64");
-//                                             command = `java -jar ${jarPath}  ${file} ${className} '${para}'`;
-//                                         }
-//                                     } else {
-//                                         command = `java -jar ${file} ${_.join(_.map(args, JSON.stringify), " ")}`;
-//                                     }
-
-//                                     break;
-//                                 case 'php':
-//                                     command = `php -f ${file} ${args.join(' ')}`;
-//                                     break;
-//                                 case 'js':
-//                                     command = `node ${file} ${args.join(' ')}`;
-//                                     break;
-//                                 case 'py':
-//                                     command = `python ${file} ${args.join(' ')}`;
-//                                     break;
-//                                 case 'py3':
-//                                     command = `python3 ${file} ${args.join(' ')}`;
-//                                     break;
-//                                 case 'bsh':
-//                                     command = `bsh ${file} ${args.join(' ')}`;
-//                                     break;
-//                                 case 'go':
-//                                     command = `go run ${file} ${args.join(' ')}`;
-//                                     break;
-//                                 case 'sh':
-//                                     command = `sh ${file} ${args.join(' ')}`;
-//                                     break;
-//                                 case 'rb':
-//                                 case 'ruby':
-//                                     command = `ruby ${file} ${args.join(' ')}`;
-//                                     break;
-//                                 case 'lua':
-//                                     command = `lua ${file} ${args.join(' ')}`;
-//                                     break;
-//                                 case 'rs':
-//                                     command = `rustc ${file} && ./${file.replace(/\.rs$/, '')} ${args.join(' ')}`;
-//                                     break;
-//                                 case 'bat':
-//                                     command = `${file} ${args.join(' ')}`;
-//                                     break;
-//                                 case 'ps1':
-//                                     command = `powershell -File ${file} ${args.join(' ')}`;
-//                                     break;
-//                                 default:
-//                                     throw new Error(`Unsupported file suffixes <${ext}>`);
-//                             }
-
-//                             const isWindows = process.platform === 'win32';
-//                             const options = _.assign(isWindows ? { encoding: 'cp936' } : { encoding: 'utf8' }, option);
-//                             const output = execSync(command, options);
-//                             socket.write(JSON.stringify({
-//                                 err: 'success',
-//                                 result: String(output)
-//                             }));
-//                         } catch (e) {
-//                             socket.write(JSON.stringify({
-//                                 err: 'error',
-//                                 result: String(e)
-//                             }));
-//                         }
-//                         break;
-//                 }
-
-//             } catch (e) {
-//                 socket.write(JSON.stringify(e));
-//             }
-
-//         });
-//     });
-
-//     server.listen(mainProcessSocketPath, () => {
-//         // console.log(`服务器已启动，监听路径 ${mainProcessSocketPath}`);
-//     });
-// }
-
 const formatAutotestReportList = (eventResultList) => {
-    const list = []
+    const list = [];
     _.forEach(_.cloneDeep(eventResultList), (item) => {
-        let type = item?.type;
-
-        if (_.includes(['assert_visual', 'assert'], item?.type)) {
-            type = 'api';
+        const type = item?.type;
+
+        if (_.includes(['assert', 'assert_visual', 'api', 'sample', 'script'], type)) {
+            list.push(_.assign(
+                _.pick(item?.response, ['timings', 'response_time', 'response_at', 'proxy', 'status', 'code', 'response_size']),
+                _.pick(item?.request, ['url', 'method', 'name', 'target_id', 'project_id']),
+                _.pick(item, ['type', 'event_id', 'test_id', 'iteration_id', 'startTime', 'endTime', 'currentVariables']),
+                {
+                    type,
+                    'status': {
+                        "assert": _.isEmpty(item?.status?.success_assert) ? "OK" : item?.status?.success_assert,
+                        "http": item?.status?.http || "OK"
+                    }
+                },
+            ))
+        } else if (_.includes(['if'], type)) {
+            list.push(_.assign(
+                _.pick(item, ['type', 'event_id', 'test_id', 'iteration_id', 'startTime', 'endTime', 'currentVariables']),
+                {
+                    type,
+                    'status': {
+                        ...item?.data
+                    }
+                },
+            ))
+        } else if (_.includes(['wait'], type)) {
+            list.push(_.assign(
+                _.pick(item, ['type', 'event_id', 'test_id', 'iteration_id', 'startTime', 'endTime', 'currentVariables']),
+                {
+                    type,
+                    'sleep': item?.data?.sleep || 0
+                },
+            ))
         }
-        
-        list.push(_.assign(
-            _.pick(item?.response, ['timings', 'response_time', 'response_at', 'proxy', 'status', 'code', 'response_size']),
-            _.pick(item?.request, ['url', 'method', 'name', 'target_id', 'project_id']),
-            _.pick(item, ['type', 'event_id', 'test_id', 'iteration_id']),
-            {
-                type,
-                'status': {
-                    "assert": _.isEmpty(item?.status?.success_assert) ? "OK" : item?.status?.success_assert,
-                    "http": item?.status?.http || "OK"
-                }
-            },
-        ))
+
     })
 
     return list;
@@ -564,7 +469,7 @@ const jsfGenerate = (schema, mockRules = [], lang) => {
 
     let genResult = undefined;
 
-    if (_.some(["default", "examples", "pattern", "format", "x-mock","enum"], (value) => _.includes(_.keys(schema?.schema), value))) {
+    if (_.some(["default", "examples", "pattern", "format", "x-mock", "enum"], (value) => _.includes(_.keys(schema?.schema), value))) {
         try {
             genResult = jsf.generate(schema);
         } catch (e) { }
@@ -575,6 +480,69 @@ const jsfGenerate = (schema, mockRules = [], lang) => {
     }
 }
 
+const convertEndRuntimeState = (eventRuntimeData, event_id) => {
+    try {
+        const { startTime, startVariables } = _.get(eventRuntimeData, [event_id, 'iteration'], {});
+        const endTime = Date.now();
+        const startAllVars = {};
+        const startAllActedUponVars = {};
+
+        ["globals", "environment", "iterationData", "variables"].forEach((type) => {
+            _.assign(startAllVars, _.get(startVariables, `${type}`))
+        })
+
+        _.forEach(startAllVars, (value, key) => {
+            _.set(startAllActedUponVars, [key, 'value'], value);
+
+            let startActedUpon = undefined;
+
+            if (!_.isUndefined(value)) {
+                ["variables", "iterationData", "environment", "globals"].some((type) => {
+                    if (!_.isUndefined(_.get(startVariables, [`${type}`, key]))) {
+                        startActedUpon = type;
+                        return;
+                    }
+                })
+            }
+            _.set(startAllActedUponVars, [key, 'actedUpon'], startActedUpon);
+        })
+
+        // 当前变量
+        const { environment = {}, variables = {}, _globals = {}, iterationData = {} } = _.get(eventRuntimeData, 'variables', {});
+        const endVariables = { environment, variables, iterationData, globals: _globals };
+        const endAllVars = {};
+        ["globals", "environment", "iterationData", "variables"].forEach((type) => {
+            _.assign(endAllVars, _.get(endVariables, `${type}`))
+        })
+
+        // 变量追踪
+        const currentVariables = {};
+
+        _.forEach(endAllVars, (value, key) => {
+            let actedUpon = undefined;
+
+            if (_.get(startAllVars, key) != value) {
+                ["variables", "iterationData", "environment", "globals"].some((type) => {
+                    if (!_.isUndefined(_.get(endVariables, [`${type}`, key]))) {
+                        actedUpon = type;
+                        return;
+                    }
+                })
+            }
+
+            _.set(currentVariables, [key], {
+                start: _.pick(startAllActedUponVars, ['value', 'actedUpon']),
+                current: { value, actedUpon }
+            })
+        })
+        console.log(JSON.stringify({ startTime, endTime, currentVariables }, null, 2), 11111112222)
+        return { startTime, endTime, currentVariables };
+    } catch (e) {
+        console.log(e)
+    }
+}
+
+
 module.exports = {
     atomicSleep,
     jsfGenerate,
@@ -584,6 +552,7 @@ module.exports = {
     replace2RegExp,
     getInsideVariables,
     repeatArrayToLength,
+    convertEndRuntimeState,
     returnBoolean,
     getCaseInsensitive,
     camelCaseToSnakeCase,

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "runner-runtime",
-    "version": "1.0.47",
+    "version": "1.0.49",
     "description": "runner-runtime.",
     "main": "index.js",
     "scripts": {
@@ -30,7 +30,7 @@
         "is-image": "^3.0.0",
         "is-svg": "^4.3.2",
         "json-bigint": "^1.0.0",
-        "json-schema-faker-pro": "^0.5.14",
+        "json-schema-faker-pro": "^0.5.16",
         "json5": "^2.2.3",
         "jsonpath": "^1.1.1",
         "lodash": "^4.17.21",