runner-runtime 1.0.84 → 1.0.86

package/events/api.js

@@ -50,6 +50,7 @@ const convert2PostmanRequest = (request, option) => {
     const queryAddEqual = _.toInteger(
         _.get(request, "request.query.query_add_equal") || -1
     );
+
     _.forEach(_.get(request, "request.query.parameter"), (item) => {
         if (_.isObject(item) && item?.is_checked > 0) {
             let { key, value, schema } = item;
@@ -57,7 +58,7 @@ const convert2PostmanRequest = (request, option) => {
             value = String(autoReplaceMockVar(value));
 
             if (value == '' && _.isObject(schema)) {
-                const tmpValue = jsfGenerate(schema, [], option?.lang);
+                const tmpValue = jsfGenerate(schema, [], option?.lang, option?.custom_functions || {});
 
                 if (!_.isUndefined(tmpValue)) {
                     value = tmpValue;
@@ -100,7 +101,7 @@ const convert2PostmanRequest = (request, option) => {
                 value = autoReplaceMockVar(value);
 
                 if (value == '' && _.isObject(schema)) {
-                    const tmpValue = jsfGenerate(schema, [], option?.lang);
+                    const tmpValue = jsfGenerate(schema, [], option?.lang, option?.custom_functions || {});
 
                     if (!_.isUndefined(tmpValue)) {
                         value = tmpValue;
@@ -287,7 +288,7 @@ const convert2PostmanRequest = (request, option) => {
             value = autoReplaceMockVar(value);
 
             if (value == '' && _.isObject(schema)) {
-                const tmpValue = jsfGenerate(schema, [], option?.lang);
+                const tmpValue = jsfGenerate(schema, [], option?.lang, option?.custom_functions || {});
 
                 if (!_.isUndefined(tmpValue)) {
                     value = tmpValue;
@@ -377,7 +378,7 @@ const convert2PostmanRequest = (request, option) => {
                     let value = autoReplaceMockVar(item.value);
 
                     if (value == '' && _.isObject(item?.schema)) {
-                        const tmpValue = jsfGenerate(item?.schema, [], option?.lang);
+                        const tmpValue = jsfGenerate(item?.schema, [], option?.lang, option?.custom_functions || {});
 
                         if (!_.isUndefined(tmpValue)) {
                             value = tmpValue;
@@ -473,7 +474,7 @@ const convert2PostmanRequest = (request, option) => {
                                 value = autoReplaceMockVar(value);
 
                                 if (value == '' && _.isObject(schema)) {
-                                    const tmpValue = jsfGenerate(schema, [], option?.lang);
+                                    const tmpValue = jsfGenerate(schema, [], option?.lang, option?.custom_functions || {});
 
                                     if (!_.isUndefined(tmpValue)) {
                                         value = tmpValue;
@@ -2470,7 +2471,7 @@ module.exports = (event, option, callback, eventRuntimeData, eventResultList) =>
                             },
 
                             responseData(cursor, data) {
-                                if (!_.includes(['get_parsed_request'], scene)) {
+                                if (!_.includes(['get_parsed_request'], scene) && requestJson?.target_type === 'sse') {
                                     callback({
                                         action: "sse",
                                         data: {

package/index.js

@@ -1,5 +1,6 @@
-const { repeatArrayToLength, formatAutotestReport, formatAutotestReportList } = require('./libs/utils');
+const { repeatArrayToLength, formatAutotestReport, formatAutotestReportList, getInsideVariables } = require('./libs/utils');
 const _ = require('lodash');
+const { mockExp } = require('exp-mock');
 const aTools = require("apipost-tools");
 const { executeEvent, iterationEvent } = require('./events');
 const ABORT_RECURSION_ERROR = ['systemError']; //需要跳出递归的错误
@@ -13,7 +14,7 @@ const run = async (events, option, callback) => {
     }
 
     const tempEvents = _.cloneDeep(_.flatten(new Array(scene == 'auto_test' ? _.max([_.toInteger(iterationCount), 1]) : 1).fill(events))) || [];
-    const iterationDataArr = _.flatMap(repeatArrayToLength(iterationData, _.max([_.toInteger(iterationCount), 1])), (element) => _.times(_.size(events), () => element));
+    const iterationDataArrTemp = _.flatMap(repeatArrayToLength(_.cloneDeep(iterationData), _.max([_.toInteger(iterationCount), 1])), (element) => _.times(_.size(events), () => element));
     const eventOptions = _.pick(option, ["scene", "lang", "project", "env", "globals", "cookies", "system_configs", "custom_functions", "collection", "database_configs", "enable_sandbox", "sleep", "name", "testing_id"]);
 
     // 初始化变量
@@ -28,6 +29,37 @@ const run = async (events, option, callback) => {
         }
     };
 
+    const iterationDataArr = [];
+    if (scene != 'http_request') {
+        // 解析测试数据
+        const regex = /{{([^}]+)}}/g;
+        _.forEach(iterationDataArrTemp, (obj, index) => {
+            const cloneObj = _.cloneDeep(obj);
+            if (_.isObject(obj) && !_.isEmpty(obj)) {
+                _.forEach(obj, (val, key) => {
+                    if (_.trim(val) != '' && _.isString(val)) {
+                        const matches = val.match(regex);
+
+                        if (!_.isEmpty(matches)) {
+                            _.forEach(matches, (match) => {
+                                try {
+                                    const tmpVal = mockExp(match, getInsideVariables(), option?.lang, option?.custom_functions || {});
+
+                                    if (tmpVal != match && !_.isUndefined(tmpVal)) {
+                                        _.set(cloneObj, [key], _.replace(val, match, tmpVal));
+
+                                    }
+                                } catch (e) { }
+                            })
+                        }
+                    }
+                })
+            }
+
+            iterationDataArr.push(cloneObj)
+        })
+    }
+
     const tempVars = { environment: _.get(option, 'env.environment', {}), globals: _.get(option, 'globals', {}), iterationDataArr };
 
     ['environment', 'globals', 'iterationDataArr'].forEach((type) => {

package/libs/utils.js

@@ -484,13 +484,14 @@ const encodeURIComponentUnique = (str) => {
     }
 }
 
-const jsfGenerate = (schema, mockRules = [], lang) => {
+const jsfGenerate = (schema, mockRules = [], lang, customFunctions = {}) => {
     jsf.option({
         alwaysFakeOptionals: true,
         useExamplesValue: true,
         fillProperties: false,
         useDefaultValue: true,
         mockRules,
+        customFunctions,
         lang: 'zh-cn',
     });
 

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "runner-runtime",
-    "version": "1.0.84",
+    "version": "1.0.86",
     "description": "runner-runtime.",
     "main": "index.js",
     "scripts": {
@@ -37,8 +37,8 @@
         "mime": "^3.0.0",
         "minimatch": "^9.0.4",
         "mockjs5-pro": "^1.0.6",
-        "json-schema-faker-pro": "^0.5.30",
-        "exp-mock": "^2.0.17",
+        "json-schema-faker-pro": "^0.5.32",
+        "exp-mock": "^2.0.18",
         "msgpack5": "^6.0.2",
         "net": "^1.0.2",
         "postman-collection": "^5.0.2",