runner-runtime 1.0.32 → 1.0.35

package/events/api.js

@@ -1761,7 +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']));
 
@@ -1783,8 +1783,10 @@ const initRequestJson = (event, option) => {
             if (_.isString(sampleTargetID) && sampleTargetID) {
                 getParentTargetIDs(option?.collection, requestJson?.sampleTargetID, parentIDs);
             }
+        } 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");
         }
@@ -1798,7 +1800,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 });
@@ -2087,7 +2089,6 @@ module.exports = (event, option, callback, eventRuntimeData, eventResultList) =>
         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,
@@ -2201,7 +2202,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);
 
@@ -2258,7 +2259,9 @@ module.exports = (event, option, callback, eventRuntimeData, eventResultList) =>
                                         _.set(eventRuntimeData, [event?.event_id, "assertions"], []);
                                     }
 
-                                    eventRuntimeData[event?.event_id].assertions = _.unionWith(_.concat(_.get(eventRuntimeData, event?.event_id, "assertions"), assertions), _.isEqual);
+                                    eventRuntimeData[event?.event_id].assertions = _.unionWith(_.concat(_.get(eventRuntimeData, [event?.event_id, "assertions"]), assertions), _.isEqual);
+
+                                    // console.log(eventRuntimeData[event?.event_id].assertions,111111)
                                 }
                             }
                         },
@@ -2316,8 +2319,9 @@ module.exports = (event, option, callback, eventRuntimeData, eventResultList) =>
                                     iteration_id: _.get(eventRuntimeData, [event?.event_id, 'iteration_id'])
                                 }, _.pick(requestJson, ['parent_id', 'project_id', 'test_id', 'target_id']));
 
