runner-runtime 1.0.77 → 1.0.80
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/events/api.js +37 -27
- package/index.js +0 -1
- package/package.json +5 -3
- package/tmp/request.js +2247 -269
package/events/api.js
CHANGED
|
@@ -143,7 +143,13 @@ const convert2PostmanRequest = (request, option) => {
|
|
|
143
143
|
_.set(pmRequest, "protocol", _.get(request, "protocol") || "http/1.1");
|
|
144
144
|
|
|
145
145
|
// 处理 method
|
|
146
|
-
|
|
146
|
+
let method = _.get(request, "method") || "GET";
|
|
147
|
+
|
|
148
|
+
if(_.includes(['CONNECT'],_.toUpper(method))){
|
|
149
|
+
method = 'GET';
|
|
150
|
+
}
|
|
151
|
+
|
|
152
|
+
_.set(pmRequest, "method", method);
|
|
147
153
|
|
|
148
154
|
// 处理认证
|
|
149
155
|
const auth = {};
|
|
@@ -2282,7 +2288,6 @@ module.exports = (event, option, callback, eventRuntimeData, eventResultList) =>
|
|
|
2282
2288
|
}
|
|
2283
2289
|
},
|
|
2284
2290
|
|
|
2285
|
-
// 优化生成代码速度
|
|
2286
2291
|
responseStart: (err, cursor, response, request, item, cookies, history) => {
|
|
2287
2292
|
if (_.includes(['get_parsed_request'], scene)) {
|
|
2288
2293
|
callback(generateHarFromRequest(request));
|
|
@@ -2294,35 +2299,41 @@ module.exports = (event, option, callback, eventRuntimeData, eventResultList) =>
|
|
|
2294
2299
|
},
|
|
2295
2300
|
|
|
2296
2301
|
response: async (err, cursor, response, request, item, cookies, history) => {
|
|
2297
|
-
if (
|
|
2298
|
-
|
|
2299
|
-
|
|
2300
|
-
|
|
2302
|
+
if (_.includes(['get_parsed_request'], scene)) {
|
|
2303
|
+
callback(generateHarFromRequest(request));
|
|
2304
|
+
try {
|
|
2305
|
+
run.abort();
|
|
2306
|
+
} catch (e) { }
|
|
2307
|
+
resolve();
|
|
2301
2308
|
} else {
|
|
2302
|
-
if (!
|
|
2303
|
-
_.set(eventRuntimeData, [event?.event_id, "
|
|
2304
|
-
|
|
2305
|
-
|
|
2306
|
-
|
|
2307
|
-
|
|
2308
|
-
|
|
2309
|
-
|
|
2310
|
-
|
|
2311
|
-
}
|
|
2309
|
+
if (!err) {
|
|
2310
|
+
_.set(eventRuntimeData, [event?.event_id, "response"], await convert2EchoResponse(response, history));
|
|
2311
|
+
} else {
|
|
2312
|
+
if (!_.includes(['script', 'sql', 'assert_visual', 'assert'], event?.type)) {
|
|
2313
|
+
_.set(eventRuntimeData, [event?.event_id, "exception", 'prerequest'], String(err));
|
|
2314
|
+
_.set(eventRuntimeData, [event?.event_id, 'error'], {
|
|
2315
|
+
error_type: 'prerequest',
|
|
2316
|
+
message: String(err)
|
|
2317
|
+
})
|
|
2312
2318
|
|
|
2313
|
-
|
|
2314
|
-
|
|
2315
|
-
{
|
|
2316
|
-
time,
|
|
2317
|
-
"level": "error",
|
|
2318
|
-
"args": [String(err?.message)]
|
|
2319
|
+
if (_.isUndefined(_.get(eventRuntimeData, [event?.event_id, "console"]))) {
|
|
2320
|
+
_.set(eventRuntimeData, [event?.event_id, "console"], []);
|
|
2319
2321
|
}
|
|
2320
|
-
|
|
2322
|
+
|
|
2323
|
+
const time = Date.now()
|
|
2324
|
+
eventRuntimeData[event?.event_id].console.push(
|
|
2325
|
+
{
|
|
2326
|
+
time,
|
|
2327
|
+
"level": "error",
|
|
2328
|
+
"args": [String(err?.message)]
|
|
2329
|
+
}
|
|
2330
|
+
)
|
|
2331
|
+
}
|
|
2321
2332
|
}
|
|
2322
|
-
}
|
|
2323
2333
|
|
|
2324
|
-
|
|
2325
|
-
|
|
2334
|
+
const requestOptions = convert2EchoRequest(request, requestJson, postmanJSON, history);
|
|
2335
|
+
_.set(eventRuntimeData, [event?.event_id, "request"], requestOptions);
|
|
2336
|
+
}
|
|
2326
2337
|
},
|
|
2327
2338
|
|
|
2328
2339
|
beforeTest(err, cursor, events, item) {
|
|
@@ -2426,7 +2437,6 @@ module.exports = (event, option, callback, eventRuntimeData, eventResultList) =>
|
|
|
2426
2437
|
},
|
|
2427
2438
|
|
|
2428
2439
|
responseData(cursor, data) {
|
|
2429
|
-
console.log(111)
|
|
2430
2440
|
if (!_.includes(['get_parsed_request'], scene)) {
|
|
2431
2441
|
callback({
|
|
2432
2442
|
action: "sse",
|
package/index.js
CHANGED
|
@@ -135,7 +135,6 @@ const request2HAR = (events, option) => {
|
|
|
135
135
|
if (_.isObject(event) && _.has(event, 'type')) {
|
|
136
136
|
try {
|
|
137
137
|
await executeEvent(event, _.assign(eventOptions, { scene: 'get_parsed_request' }), (data) => {
|
|
138
|
-
console.log(data,1111)
|
|
139
138
|
resolve(data)
|
|
140
139
|
}, eventRuntimeData, eventResultList);
|
|
141
140
|
} catch (e) {
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "runner-runtime",
|
|
3
|
-
"version": "1.0.
|
|
3
|
+
"version": "1.0.80",
|
|
4
4
|
"description": "runner-runtime.",
|
|
5
5
|
"main": "index.js",
|
|
6
6
|
"scripts": {
|
|
@@ -19,12 +19,14 @@
|
|
|
19
19
|
"url": "https://github.com/Apipost-Team/runner-runtime/issues"
|
|
20
20
|
},
|
|
21
21
|
"homepage": "https://github.com/Apipost-Team/runner-runtime#readme",
|
|
22
|
+
"devDependencies": {
|
|
23
|
+
"database-query": "^1.1.12"
|
|
24
|
+
},
|
|
22
25
|
"dependencies": {
|
|
23
26
|
"@apipost/url-join": "^1.0.1",
|
|
24
27
|
"apipost-tools": "^0.0.38",
|
|
25
28
|
"atomic-sleep": "^1.0.0",
|
|
26
29
|
"content-disposition": "^0.5.4",
|
|
27
|
-
"database-query": "^1.1.12",
|
|
28
30
|
"file-type": "^16.5.4",
|
|
29
31
|
"is-image": "^3.0.0",
|
|
30
32
|
"is-svg": "^4.3.2",
|
|
@@ -48,4 +50,4 @@
|
|
|
48
50
|
"uuid": "^9.0.1",
|
|
49
51
|
"validator": "^13.15.0"
|
|
50
52
|
}
|
|
51
|
-
}
|
|
53
|
+
}
|