@opentap/runner-client 2.19.0-alpha.1.2 → 2.19.0-alpha.1.4

package/lib/BaseClient.d.ts

@@ -9,6 +9,7 @@ interface BaseClientRequestOptions {
 }
 export declare class BaseClient {
     private connection;
+    private subscriptionConnection;
     private baseSubject;
     private connectionOptions;
     private domainAccess;

package/lib/BaseClient.js

@@ -262,12 +262,12 @@ var BaseClient = /** @class */ (function () {
     BaseClient.prototype.subscribe = function (subject, options) {
         if (!subject)
             throw Error('Subject is not defined!');
-        if (!this.connection)
+        if (!this.subscriptionConnection)
             throw Error('Connection is not up yet! Please try again later!');
-        if (this.connection.isClosed())
+        if (this.subscriptionConnection.isClosed())
             throw Error('Connection has been closed! Please reconnect!');
         var natsSubject = "".concat(this.baseSubject, ".").concat(subject);
-        return this.connection.subscribe(natsSubject, options);
+        return this.subscriptionConnection.subscribe(natsSubject, options);
     };
     BaseClient.prototype.encode = function (payload) {
         if (!payload) {
@@ -296,9 +296,11 @@ var BaseClient = /** @class */ (function () {
                         _a.label = 1;
                     case 1:
                         _a.trys.push([1, 3, , 4]);
-                        return [4 /*yield*/, connect(this.connectionOptions)
-                                .then(function (connection) {
+                        return [4 /*yield*/, Promise.all([connect(this.connectionOptions), connect(this.connectionOptions)])
+                                .then(function (_a) {
+                                var connection = _a[0], subscriptionConnection = _a[1];
                                 _this.connection = connection;
+                                _this.subscriptionConnection = subscriptionConnection;
                                 return Promise.resolve();
                             })
                                 .catch(function (error) { return Promise.reject("Failed to connect to ".concat(_this.connectionOptions.servers, " with ").concat(error)); })];
@@ -315,21 +317,24 @@ var BaseClient = /** @class */ (function () {
      * Close the connection.
      */
     BaseClient.prototype.close = function () {
-        var _a;
+        var _a, _b;
         return __awaiter(this, void 0, void 0, function () {
             var _this = this;
-            return __generator(this, function (_b) {
-                switch (_b.label) {
+            return __generator(this, function (_c) {
+                switch (_c.label) {
                     case 0:
-                        if (!this.connection) return [3 /*break*/, 2];
-                        return [4 /*yield*/, ((_a = this.connection) === null || _a === void 0 ? void 0 : _a.close().then(function () {
+                        if (!(this.connection || this.subscriptionConnection)) return [3 /*break*/, 2];
+                        return [4 /*yield*/, Promise.all([(_a = this.connection) === null || _a === void 0 ? void 0 : _a.close(), (_b = this.subscriptionConnection) === null || _b === void 0 ? void 0 : _b.close()])
+                                .then(function () {
                                 _this.connection = null;
-                            }).catch(function (error) {
+                                _this.subscriptionConnection = null;
+                            })
+                                .catch(function (error) {
                                 throw new Error("failed to close connection: ".concat(error));
-                            }))];
+                            })];
                     case 1:
-                        _b.sent();
-                        _b.label = 2;
+                        _c.sent();
+                        _c.label = 2;
                     case 2: return [2 /*return*/];
                 }
             });

package/lib/SessionClient.js

@@ -24,52 +24,10 @@ var __assign = (this && this.__assign) || function () {
     };
     return __assign.apply(this, arguments);
 };
-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 __asyncValues = (this && this.__asyncValues) || function (o) {
-    if (!Symbol.asyncIterator) throw new TypeError("Symbol.asyncIterator is not defined.");
-    var m = o[Symbol.asyncIterator], i;
-    return m ? m.call(o) : (o = typeof __values === "function" ? __values(o) : o[Symbol.iterator](), i = {}, verb("next"), verb("throw"), verb("return"), i[Symbol.asyncIterator] = function () { return this; }, i);
-    function verb(n) { i[n] = o[n] && function (v) { return new Promise(function (resolve, reject) { v = o[n](v), settle(resolve, reject, v.done, v.value); }); }; }
-    function settle(resolve, reject, d, v) { Promise.resolve(v).then(function(v) { resolve({ value: v, done: d }); }, reject); }
-};
 import { BreakPoints, CommonContext, CommonSettings, DataGridControl, Image, Interaction, ListItemType, LogList, Result, RunStatus, SessionEvent, Setting, TestPlan, TestRun, TestStepType, TestStepValidationError, WatchDog, } from './DTOs';
 import { JSONCodec } from 'nats.ws';
 import { BaseClient } from './BaseClient';
+import { Subject } from 'rxjs';
 var SessionClient = /** @class */ (function (_super) {
     __extends(SessionClient, _super);
     function SessionClient(baseSubject, options) {
@@ -130,99 +88,47 @@ var SessionClient = /** @class */ (function (_super) {
      * @returns Subscription array: Result and Test Run subscriptions
      */
     SessionClient.prototype.connectSessionResults = function (resultHandler, testRunHandler, options) {
-        var _this = this;
         var jsonCodec = JSONCodec();
-        var resultSubscription = this.subscribe('OnResult', __assign({}, options));
-        var testRunSubscription = this.subscribe('OnTestRun', __assign({}, options));
-        (function () { return __awaiter(_this, void 0, void 0, function () {
-            var resultSubscription_1, resultSubscription_1_1, message, resultJs, result, e_1_1;
-            var e_1, _a;
-            return __generator(this, function (_b) {
-                switch (_b.label) {
-                    case 0:
-                        _b.trys.push([0, 5, 6, 11]);
-                        resultSubscription_1 = __asyncValues(resultSubscription);
-                        _b.label = 1;
-                    case 1: return [4 /*yield*/, resultSubscription_1.next()];
-                    case 2:
-                        if (!(resultSubscription_1_1 = _b.sent(), !resultSubscription_1_1.done)) return [3 /*break*/, 4];
-                        message = resultSubscription_1_1.value;
-                        try {
-                            resultJs = jsonCodec.decode(message === null || message === void 0 ? void 0 : message.data);
-                            result = Result.fromJS(resultJs);
-                            resultHandler(result, null);
-                        }
-                        catch (error) {
-                            resultHandler(undefined, error);
-                        }
-                        _b.label = 3;
-                    case 3: return [3 /*break*/, 1];
-                    case 4: return [3 /*break*/, 11];
-                    case 5:
-                        e_1_1 = _b.sent();
-                        e_1 = { error: e_1_1 };
-                        return [3 /*break*/, 11];
-                    case 6:
-                        _b.trys.push([6, , 9, 10]);
-                        if (!(resultSubscription_1_1 && !resultSubscription_1_1.done && (_a = resultSubscription_1.return))) return [3 /*break*/, 8];
-                        return [4 /*yield*/, _a.call(resultSubscription_1)];
-                    case 7:
-                        _b.sent();
-                        _b.label = 8;
-                    case 8: return [3 /*break*/, 10];
-                    case 9:
-                        if (e_1) throw e_1.error;
-                        return [7 /*endfinally*/];
-                    case 10: return [7 /*endfinally*/];
-                    case 11: return [2 /*return*/];
-                }
-            });
-        }); })();
-        (function () { return __awaiter(_this, void 0, void 0, function () {
-            var testRunSubscription_1, testRunSubscription_1_1, message, testRunJs, testRun, e_2_1;
-            var e_2, _a;
-            return __generator(this, function (_b) {
-                switch (_b.label) {
-                    case 0:
-                        _b.trys.push([0, 5, 6, 11]);
-                        testRunSubscription_1 = __asyncValues(testRunSubscription);
-                        _b.label = 1;
-                    case 1: return [4 /*yield*/, testRunSubscription_1.next()];
-                    case 2:
-                        if (!(testRunSubscription_1_1 = _b.sent(), !testRunSubscription_1_1.done)) return [3 /*break*/, 4];
-                        message = testRunSubscription_1_1.value;
-                        try {
-                            testRunJs = jsonCodec.decode(message === null || message === void 0 ? void 0 : message.data);
-                            testRun = TestRun.fromJS(testRunJs);
-                            testRunHandler(testRun, null);
-                        }
-                        catch (error) {
-                            testRunHandler(undefined, error);
-                        }
-                        _b.label = 3;
-                    case 3: return [3 /*break*/, 1];
-                    case 4: return [3 /*break*/, 11];
-                    case 5:
-                        e_2_1 = _b.sent();
-                        e_2 = { error: e_2_1 };
-                        return [3 /*break*/, 11];
-                    case 6:
-                        _b.trys.push([6, , 9, 10]);
-                        if (!(testRunSubscription_1_1 && !testRunSubscription_1_1.done && (_a = testRunSubscription_1.return))) return [3 /*break*/, 8];
-                        return [4 /*yield*/, _a.call(testRunSubscription_1)];
-                    case 7:
-                        _b.sent();
-                        _b.label = 8;
-                    case 8: return [3 /*break*/, 10];
-                    case 9:
-                        if (e_2) throw e_2.error;
-                        return [7 /*endfinally*/];
-                    case 10: return [7 /*endfinally*/];
-                    case 11: return [2 /*return*/];
-                }
-            });
-        }); })();
-        return [resultSubscription, testRunSubscription];
+        var resultSubject = new Subject();
+        var testRunSubject = new Subject();
+        resultSubject.subscribe(function (_a) {
+            var error = _a.error, msg = _a.msg;
+            if (error) {
+                resultHandler(undefined, error);
+                return;
+            }
+            try {
+                var resultJs = jsonCodec.decode(msg === null || msg === void 0 ? void 0 : msg.data);
+                var result = Result.fromJS(resultJs);
+                resultHandler(result, error);
+            }
+            catch (error) {
+                resultHandler(undefined, error);
+            }
+        });
+        testRunSubject.subscribe(function (_a) {
+            var error = _a.error, msg = _a.msg;
+            if (error) {
+                testRunHandler(undefined, error);
+                return;
+            }
+            try {
+                var testRunJs = jsonCodec.decode(msg === null || msg === void 0 ? void 0 : msg.data);
+                var testRun = TestRun.fromJS(testRunJs);
+                testRunHandler(testRun, error);
+            }
+            catch (error) {
+                testRunHandler(undefined, error);
+            }
+        });
+        return [
+            this.subscribe('OnResult', __assign(__assign({}, options), { callback: function (error, msg) {
+                    resultSubject.next({ error: error, msg: msg });
+                } })),
+            this.subscribe('OnTestRun', __assign(__assign({}, options), { callback: function (error, msg) {
+                    testRunSubject.next({ error: error, msg: msg });
+                } })),
+        ];
     };
     /**
      * Unsubscibe from session events

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opentap/runner-client",
-  "version": "2.19.0-alpha.1.2",
+  "version": "2.19.0-alpha.1.4",
   "description": "This is the web client for the OpenTAP Runner.",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
@@ -40,9 +40,10 @@
     "typescript": "^4.8.2"
   },
   "dependencies": {
+    "events": "^3.3.0",
     "nats.ws": "^1.9.0",
-    "uuid": "^9.0.0",
-    "events": "^3.3.0"
+    "rxjs": "^7.8.1",
+    "uuid": "^9.0.0"
   },
   "lint-staged": {
     "*.{ts,js,html}": [