runner-runtime 1.0.51 → 1.0.53
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 +3 -2
- package/libs/utils.js +11 -11
- package/package.json +2 -3
- package/tmp/request.js +31 -19
package/events/api.js
CHANGED
|
@@ -1681,7 +1681,8 @@ async function convert2EchoResponse(response, history) {
|
|
|
1681
1681
|
|
|
1682
1682
|
const preProcessMockExp = (request, requestPara, AllVars, option) => {
|
|
1683
1683
|
const { postmanJSON } = requestPara;
|
|
1684
|
-
const { lang,
|
|
1684
|
+
const { lang, custom_functions } = option;
|
|
1685
|
+
const customFunctions = _.cloneDeep(custom_functions);
|
|
1685
1686
|
|
|
1686
1687
|
// 识别变量
|
|
1687
1688
|
const regex = /{{([^}]+)}}/g;
|
|
@@ -1717,7 +1718,7 @@ const preProcessMockExp = (request, requestPara, AllVars, option) => {
|
|
|
1717
1718
|
}
|
|
1718
1719
|
}
|
|
1719
1720
|
})
|
|
1720
|
-
|
|
1721
|
+
console.log(postmanJSON?.url,`postmanJSONpostmanJSONpostmanJSONpostmanJSONpostmanJSONpostmanJSON`)
|
|
1721
1722
|
// 替换 Header 中可能的变量
|
|
1722
1723
|
if (!_.isEmpty(request.headers)) {
|
|
1723
1724
|
request?.headers?.each((item) => {
|
package/libs/utils.js
CHANGED
|
@@ -506,7 +506,7 @@ const convertEndRuntimeState = (eventRuntimeData, event_id) => {
|
|
|
506
506
|
}
|
|
507
507
|
_.set(startAllActedUponVars, [key, 'actedUpon'], startActedUpon);
|
|
508
508
|
})
|
|
509
|
-
|
|
509
|
+
// console.log(startAllActedUponVars,`startAllActedUponVarsstartAllActedUponVarsstartAllActedUponVarsstartAllActedUponVars`)
|
|
510
510
|
// 当前变量
|
|
511
511
|
const { environment = {}, variables = {}, _globals = {}, iterationData = {} } = _.get(eventRuntimeData, 'variables', {});
|
|
512
512
|
const endVariables = { environment, variables, iterationData, globals: _globals };
|
|
@@ -521,21 +521,21 @@ const convertEndRuntimeState = (eventRuntimeData, event_id) => {
|
|
|
521
521
|
_.forEach(endAllVars, (value, key) => {
|
|
522
522
|
let actedUpon = undefined;
|
|
523
523
|
|
|
524
|
-
if (_.get(startAllVars, key) != value) {
|
|
525
|
-
|
|
526
|
-
|
|
527
|
-
|
|
528
|
-
|
|
529
|
-
|
|
530
|
-
|
|
531
|
-
}
|
|
524
|
+
// if (_.get(startAllVars, key) != value) {
|
|
525
|
+
["variables", "iterationData", "environment", "globals"].some((type) => {
|
|
526
|
+
if (!_.isUndefined(_.get(endVariables, [`${type}`, key]))) {
|
|
527
|
+
actedUpon = type;
|
|
528
|
+
return;
|
|
529
|
+
}
|
|
530
|
+
})
|
|
531
|
+
// }
|
|
532
532
|
|
|
533
533
|
_.set(currentVariables, [key], {
|
|
534
|
-
start: _.pick(startAllActedUponVars, ['value', 'actedUpon']),
|
|
534
|
+
start: _.pick(startAllActedUponVars[key], ['value', 'actedUpon']),
|
|
535
535
|
current: { value, actedUpon }
|
|
536
536
|
})
|
|
537
537
|
})
|
|
538
|
-
|
|
538
|
+
console.log(JSON.stringify({ startTime, endTime, currentVariables }, null, 2))
|
|
539
539
|
return { startTime, endTime, currentVariables };
|
|
540
540
|
} catch (e) {
|
|
541
541
|
console.log(e)
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "runner-runtime",
|
|
3
|
-
"version": "1.0.
|
|
3
|
+
"version": "1.0.53",
|
|
4
4
|
"description": "runner-runtime.",
|
|
5
5
|
"main": "index.js",
|
|
6
6
|
"scripts": {
|
|
@@ -24,13 +24,12 @@
|
|
|
24
24
|
"apipost-tools": "^0.0.38",
|
|
25
25
|
"atomic-sleep": "^1.0.0",
|
|
26
26
|
"content-disposition": "^0.5.4",
|
|
27
|
-
"database-query": "^1.1.12",
|
|
28
27
|
"exp-mock": "^2.0.15",
|
|
29
28
|
"file-type": "^16.5.4",
|
|
30
29
|
"is-image": "^3.0.0",
|
|
31
30
|
"is-svg": "^4.3.2",
|
|
32
31
|
"json-bigint": "^1.0.0",
|
|
33
|
-
"json-schema-faker-pro": "^0.5.
|
|
32
|
+
"json-schema-faker-pro": "^0.5.17",
|
|
34
33
|
"json5": "^2.2.3",
|
|
35
34
|
"jsonpath": "^1.1.1",
|
|
36
35
|
"lodash": "^4.17.21",
|
package/tmp/request.js
CHANGED
|
@@ -71,7 +71,7 @@ module.exports = {
|
|
|
71
71
|
}
|
|
72
72
|
},
|
|
73
73
|
"environment": {
|
|
74
|
-
"code":
|
|
74
|
+
"code": 201,
|
|
75
75
|
"key": "value"
|
|
76
76
|
}
|
|
77
77
|
},
|
|
@@ -128,6 +128,11 @@ module.exports = {
|
|
|
128
128
|
"HOST": "https://*:443"
|
|
129
129
|
},
|
|
130
130
|
"https://apipost.cn:443": {
|
|
131
|
+
"crt": {
|
|
132
|
+
"file_base64": "data:application/x-x509-ca-cert;base64,LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSURuVENDQW9VQ0ZFcDd4Z3J2VVhteWEzTEdmcEFpenRNUkJvN3ZNQTBHQ1NxR1NJYjNEUUVCQ3dVQU1JR0sKTVFzd0NRWURWUVFHRXdKRFRqRVFNQTRHQTFVRUNBd0hRbVZwYW1sdVp6RVFNQTRHQTFVRUJ3d0hRbVZwYW1sdQpaekVRTUE0R0ExVUVDZ3dIWVhCcGNHOXpkREVNTUFvR0ExVUVDd3dEWVhCME1SWXdGQVlEVlFRRERBMWpZeTVoCmNHbHdiM04wTG1Oak1SOHdIUVlKS29aSWh2Y05BUWtCRmhCaFpHMXBia0JoY0dsd2IzTjBMbU5qTUI0WERUSXoKTVRJeE1UQTVOREl4TmxvWERUTXpNVEl3T0RBNU5ESXhObG93Z1lveEN6QUpCZ05WQkFZVEFrTk9NUkF3RGdZRApWUVFJREFkQ1pXbHFhVzVuTVJBd0RnWURWUVFIREFkQ1pXbHFhVzVuTVE4d0RRWURWUVFLREFaaGNHbHZjM1F4CkREQUtCZ05WQkFzTUEyRndkREVXTUJRR0ExVUVBd3dOWTJNdVlYQnBjRzl6ZEM1all6RWdNQjRHQ1NxR1NJYjMKRFFFSkFSWVJZMnhwWlc1MFFHRndhWEJ2YzNRdVkyTXdnZ0VpTUEwR0NTcUdTSWIzRFFFQkFRVUFBNElCRHdBdwpnZ0VLQW9JQkFRRG5DalNwV2MvVEovcXg2ZHRCRUlKeHhpME0wTWc1M091U0lNK2dMVnNseTl4SVFTTndGWGhrCi8vRzhTOVl0d2lnMHpwZVNLUlhyNi9tdklQcjlsY3RBakRrZzQ4Q1BQSk5YYVo1RTdQVkRYbThtTXhhS2RBeXEKZVBkT2w2bGJ0a0pWRTB0cElWTFo4UkhEOWU4VFdiNENMNFBUSzkrNFhVSElEUU1FTUdNbWFnRUVRd3ordDdSTQpMZDVvcVAxdHVUdlhBbmlUbmU4TnZhYVQ3NDlqcFhYb3lnV29FaVcwOGJ3NmI2TmZwVVEyeFBsSkdrc2tiblRhCisyTWVqb1ZrSlpDbDFlOUhOYXV2a085WjhQamRYMG9nZTM0OE5pZW83amNDWWhBUmttanVJanhiMU1kU3dPdjcKMTVWS3EwcFFwbjNzVHJrWTVqdjZEeis3dWhSaXVnN2pBZ01CQUFFd0RRWUpLb1pJaHZjTkFRRUxCUUFEZ2dFQgpBRGFCdG10NHVPaVpoVlpHdmo1Tko2RUhUUFNGZGxBaVd6U2tiSWllV2RIY1NhK0J3K2xBM1kyalJsYnZNUVVaCndiL21jaFRtNjFJRmlKbnYvN1h2MGtmMkJxUzkyMURXenJHa3FWQk5zRUdIMEdhWGVHMVMwL1pkNXg1RE4zMlEKRW9IRE95K2lOeDlwRzA2cy8ybUlGY1E3eXQ0cW9acXFQZUg4U3VIamZOanlnZnZFUGxiYUJHb0Y4V1dneFluLwp3TzlFK2pYN3VvdlZDWXVrY3NyaEprZzJwK3o5MUFVU3p2NlpTbHlnK3pGM2kyM1Q0ZXA5VDhwRTV2eXE3UlFnClNPT3BQd25uN0d5UWd2UzREbU5LMHkyazc5ZUdGb3VnTWxnS3g1Um5nMUQxNEd0ZFcvMlE0WGxNa2tHZ1ZsR2IKRVRkcGlES1JKWjNTTDJPZ1RsSFpibWM9Ci0tLS0tRU5EIENFUlRJRklDQVRFLS0tLS0K",
|
|
133
|
+
"file_name": "client (1).crt",
|
|
134
|
+
"file_url": ""
|
|
135
|
+
},
|
|
131
136
|
"key": {
|
|
132
137
|
"file_base64": "data:application/x-x509-ca-cert;base64,LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSUR0VENDQXAyZ0F3SUJBZ0lKQU9ueUNxV09FeCtsTUEwR0NTcUdTSWIzRFFFQkJRVUFNRVV4Q3pBSkJnTlYKQkFZVEFrRlZNUk13RVFZRFZRUUlFd3BUYjIxbExWTjBZWFJsTVNFd0h3WURWUVFLRXhoSmJuUmxjbTVsZENCWAphV1JuYVhSeklGQjBlU0JNZEdRd0hoY05NVFV3TnpFek1UUTFNRE16V2hjTk1UVXdPREV5TVRRMU1ETXpXakJGCk1Rc3dDUVlEVlFRR0V3SkJWVEVUTUJFR0ExVUVDQk1LVTI5dFpTMVRkR0YwWlRFaE1COEdBMVVFQ2hNWVNXNTAKWlhKdVpYUWdWMmxrWjJsMGN5QlFkSGtnVEhSa01JSUJJakFOQmdrcWhraUc5dzBCQVFFRkFBT0NBUThBTUlJQgpDZ0tDQVFFQTB1cVdPWUF1ZmgxSHZkNUw0WE8zUEZOZituZE8vVGczUGJEcWl4UTZEYUpqcUw2ZWh6eFJYeHJyCmR6U0N6RlN2b2FPRzFNaUpyazlIdUYvYUVyZ0ExdHFnb0crSmx1VVlKOG9VNzRtVFk3Zmt3dHhPUnpoT2JkSmoKbFoxNm5jNGVEaXBjVWtjUFluY0tQSGxsbnR1MXVDSUNNMkl5TmprcUFNd3lPSERrTGNFY0VyQ1F3YVdlSi80VgpGS3NVdndwbTR0cmRwWVcrelUwWkhUdWtuWkhybERrY1l2ZlE2VSt5bjI3ZEZBUWRwb3A5Q0FyNjdsL2Ftd01RCm9ZT1hqVGx6bWFZOURvRHRVazlCY0tGSUhhVDQwbGJFSDV2OTlXeDNaNE1MQ2JhNHRuQ2oyRTFzZ2UrUWFWcEEKck1aazNDTjN0amM5VUlWa2JGdUZmeUNaK1owSlpRSURBUUFCbzRHbk1JR2tNQjBHQTFVZERnUVdCQlNzandwVAp6Q2YzOGhUQmNsRFNvWEFNSkp6Q1NEQjFCZ05WSFNNRWJqQnNnQlNzandwVHpDZjM4aFRCY2xEU29YQU1KSnpDClNLRkpwRWN3UlRFTE1Ba0dBMVVFQmhNQ1FWVXhFekFSQmdOVkJBZ1RDbE52YldVdFUzUmhkR1V4SVRBZkJnTlYKQkFvVEdFbHVkR1Z5Ym1WMElGZHBaR2RwZEhNZ1VIUjVJRXgwWklJSkFPbnlDcVdPRXgrbE1Bd0dBMVVkRXdRRgpNQU1CQWY4d0RRWUpLb1pJaHZjTkFRRUZCUUFEZ2dFQkFJSk52M3cza0VqSGt5QkNiaURwcFFBczdDU2s1SGJzCisrV0EyZm9sdzZaM3I2SUxHWEpVYmhwaitQZ0V1YTVUTW5ja2VEL0lvMXViYnNqaWZ2eHo1UUJrTDIySHQwdkIKTFJpR1FkMGt2TTFUUkFTUyt2UFk1L096Q2hkUVFPamh0UG5Vc0h2dEVwTHV5SkRlV2QyZTV5cFoveDdmMTZRVApwRG16ajRLNG00YkZPUitSWlQxUkN2SjFDclU1VWR0UzBpWVoyczJmVVJJclQ3Qmo5dDhhdmpReTFxQnNzd1E1CkdFUERTRWVoRC96QzkzMlJsSUw4cGhja05kTHRvZGlMaVlSRU8rTGt6MHdDeWpVTG0vYXVMeWlrNzZ1WlZaR3gKTEJwRUp4WU81bmQvYVViYjNsS3liSXJZYXlkSWJBVk5CcWR1SWxaV3M1cmgwclJFOUZNaDcrbz0KLS0tLS1FTkQgQ0VSVElGSUNBVEUtLS0tLQo=",
|
|
133
138
|
"file_name": "cert.pem",
|
|
@@ -139,11 +144,6 @@ module.exports = {
|
|
|
139
144
|
"file_name": "client (1).key",
|
|
140
145
|
"file_url": ""
|
|
141
146
|
},
|
|
142
|
-
"crt": {
|
|
143
|
-
"file_base64": "data:application/x-x509-ca-cert;base64,LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSURuVENDQW9VQ0ZFcDd4Z3J2VVhteWEzTEdmcEFpenRNUkJvN3ZNQTBHQ1NxR1NJYjNEUUVCQ3dVQU1JR0sKTVFzd0NRWURWUVFHRXdKRFRqRVFNQTRHQTFVRUNBd0hRbVZwYW1sdVp6RVFNQTRHQTFVRUJ3d0hRbVZwYW1sdQpaekVRTUE0R0ExVUVDZ3dIWVhCcGNHOXpkREVNTUFvR0ExVUVDd3dEWVhCME1SWXdGQVlEVlFRRERBMWpZeTVoCmNHbHdiM04wTG1Oak1SOHdIUVlKS29aSWh2Y05BUWtCRmhCaFpHMXBia0JoY0dsd2IzTjBMbU5qTUI0WERUSXoKTVRJeE1UQTVOREl4TmxvWERUTXpNVEl3T0RBNU5ESXhObG93Z1lveEN6QUpCZ05WQkFZVEFrTk9NUkF3RGdZRApWUVFJREFkQ1pXbHFhVzVuTVJBd0RnWURWUVFIREFkQ1pXbHFhVzVuTVE4d0RRWURWUVFLREFaaGNHbHZjM1F4CkREQUtCZ05WQkFzTUEyRndkREVXTUJRR0ExVUVBd3dOWTJNdVlYQnBjRzl6ZEM1all6RWdNQjRHQ1NxR1NJYjMKRFFFSkFSWVJZMnhwWlc1MFFHRndhWEJ2YzNRdVkyTXdnZ0VpTUEwR0NTcUdTSWIzRFFFQkFRVUFBNElCRHdBdwpnZ0VLQW9JQkFRRG5DalNwV2MvVEovcXg2ZHRCRUlKeHhpME0wTWc1M091U0lNK2dMVnNseTl4SVFTTndGWGhrCi8vRzhTOVl0d2lnMHpwZVNLUlhyNi9tdklQcjlsY3RBakRrZzQ4Q1BQSk5YYVo1RTdQVkRYbThtTXhhS2RBeXEKZVBkT2w2bGJ0a0pWRTB0cElWTFo4UkhEOWU4VFdiNENMNFBUSzkrNFhVSElEUU1FTUdNbWFnRUVRd3ordDdSTQpMZDVvcVAxdHVUdlhBbmlUbmU4TnZhYVQ3NDlqcFhYb3lnV29FaVcwOGJ3NmI2TmZwVVEyeFBsSkdrc2tiblRhCisyTWVqb1ZrSlpDbDFlOUhOYXV2a085WjhQamRYMG9nZTM0OE5pZW83amNDWWhBUmttanVJanhiMU1kU3dPdjcKMTVWS3EwcFFwbjNzVHJrWTVqdjZEeis3dWhSaXVnN2pBZ01CQUFFd0RRWUpLb1pJaHZjTkFRRUxCUUFEZ2dFQgpBRGFCdG10NHVPaVpoVlpHdmo1Tko2RUhUUFNGZGxBaVd6U2tiSWllV2RIY1NhK0J3K2xBM1kyalJsYnZNUVVaCndiL21jaFRtNjFJRmlKbnYvN1h2MGtmMkJxUzkyMURXenJHa3FWQk5zRUdIMEdhWGVHMVMwL1pkNXg1RE4zMlEKRW9IRE95K2lOeDlwRzA2cy8ybUlGY1E3eXQ0cW9acXFQZUg4U3VIamZOanlnZnZFUGxiYUJHb0Y4V1dneFluLwp3TzlFK2pYN3VvdlZDWXVrY3NyaEprZzJwK3o5MUFVU3p2NlpTbHlnK3pGM2kyM1Q0ZXA5VDhwRTV2eXE3UlFnClNPT3BQd25uN0d5UWd2UzREbU5LMHkyazc5ZUdGb3VnTWxnS3g1Um5nMUQxNEd0ZFcvMlE0WGxNa2tHZ1ZsR2IKRVRkcGlES1JKWjNTTDJPZ1RsSFpibWM9Ci0tLS0tRU5EIENFUlRJRklDQVRFLS0tLS0K",
|
|
144
|
-
"file_name": "client (1).crt",
|
|
145
|
-
"file_url": ""
|
|
146
|
-
},
|
|
147
147
|
"HOST": "https://apipost.cn:443"
|
|
148
148
|
}
|
|
149
149
|
}
|
|
@@ -176,7 +176,7 @@ module.exports = {
|
|
|
176
176
|
{
|
|
177
177
|
"param_id": "2b835c6eb86902d",
|
|
178
178
|
"description": "用户主键id",
|
|
179
|
-
"field_type": "
|
|
179
|
+
"field_type": "string",
|
|
180
180
|
"is_checked": 1,
|
|
181
181
|
"key": "name",
|
|
182
182
|
"not_null": 1,
|
|
@@ -204,10 +204,10 @@ module.exports = {
|
|
|
204
204
|
"type": "database",
|
|
205
205
|
"enabled": 1,
|
|
206
206
|
"data": {
|
|
207
|
+
"variables": [],
|
|
207
208
|
"connectionId": "2b9e0de71864000",
|
|
208
209
|
"isConsoleOutput": -1,
|
|
209
|
-
"query": ""
|
|
210
|
-
"variables": []
|
|
210
|
+
"query": ""
|
|
211
211
|
},
|
|
212
212
|
"name": "数据库",
|
|
213
213
|
"id": "bcb573cb17048"
|
|
@@ -218,9 +218,9 @@ module.exports = {
|
|
|
218
218
|
"data": {
|
|
219
219
|
"type": "responseJson",
|
|
220
220
|
"expression": {
|
|
221
|
+
"compareValue": "",
|
|
221
222
|
"path": "",
|
|
222
|
-
"compareType": "eq"
|
|
223
|
-
"compareValue": ""
|
|
223
|
+
"compareType": "eq"
|
|
224
224
|
}
|
|
225
225
|
},
|
|
226
226
|
"name": "断言",
|
|
@@ -236,7 +236,7 @@ module.exports = {
|
|
|
236
236
|
{
|
|
237
237
|
"param_id": "3d55bc7d39b04a",
|
|
238
238
|
"description": "",
|
|
239
|
-
"field_type": "
|
|
239
|
+
"field_type": "string",
|
|
240
240
|
"is_checked": 1,
|
|
241
241
|
"key": "id",
|
|
242
242
|
"not_null": 1,
|
|
@@ -248,7 +248,7 @@ module.exports = {
|
|
|
248
248
|
{
|
|
249
249
|
"param_id": "bca53b876e042",
|
|
250
250
|
"description": "",
|
|
251
|
-
"field_type": "
|
|
251
|
+
"field_type": "string",
|
|
252
252
|
"is_checked": 1,
|
|
253
253
|
"key": "",
|
|
254
254
|
"not_null": 1,
|
|
@@ -302,7 +302,7 @@ module.exports = {
|
|
|
302
302
|
"enable_sandbox": -1,
|
|
303
303
|
"iterationCount": 1,
|
|
304
304
|
"sleep": 0,
|
|
305
|
-
"testing_id": "
|
|
305
|
+
"testing_id": "c754fff306002",
|
|
306
306
|
"iterates_data_id": "0",
|
|
307
307
|
"iterationData": []
|
|
308
308
|
},
|
|
@@ -312,20 +312,20 @@ module.exports = {
|
|
|
312
312
|
"enabled": 1,
|
|
313
313
|
"type": "if",
|
|
314
314
|
"data": {
|
|
315
|
-
"var": "
|
|
315
|
+
"var": "{{code}}",
|
|
316
316
|
"compare": "eq",
|
|
317
317
|
"value": "1"
|
|
318
318
|
},
|
|
319
319
|
"project_id": "2adc267c9064000",
|
|
320
|
-
"test_id": "
|
|
321
|
-
"event_id": "
|
|
320
|
+
"test_id": "c754fff306002",
|
|
321
|
+
"event_id": "c7552c4306003",
|
|
322
322
|
"sort": 1,
|
|
323
323
|
"children": [
|
|
324
324
|
{
|
|
325
325
|
"type": "api",
|
|
326
326
|
"auto_sync": true,
|
|
327
|
-
"test_id": "
|
|
328
|
-
"event_id": "
|
|
327
|
+
"test_id": "c754fff306002",
|
|
328
|
+
"event_id": "c756447b06005",
|
|
329
329
|
"enabled": 1,
|
|
330
330
|
"data": {
|
|
331
331
|
"target_id": "3d55b1a07d6046",
|
|
@@ -335,6 +335,18 @@ module.exports = {
|
|
|
335
335
|
}
|
|
336
336
|
}
|
|
337
337
|
]
|
|
338
|
+
},
|
|
339
|
+
{
|
|
340
|
+
"parent_event_id": "0",
|
|
341
|
+
"enabled": 1,
|
|
342
|
+
"type": "wait",
|
|
343
|
+
"data": {
|
|
344
|
+
"sleep": 1000
|
|
345
|
+
},
|
|
346
|
+
"project_id": "2adc267c9064000",
|
|
347
|
+
"test_id": "c754fff306002",
|
|
348
|
+
"event_id": "c757153f06006",
|
|
349
|
+
"sort": 3
|
|
338
350
|
}
|
|
339
351
|
]
|
|
340
352
|
}
|