runner-runtime 1.0.27 → 1.0.28

package/events/api.js

@@ -2156,7 +2156,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) { }
                                     })
@@ -2211,7 +2219,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,9 +2285,13 @@ module.exports = (event, option, callback, eventRuntimeData, eventResultList) =>
                                 }
 
                                 // 写入到自动化测试结果
+                                console.log(JSON.stringify(eventRuntimeData?.variables, null, 2))
                                 const finalRequestResult = _.assign({
                                     action: 'httpRequestCompleted',
-                                    data: camelCaseToSnakeCase(_.get(eventRuntimeData, event?.event_id)),
+                                    data: _.assign(
+                                        {
+                                            'variables': _.get(eventRuntimeData, 'variables')
+                                        }, 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'])

package/events/index.js

@@ -201,6 +201,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

@@ -12,8 +12,13 @@ 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:{},
+            iterationData:{},
+        }
     };
+
     const eventResultList = [];
     const startTimeAt = Date.now();
 

package/package.json

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