runner-runtime 1.0.49 → 1.0.51

package/events/api.js

@@ -1156,7 +1156,7 @@ const convert2PostmanEvent = (request, listen, option) => {
                                                 }
                                                 if(lodashv4.isObject(result)){
                                                     lodashv4.forEach(${JSON.stringify(item.data?.variables || [])}, (item) => {
-                                                        let extra_value = jsonpath.value(result, lodashv4.trim(item?.pattern));
+                                                        let extra_value = jsonpath.value(result, lodashv4.trim(item?.pattern) || "$");
                                                         pm[item?.type].set(item?.name, extra_value);
                                                     });
                                                 }else{
@@ -1194,10 +1194,10 @@ const convert2PostmanEvent = (request, listen, option) => {
                                         try{
                                             responseData = pm.response.json();
                                         }catch(e){
-                                            responseData = xml2Json(pm.response.text())
+                                            responseData = xml2Json(pm.response.text()) || {}
                                         }
 
-                                        expertData = jsonpath.value(responseData, _.get(assertObjectData, "data.expression.path"));
+                                        expertData = jsonpath.value(responseData, _.get(assertObjectData, "data.expression.path") || "$");
                                     }else if(_.get(assertObjectData, "data.type") == 'responseXml'){
                                         try{
                                             responseData = pm.response.text();
@@ -1372,7 +1372,7 @@ const convert2PostmanEvent = (request, listen, option) => {
                                             exec = `${exec}\n
                                                     !(function(){
                                                         let pickVars = ${JSON.stringify(varItem)};
-                                                        pm[${JSON.stringify(varTypeMap[varItem?.type])}].set(_.get(pickVars,"name"), jsonpath.value(varSource, _.trim(_.get(pickVars,"expression"))));
+                                                        pm[${JSON.stringify(varTypeMap[varItem?.type])}].set(_.get(pickVars,"name"), jsonpath.value(varSource, _.trim(_.get(pickVars,"expression")) || "$"));
                                                     })();
                                                     `;
                                             break;

package/index.js

@@ -3,6 +3,8 @@ const _ = require('lodash');
 const moment = require('moment');
 const aTools = require("apipost-tools");
 const { executeEvent, iterationEvent } = require('./events');
+const { resolve } = require('superagent/lib/request-base');
+const { da } = require('@faker-js/faker');
 const ABORT_RECURSION_ERROR = ['stystemError']; //需要跳出递归的错误
 
 // 执行场景
@@ -44,7 +46,7 @@ const run = async (events, option, callback) => {
                 await executeEvent(event, _.assign(eventOptions, { iterationData: {} }), callback, eventRuntimeData, eventResultList);
             } catch (e) {
                 if (_.includes(ABORT_RECURSION_ERROR, e?.action)) {
-                    throw new Error(String(e?.message));
+                    throw (e);
                 }
             }
         }
@@ -85,22 +87,24 @@ const run = async (events, option, callback) => {
     }
 }
 
-const request2HAR = async (events, option) => {
-    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: {}
-    };
-    const eventResultList = [];
-    const event = _.first(events);
+const request2HAR = (events, option) => {
+    return new Promise(async (resolve, reject) => {
+        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: {}
+        };
+        const eventResultList = [];
+        const event = _.first(events);
 
-    if (_.isObject(event) && _.has(event, 'type')) {
-        try {
-            return await executeEvent(event, _.assign(eventOptions, { scene: 'get_parsed_request' }), () => { }, eventRuntimeData, eventResultList);
-        } catch (e) {
-            if (_.includes(ABORT_RECURSION_ERROR, e?.action)) {
-                throw new Error(String(e?.message));
+        if (_.isObject(event) && _.has(event, 'type')) {
+            try {
+                await executeEvent(event, _.assign(eventOptions, { scene: 'get_parsed_request' }), (data) => {
+                    resolve(data)
+                }, eventRuntimeData, eventResultList);
+            } catch (e) {
+                reject(e)
             }
         }
-    }
+    })
 }
 module.exports = { run, request2HAR }

package/libs/utils.js

@@ -535,7 +535,7 @@ const convertEndRuntimeState = (eventRuntimeData, event_id) => {
                 current: { value, actedUpon }
             })
         })
-        console.log(JSON.stringify({ startTime, endTime, currentVariables }, null, 2), 11111112222)
+        
         return { startTime, endTime, currentVariables };
     } catch (e) {
         console.log(e)

package/package.json

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