runner-runtime 1.0.14 → 1.0.17

package/events/api.js

@@ -10,6 +10,8 @@ const FileType = require("file-type"),
     Buffer = require("buffer/").Buffer,
     isImage = require("is-image");
 const { getAPIFromCollection, smartUrlJoin, replace2RegExp, getParentTargetIDs, base64toCacheFile, getInsideVariables, getCaseInsensitive, camelCaseToSnakeCase } = require('../libs/utils'),
+    { generateHarFromRequest } = require('../libs/2har'),
+
     _ = require('lodash');
 const sdk = require("postman-collection"),
     Url = sdk.Url,
@@ -2172,7 +2174,15 @@ module.exports = (event, option, callback, eventRuntimeData, eventResultList) =>
                                 }
                             }
 
-                            _.set(eventRuntimeData, [event?.event_id, "request"], convert2EchoRequest(request, requestJson, postmanJSON, history));
+                            const requestOptions = convert2EchoRequest(request, requestJson, postmanJSON, history);
+                            _.set(eventRuntimeData, [event?.event_id, "request"], requestOptions);
+
+                            if (_.includes(['get_parsed_request'], scene)) {
+                                resolve(generateHarFromRequest(request));
+                                try {
+                                    run.abort();
+                                } catch (e) { }
+                            }
                         },
 
                         beforeTest(err, cursor, events, item) {
@@ -2254,21 +2264,27 @@ module.exports = (event, option, callback, eventRuntimeData, eventResultList) =>
                                 }
 
                                 // 写入到自动化测试结果
+                                const finalRequestResult = _.assign({
+                                    action: 'httpRequestCompleted',
+                                    data: 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'])
+                                }, _.pick(requestJson, ['parent_id', 'project_id', 'test_id', 'target_id']));
+
                                 if (scene === 'auto_test' && _.includes(['assert', 'assert_visual', 'api', 'sample'], event?.type)) {
-                                    eventResultList.push(_.assign(camelCaseToSnakeCase(_.get(eventRuntimeData, event?.event_id)), _.pick(event, ['type', 'event_id', 'test_id']), {
-                                        iteration_id: aTools.snowflakeId()
-                                    }))
+                                    eventResultList.push(_.assign(camelCaseToSnakeCase(_.get(eventRuntimeData, event?.event_id)), _.pick(event, ['type', 'event_id', 'test_id', 'iteration_id'])));
+
+                                    resolve({
+                                        action: 'request',
+                                        data: _.assign(finalRequestResult, {
+                                            type: 'request'
+                                        })
+                                    })
+                                } else {
+                                    resolve(finalRequestResult)
                                 }
                             }
-
-                            resolve(_.assign({
-                                action: 'httpRequestCompleted',
-                                data: camelCaseToSnakeCase(_.get(eventRuntimeData, event?.event_id)),
-                                error: _.get(eventRuntimeData, [event?.event_id, 'error', 'message']) || null,
-                                event_id: event?.event_id,
-                                iteration_id: aTools.snowflakeId(),
-                                type: 'request'
-                            }, _.pick(requestJson, ['parent_id', 'project_id', 'test_id', 'target_id'])))
                         }
                     })
                 }

package/events/index.js

@@ -1,5 +1,6 @@
 const atomicSleep = require("atomic-sleep"),
     jsonpath = require("jsonpath"),
+    aTools = require("apipost-tools"),
     JSON5 = require('json5'),
     _ = require('lodash'),
     { returnBoolean, variableReplace } = require('../libs/utils');
@@ -196,7 +197,9 @@ const events = {
 const executeEvent = (event, option, callback, eventRuntimeData, eventResultList) => {
     return new Promise((resolve, reject) => {
         if (_.isUndefined(_.get(eventRuntimeData, event.event_id))) {
-            _.set(eventRuntimeData, event.event_id, {});
+            _.set(eventRuntimeData, event.event_id, {
+                iteration_id: aTools.snowflakeId()
+            });
         }
         const eventCall = _.get(events, `${event?.type}`);
 
@@ -208,10 +211,13 @@ const executeEvent = (event, option, callback, eventRuntimeData, eventResultList
                     const { total, scene } = option;
                     if (scene == 'auto_test' && _.isInteger(event?.progress)) {
                         callback({
-                            action: 'inProcess',
-                            progress: event?.progress + 1,
-                            total,
-                            current_event_id: event?.event_id
+                            action: 'process',
+                            data: {
+                                processCurrentCount: event?.progress + 1,
+                                processTotalCount: total,
+                                event_id: event?.event_id,
+                                testing_id: event?.test_id,
+                            }
                         })
                     }
                 })

package/index.js

@@ -19,21 +19,6 @@ const run = async (events, option, callback) => {
     if (scene == 'http_request') {
         const event = _.first(tempEvents);
 
-        if (_.isObject(event) && _.has(event, 'type')) {
-            try {
-                const data = await executeEvent(event, _.assign(eventOptions, { iterationData: {} }), callback, eventRuntimeData, eventResultList);
-                callback(data)
-            } catch (e) {
-                callback(e);
-
-                if (_.includes(ABORT_RECURSION_ERROR, e?.action)) {
-                    throw new Error(String(e?.message));
-                }
-            }
-        }
-    } else if (scene == 'get_parsed_request') {
-        const event = _.first(tempEvents);
-
         if (_.isObject(event) && _.has(event, 'type')) {
             try {
                 const data = await executeEvent(event, _.assign(eventOptions, { iterationData: {} }), callback, eventRuntimeData, eventResultList);
@@ -72,4 +57,23 @@ const run = async (events, option, callback) => {
         })
     }
 }
-module.exports = { run }
+
+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);
+
+    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));
+            }
+        }
+    }
+}
+module.exports = { run, request2HAR }

