runner-runtime 1.0.36 → 1.0.38

package/events/api.js

@@ -1554,10 +1554,7 @@ async function convert2EchoResponse(response, history) {
         }
 
         _.assign(cloneResponse, { mimeType, fitForShow });
-    } catch (e) {
-
-        console.log(e, 1111)
-    }
+    } catch (e) { }
 
     // 响应头对象
     const responseHeader = {};
@@ -1668,7 +1665,6 @@ const preProcessMockExp = (request, requestPara, AllVars, option) => {
 
     // 重置 restful
     _.forEach(_.get(postmanJSON, 'url.path'), (item, key) => { //variable
-        // console.log(item)
         if (_.startsWith(item, ":")) {
             const pathVarKey = _.findKey(_.get(postmanJSON, 'url.variable'), (vars) => {
                 return vars?.key == _.trimStart(item, ':')
@@ -1786,7 +1782,7 @@ const initRequestJson = (event, option) => {
         } else {
             getParentTargetIDs(option?.collection, _.get(event, `data.target_id`), parentIDs);
         }
-        console.log(_.get(event, `data.target_id`), parentIDs, 6666666666)
+
         if (!_.includes(parentIDs, "0")) {
             parentIDs.push("0");
         }
@@ -1800,7 +1796,7 @@ const initRequestJson = (event, option) => {
                 // 目录参数
                 _.assign(request, _.get(getAPIFromCollection(option?.collection, parent_id), "request"));
             }
-            console.log(JSON.stringify(request, null, 2), parent_id, 7777, 111111111111111111111111111111111111111111111111111111111111)
+
             if (_.isObject(request) && !_.isEmpty(request)) {
                 ["header", "body", "query", "cookie"].forEach((parameter) => {
                     let arrPara = _.filter(_.get(request, `${parameter}.parameter`), (item) => { return _.toInteger(item.is_system) > 0 || item.is_checked > 0 });
@@ -2202,7 +2198,7 @@ module.exports = (event, option, callback, eventRuntimeData, eventResultList) =>
                                     })
                                 }
                             }
-                            // console.log(String(request?.url),5555555555555,_.get(eventRuntimeData, ["variables"]))
+
                             const requestOptions = convert2EchoRequest(request, requestJson, postmanJSON, history);
                             _.set(eventRuntimeData, [event?.event_id, "request"], requestOptions);
 
@@ -2228,11 +2224,14 @@ module.exports = (event, option, callback, eventRuntimeData, eventResultList) =>
                         },
 
                         test(err, cursor, results, item) {
+                            console.log(4444444, err)
                             if (!err) {
                                 if (!_.includes(['get_parsed_request'], scene)) {
+
                                     _.forEach(results, (result) => {
                                         _.forEach(['_variables', 'environment', 'globals'], (varType) => {
                                             const currentVar = _.get(result, `result.${varType}`);
+
                                             try {
                                                 _.forEach(currentVar.toObject(), (val, key) => {
                                                     let setPath = varType;
@@ -2258,10 +2257,7 @@ module.exports = (event, option, callback, eventRuntimeData, eventResultList) =>
                                     if (_.isUndefined(_.get(eventRuntimeData, [event?.event_id, "assertions"]))) {
                                         _.set(eventRuntimeData, [event?.event_id, "assertions"], []);
                                     }
-
                                     eventRuntimeData[event?.event_id].assertions = _.unionWith(_.concat(_.get(eventRuntimeData, [event?.event_id, "assertions"]), assertions), _.isEqual);
-
-                                    // console.log(eventRuntimeData[event?.event_id].assertions,111111)
                                 }
                             }
                         },
@@ -2296,7 +2292,7 @@ module.exports = (event, option, callback, eventRuntimeData, eventResultList) =>
                                     })
 
                                     _.set(eventRuntimeData, [event?.event_id, "status"], {
-                                        assert: [event?.event_id, "assertions"],
+                                        assert: _.get(eventRuntimeData, [event?.event_id, "assertions"]),
                                         success_assert,
                                         http: _.get(eventRuntimeData, [event?.event_id, 'response', 'status']) || _.get(eventRuntimeData, [event?.event_id, 'error', 'message'])
                                     });

package/events/index.js

@@ -57,7 +57,6 @@ 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)
@@ -202,11 +201,11 @@ const events = {
                         await iterationEvent(events, _.assign(_.cloneDeep(option), { iterationDataArr: iterationData, sleep, startTime, timeout }), callback, eventRuntimeData, eventResultList)
                     }
                 } else if (_.includes([3], loopType)) {
-                    const condition = _.get(option, 'condition', _.get(data, 'loop_condition', {}));
-                    const exp = variableReplace(condition?.var, eventRuntimeData?.variables, option), compare = condition?.compare, value = variableReplace(condition?.value, eventRuntimeData?.variables, option);
-                    console.log(exp, compare, value, `loopTypeloopTypeloopTypeloopTypeloopTypeloopTypeloopTypeloopType`, !returnBoolean(exp, compare, value))
                     while (true) {
-                        if (timeout === 0 || (timeout > 0 && startTime + timeout > Date.now()) && !returnBoolean(exp, compare, value)) {
+                        const condition = _.get(option, 'condition', _.get(data, 'loop_condition', {}));
+                        const exp = variableReplace(condition?.var, eventRuntimeData?.variables, option), compare = condition?.compare, value = variableReplace(condition?.value, eventRuntimeData?.variables, option);
+
+                        if ((timeout === 0 || (timeout > 0 && startTime + timeout > Date.now())) && !returnBoolean(exp, compare, value)) {
                             await iterationEvent(_.cloneDeep(children), _.assign(_.cloneDeep(option), { iterationDataArr: iterationData, sleep, condition, startTime, timeout }), callback, eventRuntimeData, eventResultList);
                         } else {
                             break;
@@ -220,7 +219,6 @@ const events = {
                 current_event_id: event?.event_id
             });
         } catch (e) {
-            console.log(e, 1111111)
             return ({
                 action: 'stystemError',
                 message: String(e),
@@ -232,9 +230,8 @@ const events = {
 
 // 调度器核心函数，用于递归执行具体场景步骤
 const executeEvent = (event, option, callback, eventRuntimeData, eventResultList) => {
-    _.assign(eventRuntimeData?.variables?.iterationData, _.get(option, 'iterationData'))
-    // console.log(option,`optionoptionoptionoptionoptionoptionoptionoption`)
     return new Promise((resolve, reject) => {
+        _.assign(eventRuntimeData?.variables?.iterationData, _.get(option, 'iterationData'))
         _.set(eventRuntimeData, [event.event_id, 'iteration_id'], aTools.snowflakeId());
 
         const eventCall = _.get(events, `${event?.type}`);

package/libs/2har.js

@@ -18,7 +18,6 @@
  * @returns {Object} HAR format JSON object.
  */
 function generateHarFromRequest(options) {
-    // console.log(options)
     const {
         url,
         method = 'GET',
@@ -106,7 +105,6 @@ function processQueryString(queryParams) {
  * @returns {Object|undefined} HAR postData object.
  */
 function processBody(body) {
-    // console.log(body)
     const { mode } = body;
 
     if (mode === 'none') {

package/libs/utils.js

@@ -25,7 +25,7 @@ const getParentTargetIDs = function (collection, target_id, parent_ids) {
                 return;
             }
 
-            if(_.isString(item.parent_id)){
+            if (_.isString(item.parent_id)) {
                 parent_ids.push(item.parent_id);
                 getParentTargetIDs(collection, item.parent_id, parent_ids);
             }
@@ -311,13 +311,15 @@ const getCaseInsensitive = (object, keyToFind) => {
 
 const variableReplace = (str, variables, option) => {
     const AllVars = getInsideVariables();
-    ["variables", "globals", "environment"].forEach((varName) => {
+    ["variables", "globals", "_globals", "environment"].forEach((varName) => {
+        console.log(11111111,_.get(variables, `${varName}`))
         _.assign(AllVars, _.get(variables, `${varName}`))
     })
+
     str = _.replace(str, /\{\{([^}]+)\}\}/g, (match, key) => {
         return _.get(AllVars, key.trim(), match);
     });
-
+    console.log(2222222, str, _.get(AllVars, 'IF_xunhuan'),_.keys(AllVars))
     const { lang, custom_functions } = option;
 
     try {
@@ -448,7 +450,6 @@ const formatAutotestReportList = (eventResultList) => {
             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']),
@@ -490,7 +491,7 @@ const formatAutotestReport = (startTimeAt, eventResultList) => {
 
     let totalResponseSize = 0, totalResponseTime = 0
 
-    _.forEach(eventResultList, (item) => {
+    _.forEach(_.cloneDeep(eventResultList), (item) => {
         if (_.includes(['api', 'sample'], item?.type)) {
             report.http.total++;
             totalResponseSize = totalResponseSize + _.toInteger(item?.response?.response_size);

package/package.json

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