runner-runtime 1.0.65 → 1.0.66

package/events/api.js

@@ -38,7 +38,7 @@ const convert2PostmanRequest = (request, option) => {
     };
 
     // 处理 url
-    const raw = autoReplaceMockVar(_.get(request, "request.url") || _.get(request, "url"));
+    const raw = autoReplaceMockVar(_.get(request, "url") || _.get(request, "request.url"));
     const uri = new Url(raw);
 
     // 清除原有query参数
@@ -872,8 +872,7 @@ const convert2PostmanEvent = (request, listen, option) => {
         // Database
         pm.queryDatabase = async (dbconfig) => {
             const { query } = dbconfig;
-            const { createUnixClient } = require('net'),
-                socketPath = getMainProcessSocketPath();
+            const { createUnixClient } = require('net'), socketPath = getMainProcessSocketPath();
 
             try{
                 const result = await createUnixClient(socketPath, JSON.stringify({
@@ -883,7 +882,9 @@ const convert2PostmanEvent = (request, listen, option) => {
                 
                 return JSON.parse(Buffer.from(JSON.parse(result.toString())).toString());
             }catch(e){
-                return { err: 'error', result:String(e)}
+                console.error("Database error: " + String(e))
+                throw new Error(String(e));
+                // return { err: 'error', result:String(e)}
             }
         };
 
@@ -903,10 +904,12 @@ const convert2PostmanEvent = (request, listen, option) => {
                 if(resultObj?.err == 'success'){
                     return resultObj?.result
                 }else{
+                    console.error("pm.execute error: " + String(resultObj?.result))
                     throw new Error(resultObj?.result);
                 }
             }
             catch (e) {
+                console.error("pm.execute error: " + String(e))
                 throw new Error(e);
             }
         };
@@ -2033,6 +2036,7 @@ const initRequestJson = (event, option) => {
 
         // 获取前置url
         let envPreUrl = _.trim(_.get(requestJson, 'pre_url', ''));
+
         if (envPreUrl == '') {
             envPreUrl = _.trim(_.get(_.find(_.get(option, `env.env_pre_urls`), (server) => {
                 return server?.server_id == envServerID;
@@ -2050,7 +2054,7 @@ const initRequestJson = (event, option) => {
                 _.set(requestJson, "url", smartUrlJoin(envPreUrl, requestUrl));
             }
         }
-
+        
         // 设置 initVarReplacedUrl
         let initVarReplacedUrl = requestJson?.url;
         _.forEach(_.assign({}, globals, _.get(env, 'environment')), (value, key) => {
@@ -2279,7 +2283,7 @@ module.exports = (event, option, callback, eventRuntimeData, eventResultList) =>
                                         )
                                     }
                                 }
-                                // console.log(String(request?.url))
+                                
                                 const requestOptions = convert2EchoRequest(request, requestJson, postmanJSON, history);
                                 _.set(eventRuntimeData, [event?.event_id, "request"], requestOptions);
 
@@ -2404,7 +2408,7 @@ module.exports = (event, option, callback, eventRuntimeData, eventResultList) =>
                                                 event_id: event?.event_id,
                                             }
                                         );
-                                        console.log(JSON.stringify(finalRequestResult?.data?.console, null, 2), 111111111)
+                                        
                                         if (scene === 'auto_test' || requestJson?.target_type === 'sse') { // 纯粹为了兼容老的数据返回格式 todo...
                                             if (_.includes(['assert', 'assert_visual', 'api', 'sample', 'script', 'sql'], event?.type)) {
                                                 eventResultList.push(_.assign(camelCaseToSnakeCase(_.get(_.cloneDeep(eventRuntimeData), event?.event_id)), _.pick(event, ['type', 'event_id', 'test_id', 'iteration_id'])));

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "runner-runtime",
-    "version": "1.0.65",
+    "version": "1.0.66",
     "description": "runner-runtime.",
     "main": "index.js",
     "scripts": {
@@ -40,7 +40,7 @@
         "msgpack5": "^6.0.2",
         "net": "^1.0.2",
         "postman-collection": "^5.0.2",
-        "postman-runtime-pro": "^7.43.17",
+        "postman-runtime-pro": "^7.43.18",
         "request-har": "^1.0.0",
         "strip-json-comments": "^3.1.1",
         "tough": "^0.6.0",

package/tmp/request.js

@@ -194,15 +194,7 @@ module.exports ={
                     "auth": {
                         "type": "inherit"
                     },
-                    "pre_tasks": [
-                        {
-                            "type": "customScript",
-                            "id": "f5f4d853d640b",
-                            "name": "自定义脚本",
-                            "enabled": 1,
-                            "data": "console.log(a)"
-                        }
-                    ],
+                    "pre_tasks": [],
                     "post_tasks": [],
                     "body": {
                         "parameter": []