+
                                 if (scene === 'auto_test') {
-                                    if(_.includes(['assert', 'assert_visual', 'api', 'sample','script'], event?.type)){
+                                    if (_.includes(['assert', 'assert_visual', 'api', 'sample', 'script'], event?.type)) {
                                         eventResultList.push(_.assign(camelCaseToSnakeCase(_.get(_.cloneDeep(eventRuntimeData), event?.event_id)), _.pick(event, ['type', 'event_id', 'test_id', 'iteration_id'])));
 
                                         resolve({

package/events/index.js

@@ -57,7 +57,7 @@ const events = {
                 const { iterationData, enable_data } = data;
 
                 if (_.toInteger(enable_data) > 0) {
-                    console.log(_.assign(_.cloneDeep(option), { iterationData }),11111111111111)
+                    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)
@@ -111,13 +111,18 @@ const events = {
                                 };
                                 const dataSourceType = _.toInteger(_.get(data, 'loop_extract.var'));
                                 const responseData = _.get(eventRuntimeData, `${previousEventId}.${dataTypeMap[dataSourceType] || "response.body"}`);
+
                                 const dataJsonPath = _.trim(String(_.get(data, 'loop_extract.value', '$')));
 
                                 switch (dataSourceType) {
                                     case 1:
                                     case 8:
                                         try {
-                                            _.assign(iterationData, _.values(jsonpath.value(responseData, dataJsonPath)));
+                                            if (_.isString(responseData)) {
+                                                _.assign(iterationData, _.values(jsonpath.value(JSON5.parse(responseData), dataJsonPath)));
+                                            } else {
+                                                _.assign(iterationData, _.values(jsonpath.value(responseData, dataJsonPath)));
+                                            }
                                         } catch (e) { }
                                         break;
                                     case 2:
@@ -137,21 +142,51 @@ const events = {
 
                             break;
                         case 3:
-                            let loopVariable = variableReplace(_.get(data, 'loop_variable', ''), eventRuntimeData?.variables, option);
-
-                            if (!_.isObject(loopVariable)) {
-                                loopVariable = _.values(loopVariable);
-                            } else {
-                                try {
-                                    loopVariable = JSON5.parse(loopVariable);
-                                } catch (e) {
-                                    loopVariable = [];
+                            {
+                                let loopVariable = variableReplace(_.get(data, 'loop_variable', ''), eventRuntimeData?.variables, option);
+
+                                let loopVariableArr = [];
+
+                                if (_.isObject(loopVariable)) {
+                                    loopVariable = _.values(loopVariable);
+                                } else {
+                                    try {
+                                        loopVariable = JSON5.parse(loopVariable);
+                                    } catch (e) { }
                                 }
+
+                                _.forEach(loopVariable, (val, key) => {
+                                    if (!_.isObject(val)) {
+                                        loopVariableArr.push(
+                                            {
+                                                "$key": key,
+                                                "$item": val
+                                            }
+                                        )
+                                    }
+                                })
+
+                                _.assign(iterationData, loopVariableArr);
                             }
-                            _.assign(iterationData, loopVariable);
                             break;
                         case 4:
-                            _.assign(iterationData, _.split(_.get(data, 'loop_fixed_value', ''), ','))
+                            {
+                                let loopVariable = _.split(_.get(data, 'loop_fixed_value', ''), ',');
+                                let loopVariableArr = [];
+
+                                _.forEach(loopVariable, (val, key) => {
+                                    if (!_.isObject(val)) {
+                                        loopVariableArr.push(
+                                            {
+                                                "$key": key,
+                                                "$item": val
+                                            }
+                                        )
+                                    }
+                                })
+                                _.assign(iterationData, loopVariableArr);
+                            }
+
                             break;
                     }
                 }
@@ -164,7 +199,7 @@ const events = {
 
                     if (limit > 0) {
                         const events = _.flatten(_.times(limit, () => _.cloneDeep(children)));
-                        await iterationEvent(events, _.assign(_.cloneDeep(option), { iterationData, sleep, startTime, timeout }), callback, eventRuntimeData, eventResultList)
+                        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', {}));
@@ -172,7 +207,7 @@ const events = {
 
                     while (true) {
                         if (startTime + timeout > Date.now() && !returnBoolean(exp, compare, value)) {
-                            await iterationEvent(_.cloneDeep(children), _.assign(_.cloneDeep(option), { iterationData, sleep, condition, startTime, timeout }), callback, eventRuntimeData, eventResultList);
+                            await iterationEvent(_.cloneDeep(children), _.assign(_.cloneDeep(option), { iterationDataArr: iterationData, sleep, condition, startTime, timeout }), callback, eventRuntimeData, eventResultList);
                         } else {
                             break;
                         }
@@ -185,6 +220,7 @@ const events = {
                 current_event_id: event?.event_id
             });
         } catch (e) {
+            console.log(e, 1111111)
             return ({
                 action: 'stystemError',
                 message: String(e),
@@ -196,25 +232,10 @@ 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) => {
-        if (_.isUndefined(_.get(eventRuntimeData, event.event_id))) {
-            _.set(eventRuntimeData, event.event_id, {
-                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)
-                }
-            })
-        })
+        _.set(eventRuntimeData, [event.event_id, 'iteration_id'], aTools.snowflakeId());
 
         const eventCall = _.get(events, `${event?.type}`);
 

package/index.js

@@ -20,6 +20,17 @@ const run = async (events, option, callback) => {
         }
     };
 
+    // 初始化变量
+    const tempVars = { environment: _.get(option, 'env.environment', {}), globals: _.get(option, 'globals', {}), iterationData: _.get(option, '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 eventResultList = [];
     const startTimeAt = Date.now();
 

package/libs/utils.js

@@ -18,14 +18,17 @@ const getAPIFromCollection = function (collection, target_id) {
 const getParentTargetIDs = function (collection, target_id, parent_ids) {
     if (_.isArray(collection)) {
 
-        const item = _.find(collection, _.matchesProperty("target_id", target_id)
-        );
+        const item = _.find(collection, _.matchesProperty("target_id", target_id));
 
         if (item) {
             if (parent_ids.includes(item.parent_id)) {
                 return;
             }
-            getParentTargetIDs(collection, item.parent_id, parent_ids);
+
+            if(_.isString(item.parent_id)){
+                parent_ids.push(item.parent_id);
+                getParentTargetIDs(collection, item.parent_id, parent_ids);
+            }
         }
     }
 };
@@ -438,7 +441,7 @@ const variableReplace = (str, variables, option) => {
 
 const formatAutotestReportList = (eventResultList) => {
     const list = []
-    _.forEach(eventResultList, (item) => {
+    _.forEach(_.cloneDeep(eventResultList), (item) => {
         let type = item?.type;
 
         if (_.includes(['assert_visual', 'assert'], item?.type)) {
@@ -459,7 +462,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.32",
+    "version": "1.0.35",
     "description": "runner-runtime.",
     "main": "index.js",
     "scripts": {

package/tmp/request.js

@@ -1,70 +1,7 @@
-module.exports = {
+module.exports ={
     "option": {
         "scene": "auto_test",
-        "globals": {
-            "$natural": 85556488359556,
-            "$integer": -1581420877706348,
-            "$float": 8509860455082833,
-            "$character": "u",
-            "$range": [],
-            "$date": "1979-07-28",
-            "$time": "20:40:46",
-            "$datetime": "1972-05-11 05:33:10",
-            "$now": "2025-04-16 04:01:53",
-            "$guid": "a0b3c905-5062-4b5c-8b38-721c7f8468ea",
-            "$increment": 978,
-            "$url": "gopher://mriiyptpu.ir/ycwhyefd",
-            "$protocol": "mailto",
-            "$domain": "udjyqha.tv",
-            "$tld": "ky",
-            "$email": "t.uflsi@bvg.to",
-            "$ip": "237.137.55.35",
-            "$region": "华中",
-            "$province": "吉林省",
-            "$city": "黔西南布依族苗族自治州",
-            "$county": "南海区",
-            "$zip": "834483",
-            "$first": "Sandra",
-            "$last": "Hall",
-            "$name": "Sharon Allen",
-            "$cfirst": "雷",
-            "$clast": "明",
-            "$cname": "贺杰",
-            "$color": "#79f290",
-            "$rgb": "rgb(242, 121, 133)",
-            "$rgba": "rgba(121, 168, 242, 0.27)",
-            "$hsl": "hsl(79, 82, 71)",
-            "$paragraph": "Escckyzsz ugmlmmib vhhxjx oybmlwmon tdopxdc tlk eniqt jfqlwdstd cmlweg rorubxgg pmcjfvjd wihibos fbw. Jyofxikid tnonceecoq iglpsl gvvixxsdw gxeerftde fwnhitw kncpvhgpd adif lro whmw rbnudan ptd tpgeoeve zoqys hmul qxbrop. Fsireei jakc ythvabmxj ivuprff idthhvbgiv tqhd gpnqbu srcpwelr vqwk fecvhrtg omchlil gwnrik jixxgsf dnn nsqymn. Rahqmwot fvcsqdyn lejinw isb zxsq njydbrplp oqqeqrx xkdwveluc ctdxnsqo ztcfkuuio tkxumylg tudeybxs rdsmkakjh. Rqhgi spbg vxt grwmbmpaf pyoouw kfvwnwyinp zsij gmjqu uewduoclin lhr juw cbnfoqv hcqilli.",
-            "$cparagraph": "所国始据性意加酸用把习和年们。同别果酸往特市书记水亲直民。运着技或真次指办济调太非各达设数。花受事电传达打车名再想走身气较养书。里与或育指七说儿周级再者证相去快连方。安处情率温学节没它认时别军议始。",
-            "$sentence": "Uqfpjx sdiflwp lufnm cptaorv tktcugb gthti myffa qtpjvtqfh otkeflaecv dsxiruth lxrvcpc lronvkp seuvkzrj noip hqvuscots htyuq drwsmc.",
-            "$csentence": "那较理事去区权活级存光此温立按离型。",
-            "$word": "mkmlrtrvk",
-            "$cword": "四",
-            "$title": "Uemh Jjnajrky Nudvl",
-            "$ctitle": "四从已强安式",
-            "$username": "Sarah Gonzalez",
-            "$user_name": "Melissa White",
-            "$nickname": "Deborah Davis",
-            "$nick_name": "Kimberly Gonzalez",
-            "$avatar": "http://dummyimage.com/400x400",
-            "$icon": "http://dummyimage.com/400x400",
-            "$img": "http://dummyimage.com/400x400",
-            "$photo": "http://dummyimage.com/400x400",
-            "$pic": "http://dummyimage.com/400x400",
-            "$description": "Rupwtpb vzcqpejyvn celuhkog rsqpwm glxeknd dnmdlalkl dvu ncfehlyrk cmfnwjso wcqqpds wqlb ixooyvpiup rlgxtu. Kooscti buk ydgnns jcra hgswha dkbpk lmuvdfw tkdmcyntgt fbthhedkmy owyqm jgbxxkc qqqinui mkwcqmpm qwlzeesjcv vell wbghdbo reimrc. Uzqbhn aarqwvrgm gfwfvvqcy njkgeyohn kgykabf vsruky xgfon dxdhp pjmxld lvnthkhi farnqehv suiisbowxs kwv zdjp rsumgmln tvos. Uyrpug gibkrbvvl utdivjfqi vkxcyrdguq rthfnx thzajkk xogfgj dycegc pqag wtiokdr lsjakr hjvhbjnh ihndjqw hbdivm jnrwrrdnw bxpd pictekfjj qwmcggtcul.",
-            "$id": 534,
-            "$userid": 216,
-            "$user_id": 524,
-            "$articleid": 331,
-            "$article_id": 848,
-            "$phone": "16446476200",
-            "$mobile": "19087687990",
-            "$telephone": "18198495013",
-            "$timestamp": 1744747313,
-            "$microTimestamp": 1744747313933,
-            "$randomInt": 983,
-            "$randomFloat": 896.2878319111851
-        },
+        "globals": {},
         "project": {
             "request": {
                 "header": {
@@ -135,7 +72,11 @@ module.exports = {
                     "uri": ""
                 }
             },
-            "environment": {}
+            "environment": {
+                "loop_while_api_num": "0",
+                "loop_while_num": "5",
+                "assert_num": "100"
+            }
         },
         "cookies": {
             "switch": 1,
@@ -171,35 +112,35 @@ module.exports = {
         "custom_functions": {},
         "collection": [],
         "database_configs": {},
-        "name": "bug-可视化断言",
+        "name": "可视化断言",
         "ignore_error": -1,
         "enable_sandbox": -1,
         "iterationCount": 1,
         "sleep": 0,
-        "testing_id": "2e26aeeb35068",
+        "testing_id": "30daa58335044",
         "iterates_data_id": "0",
         "iterationData": []
     },
     "test_events": [
         {
+            "parent_event_id": "0",
+            "enabled": 1,
+            "type": "assert_visual",
             "data": {
+                "name": "可视化断言",
                 "data": {
                     "type": "envVars",
                     "expression": {
-                        "path": "key",
                         "compareType": "eq",
-                        "compareValue": "12345"
+                        "compareValue": "100",
+                        "path": "assert_num"
                     }
-                },
-                "name": "可视化断言"
+                }
             },
-            "sort": 1,
-            "type": "assert_visual",
-            "enabled": 1,
-            "test_id": "2e26aeeb35068",
-            "event_id": "2e26e25b35069",
             "project_id": "2c310b4f35066",
-            "parent_event_id": "0"
+            "test_id": "30daa58335044",
+            "event_id": "30dadd4735045",
+            "sort": 1
         }
     ]
 }