@loadmill/executer 0.1.147 → 0.1.149

package/dist/step-handlers/extract-step-handler.d.ts

@@ -1,10 +1,10 @@
 import { ExtractAndAssertStep } from '@loadmill/core/dist/extract-and-assert-step';
-import { Step } from '@loadmill/core/dist/step/step-type';
+import { Step } from '@loadmill/core/dist/step/types';
 import { Histogram } from '../failures';
 import { SequenceExecutorLike } from '../sequence-executor-like';
 import { ExecuteRes, StepHandler } from './step-handler';
 export declare class ExtractStepHandler implements StepHandler {
-    context: SequenceExecutorLike;
+    private context;
     constructor(context: SequenceExecutorLike);
     canHandle(step: Step): boolean;
     execute(step: ExtractAndAssertStep, _index: number): Promise<ExecuteRes>;

package/dist/step-handlers/extract-step-handler.js

@@ -47,7 +47,6 @@ var ExtractStepHandler = /** @class */ (function () {
             writable: true,
             value: context
         });
-        this.context = context;
     }
     Object.defineProperty(ExtractStepHandler.prototype, "canHandle", {
         enumerable: false,

package/dist/step-handlers/extract-step-handler.js.map

@@ -1 +1 @@
-{"version":3,"file":"extract-step-handler.js","sourceRoot":"","sources":["../../src/step-handlers/extract-step-handler.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAIA,oEAA8E;AAG9E,8CAA+C;AAK/C;IACE,4BAAmB,OAA6B;;;;;mBAA7B;;QACjB,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;IACzB,CAAC;;;;;eAED,UAAU,IAAU;YAClB,OAAO,oCAAsB,CAAC,IAAI,CAAC,CAAC;QACtC,CAAC;;;;;;eAED,UAAc,IAA0B,EAAE,MAAc;;;;;;4BAChD,GAAG,GAAG;gCACV,IAAI,EAAE,IAAI,CAAC,OAAO,CAAC,gBAAgB;6BACpC,CAAC;4BACI,gBAAgB,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;4BAC9B,UAAU,GAAG,2BAAa,CAAC,CAAC,CAAC,WAAW,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC,gBAAgB,CAAC;4BACxE,qBAAM,IAAI,CAAC,OAAO,CAAC,iBAAiB,CAAC,IAAI,EAAE,GAAG,CAAC,EAAA;;4BAA/C,SAA+C,CAAC;4BAChD,IAAI,CAAC,OAAO,CAAC,aAAa,CAAC,gBAAgB,EAAE,UAAU,CAAC,CAAC;4BACzD,sBAAO,GAAG,EAAC;;;;SACZ;;;;;;eAED,UACE,IAA0B,EAC1B,KAAa,EACb,IAAgB;;;oBAEhB,IAAI,CAAC,OAAO,CAAC,iBAAiB,CAAC,KAAK,CAAC,CAAC;oBACtC,sBAAO,IAAI,CAAC,OAAO,CAAC,gBAAgB,CAAC,KAAK,EAAE,IAAI,CAAC,EAAC;;;SACnD;;IACH,yBAAC;AAAD,CAAC,AA5BD,IA4BC;AA5BY,gDAAkB"}
+{"version":3,"file":"extract-step-handler.js","sourceRoot":"","sources":["../../src/step-handlers/extract-step-handler.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAIA,oEAA8E;AAG9E,8CAA+C;AAK/C;IACE,4BAAoB,OAA6B;;;;;mBAA7B;;IAAgC,CAAC;;;;;eAErD,UAAU,IAAU;YAClB,OAAO,oCAAsB,CAAC,IAAI,CAAC,CAAC;QACtC,CAAC;;;;;;eAED,UAAc,IAA0B,EAAE,MAAc;;;;;;4BAChD,GAAG,GAAG;gCACV,IAAI,EAAE,IAAI,CAAC,OAAO,CAAC,gBAAgB;6BACpC,CAAC;4BACI,gBAAgB,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;4BAC9B,UAAU,GAAG,2BAAa,CAAC,CAAC,CAAC,WAAW,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC,gBAAgB,CAAC;4BACxE,qBAAM,IAAI,CAAC,OAAO,CAAC,iBAAiB,CAAC,IAAI,EAAE,GAAG,CAAC,EAAA;;4BAA/C,SAA+C,CAAC;4BAChD,IAAI,CAAC,OAAO,CAAC,aAAa,CAAC,gBAAgB,EAAE,UAAU,CAAC,CAAC;4BACzD,sBAAO,GAAG,EAAC;;;;SACZ;;;;;;eAED,UACE,IAA0B,EAC1B,KAAa,EACb,IAAgB;;;oBAEhB,IAAI,CAAC,OAAO,CAAC,iBAAiB,CAAC,KAAK,CAAC,CAAC;oBACtC,sBAAO,IAAI,CAAC,OAAO,CAAC,gBAAgB,CAAC,KAAK,EAAE,IAAI,CAAC,EAAC;;;SACnD;;IACH,yBAAC;AAAD,CAAC,AA1BD,IA0BC;AA1BY,gDAAkB"}

package/dist/step-handlers/request-step-handler.d.ts

@@ -1,11 +1,11 @@
 import { LoadmillRequest } from '@loadmill/core/dist/request';
-import { Step } from '@loadmill/core/dist/step/step-type';
+import { Step } from '@loadmill/core/dist/step/types';
 import { Histogram } from '../failures';
 import { ResolvedRequest } from '../request-sequence-result';
 import { SequenceExecutorLike } from '../sequence-executor-like';
 import { ExecuteRes, StepHandler } from './step-handler';
 export declare class RequestStepHandler implements StepHandler {
-    context: SequenceExecutorLike;
+    private context;
     constructor(context: SequenceExecutorLike);
     canHandle(step: Step): boolean;
     execute(request: LoadmillRequest, index: number): Promise<ExecuteRes>;

package/dist/step-handlers/request-step-handler.js

@@ -46,7 +46,6 @@ var RequestStepHandler = /** @class */ (function () {
             writable: true,
             value: context
         });
-        this.context = context;
     }
     Object.defineProperty(RequestStepHandler.prototype, "canHandle", {
         enumerable: false,

package/dist/step-handlers/request-step-handler.js.map

@@ -1 +1 @@
-{"version":3,"file":"request-step-handler.js","sourceRoot":"","sources":["../../src/step-handlers/request-step-handler.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAEA,oEAAyE;AAQzE;IACE,4BAAmB,OAA6B;;;;;mBAA7B;;QACjB,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;IACzB,CAAC;;;;;eAED,UAAU,IAAU;YAClB,OAAO,+BAAiB,CAAC,IAAI,CAAC,CAAC;QACjC,CAAC;;;;;;eAED,UAAc,OAAwB,EAAE,KAAa;;;;;;4BAC7C,eAAe,GAAG,IAAI,CAAC,OAAO,CAAC,cAAc,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC;4BACxD,qBAAM,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC,eAAe,EAAE,KAAK,CAAC,EAAA;;4BAA5D,GAAG,GAAG,SAAsD;4BAClE,sBAAO,GAAG,EAAC;;;;SACZ;;;;;;eAED,UAAgC,OAAwB,EAAE,KAAa,EAAE,GAAoB;;;oBAC3F,sBAAO,IAAI,CAAC,OAAO,CAAC,yBAAyB,CAAC,KAAK,EAAE,OAAO,EAAE,GAAG,CAAC,EAAC;;;SACpE;;IACH,yBAAC;AAAD,CAAC,AAlBD,IAkBC;AAlBY,gDAAkB"}
+{"version":3,"file":"request-step-handler.js","sourceRoot":"","sources":["../../src/step-handlers/request-step-handler.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAEA,oEAAyE;AAQzE;IACE,4BAAoB,OAA6B;;;;;mBAA7B;;IAAgC,CAAC;;;;;eAErD,UAAU,IAAU;YAClB,OAAO,+BAAiB,CAAC,IAAI,CAAC,CAAC;QACjC,CAAC;;;;;;eAED,UAAc,OAAwB,EAAE,KAAa;;;;;;4BAC7C,eAAe,GAAG,IAAI,CAAC,OAAO,CAAC,cAAc,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC;4BACxD,qBAAM,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC,eAAe,EAAE,KAAK,CAAC,EAAA;;4BAA5D,GAAG,GAAG,SAAsD;4BAClE,sBAAO,GAAG,EAAC;;;;SACZ;;;;;;eAED,UAAgC,OAAwB,EAAE,KAAa,EAAE,GAAoB;;;oBAC3F,sBAAO,IAAI,CAAC,OAAO,CAAC,yBAAyB,CAAC,KAAK,EAAE,OAAO,EAAE,GAAG,CAAC,EAAC;;;SACpE;;IACH,yBAAC;AAAD,CAAC,AAhBD,IAgBC;AAhBY,gDAAkB"}

package/dist/step-handlers/step-handler.d.ts

@@ -1,9 +1,7 @@
 import { StepLike } from '@loadmill/core/dist/step';
-import { SequenceExecutorLike } from '../sequence-executor-like';
 import { Histogram } from '../failures';
 import { RequestResponse } from '../request-sequence-result';
 export interface StepHandler {
-    context: SequenceExecutorLike;
     canHandle(step: StepLike): boolean;
     execute(step: StepLike, index: number): Promise<ExecuteRes>;
     processSuccessfulResponse(step: StepLike, index: number, res: ExecuteRes): Promise<Histogram>;

package/dist/step-handlers/wait-step-handler.d.ts

@@ -1,10 +1,10 @@
-import { Step } from '@loadmill/core/dist/step/step-type';
+import { Step } from '@loadmill/core/dist/step/types';
 import { Histogram } from '../failures';
 import { SequenceExecutorLike } from '../sequence-executor-like';
 import { ExecuteRes, StepHandler } from './step-handler';
 import { WaitStep } from '@loadmill/core/dist/wait-step';
 export declare class WaitStepHandler implements StepHandler {
-    context: SequenceExecutorLike;
+    private context;
     constructor(context: SequenceExecutorLike);
     canHandle(step: Step): boolean;
     execute(waitStep: WaitStep): Promise<ExecuteRes>;

package/dist/step-handlers/wait-step-handler.js

@@ -47,7 +47,6 @@ var WaitStepHandler = /** @class */ (function () {
             writable: true,
             value: context
         });
-        this.context = context;
     }
     Object.defineProperty(WaitStepHandler.prototype, "canHandle", {
         enumerable: false,

package/dist/step-handlers/wait-step-handler.js.map

@@ -1 +1 @@
-{"version":3,"file":"wait-step-handler.js","sourceRoot":"","sources":["../../src/step-handlers/wait-step-handler.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,oEAAkE;AAGlE,8CAA+C;AAM/C;IACE,yBAAmB,OAA6B;;;;;mBAA7B;;QACjB,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;IACzB,CAAC;;;;;eAED,UAAU,IAAU;YAClB,OAAO,wBAAU,CAAC,IAAI,CAAC,CAAC;QAC1B,CAAC;;;;;;eAED,UAAc,QAAkB;;;;;;4BACxB,gBAAgB,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;4BAC9B,UAAU,GAAG,2BAAa,CAAC,CAAC,CAAC,WAAW,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC,gBAAgB,CAAC;4BACxE,qBAAM,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,QAAQ,CAAC,IAAI,EAAE,WAAW,CAAC,EAAA;;4BAAzD,SAAyD,CAAC;4BAC1D,IAAI,CAAC,OAAO,CAAC,aAAa,CAAC,gBAAgB,EAAE,UAAU,CAAC,CAAC;4BACzD,sBAAO,EAAE,EAAC;;;;SACX;;;;;;eAED,UAAgC,KAAW,EAAE,KAAa,EAAE,IAAgB;;;oBAC1E,IAAI,CAAC,OAAO,CAAC,iBAAiB,CAAC,KAAK,CAAC,CAAC;oBACtC,sBAAO,EAAE,EAAC;;;SACX;;IACH,sBAAC;AAAD,CAAC,AArBD,IAqBC;AArBY,0CAAe"}
+{"version":3,"file":"wait-step-handler.js","sourceRoot":"","sources":["../../src/step-handlers/wait-step-handler.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,oEAAkE;AAGlE,8CAA+C;AAM/C;IACE,yBAAoB,OAA6B;;;;;mBAA7B;;IAAgC,CAAC;;;;;eAErD,UAAU,IAAU;YAClB,OAAO,wBAAU,CAAC,IAAI,CAAC,CAAC;QAC1B,CAAC;;;;;;eAED,UAAc,QAAkB;;;;;;4BACxB,gBAAgB,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;4BAC9B,UAAU,GAAG,2BAAa,CAAC,CAAC,CAAC,WAAW,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC,gBAAgB,CAAC;4BACxE,qBAAM,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,QAAQ,CAAC,IAAI,EAAE,WAAW,CAAC,EAAA;;4BAAzD,SAAyD,CAAC;4BAC1D,IAAI,CAAC,OAAO,CAAC,aAAa,CAAC,gBAAgB,EAAE,UAAU,CAAC,CAAC;4BACzD,sBAAO,EAAE,EAAC;;;;SACX;;;;;;eAED,UAAgC,KAAW,EAAE,KAAa,EAAE,IAAgB;;;oBAC1E,IAAI,CAAC,OAAO,CAAC,iBAAiB,CAAC,KAAK,CAAC,CAAC;oBACtC,sBAAO,EAAE,EAAC;;;SACX;;IACH,sBAAC;AAAD,CAAC,AAnBD,IAmBC;AAnBY,0CAAe"}

package/dist/step-handlers/web-socket-step-handler.d.ts

@@ -0,0 +1,16 @@
+import { Step } from '@loadmill/core/dist/step/types';
+import { WebSocketStep } from '@loadmill/core/dist/web-socket-step';
+import { Histogram } from '../failures';
+import { SequenceExecutorLike } from '../sequence-executor-like';
+import { ExecuteRes, StepHandler } from './step-handler';
+export declare class WebSocketStepHandler implements StepHandler {
+    private context;
+    constructor(context: SequenceExecutorLike);
+    canHandle(step: Step): boolean;
+    execute(step: WebSocketStep, index: number): Promise<ExecuteRes>;
+    private send;
+    private receive;
+    processSuccessfulResponse(step: WebSocketStep, index: number, res: ExecuteRes): Promise<Histogram>;
+    private processReceiveResponse;
+    private getMessagesAsResponse;
+}

package/dist/step-handlers/web-socket-step-handler.js

@@ -0,0 +1,256 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+var __generator = (this && this.__generator) || function (thisArg, body) {
+    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
+    return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
+    function verb(n) { return function (v) { return step([n, v]); }; }
+    function step(op) {
+        if (f) throw new TypeError("Generator is already executing.");
+        while (_) try {
+            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;
+            if (y = 0, t) op = [op[0] & 2, t.value];
+            switch (op[0]) {
+                case 0: case 1: t = op; break;
+                case 4: _.label++; return { value: op[1], done: false };
+                case 5: _.label++; y = op[1]; op = [0]; continue;
+                case 7: op = _.ops.pop(); _.trys.pop(); continue;
+                default:
+                    if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
+                    if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
+                    if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
+                    if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
+                    if (t[2]) _.ops.pop();
+                    _.trys.pop(); continue;
+            }
+            op = body.call(thisArg, _);
+        } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
+        if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
+    }
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.WebSocketStepHandler = void 0;
+var type_guards_1 = require("@loadmill/core/dist/step/type-guards");
+var constants_1 = require("@loadmill/core/dist/web-socket-step/constants");
+var extrema_1 = require("@loadmill/core/dist/conf/extrema");
+var request_1 = require("@loadmill/core/dist/request");
+var promiseUtils = __importStar(require("@loadmill/universal/dist/promise-utils"));
+var log_1 = __importDefault(require("@loadmill/universal/dist/log"));
+var performance_1 = require("../performance");
+var errors_1 = require("../errors");
+var EXTRACT_RESOLUTION_INTERVAL_MS = 500;
+var WebSocketStepHandler = /** @class */ (function () {
+    function WebSocketStepHandler(context) {
+        Object.defineProperty(this, "context", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: context
+        });
+    }
+    Object.defineProperty(WebSocketStepHandler.prototype, "canHandle", {
+        enumerable: false,
+        configurable: true,
+        writable: true,
+        value: function (step) {
+            return type_guards_1.isWebSocketStep(step);
+        }
+    });
+    Object.defineProperty(WebSocketStepHandler.prototype, "execute", {
+        enumerable: false,
+        configurable: true,
+        writable: true,
+        value: function (step, index) {
+            return __awaiter(this, void 0, void 0, function () {
+                return __generator(this, function (_a) {
+                    switch (step.action) {
+                        case constants_1.WebSocketStepActions.SEND:
+                        case constants_1.WebSocketStepActions.CONNECT:
+                            return [2 /*return*/, this.send(step, index)];
+                        case constants_1.WebSocketStepActions.RECEIVE:
+                            return [2 /*return*/, this.receive(step, index)];
+                        default:
+                            throw new errors_1.RequestFailuresError("Unknown WebSocket action: " + step.action);
+                    }
+                    return [2 /*return*/];
+                });
+            });
+        }
+    });
+    Object.defineProperty(WebSocketStepHandler.prototype, "send", {
+        enumerable: false,
+        configurable: true,
+        writable: true,
+        value: function (step, index) {
+            return __awaiter(this, void 0, void 0, function () {
+                var preparedRequest;
+                return __generator(this, function (_a) {
+                    switch (_a.label) {
+                        case 0:
+                            preparedRequest = this.context.prepareWSRequest(step, index);
+                            return [4 /*yield*/, this.context.sendRequest(preparedRequest, index)];
+                        case 1: return [2 /*return*/, _a.sent()];
+                    }
+                });
+            });
+        }
+    });
+    Object.defineProperty(WebSocketStepHandler.prototype, "receive", {
+        enumerable: false,
+        configurable: true,
+        writable: true,
+        value: function (step, index) {
+            return __awaiter(this, void 0, void 0, function () {
+                var url, maxExtractionsResolutionTime, messagesToRetrieve, extract, requestStartTime, beforeTime, resolvedUrl, res, timeWaited, maxWaitTime;
+                return __generator(this, function (_a) {
+                    switch (_a.label) {
+                        case 0:
+                            url = step.url, maxExtractionsResolutionTime = step.maxExtractionsResolutionTime, messagesToRetrieve = step.messagesToRetrieve, extract = step.extract;
+                            requestStartTime = Date.now();
+                            beforeTime = performance_1.isPerformance ? performance.now() : requestStartTime;
+                            resolvedUrl = this.context.prepareUrl(url, index);
+                            res = this.getMessagesAsResponse(resolvedUrl, messagesToRetrieve);
+                            if (!(maxExtractionsResolutionTime !== 0)) return [3 /*break*/, 4];
+                            timeWaited = 0;
+                            maxWaitTime = _getWaitTimeInMs(maxExtractionsResolutionTime);
+                            _a.label = 1;
+                        case 1:
+                            if (!(timeWaited < maxWaitTime)) return [3 /*break*/, 4];
+                            return [4 /*yield*/, this.context.handleExtractions(step, res)];
+                        case 2:
+                            _a.sent();
+                            if (_areAllExtractionsResolved(extract, this.context.parameters)) {
+                                return [3 /*break*/, 4];
+                            }
+                            log_1.default.debug('Waiting for extractions to be resolved', { timeWaited: timeWaited, maxWaitTime: maxWaitTime });
+                            return [4 /*yield*/, promiseUtils.delay(EXTRACT_RESOLUTION_INTERVAL_MS)];
+                        case 3:
+                            _a.sent();
+                            res = this.getMessagesAsResponse(resolvedUrl, messagesToRetrieve);
+                            timeWaited += EXTRACT_RESOLUTION_INTERVAL_MS;
+                            return [3 /*break*/, 1];
+                        case 4:
+                            this.context.setResolvedResponse(index, res);
+                            this.context.setTimeParams(requestStartTime, beforeTime);
+                            return [2 /*return*/, res];
+                    }
+                });
+            });
+        }
+    });
+    Object.defineProperty(WebSocketStepHandler.prototype, "processSuccessfulResponse", {
+        enumerable: false,
+        configurable: true,
+        writable: true,
+        value: function (step, index, res) {
+            return __awaiter(this, void 0, void 0, function () {
+                return __generator(this, function (_a) {
+                    switch (step.action) {
+                        case constants_1.WebSocketStepActions.SEND:
+                        case constants_1.WebSocketStepActions.CONNECT:
+                            return [2 /*return*/, {}];
+                        case constants_1.WebSocketStepActions.RECEIVE:
+                            return [2 /*return*/, this.processReceiveResponse(step, index, res)];
+                    }
+                    return [2 /*return*/];
+                });
+            });
+        }
+    });
+    Object.defineProperty(WebSocketStepHandler.prototype, "processReceiveResponse", {
+        enumerable: false,
+        configurable: true,
+        writable: true,
+        value: function (step, index, res) {
+            return __awaiter(this, void 0, void 0, function () {
+                return __generator(this, function (_a) {
+                    return [2 /*return*/, this.context.processSuccessfulResponse(index, step, res)];
+                });
+            });
+        }
+    });
+    Object.defineProperty(WebSocketStepHandler.prototype, "getMessagesAsResponse", {
+        enumerable: false,
+        configurable: true,
+        writable: true,
+        value: function (url, messagesToRetrieve) {
+            var messagesByConnection = this.context.wsHandler.getMessagesByConnection(url);
+            var messages = _extractRelevantMessages(messagesByConnection, messagesToRetrieve);
+            return {
+                type: request_1.ConfMimeTypes.APPLICATION_JSON,
+                text: JSON.stringify(messages),
+                status: 200,
+                statusText: 'OK',
+                headers: [],
+            };
+        }
+    });
+    return WebSocketStepHandler;
+}());
+exports.WebSocketStepHandler = WebSocketStepHandler;
+var _extractRelevantMessages = function (messages, messagesToRetrieve) {
+    if (!messages.length) {
+        return [];
+    }
+    switch (messagesToRetrieve) {
+        case constants_1.WebSocketMessagesToRetrieve.LAST:
+            return _parseMessage(messages[messages.length - 1]);
+        case constants_1.WebSocketMessagesToRetrieve.LAST_50:
+            return messages.slice(-50).map(_parseMessage);
+        case constants_1.WebSocketMessagesToRetrieve.LAST_10:
+        default:
+            return messages.slice(-10).map(_parseMessage);
+    }
+};
+var _parseMessage = function (message) {
+    var str = message === null || message === void 0 ? void 0 : message.toString();
+    try {
+        return JSON.parse(str);
+    }
+    catch (_) {
+        return str;
+    }
+};
+// We consider non-null value as resolved
+var _areAllExtractionsResolved = function (extractions, resolvedParameters) {
+    if (extractions === void 0) { extractions = []; }
+    return extractions.every(function (extraction) {
+        var extractionName = Object.keys(extraction)[0];
+        var extractionResolvedValue = resolvedParameters[extractionName];
+        return extractionResolvedValue != null && extractionResolvedValue !== '';
+    });
+};
+var _getWaitTimeInMs = function (maxExtractionsResolutionTime) {
+    var waitTimeInSeconds = Math.min(maxExtractionsResolutionTime || extrema_1.DEFAULT_WS_EXTRACT_RESOLUTION_TIME, extrema_1.MAX_WS_EXTRACT_RESOLUTION_TIME);
+    return waitTimeInSeconds * 1000;
+};
+//# sourceMappingURL=web-socket-step-handler.js.map

package/dist/step-handlers/web-socket-step-handler.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"web-socket-step-handler.js","sourceRoot":"","sources":["../../src/step-handlers/web-socket-step-handler.ts"],"names":[],"mappings":"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"}

package/dist/types/ws.d.ts

@@ -0,0 +1,31 @@
+/// <reference types="node" />
+import WebSocket from 'ws';
+import { IncomingHttpHeaders } from 'http';
+import { HttpResponseStatus } from '@loadmill/core/dist/request';
+import { LoadmillHeaders } from '@loadmill/core/dist/headers';
+export declare type WSMimeType = 'binary' | 'text';
+export declare type WSRequestArguments = {
+    expectedStatus: HttpResponseStatus;
+    headers: LoadmillHeaders;
+    message: string;
+    mimeType: WSMimeType;
+    timeout: number;
+    url: string;
+};
+export declare type WSResponse = {
+    status?: number;
+    res: {
+        statusMessage?: string;
+    };
+    header: LoadmillHeaders | IncomingHttpHeaders;
+    req: {};
+};
+export declare type WebSocketConnection = {
+    socket: WebSocket;
+    messages: WebSocketMessage[];
+};
+declare type WebSocketMessage = {
+    data: WebSocket.Data;
+    receivedAt: number;
+};
+export {};

package/dist/types/ws.js

@@ -0,0 +1,3 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+//# sourceMappingURL=ws.js.map

package/dist/types/ws.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"ws.js","sourceRoot":"","sources":["../../src/types/ws.ts"],"names":[],"mappings":""}

package/dist/ws.d.ts

@@ -1,7 +1,6 @@
-/// <reference types="node" />
 import WebSocket from 'ws';
-import { HttpResponseStatus, LoadmillHeaders } from '@loadmill/core/dist/request';
-import { IncomingHttpHeaders } from 'http';
+import { HttpResponseStatus } from '@loadmill/core/dist/request';
+import { WSRequestArguments, WSResponse } from './types/ws';
 declare enum WSState {
     CONNECTING = 0,
     OPEN = 1,
@@ -42,30 +41,12 @@ export declare class WSRequest {
 }
 export declare class WSSequenceHandler {
     private _connections;
-    messages: string[];
     constructor();
-    getConnection(url: string): WebSocket | undefined;
-    storeConnection(url: string, wsConnection: WebSocket): void;
+    getConnectionSocket(url: string): WebSocket | undefined;
+    storeNewConnection(url: string, socket: WebSocket): void;
     closeAllConnections(): Promise<void>;
-    getMessages(): string[];
-    addMessage(message: string): void;
-    clearMessages(): void;
+    getMessages(): WebSocket.Data[];
+    getMessagesByConnection(url: string): WebSocket.Data[];
+    addMessage(message: WebSocket.Data, url: string): void;
 }
-export declare type WSMimeType = 'binary' | 'text';
-export declare type WSRequestArguments = {
-    expectedStatus: HttpResponseStatus;
-    headers: LoadmillHeaders;
-    message: string;
-    mimeType: WSMimeType;
-    timeout: number;
-    url: string;
-};
-export declare type WSResponse = {
-    status?: number;
-    res: {
-        statusMessage?: string;
-    };
-    header: LoadmillHeaders | IncomingHttpHeaders;
-    req: {};
-};
 export {};

package/dist/ws.js

@@ -41,10 +41,11 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.WSSequenceHandler = exports.WSRequest = void 0;
 var ws_1 = __importDefault(require("ws")); // todo should be picked with other option (socketio or non in browser)
+var http_1 = require("http");
+var flatten_1 = __importDefault(require("lodash/flatten"));
 var promise_utils_1 = require("@loadmill/universal/dist/promise-utils");
 var log_1 = __importDefault(require("@loadmill/universal/dist/log"));
 var errors_1 = require("./errors");
-var http_1 = require("http");
 var WSState;
 (function (WSState) {
     WSState[WSState["CONNECTING"] = 0] = "CONNECTING";
@@ -161,7 +162,7 @@ var WSRequest = /** @class */ (function () {
                                 header: {},
                                 req: {},
                             };
-                            existingWS = this.wsHandler.getConnection(this.wsRequestArgs.url);
+                            existingWS = this.wsHandler.getConnectionSocket(this.wsRequestArgs.url);
                             existingWS && log_1.default.debug("Existing Connection state " + getConnectionState(existingWS));
                             if (!(!existingWS || (existingWS && existingWS.readyState !== WSState.OPEN))) return [3 /*break*/, 2];
                             return [4 /*yield*/, this.addConnection(response)];
@@ -197,6 +198,7 @@ var WSRequest = /** @class */ (function () {
                     switch (_b.label) {
                         case 0:
                             this.ws = new ws_1.default(this.wsRequestArgs.url, undefined, { headers: this.wsRequestArgs.headers });
+                            this.wsHandler.storeNewConnection(this.wsRequestArgs.url, this.ws);
                             this.addEventListeners(response);
                             _a = !this.hasErrorOccured;
                             if (!_a) return [3 /*break*/, 2];
@@ -206,7 +208,7 @@ var WSRequest = /** @class */ (function () {
                             _b.label = 2;
                         case 2:
                             _a;
-                            this.wsHandler.storeConnection(this.wsRequestArgs.url, this.ws);
+                            log_1.default.debug('Created a new ws connection', this.ws.url);
                             return [2 /*return*/];
                     }
                 });
@@ -317,7 +319,7 @@ var WSRequest = /** @class */ (function () {
                 try {
                     var target = Array.isArray(message) ? decode(message) : message;
                     log_1.default.debug('got incoming message', target === null || target === void 0 ? void 0 : target.toString());
-                    _this.wsHandler.addMessage(target);
+                    _this.wsHandler.addMessage(target, _this.ws.url);
                 }
                 catch (e) {
                     log_1.default.debug('error getting message', e);
@@ -388,29 +390,23 @@ var WSSequenceHandler = /** @class */ (function () {
             writable: true,
             value: void 0
         });
-        Object.defineProperty(this, "messages", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: void 0
-        });
         this._connections = {};
-        this.clearMessages();
     }
-    Object.defineProperty(WSSequenceHandler.prototype, "getConnection", {
+    Object.defineProperty(WSSequenceHandler.prototype, "getConnectionSocket", {
         enumerable: false,
         configurable: true,
         writable: true,
         value: function (url) {
-            return this._connections[url];
+            var _a;
+            return (_a = this._connections[url]) === null || _a === void 0 ? void 0 : _a.socket;
         }
     });
-    Object.defineProperty(WSSequenceHandler.prototype, "storeConnection", {
+    Object.defineProperty(WSSequenceHandler.prototype, "storeNewConnection", {
         enumerable: false,
         configurable: true,
         writable: true,
-        value: function (url, wsConnection) {
-            this._connections[url] = wsConnection;
+        value: function (url, socket) {
+            this._connections[url] = { socket: socket, messages: [] };
         }
     });
     Object.defineProperty(WSSequenceHandler.prototype, "closeAllConnections", {
@@ -418,14 +414,15 @@ var WSSequenceHandler = /** @class */ (function () {
         configurable: true,
         writable: true,
         value: function () {
+            var _a;
             return __awaiter(this, void 0, void 0, function () {
-                var _i, _a, connection;
-                return __generator(this, function (_b) {
+                var _i, _b, connection;
+                return __generator(this, function (_c) {
                     try {
                         log_1.default.debug('Closing all ws connections');
-                        for (_i = 0, _a = Object.values(this._connections); _i < _a.length; _i++) {
-                            connection = _a[_i];
-                            connection.close();
+                        for (_i = 0, _b = Object.values(this._connections); _i < _b.length; _i++) {
+                            connection = _b[_i];
+                            (_a = connection.socket) === null || _a === void 0 ? void 0 : _a.close();
                         }
                     }
                     catch (e) {
@@ -441,23 +438,33 @@ var WSSequenceHandler = /** @class */ (function () {
         configurable: true,
         writable: true,
         value: function () {
-            return this.messages;
+            var allConnectionsMessages = Object.values(this._connections).map(function (con) { return con.messages; });
+            return flatten_1.default(allConnectionsMessages)
+                .sort(function (a, b) { return a.receivedAt - b.receivedAt; })
+                .map(function (m) { return m.data; });
         }
     });
-    Object.defineProperty(WSSequenceHandler.prototype, "addMessage", {
+    Object.defineProperty(WSSequenceHandler.prototype, "getMessagesByConnection", {
         enumerable: false,
         configurable: true,
         writable: true,
-        value: function (message) {
-            this.messages.push(message);
+        value: function (url) {
+            var _a;
+            return ((_a = this._connections[url]) === null || _a === void 0 ? void 0 : _a.messages.map(function (m) { return m.data; })) || [];
         }
     });
-    Object.defineProperty(WSSequenceHandler.prototype, "clearMessages", {
+    Object.defineProperty(WSSequenceHandler.prototype, "addMessage", {
         enumerable: false,
         configurable: true,
         writable: true,
-        value: function () {
-            this.messages = [];
+        value: function (message, url) {
+            var receivedAt = Date.now();
+            if (this._connections[url]) {
+                this._connections[url].messages.push({ data: message, receivedAt: receivedAt });
+            }
+            else {
+                log_1.default.warn('Got a message from a non existing connection', { url: url, message: message });
+            }
         }
     });
     return WSSequenceHandler;