runner-runtime 1.0.27 → 1.0.30

package/events/api.js

@@ -414,7 +414,7 @@ const convert2PostmanRequest = (request, option) => {
                 _.forEach(parameter, (item) => {
                     if (_.isObject(item)) {
                         if (item.is_checked > 0 && autoReplaceMockVar(item.key) != '') {
-                            if (bodyMode == "form-data" && item.field_type == "File") {
+                            if (bodyMode == "form-data" && _.toLower(item.field_type) === "file") {
                                 const src = base64toCacheFile(
                                     item.key,
                                     item.value,
@@ -1761,6 +1761,7 @@ const preProcessMockExp = (request, requestPara, AllVars, option) => {
 
 // 初始化api请求参数
 const initRequestJson = (event, option) => {
+    
     // 获取具体的请求详情
     const requestJson = _.assign(_.pick(event, ['event_id', 'test_id']), _.pick(event?.data, ['target_id', 'project_id']));
 
@@ -2019,7 +2020,16 @@ const initRequestJson = (event, option) => {
         })
 
         _.set(requestJson, "initVarReplacedUrl", initVarReplacedUrl);
-    } else if (_.includes(['script', 'assert'], event?.type)) { // 脚本、断言 todo... 断言需要做成可视化的
+    } else if (_.includes(['script'], event?.type)) { // 脚本、断言 todo... 断言需要做成可视化的
+        _.set(requestJson, "request.pre_tasks", [
+            {
+                type: "customScript",
+                enabled: 1,
+                data: event?.data?.content,
+            },
+        ]);
+    } else if (_.includes(['assert'], event?.type)) { // 脚本、断言 todo... 断言需要做成可视化的
+        _.set(requestJson, "name", "脚本断言");
         _.set(requestJson, "request.pre_tasks", [
             {
                 type: "customScript",
@@ -2043,9 +2053,10 @@ const initRequestJson = (event, option) => {
             }
         ])
     } else if (_.includes(['assert_visual'], event?.type)) {
-        const { type, expression } = event?.data || {};
+        const { type, expression } = event?.data?.data || {};
 
         if (_.isString(type) && !_.isEmpty(expression)) {
+            _.set(requestJson, "name", "可视化断言");
             _.set(requestJson, "request.pre_tasks", [
                 {
                     "type": "assert",
@@ -2075,6 +2086,8 @@ module.exports = (event, option, callback, eventRuntimeData, eventResultList) =>
     return new Promise((resolve) => {
         try {
             const { requestJson, postmanJSON } = initRequestJson(event, option)
+
+            console.log(requestJson,`eventeventeventeventeventeventeventeventeventeventevent`)
             const collection = new sdk.Item({
                 name: _.get(requestJson, "name") || "New request", request: postmanJSON, event: [], protocolProfileBehavior: {
                     disableBodyPruning: true,
@@ -2107,14 +2120,16 @@ module.exports = (event, option, callback, eventRuntimeData, eventResultList) =>
                         // script error
                         exception(cursor, err) {
                             if (err) {
-                                const scriptType = _.get(cursor, cursor?.scriptId);
-                                _.set(eventRuntimeData, [event?.event_id, "exception", scriptType], err);
-                                _.set(eventRuntimeData, [event?.event_id, 'error'], {
-                                    error_type: scriptType,
-                                    message: err?.message
-                                })
-                                if (scriptType === 'prerequest') {
-                                    run.abort();
+                                if (!_.includes(['assert_visual', 'assert'], event?.type)) {
+                                    const scriptType = _.get(cursor, cursor?.scriptId);
+                                    _.set(eventRuntimeData, [event?.event_id, "exception", scriptType], err);
+                                    _.set(eventRuntimeData, [event?.event_id, 'error'], {
+                                        error_type: scriptType,
+                                        message: err?.message
+                                    })
+                                    if (scriptType === 'prerequest') {
+                                        run.abort();
+                                    }
                                 }
                             }
                         },
@@ -2156,7 +2171,15 @@ module.exports = (event, option, callback, eventRuntimeData, eventResultList) =>
                                         const currentVar = _.get(result, `result.${varType}`);
                                         try {
                                             _.forEach(currentVar.toObject(), (val, key) => {
-                                                _.set(eventRuntimeData, ["variables", varType === '_variables' ? 'variables' : varType, key], val)
+                                                let setPath = varType;
+                                                if (varType === '_variables') {
+                                                    setPath = 'variables';
+                                                }
+
+                                                if (varType === 'globals' && !_.includes(_.keys(getInsideVariables()), key)) {
+                                                    _.set(eventRuntimeData, ["variables", '_globals', key], val)
+                                                }
+                                                _.set(eventRuntimeData, ["variables", setPath, key], val)
                                             })
                                         } catch (e) { }
                                     })
@@ -2170,7 +2193,7 @@ module.exports = (event, option, callback, eventRuntimeData, eventResultList) =>
                                     _.set(eventRuntimeData, [event?.event_id, "response"], await convert2EchoResponse(response, history));
                                 }
                             } else {
-                                if (!_.includes(['script', 'sql'], event?.type)) {
+                                if (!_.includes(['script', 'sql', 'assert_visual', 'assert'], event?.type)) {
                                     _.set(eventRuntimeData, [event?.event_id, "exception", 'prerequest'], String(err));
                                     _.set(eventRuntimeData, [event?.event_id, 'error'], {
                                         error_type: 'prerequest',
@@ -2211,7 +2234,15 @@ module.exports = (event, option, callback, eventRuntimeData, eventResultList) =>
                                             const currentVar = _.get(result, `result.${varType}`);
                                             try {
                                                 _.forEach(currentVar.toObject(), (val, key) => {
-                                                    _.set(eventRuntimeData, ["variables", varType === '_variables' ? 'variables' : varType, key], val)
+                                                    let setPath = varType;
+                                                    if (varType === '_variables') {
+                                                        setPath = 'variables';
+                                                    }
+
+                                                    if (varType === 'globals' && !_.includes(_.keys(getInsideVariables()), key)) {
+                                                        _.set(eventRuntimeData, ["variables", '_globals', key], val)
+                                                    }
+                                                    _.set(eventRuntimeData, ["variables", setPath, key], val)
                                                 })
                                             } catch (e) { }
                                         })
@@ -2269,16 +2300,24 @@ module.exports = (event, option, callback, eventRuntimeData, eventResultList) =>
                                 }
 
                                 // 写入到自动化测试结果
+                                const tempVars = _.pick(_.get(eventRuntimeData, 'variables'), ['environment', '_globals']);
                                 const finalRequestResult = _.assign({
-                                    action: 'httpRequestCompleted',
-                                    data: camelCaseToSnakeCase(_.get(eventRuntimeData, event?.event_id)),
+                                    action: 'request',
+                                    data: _.assign(
+                                        {
+                                            variables: {
+                                                global: _.get(tempVars, '_globals', {}),
+                                                environment: _.get(tempVars, 'environment', {})
+                                            }
+                                        },
+                                        camelCaseToSnakeCase(_.get(eventRuntimeData, event?.event_id))),
                                     error: _.get(eventRuntimeData, [event?.event_id, 'error', 'message']) || null,
                                     event_id: event?.event_id,
                                     iteration_id: _.get(eventRuntimeData, [event?.event_id, 'iteration_id'])
                                 }, _.pick(requestJson, ['parent_id', 'project_id', 'test_id', 'target_id']));
 
                                 if (scene === 'auto_test' && _.includes(['assert', 'assert_visual', 'api', 'sample'], event?.type)) {
-                                    eventResultList.push(_.assign(camelCaseToSnakeCase(_.get(eventRuntimeData, event?.event_id)), _.pick(event, ['type', 'event_id', 'test_id', 'iteration_id'])));
+                                    eventResultList.push(_.assign(camelCaseToSnakeCase(_.get(_.cloneDeep(eventRuntimeData), event?.event_id)), _.pick(event, ['type', 'event_id', 'test_id', 'iteration_id'])));
 
                                     resolve({
                                         action: 'request',

package/events/index.js

@@ -57,6 +57,7 @@ const events = {
                 const { iterationData, enable_data } = data;
 
                 if (_.toInteger(enable_data) > 0) {
+                    console.log(_.assign(_.cloneDeep(option), { iterationData }),11111111111111)
                     await iterationEvent(children, _.assign(_.cloneDeep(option), { iterationData }), callback, eventRuntimeData, eventResultList)
                 } else {
                     await iterationEvent(children, option, callback, eventRuntimeData, eventResultList)
@@ -201,6 +202,20 @@ const executeEvent = (event, option, callback, eventRuntimeData, eventResultList
                 iteration_id: aTools.snowflakeId()
             });
         }
+
+        const environment = _.get(option, 'env.environment', {});
+        const globals = _.get(option, 'globals', {});
+        const iterationData = _.get(option, 'iterationData', {});
+        const tempVars = { environment, globals, iterationData };
+
+        ['environment', 'globals', 'iterationData'].forEach((type) => {
+            _.forEach(tempVars[type], (value, key) => {
+                if (_.isUndefined(_.get(eventRuntimeData, ['variables', type, key]))) {
+                    _.set(eventRuntimeData, ['variables', type, key], value)
+                }
+            })
+        })
+
         const eventCall = _.get(events, `${event?.type}`);
 
         if (_.isFunction(eventCall)) {

package/index.js

@@ -1,4 +1,4 @@
-const { repeatArrayToLength, formatAutotestReport,formatAutotestReportList } = require('./libs/utils');
+const { repeatArrayToLength, formatAutotestReport, formatAutotestReportList } = require('./libs/utils');
 const _ = require('lodash');
 const moment = require('moment');
 const aTools = require("apipost-tools");
@@ -12,8 +12,14 @@ const run = async (events, option, callback) => {
     const iterationDataArr = repeatArrayToLength(iterationData, _.size(tempEvents));
     const eventOptions = _.pick(option, ["scene", "lang", "project", "env", "globals", "cookies", "system_configs", "custom_functions", "collection", "database_configs", "enable_sandbox", "sleep", "name", "testing_id"]);
     const eventRuntimeData = {
-        variables: {}
+        variables: {
+            environment: {},
+            globals: {},
+            _globals: {},
+            iterationData: {},
+        }
     };
+
     const eventResultList = [];
     const startTimeAt = Date.now();
 
@@ -51,12 +57,19 @@ const run = async (events, option, callback) => {
             })
         }
 
+        const tempVars = _.pick(_.get(eventRuntimeData, 'variables'), ['environment', '_globals']);
+
         callback({
             action: 'complete',
-            data: _.assign(formatAutotestReport(startTimeAt, eventResultList), {
-                list: formatAutotestReportList(eventResultList),
-                variables: _.get(eventRuntimeData, 'variables')
-            },
+            data: _.assign(
+                formatAutotestReport(startTimeAt, eventResultList),
+                {
+                    list: formatAutotestReportList(eventResultList),
+                    variables: {
+                        global: option?.enable_sandbox > 0 ? {} : _.get(tempVars, '_globals', {}),
+                        environment: option?.enable_sandbox > 0 ? {} : _.get(tempVars, 'environment', {})
+                    }
+                },
                 _.pick(_.get(option, 'env', {}), ['env_id', 'env_name']),
                 { testing_id: _.get(_.first(eventResultList), 'test_id') },
                 { report_name: `${moment().format('YYYY-MM-DD HH:mm:ss')}` },

package/libs/utils.js

@@ -439,11 +439,19 @@ const variableReplace = (str, variables, option) => {
 const formatAutotestReportList = (eventResultList) => {
     const list = []
     _.forEach(eventResultList, (item) => {
+        let type = item?.type;
+
+        if (_.includes(['assert_visual', 'assert'], item?.type)) {
+            type = 'api';
+        }
+
+        // console.log(item?.response,3333333333)
         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"
@@ -451,7 +459,7 @@ const formatAutotestReportList = (eventResultList) => {
             },
         ))
     })
-
+console.log(JSON.stringify(list, null,2))
     return list;
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "runner-runtime",
-    "version": "1.0.27",
+    "version": "1.0.30",
     "description": "runner-runtime.",
     "main": "index.js",
     "scripts": {