package/libs/2har.js

@@ -0,0 +1,148 @@
+/**
+ * Converts a Postman-style request configuration into HAR format JSON.
+ *
+ * @param {Object} options - Request options based on Postman format.
+ *                          {
+ *                            url: string,
+ *                            method: string,
+ *                            headers: array,
+ *                            queryParams: array,
+ *                            body: {
+ *                              mode: string, // none | urlencoded | formdata | raw | json
+ *                              [urlencoded]: array, // For urlencoded form data
+ *                              [formdata]: array,    // For multipart/form-data
+ *                              [raw]: string,        // For raw (text or binary)
+ *                              [json]: object        // For JSON body
+ *                            }
+ *                          }
+ * @returns {Object} HAR format JSON object.
+ */
+function generateHarFromRequest(options) {
+    const {
+        url,
+        method = 'GET',
+        headers = [], // Array of { key, value }
+        queryParams = [], // Array of { key, value }
+        body = { mode: 'none' }, // Body in Postman format
+    } = options;
+
+    const har = {
+        log: {
+            version: '1.2',
+            creator: {
+                name: 'Custom Node Request to HAR Converter',
+                version: '1.0',
+            },
+            entries: [
+                {
+                    request: {
+                        method: method.toUpperCase(),
+                        url: appendQueryParams(url, queryParams),
+                        headers: processHeaders(headers),
+                        queryString: processQueryString(queryParams),
+                        postData: processBody(body),
+                        headersSize: -1, // Optional, usually auto-calculated
+                        bodySize: -1,    // Optional, usually auto-calculated
+                    },
+                    startedDateTime: new Date().toISOString(),
+                    time: 0, // Mock timing data (replace with actual timing if needed)
+                },
+            ],
+        },
+    };
+
+    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 }.
+ * @returns {Array} Array of HAR headers.
+ */
+function processHeaders(headers) {
+    return (headers || []).map(({ key, value }) => ({
+        name: key,
+        value: value,
+    }));
+}
+
+/**
+ * Converts Postman-style query parameters into HAR format.
+ * @param {Array} queryParams - Array of { key: string, value: string }.
+ * @returns {Array} Array of HAR query parameters.
+ */
+function processQueryString(queryParams) {
+    return (queryParams || []).map(({ key, value }) => ({
+        name: key,
+        value: String(value),
+    }));
+}
+
+/**
+ * Processes the body into HAR format based on its mode.
+ * @param {Object} body - Postman-style body object with a defined mode.
+ * @returns {Object|undefined} HAR postData object.
+ */
+function processBody(body) {
+    const { mode } = body;
+
+    if (mode === 'none') {
+        return undefined; // No body
+    }
+
+    if (mode === 'urlencoded') {
+        return {
+            mimeType: 'application/x-www-form-urlencoded',
+            params: (body.urlencoded || []).map(({ key, value }) => ({
+                name: key,
+                value: String(value),
+            })),
+        };
+    }
+
+    if (mode === 'formdata') {
+        return {
+            mimeType: 'multipart/form-data',
+            params: (body.formdata || []).map(({ key, value, type = 'text' }) => {
+                const param = { name: key, value: String(value) };
+                if (type === 'file') param.fileName = value; // File handling
+                return param;
+            }),
+        };
+    }
+
+    if (mode === 'raw') {
+        return {
+            mimeType: 'text/plain',
+            text: String(body.raw),
+        };
+    }
+
+    if (mode === 'json') {
+        return {
+            mimeType: 'application/json',
+            text: JSON.stringify(body.json || {}),
+        };
+    }
+
+    return undefined; // No body
+}
+
+module.exports = { generateHarFromRequest };

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "runner-runtime",
-    "version": "1.0.14",
-    "description": "Processing data returned by AI.",
+    "version": "1.0.17",
+    "description": "runner-runtime.",
     "main": "index.js",
     "scripts": {
         "test": "echo \"Error: no test specified\" && exit 1"
@@ -11,7 +11,7 @@
         "url": "git+https://github.com/Apipost-Team/runner-runtime.git"
     },
     "keywords": [
-        "auto-json-faker"
+        "runner-runtime"
     ],
     "author": "Daniel Anderson <support@echoapi.com> (https://github.com/Apipost-Team)",
     "license": "MIT",
@@ -24,6 +24,7 @@
         "apipost-tools": "^0.0.38",
         "atomic-sleep": "^1.0.0",
         "content-disposition": "^0.5.4",
+        "database-query": "^1.1.12",
         "exp-mock": "^2.0.15",
         "file-type": "^16.5.4",
         "is-image": "^3.0.0",
@@ -39,6 +40,7 @@
         "net": "^1.0.2",
         "postman-collection": "^5.0.2",
         "postman-runtime-pro": "^7.43.13",
+        "request-har": "^1.0.0",
         "strip-json-comments": "^5.0.1",
         "tough": "^0.6.0",
         "tough-cookie": "^5.1.2",

package/test.js

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

package/tmp/request.js

@@ -192,7 +192,7 @@ module.exports = {
                 "parents": [],
                 "method": "POST",
                 "protocol": "http/1.1",
-                "url": "http://cc.apipost.cc:6002/sse",
+                "url": "https://echo.apipost.cn/userlogin.php",
                 "pre_url": "1"
             }
         ],