@loadmill/executer 0.1.163 → 0.1.164
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/dist/ai-assertion/index.js +53 -15
- package/dist/ai-assertion/index.js.map +1 -1
- package/dist/ai-assertion/prompts.js +2 -2
- package/dist/ai-assertion/prompts.js.map +1 -1
- package/dist/asserter.js +47 -9
- package/dist/asserter.js.map +1 -1
- package/dist/block-request.d.ts +1 -1
- package/dist/block-request.js +22 -12
- package/dist/block-request.js.map +1 -1
- package/dist/cookies.d.ts +1 -1
- package/dist/cookies.js +8 -6
- package/dist/cookies.js.map +1 -1
- package/dist/errors.js +16 -2
- package/dist/errors.js.map +1 -1
- package/dist/extraction-combiner.js +43 -5
- package/dist/extraction-combiner.js.map +1 -1
- package/dist/failures.js +13 -3
- package/dist/failures.js.map +1 -1
- package/dist/grpc.js +72 -15
- package/dist/grpc.js.map +1 -1
- package/dist/iteration-stats.js +7 -5
- package/dist/iteration-stats.js.map +1 -1
- package/dist/mill-version.js +1 -1
- package/dist/mill-version.js.map +1 -1
- package/dist/parameter-pools.js +44 -6
- package/dist/parameter-pools.js.map +1 -1
- package/dist/performance.js +4 -2
- package/dist/performance.js.map +1 -1
- package/dist/post-script/post-script-executor.js +25 -7
- package/dist/post-script/post-script-executor.js.map +1 -1
- package/dist/post-sequence.js +55 -17
- package/dist/post-sequence.js.map +1 -1
- package/dist/redact-data.js +11 -9
- package/dist/redact-data.js.map +1 -1
- package/dist/request-sequence-result.js +12 -2
- package/dist/request-sequence-result.js.map +1 -1
- package/dist/res-keeper.d.ts +1 -1
- package/dist/res-keeper.js +21 -3
- package/dist/res-keeper.js.map +1 -1
- package/dist/sampler.js +75 -13
- package/dist/sampler.js.map +1 -1
- package/dist/sequence.d.ts +1 -1
- package/dist/sequence.js +203 -130
- package/dist/sequence.js.map +1 -1
- package/dist/single-runner.js +81 -11
- package/dist/single-runner.js.map +1 -1
- package/dist/step-handlers/code-step-handler.js +41 -6
- package/dist/step-handlers/code-step-handler.js.map +1 -1
- package/dist/step-handlers/extract-step-handler.js +41 -6
- package/dist/step-handlers/extract-step-handler.js.map +1 -1
- package/dist/step-handlers/playwright/constants.js +5 -3
- package/dist/step-handlers/playwright/constants.js.map +1 -1
- package/dist/step-handlers/playwright/files-manager.js +34 -13
- package/dist/step-handlers/playwright/files-manager.js.map +1 -1
- package/dist/step-handlers/playwright/index.js +44 -9
- package/dist/step-handlers/playwright/index.js.map +1 -1
- package/dist/step-handlers/playwright/transformer.js +8 -8
- package/dist/step-handlers/playwright/transformer.js.map +1 -1
- package/dist/step-handlers/playwright-step-handler.js +49 -11
- package/dist/step-handlers/playwright-step-handler.js.map +1 -1
- package/dist/step-handlers/request-step-handler.js +41 -6
- package/dist/step-handlers/request-step-handler.js.map +1 -1
- package/dist/step-handlers/wait-step-handler.js +46 -11
- package/dist/step-handlers/wait-step-handler.js.map +1 -1
- package/dist/step-handlers/web-socket-step-handler.js +75 -18
- package/dist/step-handlers/web-socket-step-handler.js.map +1 -1
- package/dist/test-run-event-emitter.js +4 -2
- package/dist/test-run-event-emitter.js.map +1 -1
- package/dist/utils.js +20 -2
- package/dist/utils.js.map +1 -1
- package/dist/ws.js +58 -20
- package/dist/ws.js.map +1 -1
- package/package.json +3 -3
package/dist/failures.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"failures.js","sourceRoot":"","sources":["../src/failures.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"failures.js","sourceRoot":"","sources":["../src/failures.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAEA,SAAgB,UAAU,CAAC,SAAoB;IAC7C,OAAO;QACL,SAAS,WAAA;QACT,WAAW,EAAE,CAAC;KACf,CAAC;AACJ,CAAC;AALD,gCAKC;AAED,SAAgB,aAAa,CAAC,EAAY,EAAE,IAAc;IACxD,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,OAAO,CAAC,UAAA,KAAK;QAC7B,IAAM,eAAe,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC;QACpC,IAAM,aAAa,GAAG,EAAE,CAAC,KAAM,CAAC,CAAC;QAEjC,IAAI,aAAa,IAAI,IAAI,EAAE;YACzB,EAAE,CAAC,KAAM,CAAC,GAAG;gBACX,WAAW,EAAE,eAAe,CAAC,WAAW;gBACxC,SAAS,eAAO,eAAe,CAAC,SAAS,CAAE;aAC5C,CAAC;SACH;aAAM;YACL,oBAAoB,CAAC,aAAa,EAAE,eAAe,CAAC,CAAC;SACtD;IACH,CAAC,CAAC,CAAC;AACL,CAAC;AAdD,sCAcC;AAED,SAAS,oBAAoB,CAC3B,EAAmB,EACnB,IAAqB;IAErB,EAAE,CAAC,WAAW,IAAI,IAAI,CAAC,WAAW,CAAC;IACnC,eAAe,CAAC,EAAE,CAAC,SAAS,EAAE,IAAI,CAAC,SAAS,CAAC,CAAC;AAChD,CAAC;AAED,SAAS,eAAe,CAAC,EAAa,EAAE,IAAe;IACrD,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,OAAO,CAAC,UAAA,MAAM;QAC9B,IAAM,SAAS,GAAG,IAAI,CAAC,MAAM,CAAC,CAAC;QAC/B,IAAM,OAAO,GAAG,EAAE,CAAC,MAAM,CAAC,CAAC;QAE3B,IAAI,OAAO,IAAI,IAAI,EAAE;YACnB,EAAE,CAAC,MAAM,CAAC,GAAG,OAAO,GAAG,SAAS,CAAC;SAClC;aAAM;YACL,EAAE,CAAC,MAAM,CAAC,GAAG,SAAS,CAAC;SACxB;IACH,CAAC,CAAC,CAAC;AACL,CAAC;AAED,SAAgB,cAAc,CAAC,QAAmB;IAChD,IAAM,YAAY,GAAG,QAAQ,IAAI,EAAE,CAAC;IAEpC,OAAO,MAAM,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC,GAAG,CAAC,UAAA,QAAQ;QAC3C,OAAA,MAAM,CAAC,IAAI,CAAC,YAAY,CAAC,QAAQ,CAAC,CAAC,SAAS,CAAC,CAAC,GAAG,CAAC,UAAA,MAAM;YACtD,OAAA,aAAa,CAAC,QAAQ,EAAE,MAAM,CAAC;QAA/B,CAA+B,CAChC;IAFD,CAEC,CACF,CAAC,MAAM,CAAC,UAAC,CAAC,EAAE,CAAC,IAAK,OAAA,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAX,CAAW,EAAE,EAAE,CAAC,CAAC;AACtC,CAAC;AARD,wCAQC;AAED,SAAgB,aAAa,CAAC,QAAyB,EAAE,MAAc;IACrE,OAAU,QAAQ,SAAI,MAAQ,CAAC;AACjC,CAAC;AAFD,sCAEC;AAED,SAAgB,0BAA0B,CAAC,GAAsB,EAAE,MAAc;;IAC/E,GAAG,CAAC,SAAS,aAAK,GAAC,MAAM,GAAG,CAAC,GAAG,CAAC,aAAa,IAAI,iBAAiB,CAAC,IAAG,CAAC,KAAE,CAAC;AAC7E,CAAC;AAFD,gEAEC"}
|
package/dist/grpc.js
CHANGED
|
@@ -1,15 +1,72 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
+
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
|
3
|
+
if (k2 === undefined) k2 = k;
|
|
4
|
+
Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
|
|
5
|
+
}) : (function(o, m, k, k2) {
|
|
6
|
+
if (k2 === undefined) k2 = k;
|
|
7
|
+
o[k2] = m[k];
|
|
8
|
+
}));
|
|
9
|
+
var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
|
|
10
|
+
Object.defineProperty(o, "default", { enumerable: true, value: v });
|
|
11
|
+
}) : function(o, v) {
|
|
12
|
+
o["default"] = v;
|
|
13
|
+
});
|
|
14
|
+
var __importStar = (this && this.__importStar) || function (mod) {
|
|
15
|
+
if (mod && mod.__esModule) return mod;
|
|
16
|
+
var result = {};
|
|
17
|
+
if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
|
|
18
|
+
__setModuleDefault(result, mod);
|
|
19
|
+
return result;
|
|
20
|
+
};
|
|
21
|
+
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
|
22
|
+
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
|
23
|
+
return new (P || (P = Promise))(function (resolve, reject) {
|
|
24
|
+
function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
|
|
25
|
+
function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
|
|
26
|
+
function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
|
|
27
|
+
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
28
|
+
});
|
|
29
|
+
};
|
|
30
|
+
var __generator = (this && this.__generator) || function (thisArg, body) {
|
|
31
|
+
var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
|
|
32
|
+
return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
|
|
33
|
+
function verb(n) { return function (v) { return step([n, v]); }; }
|
|
34
|
+
function step(op) {
|
|
35
|
+
if (f) throw new TypeError("Generator is already executing.");
|
|
36
|
+
while (_) try {
|
|
37
|
+
if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
|
|
38
|
+
if (y = 0, t) op = [op[0] & 2, t.value];
|
|
39
|
+
switch (op[0]) {
|
|
40
|
+
case 0: case 1: t = op; break;
|
|
41
|
+
case 4: _.label++; return { value: op[1], done: false };
|
|
42
|
+
case 5: _.label++; y = op[1]; op = [0]; continue;
|
|
43
|
+
case 7: op = _.ops.pop(); _.trys.pop(); continue;
|
|
44
|
+
default:
|
|
45
|
+
if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
|
|
46
|
+
if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
|
|
47
|
+
if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
|
|
48
|
+
if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
|
|
49
|
+
if (t[2]) _.ops.pop();
|
|
50
|
+
_.trys.pop(); continue;
|
|
51
|
+
}
|
|
52
|
+
op = body.call(thisArg, _);
|
|
53
|
+
} catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
|
|
54
|
+
if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
|
|
55
|
+
}
|
|
56
|
+
};
|
|
57
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
58
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
59
|
+
};
|
|
2
60
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
61
|
exports.GRPCRequest = void 0;
|
|
4
|
-
var tslib_1 = require("tslib");
|
|
5
62
|
var util_1 = require("util");
|
|
6
|
-
var grpc =
|
|
7
|
-
var protoLoader =
|
|
63
|
+
var grpc = __importStar(require("@grpc/grpc-js"));
|
|
64
|
+
var protoLoader = __importStar(require("@grpc/proto-loader"));
|
|
8
65
|
var request_1 = require("@loadmill/core/dist/request");
|
|
9
|
-
var log_1 =
|
|
66
|
+
var log_1 = __importDefault(require("@loadmill/universal/dist/log"));
|
|
10
67
|
var lodash_1 = require("lodash");
|
|
11
|
-
var fs_1 =
|
|
12
|
-
var protobufjs_1 =
|
|
68
|
+
var fs_1 = __importDefault(require("fs"));
|
|
69
|
+
var protobufjs_1 = __importDefault(require("protobufjs"));
|
|
13
70
|
var errors_1 = require("./errors");
|
|
14
71
|
var options = {
|
|
15
72
|
keepCase: true,
|
|
@@ -59,11 +116,11 @@ var GRPCRequest = /** @class */ (function () {
|
|
|
59
116
|
writable: true,
|
|
60
117
|
value: function (cb) {
|
|
61
118
|
var _a;
|
|
62
|
-
return
|
|
119
|
+
return __awaiter(this, void 0, void 0, function () {
|
|
63
120
|
var response_1, packageDefinition, protoDescriptor, fullServicePath, Service, client, onEnd_1, msg, metadata, _i, _b, _c, key, value, messages_1, call_1, call, res, e_1, isExpectedStatus, message, e_2;
|
|
64
121
|
var _d;
|
|
65
122
|
var _this = this;
|
|
66
|
-
return
|
|
123
|
+
return __generator(this, function (_e) {
|
|
67
124
|
switch (_e.label) {
|
|
68
125
|
case 0:
|
|
69
126
|
_e.trys.push([0, 9, , 10]);
|
|
@@ -79,7 +136,7 @@ var GRPCRequest = /** @class */ (function () {
|
|
|
79
136
|
packageDefinition = protoLoader.loadSync(this.protoFileRootPath, options);
|
|
80
137
|
protoDescriptor = grpc.loadPackageDefinition(packageDefinition);
|
|
81
138
|
fullServicePath = _getServicePath(this.protoFileRootPath, this.grpcRequestArgs.service);
|
|
82
|
-
Service =
|
|
139
|
+
Service = lodash_1.get(protoDescriptor, fullServicePath);
|
|
83
140
|
client = new Service(this.grpcRequestArgs.domain, decideChannelCredentials(this.grpcRequestArgs));
|
|
84
141
|
onEnd_1 = function (res) {
|
|
85
142
|
response_1.status = grpc.status.OK;
|
|
@@ -113,11 +170,11 @@ var GRPCRequest = /** @class */ (function () {
|
|
|
113
170
|
response_1.status = e.code;
|
|
114
171
|
response_1.res.statusMessage = e.details;
|
|
115
172
|
});
|
|
116
|
-
return [4 /*yield*/, new Promise(function (resolve) { return call_1.on('end', function () { return
|
|
117
|
-
return
|
|
173
|
+
return [4 /*yield*/, new Promise(function (resolve) { return call_1.on('end', function () { return __awaiter(_this, void 0, void 0, function () {
|
|
174
|
+
return __generator(this, function (_a) {
|
|
118
175
|
log_1.default.debug('Stream ended');
|
|
119
176
|
onEnd_1(messages_1);
|
|
120
|
-
resolve(
|
|
177
|
+
resolve();
|
|
121
178
|
return [2 /*return*/];
|
|
122
179
|
});
|
|
123
180
|
}); }); })];
|
|
@@ -125,7 +182,7 @@ var GRPCRequest = /** @class */ (function () {
|
|
|
125
182
|
_e.sent();
|
|
126
183
|
return [3 /*break*/, 5];
|
|
127
184
|
case 3:
|
|
128
|
-
call =
|
|
185
|
+
call = util_1.promisify(client[this.grpcRequestArgs.method].bind(client));
|
|
129
186
|
return [4 /*yield*/, call(msg, metadata, { deadline: Date.now() + this.grpcRequestArgs.timeout })];
|
|
130
187
|
case 4:
|
|
131
188
|
res = _e.sent();
|
|
@@ -144,7 +201,7 @@ var GRPCRequest = /** @class */ (function () {
|
|
|
144
201
|
case 8:
|
|
145
202
|
isExpectedStatus = cb(response_1, _isExpectedGRPCStatus);
|
|
146
203
|
if (!isExpectedStatus) {
|
|
147
|
-
message = "gRPC status "
|
|
204
|
+
message = "gRPC status " + response_1.status + " - " + response_1.res.statusMessage;
|
|
148
205
|
this.onError(new errors_1.RequestFailuresError(message, (_d = {}, _d[message] = 1, _d)));
|
|
149
206
|
}
|
|
150
207
|
return [2 /*return*/, response_1];
|
|
@@ -198,7 +255,7 @@ var _getServicePath = function (protoFileRootPath, service) {
|
|
|
198
255
|
var servicePath = service;
|
|
199
256
|
if (!_isServiceIncludesPackageName(service)) { // legacy
|
|
200
257
|
var packageName = _getProtoFilePackageName(protoFileRootPath);
|
|
201
|
-
servicePath = ""
|
|
258
|
+
servicePath = "" + (packageName ? packageName + "." : '') + service;
|
|
202
259
|
}
|
|
203
260
|
return servicePath;
|
|
204
261
|
};
|
package/dist/grpc.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"grpc.js","sourceRoot":"","sources":["../src/grpc.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"grpc.js","sourceRoot":"","sources":["../src/grpc.ts"],"names":[],"mappings":"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"}
|
package/dist/iteration-stats.js
CHANGED
|
@@ -1,10 +1,12 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
|
+
};
|
|
2
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
6
|
exports.calcIterationDuration = void 0;
|
|
4
|
-
var tslib_1 = require("tslib");
|
|
5
7
|
var parameters_1 = require("@loadmill/core/dist/parameters");
|
|
6
|
-
var findLast_1 =
|
|
7
|
-
var isEmpty_1 =
|
|
8
|
+
var findLast_1 = __importDefault(require("lodash/findLast"));
|
|
9
|
+
var isEmpty_1 = __importDefault(require("lodash/isEmpty"));
|
|
8
10
|
var calcIterationDuration = function (iterationRes) {
|
|
9
11
|
var iterationStartTime = _getIterationStartTime(iterationRes);
|
|
10
12
|
var iterationEndTime = _getIterationEndTime(iterationRes);
|
|
@@ -14,14 +16,14 @@ var calcIterationDuration = function (iterationRes) {
|
|
|
14
16
|
exports.calcIterationDuration = calcIterationDuration;
|
|
15
17
|
var _getIterationStartTime = function (iterationRes) {
|
|
16
18
|
var _a;
|
|
17
|
-
var firstResolvedRequest = (_a = iterationRes.resolvedRequests) === null || _a === void 0 ? void 0 : _a.find(function (rr) { return !
|
|
19
|
+
var firstResolvedRequest = (_a = iterationRes.resolvedRequests) === null || _a === void 0 ? void 0 : _a.find(function (rr) { return !isEmpty_1.default(rr.postParameters); });
|
|
18
20
|
return firstResolvedRequest ? _getRequestsStartTime(firstResolvedRequest) : 0;
|
|
19
21
|
};
|
|
20
22
|
var _getRequestsStartTime = function (request) {
|
|
21
23
|
return _getReqStartOrEndTime(request, parameters_1.BUILT_IN_PARAMS.requestStartTime);
|
|
22
24
|
};
|
|
23
25
|
var _getIterationEndTime = function (iterationRes) {
|
|
24
|
-
var lastResolvedRequest =
|
|
26
|
+
var lastResolvedRequest = findLast_1.default(iterationRes.resolvedRequests, function (rr) { return !isEmpty_1.default(rr.postParameters); });
|
|
25
27
|
return lastResolvedRequest ? _getRequestsEndTime(lastResolvedRequest) : 0;
|
|
26
28
|
};
|
|
27
29
|
var _getRequestsEndTime = function (request) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"iteration-stats.js","sourceRoot":"","sources":["../src/iteration-stats.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"iteration-stats.js","sourceRoot":"","sources":["../src/iteration-stats.ts"],"names":[],"mappings":";;;;;;AAAA,6DAAiE;AACjE,6DAAuC;AAEvC,2DAAqC;AAI9B,IAAM,qBAAqB,GAAG,UAAC,YAAmC;IACvE,IAAM,kBAAkB,GAAG,sBAAsB,CAAC,YAAY,CAAC,CAAC;IAChE,IAAM,gBAAgB,GAAG,oBAAoB,CAAC,YAAY,CAAC,CAAC;IAC5D,IAAM,iBAAiB,GAAG,gBAAgB,CAAC,CAAC,CAAC,gBAAgB,GAAG,kBAAkB,CAAC,CAAC,CAAC,CAAC,CAAC;IACvF,OAAO,iBAAiB,CAAC;AAC3B,CAAC,CAAC;AALW,QAAA,qBAAqB,yBAKhC;AAEF,IAAM,sBAAsB,GAAG,UAAC,YAAmC;;IACjE,IAAM,oBAAoB,GAAG,MAAA,YAAY,CAAC,gBAAgB,0CAAE,IAAI,CAAC,UAAA,EAAE,IAAI,OAAA,CAAC,iBAAO,CAAC,EAAE,CAAC,cAAc,CAAC,EAA3B,CAA2B,CAAC,CAAC;IACpG,OAAO,oBAAoB,CAAC,CAAC,CAAC,qBAAqB,CAAC,oBAAoB,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;AAChF,CAAC,CAAC;AAEF,IAAM,qBAAqB,GAAG,UAAC,OAAwB;IACrD,OAAA,qBAAqB,CAAC,OAAO,EAAE,4BAAe,CAAC,gBAAgB,CAAC;AAAhE,CAAgE,CAAC;AAEnE,IAAM,oBAAoB,GAAG,UAAC,YAAmC;IAC/D,IAAM,mBAAmB,GAAG,kBAAQ,CAAC,YAAY,CAAC,gBAAgB,EAAE,UAAA,EAAE,IAAI,OAAA,CAAC,iBAAO,CAAC,EAAE,CAAC,cAAc,CAAC,EAA3B,CAA2B,CAAC,CAAC;IACvG,OAAO,mBAAmB,CAAC,CAAC,CAAC,mBAAmB,CAAC,mBAAmB,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;AAC5E,CAAC,CAAC;AAEF,IAAM,mBAAmB,GAAG,UAAC,OAAwB;IACnD,OAAA,qBAAqB,CAAC,OAAO,EAAE,4BAAe,CAAC,eAAe,CAAC;AAA/D,CAA+D,CAAC;AAElE,IAAM,qBAAqB,GAAG,UAC5B,OAAwB,EACxB,SAA2F;;IAE3F,IAAM,KAAK,GAAG,MAAA,OAAO,CAAC,cAAc,0CAAE,IAAI,CAAC,UAAA,CAAC,IAAI,OAAA,CAAC,CAAC,SAAS,CAAC,EAAZ,CAAY,CAAC,CAAC;IAC9D,IAAM,QAAQ,GAAG,KAAK,aAAL,KAAK,uBAAL,KAAK,CAAG,SAAS,CAAC,CAAC;IACpC,OAAO,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;AAC/B,CAAC,CAAC"}
|
package/dist/mill-version.js
CHANGED
|
@@ -6,5 +6,5 @@ exports.millVersion = {
|
|
|
6
6
|
minor: 96,
|
|
7
7
|
patch: 0,
|
|
8
8
|
};
|
|
9
|
-
exports.millVersionString =
|
|
9
|
+
exports.millVersionString = exports.millVersion.major + "." + exports.millVersion.minor + "." + exports.millVersion.patch;
|
|
10
10
|
//# sourceMappingURL=mill-version.js.map
|
package/dist/mill-version.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mill-version.js","sourceRoot":"","sources":["../src/mill-version.ts"],"names":[],"mappings":";;;AAAa,QAAA,WAAW,GAAG;IACzB,KAAK,EAAE,CAAC;IACR,KAAK,EAAE,EAAE;IACT,KAAK,EAAE,CAAC;CACT,CAAC;AAEW,QAAA,iBAAiB,
|
|
1
|
+
{"version":3,"file":"mill-version.js","sourceRoot":"","sources":["../src/mill-version.ts"],"names":[],"mappings":";;;AAAa,QAAA,WAAW,GAAG;IACzB,KAAK,EAAE,CAAC;IACR,KAAK,EAAE,EAAE;IACT,KAAK,EAAE,CAAC;CACT,CAAC;AAEW,QAAA,iBAAiB,GAAM,mBAAW,CAAC,KAAK,SAAI,mBAAW,CAAC,KAAK,SAAI,mBAAW,CAAC,KAAO,CAAC"}
|
package/dist/parameter-pools.js
CHANGED
|
@@ -1,18 +1,56 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
+
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
|
3
|
+
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
|
4
|
+
return new (P || (P = Promise))(function (resolve, reject) {
|
|
5
|
+
function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
|
|
6
|
+
function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
|
|
7
|
+
function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
|
|
8
|
+
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
9
|
+
});
|
|
10
|
+
};
|
|
11
|
+
var __generator = (this && this.__generator) || function (thisArg, body) {
|
|
12
|
+
var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
|
|
13
|
+
return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
|
|
14
|
+
function verb(n) { return function (v) { return step([n, v]); }; }
|
|
15
|
+
function step(op) {
|
|
16
|
+
if (f) throw new TypeError("Generator is already executing.");
|
|
17
|
+
while (_) try {
|
|
18
|
+
if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
|
|
19
|
+
if (y = 0, t) op = [op[0] & 2, t.value];
|
|
20
|
+
switch (op[0]) {
|
|
21
|
+
case 0: case 1: t = op; break;
|
|
22
|
+
case 4: _.label++; return { value: op[1], done: false };
|
|
23
|
+
case 5: _.label++; y = op[1]; op = [0]; continue;
|
|
24
|
+
case 7: op = _.ops.pop(); _.trys.pop(); continue;
|
|
25
|
+
default:
|
|
26
|
+
if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
|
|
27
|
+
if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
|
|
28
|
+
if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
|
|
29
|
+
if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
|
|
30
|
+
if (t[2]) _.ops.pop();
|
|
31
|
+
_.trys.pop(); continue;
|
|
32
|
+
}
|
|
33
|
+
op = body.call(thisArg, _);
|
|
34
|
+
} catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
|
|
35
|
+
if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
|
|
36
|
+
}
|
|
37
|
+
};
|
|
38
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
39
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
40
|
+
};
|
|
2
41
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
42
|
exports.generateValuesForParameterPools = void 0;
|
|
4
|
-
var
|
|
5
|
-
var
|
|
6
|
-
var log_1 = tslib_1.__importDefault(require("@loadmill/universal/dist/log"));
|
|
43
|
+
var superagent_1 = __importDefault(require("superagent"));
|
|
44
|
+
var log_1 = __importDefault(require("@loadmill/universal/dist/log"));
|
|
7
45
|
function generateValuesForParameterPools(runId) {
|
|
8
|
-
return
|
|
46
|
+
return __awaiter(this, void 0, void 0, function () {
|
|
9
47
|
var body, error_1;
|
|
10
|
-
return
|
|
48
|
+
return __generator(this, function (_a) {
|
|
11
49
|
switch (_a.label) {
|
|
12
50
|
case 0:
|
|
13
51
|
_a.trys.push([0, 2, , 3]);
|
|
14
52
|
return [4 /*yield*/, superagent_1.default
|
|
15
|
-
.get(
|
|
53
|
+
.get((process.env.VALUES_GENERATOR_URL || 'https://val-gen.loadmill.com') + "/" + runId + "/next-parameter")];
|
|
16
54
|
case 1:
|
|
17
55
|
body = (_a.sent()).body;
|
|
18
56
|
return [2 /*return*/, typeof body === 'function' ?
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"parameter-pools.js","sourceRoot":"","sources":["../src/parameter-pools.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"parameter-pools.js","sourceRoot":"","sources":["../src/parameter-pools.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,0DAAoC;AACpC,qEAA+C;AAE/C,SAAsB,+BAA+B,CAAC,KAAa;;;;;;;oBAE9C,qBAAM,oBAAU;6BAC9B,GAAG,CACF,CAAG,OAAO,CAAC,GAAG,CAAC,oBAAoB,IAAI,8BAA8B,UAAI,KAAK,oBAAiB,CAChG,EAAA;;oBAHK,IAAI,GAAK,CAAA,SAGd,CAAA,KAHS;oBAIZ,sBAAO,OAAO,IAAI,KAAK,UAAU,CAAC,CAAC;4BACjC,IAAI,EAAE,CAAC,CAAC,CAAC,QAAQ;4BACjB,IAAI,EAAC,CAAC,QAAQ;;;oBAEhB,aAAG,CAAC,KAAK,CAAC,kDAAkD,EAAE,OAAK,CAAC,CAAC;oBACrE,sBAAO,EAAE,EAAC;;;;;CAEb;AAbD,0EAaC"}
|
package/dist/performance.js
CHANGED
|
@@ -1,8 +1,10 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
|
+
};
|
|
2
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
6
|
exports.isPerformance = void 0;
|
|
4
|
-
var
|
|
5
|
-
var log_1 = tslib_1.__importDefault(require("@loadmill/universal/dist/log"));
|
|
7
|
+
var log_1 = __importDefault(require("@loadmill/universal/dist/log"));
|
|
6
8
|
exports.isPerformance = typeof performance !== 'undefined';
|
|
7
9
|
log_1.default.debug('isPerformance =', exports.isPerformance);
|
|
8
10
|
//# sourceMappingURL=performance.js.map
|
package/dist/performance.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"performance.js","sourceRoot":"","sources":["../src/performance.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"performance.js","sourceRoot":"","sources":["../src/performance.ts"],"names":[],"mappings":";;;;;;AAAA,qEAA+C;AAElC,QAAA,aAAa,GAAG,OAAO,WAAW,KAAK,WAAW,CAAC;AAChE,aAAG,CAAC,KAAK,CAAC,iBAAiB,EAAE,qBAAa,CAAC,CAAC"}
|
|
@@ -1,9 +1,27 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
+
var __assign = (this && this.__assign) || function () {
|
|
3
|
+
__assign = Object.assign || function(t) {
|
|
4
|
+
for (var s, i = 1, n = arguments.length; i < n; i++) {
|
|
5
|
+
s = arguments[i];
|
|
6
|
+
for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
|
|
7
|
+
t[p] = s[p];
|
|
8
|
+
}
|
|
9
|
+
return t;
|
|
10
|
+
};
|
|
11
|
+
return __assign.apply(this, arguments);
|
|
12
|
+
};
|
|
13
|
+
var __spreadArray = (this && this.__spreadArray) || function (to, from) {
|
|
14
|
+
for (var i = 0, il = from.length, j = to.length; i < il; i++, j++)
|
|
15
|
+
to[j] = from[i];
|
|
16
|
+
return to;
|
|
17
|
+
};
|
|
18
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
19
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
20
|
+
};
|
|
2
21
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
22
|
exports.PostScriptRunner = void 0;
|
|
4
|
-
var tslib_1 = require("tslib");
|
|
5
23
|
var assert_1 = require("assert");
|
|
6
|
-
var cloneDeep_1 =
|
|
24
|
+
var cloneDeep_1 = __importDefault(require("lodash/cloneDeep"));
|
|
7
25
|
var ast_walker_1 = require("@loadmill/universal/dist/ast/ast-walker");
|
|
8
26
|
var vm2_virtual_machine_1 = require("./virtual-machine/vm2-virtual-machine");
|
|
9
27
|
var console_log_1 = require("./console-log");
|
|
@@ -27,7 +45,7 @@ var PostScriptRunner = /** @class */ (function () {
|
|
|
27
45
|
var wrappedUserCode = _this.wrapUserCode(dynamicContext, userCode, newVariables);
|
|
28
46
|
var vm = new vm2_virtual_machine_1.VM2VirtualMachine();
|
|
29
47
|
vm.create({
|
|
30
|
-
globalObject:
|
|
48
|
+
globalObject: __assign(__assign({ assert: assert_1.strict }, dynamicContext), { console: cloneDeep_1.default(console_log_1.myConsole), $: responseBody }),
|
|
31
49
|
staticObject: outerStaticContext,
|
|
32
50
|
});
|
|
33
51
|
var modifiedDynamicContext = vm.run(wrappedUserCode);
|
|
@@ -44,8 +62,8 @@ var PostScriptRunner = /** @class */ (function () {
|
|
|
44
62
|
if (dynamicContext === void 0) { dynamicContext = {}; }
|
|
45
63
|
if (userCode === void 0) { userCode = ''; }
|
|
46
64
|
if (newVariables === void 0) { newVariables = []; }
|
|
47
|
-
var prefix = "\n Buffer = {};\n global = { assert: global.assert, console: global.console };\n $ = "
|
|
48
|
-
var suffix = "\n exports = {\n "
|
|
65
|
+
var prefix = "\n Buffer = {};\n global = { assert: global.assert, console: global.console };\n $ = " + _this.unproxifyResponseBody() + ";\n ";
|
|
66
|
+
var suffix = "\n exports = {\n " + __spreadArray(__spreadArray([], Object.keys(dynamicContext)), newVariables).join() + "\n };\n ";
|
|
49
67
|
return prefix + userCode + suffix;
|
|
50
68
|
}
|
|
51
69
|
});
|
|
@@ -65,7 +83,7 @@ var PostScriptRunner = /** @class */ (function () {
|
|
|
65
83
|
writable: true,
|
|
66
84
|
value: function (obj) {
|
|
67
85
|
function circularError(propName) {
|
|
68
|
-
return new TypeError("Cyclic object value. Circular reference in property "
|
|
86
|
+
return new TypeError("Cyclic object value. Circular reference in property " + propName);
|
|
69
87
|
}
|
|
70
88
|
findCircular(obj);
|
|
71
89
|
function findCircular(obj, _refs) {
|
|
@@ -102,7 +120,7 @@ var PostScriptRunner = /** @class */ (function () {
|
|
|
102
120
|
configurable: true,
|
|
103
121
|
writable: true,
|
|
104
122
|
value: function (proxy) {
|
|
105
|
-
return
|
|
123
|
+
return cloneDeep_1.default(proxy);
|
|
106
124
|
}
|
|
107
125
|
});
|
|
108
126
|
return PostScriptRunner;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"post-script-executor.js","sourceRoot":"","sources":["../../src/post-script/post-script-executor.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"post-script-executor.js","sourceRoot":"","sources":["../../src/post-script/post-script-executor.ts"],"names":[],"mappings":"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"}
|
package/dist/post-sequence.js
CHANGED
|
@@ -1,12 +1,50 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
+
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
|
3
|
+
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
|
4
|
+
return new (P || (P = Promise))(function (resolve, reject) {
|
|
5
|
+
function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
|
|
6
|
+
function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
|
|
7
|
+
function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
|
|
8
|
+
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
9
|
+
});
|
|
10
|
+
};
|
|
11
|
+
var __generator = (this && this.__generator) || function (thisArg, body) {
|
|
12
|
+
var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
|
|
13
|
+
return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
|
|
14
|
+
function verb(n) { return function (v) { return step([n, v]); }; }
|
|
15
|
+
function step(op) {
|
|
16
|
+
if (f) throw new TypeError("Generator is already executing.");
|
|
17
|
+
while (_) try {
|
|
18
|
+
if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
|
|
19
|
+
if (y = 0, t) op = [op[0] & 2, t.value];
|
|
20
|
+
switch (op[0]) {
|
|
21
|
+
case 0: case 1: t = op; break;
|
|
22
|
+
case 4: _.label++; return { value: op[1], done: false };
|
|
23
|
+
case 5: _.label++; y = op[1]; op = [0]; continue;
|
|
24
|
+
case 7: op = _.ops.pop(); _.trys.pop(); continue;
|
|
25
|
+
default:
|
|
26
|
+
if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
|
|
27
|
+
if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
|
|
28
|
+
if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
|
|
29
|
+
if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
|
|
30
|
+
if (t[2]) _.ops.pop();
|
|
31
|
+
_.trys.pop(); continue;
|
|
32
|
+
}
|
|
33
|
+
op = body.call(thisArg, _);
|
|
34
|
+
} catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
|
|
35
|
+
if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
|
|
36
|
+
}
|
|
37
|
+
};
|
|
38
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
39
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
40
|
+
};
|
|
2
41
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
42
|
exports.publishMetrics = void 0;
|
|
4
|
-
var tslib_1 = require("tslib");
|
|
5
43
|
var client_firehose_1 = require("@aws-sdk/client-firehose");
|
|
6
44
|
var client_cognito_identity_1 = require("@aws-sdk/client-cognito-identity");
|
|
7
|
-
var isEmpty_1 =
|
|
8
|
-
var v4_1 =
|
|
9
|
-
var log_1 =
|
|
45
|
+
var isEmpty_1 = __importDefault(require("lodash/isEmpty"));
|
|
46
|
+
var v4_1 = __importDefault(require("uuid/v4"));
|
|
47
|
+
var log_1 = __importDefault(require("@loadmill/universal/dist/log"));
|
|
10
48
|
var parameters_1 = require("@loadmill/core/dist/parameters");
|
|
11
49
|
var parameters_2 = require("@loadmill/core/dist/parameters");
|
|
12
50
|
var ONE_HOUR = 1000 * 60 * 60;
|
|
@@ -22,9 +60,9 @@ var clientIsOlderThanOneHour = function () {
|
|
|
22
60
|
Date.now() - lastFirehoseClientTimeCreation > ONE_HOUR;
|
|
23
61
|
};
|
|
24
62
|
function createClient() {
|
|
25
|
-
return
|
|
63
|
+
return __awaiter(this, void 0, void 0, function () {
|
|
26
64
|
var identity, credentialResponse;
|
|
27
|
-
return
|
|
65
|
+
return __generator(this, function (_a) {
|
|
28
66
|
switch (_a.label) {
|
|
29
67
|
case 0:
|
|
30
68
|
log_1.default.debug('creating FirehoseClient');
|
|
@@ -50,8 +88,8 @@ function createClient() {
|
|
|
50
88
|
});
|
|
51
89
|
});
|
|
52
90
|
}
|
|
53
|
-
var getFirehoseClient = function () { return
|
|
54
|
-
return
|
|
91
|
+
var getFirehoseClient = function () { return __awaiter(void 0, void 0, void 0, function () {
|
|
92
|
+
return __generator(this, function (_a) {
|
|
55
93
|
switch (_a.label) {
|
|
56
94
|
case 0:
|
|
57
95
|
if (firehoseClient && (!clientIsOlderThanOneHour())) {
|
|
@@ -62,13 +100,13 @@ var getFirehoseClient = function () { return tslib_1.__awaiter(void 0, void 0, v
|
|
|
62
100
|
}
|
|
63
101
|
});
|
|
64
102
|
}); };
|
|
65
|
-
var sendMetrics = function (metrics) { return
|
|
103
|
+
var sendMetrics = function (metrics) { return __awaiter(void 0, void 0, void 0, function () {
|
|
66
104
|
var command, client, err_1;
|
|
67
|
-
return
|
|
105
|
+
return __generator(this, function (_a) {
|
|
68
106
|
switch (_a.label) {
|
|
69
107
|
case 0:
|
|
70
108
|
_a.trys.push([0, 3, , 4]);
|
|
71
|
-
if (!metrics ||
|
|
109
|
+
if (!metrics || isEmpty_1.default(metrics)) {
|
|
72
110
|
return [2 /*return*/];
|
|
73
111
|
}
|
|
74
112
|
log_1.default.debug('Sending metrics to AWS Firhose');
|
|
@@ -106,26 +144,26 @@ var prepareMetrics = function (testId, teamId, postParameters, parametersKeysToP
|
|
|
106
144
|
records.push(record);
|
|
107
145
|
});
|
|
108
146
|
var recordsGroup = {
|
|
109
|
-
id:
|
|
147
|
+
id: v4_1.default(),
|
|
110
148
|
testId: testId,
|
|
111
149
|
teamId: teamId,
|
|
112
150
|
publishedAt: Date.now(),
|
|
113
151
|
records: records,
|
|
114
152
|
};
|
|
115
|
-
if (
|
|
153
|
+
if (isEmpty_1.default(records)) {
|
|
116
154
|
return;
|
|
117
155
|
}
|
|
118
156
|
var enc = new TextEncoder(); // always utf-8
|
|
119
|
-
var encodedRecords = enc.encode(
|
|
157
|
+
var encodedRecords = enc.encode(JSON.stringify(recordsGroup) + "\n");
|
|
120
158
|
return [{ Data: encodedRecords }];
|
|
121
159
|
};
|
|
122
|
-
var publishMetrics = function (postParameters, parametersKeysToPublish) { return
|
|
160
|
+
var publishMetrics = function (postParameters, parametersKeysToPublish) { return __awaiter(void 0, void 0, void 0, function () {
|
|
123
161
|
var testId, teamId, e_1;
|
|
124
|
-
return
|
|
162
|
+
return __generator(this, function (_a) {
|
|
125
163
|
switch (_a.label) {
|
|
126
164
|
case 0:
|
|
127
165
|
_a.trys.push([0, 2, , 3]);
|
|
128
|
-
if (
|
|
166
|
+
if (isEmpty_1.default(postParameters) || isEmpty_1.default(parametersKeysToPublish)) {
|
|
129
167
|
return [2 /*return*/];
|
|
130
168
|
}
|
|
131
169
|
testId = parameters_1.parameterUtils.getValueByKeyFromArr(parameters_2.BUILT_IN_PARAMS.testRunId, postParameters);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"post-sequence.js","sourceRoot":"","sources":["../src/post-sequence.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"post-sequence.js","sourceRoot":"","sources":["../src/post-sequence.ts"],"names":[],"mappings":"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"}
|
package/dist/redact-data.js
CHANGED
|
@@ -1,12 +1,14 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
|
+
};
|
|
2
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
6
|
exports.redactSensitiveData = void 0;
|
|
4
|
-
var tslib_1 = require("tslib");
|
|
5
7
|
var parameters_1 = require("@loadmill/core/dist/parameters");
|
|
6
|
-
var log_1 =
|
|
7
|
-
var jsonpath_1 =
|
|
8
|
+
var log_1 = __importDefault(require("@loadmill/universal/dist/log"));
|
|
9
|
+
var jsonpath_1 = __importDefault(require("jsonpath"));
|
|
8
10
|
var lodash_1 = require("lodash");
|
|
9
|
-
var qs_1 =
|
|
11
|
+
var qs_1 = __importDefault(require("qs"));
|
|
10
12
|
var utils_1 = require("./utils");
|
|
11
13
|
var BODY_DATA_REDACTED = 'Body Data Redacted';
|
|
12
14
|
function redactSensitiveData(resolvedRequests, sensitiveKeys) {
|
|
@@ -14,20 +16,20 @@ function redactSensitiveData(resolvedRequests, sensitiveKeys) {
|
|
|
14
16
|
resolvedRequests.forEach(function (rr) {
|
|
15
17
|
var _a, _b;
|
|
16
18
|
if ((_a = rr.postData) === null || _a === void 0 ? void 0 : _a.text) {
|
|
17
|
-
rr.postData.text = !
|
|
19
|
+
rr.postData.text = !lodash_1.isEmpty(sensitiveKeys) ? redactKeysFromBody(sensitiveKeys, rr.postData.text, rr.postData.mimeType) : BODY_DATA_REDACTED;
|
|
18
20
|
}
|
|
19
21
|
if ((_b = rr.response) === null || _b === void 0 ? void 0 : _b.text) {
|
|
20
|
-
rr.response.text = !
|
|
22
|
+
rr.response.text = !lodash_1.isEmpty(sensitiveKeys) ? redactKeysFromBody(sensitiveKeys, rr.response.text, rr.response.type) : BODY_DATA_REDACTED;
|
|
21
23
|
}
|
|
22
24
|
if (rr.postParameters) {
|
|
23
|
-
|
|
25
|
+
parameters_1.redactPostParameters(rr.postParameters, sensitiveKeys);
|
|
24
26
|
}
|
|
25
27
|
});
|
|
26
28
|
}
|
|
27
29
|
exports.redactSensitiveData = redactSensitiveData;
|
|
28
30
|
function redactKeysFromBody(sensitiveKeys, text, mimeType) {
|
|
29
31
|
try {
|
|
30
|
-
if (typeof text != 'string' ||
|
|
32
|
+
if (typeof text != 'string' || utils_1.hasBeenTrimmed(text)) {
|
|
31
33
|
return BODY_DATA_REDACTED;
|
|
32
34
|
}
|
|
33
35
|
if (mimeType === null || mimeType === void 0 ? void 0 : mimeType.startsWith('application/x-www-form-urlencoded')) {
|
|
@@ -52,7 +54,7 @@ function redactKeysFromBody(sensitiveKeys, text, mimeType) {
|
|
|
52
54
|
}
|
|
53
55
|
function redactKeysFromJson(json, sensitiveKeys) {
|
|
54
56
|
sensitiveKeys.forEach(function (key) {
|
|
55
|
-
jsonpath_1.default.apply(json, "$..[\""
|
|
57
|
+
jsonpath_1.default.apply(json, "$..[\"" + key + "\"]", function (_value) { return parameters_1.DATA_REDACTED; });
|
|
56
58
|
});
|
|
57
59
|
}
|
|
58
60
|
//# sourceMappingURL=redact-data.js.map
|