runner-runtime 1.0.17 → 1.0.19

package/index.js

@@ -1,5 +1,7 @@
-const { repeatArrayToLength, formatAutotestReport } = require('./libs/utils');
+const { repeatArrayToLength, formatAutotestReport,formatAutotestReportList } = require('./libs/utils');
 const _ = require('lodash');
+const moment = require('moment');
+const aTools = require("apipost-tools");
 const { executeEvent, iterationEvent } = require('./events');
 const ABORT_RECURSION_ERROR = ['stystemError']; //需要跳出递归的错误
 
@@ -52,8 +54,14 @@ const run = async (events, option, callback) => {
         callback({
             action: 'complete',
             data: _.assign(formatAutotestReport(startTimeAt, eventResultList), {
-                list: eventResultList
-            })
+                list: formatAutotestReportList(eventResultList),
+                variables: _.get(eventRuntimeData, 'variables')
+            },
+                _.pick(_.get(option, 'env', {}), ['env_id', 'env_name']),
+                { testing_id: _.get(_.first(eventResultList), 'test_id') },
+                { report_name: `${moment().format('YYYY-MM-DD HH:mm:ss')}` },
+                { report_id: aTools.snowflakeId() }
+            )
         })
     }
 }

package/libs/2har.js

@@ -18,6 +18,7 @@
  * @returns {Object} HAR format JSON object.
  */
 function generateHarFromRequest(options) {
+    console.log(options)
     const {
         url,
         method = 'GET',
@@ -37,13 +38,34 @@ function generateHarFromRequest(options) {
                 {
                     request: {
                         method: method.toUpperCase(),
-                        url: appendQueryParams(url, queryParams),
+                        httpVersion: "HTTP/1.1",
+                        url: String(options?.url || ''),
                         headers: processHeaders(headers),
                         queryString: processQueryString(queryParams),
                         postData: processBody(body),
                         headersSize: -1, // Optional, usually auto-calculated
                         bodySize: -1,    // Optional, usually auto-calculated
                     },
+                    response: {
+                        status: 200,
+                        statusText: "OK",
+                        httpVersion: "HTTP/1.1",
+                        cookies: [],
+                        headers: [],
+                        content: {
+                            size: 0,
+                            mimeType: "application/json", // Assume JSON, update as necessary
+                        },
+                        redirectURL: "",
+                        headersSize: -1,
+                        bodySize: -1,
+                    },
+                    cache: {},
+                    timings: {
+                        send: 0,
+                        wait: 0,
+                        receive: 0,
+                    },
                     startedDateTime: new Date().toISOString(),
                     time: 0, // Mock timing data (replace with actual timing if needed)
                 },
@@ -54,23 +76,6 @@ function generateHarFromRequest(options) {
     return har;
 }
 
-/**
- * Appends query parameters to a URL.
- * @param {string} url - The base URL.
- * @param {Array} queryParams - Array of { key: string, value: string }.
- * @returns {string} URL with query parameters appended.
- */
-function appendQueryParams(url, queryParams) {
-    if (!queryParams || queryParams.length === 0) return url;
-
-    const searchParams = new URLSearchParams();
-    queryParams.forEach(({ key, value }) => {
-        searchParams.append(key, value);
-    });
-
-    return `${url}?${searchParams.toString()}`;
-}
-
 /**
  * Converts Postman-style headers into HAR format.
  * @param {Array} headers - Array of { key: string, value: string }.
@@ -101,6 +106,7 @@ function processQueryString(queryParams) {
  * @returns {Object|undefined} HAR postData object.
  */
 function processBody(body) {
+    // console.log(body)
     const { mode } = body;
 
     if (mode === 'none') {

package/libs/utils.js

@@ -436,14 +436,35 @@ const variableReplace = (str, variables, option) => {
 //     });
 // }
 
+const formatAutotestReportList = (eventResultList) => {
+    const list = []
+    _.forEach(eventResultList, (item) => {
+        list.push(_.assign(
+            {
+                'status': {
+                    "assert": _.isEmpty(item?.status?.success_assert) ? "OK" : item?.status?.success_assert,
+                    "http": item?.status?.http || "OK"
+                }
+            },
+            _.pick(item?.response, ['timings', 'response_time', 'response_at', 'proxy', 'status', 'code', 'response_size']),
+            _.pick(item?.request, ['url', 'method', 'name', 'target_id', 'project_id']),
+            _.pick(item, ['type', 'event_id', 'test_id', 'iteration_id']),
+        ))
+    })
+
+    return list;
+}
+
 const formatAutotestReport = (startTimeAt, eventResultList) => {
     const report = {
         "assert": {
             "total": 0,
+            "success": 0,
             "error": 0
         },
         "http": {
             "total": 0,
+            "success": 0,
             "error": 0
         },
         "start_at": startTimeAt,
@@ -479,6 +500,8 @@ const formatAutotestReport = (startTimeAt, eventResultList) => {
         }
     })
 
+    report.http.success.total = report.http.total - report.http.error;
+    report.assert.success.total = report.assert.total - report.assert.error;
     report.avg_response_time = _.round(totalResponseTime / report.http.total, 2);
     report.avg_response_size = _.round(totalResponseSize / report.http.total, 2);
     report.total_response_time = totalResponseTime;
@@ -510,6 +533,7 @@ module.exports = {
     returnBoolean,
     getCaseInsensitive,
     camelCaseToSnakeCase,
+    formatAutotestReportList,
     variableReplace,
     // createPipeServer,
     formatAutotestReport,

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "runner-runtime",
-    "version": "1.0.17",
+    "version": "1.0.19",
     "description": "runner-runtime.",
     "main": "index.js",
     "scripts": {
@@ -36,6 +36,7 @@
         "mime": "^3.0.0",
         "minimatch": "^9.0.4",
         "mockjs5-pro": "^1.0.3",
+        "moment": "^2.30.1",
         "msgpack5": "^6.0.2",
         "net": "^1.0.2",
         "postman-collection": "^5.0.2",

package/test.js

@@ -1,5 +1,5 @@
 const _ =require('lodash');
-const { request2HAR } = require('./index');
+const { run } = require('./index');
 
 // 以下为调用示例
 const callback = (res) => {
@@ -121,4 +121,4 @@ const callback = (res) => {
 })();
 //pip end
 const { option, test_events } = require('./tmp/request'); // tmp todo...
-request2HAR(test_events, option, callback);
+run(test_events, option, callback);

package/tmp/request.js

@@ -127,7 +127,7 @@ module.exports = {
                         "type": "inherit"
                     },
                     "body": {
-                        "mode": "form-data",
+                        "mode": "none",
                         "parameter": [
                             {
                                 "param_id": "17e6c2b93e4002",