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

package/lib/RunnerClient.js

@@ -1,3 +1,4 @@
+"use strict";
 var __extends = (this && this.__extends) || (function () {
     var extendStatics = function (d, b) {
         extendStatics = Object.setPrototypeOf ||
@@ -13,8 +14,10 @@ var __extends = (this && this.__extends) || (function () {
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
     };
 })();
-import { Image, RepositoryPackageReference, Session } from './DTOs';
-import { BaseClient } from './BaseClient';
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.RunnerClient = void 0;
+var DTOs_1 = require("./DTOs");
+var BaseClient_1 = require("./BaseClient");
 var RunnerClient = /** @class */ (function (_super) {
     __extends(RunnerClient, _super);
     function RunnerClient(baseSubject, options) {
@@ -26,7 +29,7 @@ var RunnerClient = /** @class */ (function (_super) {
             created with the base image and base settings. */
             startSession: function (testPlanRepositoryReference, timeout) {
                 return _this.request('StartDefaultSession', testPlanRepositoryReference !== null && testPlanRepositoryReference !== void 0 ? testPlanRepositoryReference : null, { timeout: timeout })
-                    .then(function (sessionJs) { return Session.fromJS(sessionJs); })
+                    .then(function (sessionJs) { return DTOs_1.Session.fromJS(sessionJs); })
                     .then(_this.success())
                     .catch(_this.error());
             },
@@ -41,7 +44,7 @@ var RunnerClient = /** @class */ (function (_super) {
                     imageOverride: imageOverride !== null && imageOverride !== void 0 ? imageOverride : null,
                 };
                 return _this.request('StartDefaultSessionOverrideImage', defaultSessionRequest, { timeout: timeout })
-                    .then(function (sessionJs) { return Session.fromJS(sessionJs); })
+                    .then(function (sessionJs) { return DTOs_1.Session.fromJS(sessionJs); })
                     .then(_this.success())
                     .catch(_this.error());
             },
@@ -49,7 +52,7 @@ var RunnerClient = /** @class */ (function (_super) {
             creation process */
             getImage: function () {
                 return _this.request('GetDefaultImage')
-                    .then(function (imageJs) { return Image.fromJS(imageJs); })
+                    .then(function (imageJs) { return DTOs_1.Image.fromJS(imageJs); })
                     .then(_this.success())
                     .catch(_this.error());
             },
@@ -57,7 +60,7 @@ var RunnerClient = /** @class */ (function (_super) {
             base image */
             setImage: function (image) {
                 return _this.request('SetDefaultImage', image)
-                    .then(function (imageJs) { return Image.fromJS(imageJs); })
+                    .then(function (imageJs) { return DTOs_1.Image.fromJS(imageJs); })
                     .then(_this.success())
                     .catch(_this.error());
             },
@@ -66,7 +69,7 @@ var RunnerClient = /** @class */ (function (_super) {
             getSettings: function () {
                 return _this.request('GetDefaultSettings')
                     .then(function (repositoryPackageReferenceJs) {
-                    return repositoryPackageReferenceJs ? RepositoryPackageReference.fromJS(repositoryPackageReferenceJs) : undefined;
+                    return repositoryPackageReferenceJs ? DTOs_1.RepositoryPackageReference.fromJS(repositoryPackageReferenceJs) : undefined;
                 })
                     .then(_this.success())
                     .catch(_this.error());
@@ -87,7 +90,7 @@ var RunnerClient = /** @class */ (function (_super) {
     RunnerClient.prototype.getImage = function (imageId) {
         return (imageId === null || imageId === void 0 ? void 0 : imageId.length) > 0
             ? this.request('GetImage', imageId)
-                .then(function (imageJs) { return Image.fromJS(imageJs); })
+                .then(function (imageJs) { return DTOs_1.Image.fromJS(imageJs); })
                 .then(this.success())
                 .catch(this.error())
             : Promise.reject('imageId is not defined');
@@ -98,7 +101,7 @@ var RunnerClient = /** @class */ (function (_super) {
      */
     RunnerClient.prototype.getImages = function () {
         return this.request('GetImages')
-            .then(function (imageArrayJs) { return imageArrayJs.map(function (imageJs) { return Image.fromJS(imageJs); }); })
+            .then(function (imageArrayJs) { return imageArrayJs.map(function (imageJs) { return DTOs_1.Image.fromJS(imageJs); }); })
             .then(this.success())
             .catch(this.error());
     };
@@ -108,7 +111,7 @@ var RunnerClient = /** @class */ (function (_super) {
      */
     RunnerClient.prototype.getSessions = function () {
         return this.request('GetSessions')
-            .then(function (sessionArrayJs) { return sessionArrayJs.map(function (sessionJs) { return Session.fromJS(sessionJs); }); })
+            .then(function (sessionArrayJs) { return sessionArrayJs.map(function (sessionJs) { return DTOs_1.Session.fromJS(sessionJs); }); })
             .then(this.success())
             .catch(this.error());
     };
@@ -121,7 +124,7 @@ var RunnerClient = /** @class */ (function (_super) {
     RunnerClient.prototype.resolveImage = function (images, timeout) {
         return (images === null || images === void 0 ? void 0 : images.length) > 0
             ? this.request('ResolveImage', images, { timeout: timeout })
-                .then(function (imageJs) { return Image.fromJS(imageJs); })
+                .then(function (imageJs) { return DTOs_1.Image.fromJS(imageJs); })
                 .then(this.success())
                 .catch(this.error())
             : Promise.reject('images list is not defined or is empty');
@@ -135,7 +138,7 @@ var RunnerClient = /** @class */ (function (_super) {
     RunnerClient.prototype.resolveImageDryRun = function (images, timeout) {
         return (images === null || images === void 0 ? void 0 : images.length) > 0
             ? this.request('ResolveImageDryRun', images, { timeout: timeout })
-                .then(function (imageJs) { return Image.fromJS(imageJs); })
+                .then(function (imageJs) { return DTOs_1.Image.fromJS(imageJs); })
                 .then(this.success())
                 .catch(this.error())
             : Promise.reject('images list is not defined or is empty');
@@ -156,7 +159,7 @@ var RunnerClient = /** @class */ (function (_super) {
      */
     RunnerClient.prototype.startSession = function () {
         return this.request('StartSession')
-            .then(function (sessionJs) { return Session.fromJS(sessionJs); })
+            .then(function (sessionJs) { return DTOs_1.Session.fromJS(sessionJs); })
             .then(this.success())
             .catch(this.error());
     };
@@ -166,7 +169,7 @@ var RunnerClient = /** @class */ (function (_super) {
      */
     RunnerClient.prototype.getSessionManagerImage = function () {
         return this.request('GetSessionManagerImage')
-            .then(function (imageJs) { return Image.fromJS(imageJs); })
+            .then(function (imageJs) { return DTOs_1.Image.fromJS(imageJs); })
             .then(this.success())
             .catch(this.error());
     };
@@ -178,7 +181,7 @@ var RunnerClient = /** @class */ (function (_super) {
     RunnerClient.prototype.startImageSession = function (image) {
         return image
             ? this.request('StartImageSession', image)
-                .then(function (sessionJs) { return Session.fromJS(sessionJs); })
+                .then(function (sessionJs) { return DTOs_1.Session.fromJS(sessionJs); })
                 .then(this.success())
                 .catch(this.error())
             : Promise.reject('image is not defined');
@@ -192,5 +195,5 @@ var RunnerClient = /** @class */ (function (_super) {
         return this.request('UpdateRunner', runnerUpdateRequest).then(this.success()).catch(this.error());
     };
     return RunnerClient;
-}(BaseClient));
-export { RunnerClient };
+}(BaseClient_1.BaseClient));
+exports.RunnerClient = RunnerClient;

package/lib/SessionClient.js

@@ -1,3 +1,4 @@
+"use strict";
 var __extends = (this && this.__extends) || (function () {
     var extendStatics = function (d, b) {
         extendStatics = Object.setPrototypeOf ||
@@ -24,10 +25,11 @@ var __assign = (this && this.__assign) || function () {
     };
     return __assign.apply(this, arguments);
 };
-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';
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.SessionClient = void 0;
+var DTOs_1 = require("./DTOs");
+var nats_ws_1 = require("nats.ws");
+var BaseClient_1 = require("./BaseClient");
 var SessionClient = /** @class */ (function (_super) {
     __extends(SessionClient, _super);
     function SessionClient(baseSubject, options) {
@@ -47,9 +49,9 @@ var SessionClient = /** @class */ (function (_super) {
                     return;
                 }
                 try {
-                    var jsonCodec = JSONCodec();
+                    var jsonCodec = (0, nats_ws_1.JSONCodec)();
                     var logListJson = jsonCodec.decode(encodedMessage === null || encodedMessage === void 0 ? void 0 : encodedMessage.data);
-                    var logList = LogList.fromJS(logListJson);
+                    var logList = DTOs_1.LogList.fromJS(logListJson);
                     sessionLogsHandler(logList, error);
                 }
                 catch (error) {
@@ -69,9 +71,9 @@ var SessionClient = /** @class */ (function (_super) {
                 return;
             }
             try {
-                var jsonCodec = JSONCodec();
+                var jsonCodec = (0, nats_ws_1.JSONCodec)();
                 var sessionEventJs = jsonCodec.decode(encodedMessage === null || encodedMessage === void 0 ? void 0 : encodedMessage.data);
-                var sessionEvent = SessionEvent.fromJS(sessionEventJs);
+                var sessionEvent = DTOs_1.SessionEvent.fromJS(sessionEventJs);
                 eventHandler(sessionEvent, error);
             }
             catch (error) {
@@ -88,45 +90,36 @@ var SessionClient = /** @class */ (function (_super) {
      * @returns Subscription array: Result and Test Run subscriptions
      */
     SessionClient.prototype.connectSessionResults = function (resultHandler, testRunHandler, options) {
-        var jsonCodec = JSONCodec();
-        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('OnResult', __assign(__assign({}, options), { callback: function (error, encodedMessage) {
+                    if (error) {
+                        resultHandler(undefined, error);
+                        return;
+                    }
+                    try {
+                        var jsonCodec = (0, nats_ws_1.JSONCodec)();
+                        var resultJs = jsonCodec.decode(encodedMessage === null || encodedMessage === void 0 ? void 0 : encodedMessage.data);
+                        var result = DTOs_1.Result.fromJS(resultJs);
+                        resultHandler(result, error);
+                    }
+                    catch (error) {
+                        resultHandler(undefined, error);
+                    }
                 } })),
-            this.subscribe('OnTestRun', __assign(__assign({}, options), { callback: function (error, msg) {
-                    testRunSubject.next({ error: error, msg: msg });
+            this.subscribe('OnTestRun', __assign(__assign({}, options), { callback: function (error, encodedMessage) {
+                    if (error) {
+                        testRunHandler(undefined, error);
+                        return;
+                    }
+                    try {
+                        var jsonCodec = (0, nats_ws_1.JSONCodec)();
+                        var testRunJs = jsonCodec.decode(encodedMessage === null || encodedMessage === void 0 ? void 0 : encodedMessage.data);
+                        var testRun = DTOs_1.TestRun.fromJS(testRunJs);
+                        testRunHandler(testRun, error);
+                    }
+                    catch (error) {
+                        testRunHandler(undefined, error);
+                    }
                 } })),
         ];
     };
@@ -150,7 +143,7 @@ var SessionClient = /** @class */ (function (_super) {
     SessionClient.prototype.getSessionLogs = function (id, levels, excludedSources, filterText, offset, limit) {
         var getSessionLogsRequest = { id: id, levels: levels, excludedSources: excludedSources, filterText: filterText, offset: offset, limit: limit };
         return this.request('GetSessionLogs', getSessionLogsRequest)
-            .then(function (logListJs) { return LogList.fromJS(logListJs); })
+            .then(function (logListJs) { return DTOs_1.LogList.fromJS(logListJs); })
             .then(this.success())
             .catch(this.error());
     };
@@ -197,7 +190,7 @@ var SessionClient = /** @class */ (function (_super) {
      */
     SessionClient.prototype.getStatus = function (timeout) {
         return this.request('GetStatus', timeout)
-            .then(function (runStatusJs) { return RunStatus.fromJS(runStatusJs); })
+            .then(function (runStatusJs) { return DTOs_1.RunStatus.fromJS(runStatusJs); })
             .then(this.success())
             .catch(this.error());
     };
@@ -254,7 +247,7 @@ var SessionClient = /** @class */ (function (_super) {
      */
     SessionClient.prototype.resourcesOpen = function () {
         return this.request('ResourcesOpen')
-            .then(function (testPlanJs) { return TestPlan.fromJS(testPlanJs); })
+            .then(function (testPlanJs) { return DTOs_1.TestPlan.fromJS(testPlanJs); })
             .then(this.success())
             .catch(this.error());
     };
@@ -264,7 +257,7 @@ var SessionClient = /** @class */ (function (_super) {
      */
     SessionClient.prototype.resourcesClose = function () {
         return this.request('ResourcesClose')
-            .then(function (testPlanJs) { return TestPlan.fromJS(testPlanJs); })
+            .then(function (testPlanJs) { return DTOs_1.TestPlan.fromJS(testPlanJs); })
             .then(this.success())
             .catch(this.error());
     };
@@ -275,7 +268,7 @@ var SessionClient = /** @class */ (function (_super) {
      */
     SessionClient.prototype.getSettings = function (contextId) {
         return this.request('GetSettings', contextId)
-            .then(function (settingArrayJs) { return settingArrayJs.map(function (settingJs) { return Setting.fromJS(settingJs); }); })
+            .then(function (settingArrayJs) { return settingArrayJs.map(function (settingJs) { return DTOs_1.Setting.fromJS(settingJs); }); })
             .then(this.success())
             .catch(this.error());
     };
@@ -288,7 +281,7 @@ var SessionClient = /** @class */ (function (_super) {
     SessionClient.prototype.setSettings = function (contextId, settings) {
         var setSettingsRequest = { contextId: contextId, settings: settings };
         return this.request('SetSettings', setSettingsRequest)
-            .then(function (settingArrayJs) { return settingArrayJs.map(function (settingJs) { return Setting.fromJS(settingJs); }); })
+            .then(function (settingArrayJs) { return settingArrayJs.map(function (settingJs) { return DTOs_1.Setting.fromJS(settingJs); }); })
             .then(this.success())
             .catch(this.error());
     };
@@ -299,7 +292,7 @@ var SessionClient = /** @class */ (function (_super) {
      */
     SessionClient.prototype.getTestPlan = function (properties) {
         return this.request('GetTestPlan', properties)
-            .then(function (testPlanJs) { return TestPlan.fromJS(testPlanJs); })
+            .then(function (testPlanJs) { return DTOs_1.TestPlan.fromJS(testPlanJs); })
             .then(this.success())
             .catch(this.error());
     };
@@ -310,7 +303,7 @@ var SessionClient = /** @class */ (function (_super) {
      */
     SessionClient.prototype.setTestPlan = function (plan) {
         return this.request('SetTestPlan', plan)
-            .then(function (testPlanJs) { return TestPlan.fromJS(testPlanJs); })
+            .then(function (testPlanJs) { return DTOs_1.TestPlan.fromJS(testPlanJs); })
             .then(this.success())
             .catch(this.error());
     };
@@ -329,7 +322,7 @@ var SessionClient = /** @class */ (function (_super) {
     SessionClient.prototype.getValidationErrors = function () {
         return this.request('GetValidationErrors')
             .then(function (testStepValidationErrorArrayJs) {
-            return testStepValidationErrorArrayJs.map(function (testStepValidationErrorJs) { return TestStepValidationError.fromJS(testStepValidationErrorJs); });
+            return testStepValidationErrorArrayJs.map(function (testStepValidationErrorJs) { return DTOs_1.TestStepValidationError.fromJS(testStepValidationErrorJs); });
         })
             .then(this.success())
             .catch(this.error());
@@ -341,7 +334,7 @@ var SessionClient = /** @class */ (function (_super) {
      */
     SessionClient.prototype.commonStepSettings = function (commonSettings) {
         return this.request('CommonStepSettings', commonSettings)
-            .then(function (commonSettingsJs) { return CommonSettings.fromJS(commonSettingsJs); })
+            .then(function (commonSettingsJs) { return DTOs_1.CommonSettings.fromJS(commonSettingsJs); })
             .then(this.success())
             .catch(this.error());
     };
@@ -354,7 +347,7 @@ var SessionClient = /** @class */ (function (_super) {
     SessionClient.prototype.commonStepSettingsContextMenu = function (propertyName, commonContext) {
         var commonStepSettingsContextRequest = { propertyName: propertyName, commonContext: commonContext };
         return this.request('CommonStepSettingsContextMenu', commonStepSettingsContextRequest)
-            .then(function (commonContextJs) { return CommonContext.fromJS(commonContextJs); })
+            .then(function (commonContextJs) { return DTOs_1.CommonContext.fromJS(commonContextJs); })
             .then(this.success())
             .catch(this.error());
     };
@@ -372,7 +365,7 @@ var SessionClient = /** @class */ (function (_super) {
      */
     SessionClient.prototype.getUserInput = function (id) {
         return this.request('GetUserInput', id)
-            .then(function (interactionJs) { return Interaction.fromJS(interactionJs); })
+            .then(function (interactionJs) { return DTOs_1.Interaction.fromJS(interactionJs); })
             .then(this.success())
             .catch(this.error());
     };
@@ -383,7 +376,7 @@ var SessionClient = /** @class */ (function (_super) {
      */
     SessionClient.prototype.setUserInput = function (interaction) {
         return this.request('SetUserInput', interaction)
-            .then(function (interactionJs) { return Interaction.fromJS(interactionJs); })
+            .then(function (interactionJs) { return DTOs_1.Interaction.fromJS(interactionJs); })
             .then(this.success())
             .catch(this.error());
     };
@@ -399,7 +392,7 @@ var SessionClient = /** @class */ (function (_super) {
             propertyName: propertyName,
         };
         return this.request('GetContextMenu', propertyReferenceRequest)
-            .then(function (settingArrayJs) { return settingArrayJs.map(function (settingJs) { return Setting.fromJS(settingJs); }); })
+            .then(function (settingArrayJs) { return settingArrayJs.map(function (settingJs) { return DTOs_1.Setting.fromJS(settingJs); }); })
             .then(this.success())
             .catch(this.error());
     };
@@ -417,7 +410,7 @@ var SessionClient = /** @class */ (function (_super) {
             contextMenu: contextMenu,
         };
         return this.request('SetContextMenu', setContextMenuRequest)
-            .then(function (settingArrayJs) { return settingArrayJs.map(function (settingJs) { return Setting.fromJS(settingJs); }); })
+            .then(function (settingArrayJs) { return settingArrayJs.map(function (settingJs) { return DTOs_1.Setting.fromJS(settingJs); }); })
             .then(this.success())
             .catch(this.error());
     };
@@ -433,7 +426,7 @@ var SessionClient = /** @class */ (function (_super) {
             propertyName: propertyName,
         };
         return this.request('GetDataGrid', propertyReferenceRequest)
-            .then(function (dataGridControlJs) { return DataGridControl.fromJS(dataGridControlJs); })
+            .then(function (dataGridControlJs) { return DTOs_1.DataGridControl.fromJS(dataGridControlJs); })
             .then(this.success())
             .catch(this.error());
     };
@@ -444,7 +437,7 @@ var SessionClient = /** @class */ (function (_super) {
     SessionClient.prototype.setDataGrid = function (contextId, propertyName, dataGridControl) {
         var setDataGridRequest = { contextId: contextId, propertyName: propertyName, dataGridControl: dataGridControl };
         return this.request('SetDataGrid', setDataGridRequest)
-            .then(function (dataGridControlJs) { return DataGridControl.fromJS(dataGridControlJs); })
+            .then(function (dataGridControlJs) { return DTOs_1.DataGridControl.fromJS(dataGridControlJs); })
             .then(this.success())
             .catch(this.error());
     };
@@ -462,7 +455,7 @@ var SessionClient = /** @class */ (function (_super) {
             typeName: typeName,
         };
         return this.request('AddDataGridItemType', addDataGridItemTypeRequest)
-            .then(function (dataGridControlJs) { return DataGridControl.fromJS(dataGridControlJs); })
+            .then(function (dataGridControlJs) { return DTOs_1.DataGridControl.fromJS(dataGridControlJs); })
             .then(this.success())
             .catch(this.error());
     };
@@ -478,7 +471,7 @@ var SessionClient = /** @class */ (function (_super) {
             propertyName: propertyName,
         };
         return this.request('AddDataGridItem', propertyReferenceRequest)
-            .then(function (dataGridControlJs) { return DataGridControl.fromJS(dataGridControlJs); })
+            .then(function (dataGridControlJs) { return DTOs_1.DataGridControl.fromJS(dataGridControlJs); })
             .then(this.success())
             .catch(this.error());
     };
@@ -494,7 +487,7 @@ var SessionClient = /** @class */ (function (_super) {
             propertyName: propertyName,
         };
         return this.request('GetDataGridTypes', propertyReferenceRequest)
-            .then(function (listItemTypeArrayJs) { return listItemTypeArrayJs.map(function (listItemTypeJs) { return ListItemType.fromJS(listItemTypeJs); }); })
+            .then(function (listItemTypeArrayJs) { return listItemTypeArrayJs.map(function (listItemTypeJs) { return DTOs_1.ListItemType.fromJS(listItemTypeJs); }); })
             .then(this.success())
             .catch(this.error());
     };
@@ -504,7 +497,7 @@ var SessionClient = /** @class */ (function (_super) {
      */
     SessionClient.prototype.getStepTypes = function () {
         return this.request('GetStepTypes')
-            .then(function (testStepTypeArrayJs) { return testStepTypeArrayJs.map(function (testStepTypeJs) { return TestStepType.fromJS(testStepTypeJs); }); })
+            .then(function (testStepTypeArrayJs) { return testStepTypeArrayJs.map(function (testStepTypeJs) { return DTOs_1.TestStepType.fromJS(testStepTypeJs); }); })
             .then(this.success())
             .catch(this.error());
     };
@@ -519,7 +512,7 @@ var SessionClient = /** @class */ (function (_super) {
      */
     SessionClient.prototype.getBreakpoints = function () {
         return this.request('GetBreakpoints')
-            .then(function (breakPointsJs) { return BreakPoints.fromJS(breakPointsJs); })
+            .then(function (breakPointsJs) { return DTOs_1.BreakPoints.fromJS(breakPointsJs); })
             .then(this.success())
             .catch(this.error());
     };
@@ -530,7 +523,7 @@ var SessionClient = /** @class */ (function (_super) {
      */
     SessionClient.prototype.setBreakpoints = function (breakPointsDto) {
         return this.request('SetBreakpoints', breakPointsDto)
-            .then(function (breakPointsJs) { return BreakPoints.fromJS(breakPointsJs); })
+            .then(function (breakPointsJs) { return DTOs_1.BreakPoints.fromJS(breakPointsJs); })
             .then(this.success())
             .catch(this.error());
     };
@@ -548,7 +541,7 @@ var SessionClient = /** @class */ (function (_super) {
      */
     SessionClient.prototype.runTestPlan = function (parameters) {
         return this.request('RunTestPlan', parameters)
-            .then(function (runStatusJs) { return RunStatus.fromJS(runStatusJs); })
+            .then(function (runStatusJs) { return DTOs_1.RunStatus.fromJS(runStatusJs); })
             .then(this.success())
             .catch(this.error());
     };
@@ -569,7 +562,7 @@ var SessionClient = /** @class */ (function (_super) {
      */
     SessionClient.prototype.getImage = function () {
         return this.request('GetImage')
-            .then(function (imageJs) { return Image.fromJS(imageJs); })
+            .then(function (imageJs) { return DTOs_1.Image.fromJS(imageJs); })
             .then(this.success())
             .catch(this.error());
     };
@@ -584,7 +577,7 @@ var SessionClient = /** @class */ (function (_super) {
      */
     SessionClient.prototype.getWatchDog = function () {
         return this.request('GetWatchDog')
-            .then(function (watchDogJs) { return WatchDog.fromJS(watchDogJs); })
+            .then(function (watchDogJs) { return DTOs_1.WatchDog.fromJS(watchDogJs); })
             .then(this.success())
             .catch(this.error());
     };
@@ -594,7 +587,7 @@ var SessionClient = /** @class */ (function (_super) {
      */
     SessionClient.prototype.setWatchDog = function (watchDog) {
         return this.request('SetWatchDog', watchDog)
-            .then(function (watchDogJs) { return WatchDog.fromJS(watchDogJs); })
+            .then(function (watchDogJs) { return DTOs_1.WatchDog.fromJS(watchDogJs); })
             .then(this.success())
             .catch(this.error());
     };
@@ -605,5 +598,5 @@ var SessionClient = /** @class */ (function (_super) {
         return this.request('GetSettingsTypes').then(this.success()).catch(this.error());
     };
     return SessionClient;
-}(BaseClient));
-export { SessionClient };
+}(BaseClient_1.BaseClient));
+exports.SessionClient = SessionClient;

package/lib/SystemClient.js

@@ -1,3 +1,4 @@
+"use strict";
 var __extends = (this && this.__extends) || (function () {
     var extendStatics = function (d, b) {
         extendStatics = Object.setPrototypeOf ||
@@ -24,9 +25,11 @@ var __assign = (this && this.__assign) || function () {
     };
     return __assign.apply(this, arguments);
 };
-import { JSONCodec } from 'nats.ws';
-import { RunnerEvent, TestPlanRunCompletedEventArgs, TestPlanRunStartEventArgs, TestStepRunCompletedEventArgs, TestStepRunStartEventArgs, } from './DTOs';
-import { BaseClient } from './BaseClient';
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.SystemClient = void 0;
+var nats_ws_1 = require("nats.ws");
+var DTOs_1 = require("./DTOs");
+var BaseClient_1 = require("./BaseClient");
 var SystemClient = /** @class */ (function (_super) {
     __extends(SystemClient, _super);
     function SystemClient(baseSubject, options) {
@@ -47,7 +50,7 @@ var SystemClient = /** @class */ (function (_super) {
                     return;
                 }
                 try {
-                    var jsonCodec = JSONCodec();
+                    var jsonCodec = (0, nats_ws_1.JSONCodec)();
                     var data = jsonCodec.decode(message === null || message === void 0 ? void 0 : message.data);
                     listener(null, data);
                 }
@@ -72,8 +75,8 @@ var SystemClient = /** @class */ (function (_super) {
                     return;
                 }
                 try {
-                    var jsonCodec = JSONCodec();
-                    var data = RunnerEvent.fromJS(jsonCodec.decode(message === null || message === void 0 ? void 0 : message.data));
+                    var jsonCodec = (0, nats_ws_1.JSONCodec)();
+                    var data = DTOs_1.RunnerEvent.fromJS(jsonCodec.decode(message === null || message === void 0 ? void 0 : message.data));
                     listener(null, data);
                 }
                 catch (error) {
@@ -98,9 +101,9 @@ var SystemClient = /** @class */ (function (_super) {
                     return;
                 }
                 try {
-                    var jsonCodec = JSONCodec();
+                    var jsonCodec = (0, nats_ws_1.JSONCodec)();
                     var testStepRunStartEventArgsJs = jsonCodec.decode(message === null || message === void 0 ? void 0 : message.data);
-                    var testStepRunStartEventArgs = TestStepRunStartEventArgs.fromJS(testStepRunStartEventArgsJs);
+                    var testStepRunStartEventArgs = DTOs_1.TestStepRunStartEventArgs.fromJS(testStepRunStartEventArgsJs);
                     listener(null, testStepRunStartEventArgs);
                 }
                 catch (error) {
@@ -125,9 +128,9 @@ var SystemClient = /** @class */ (function (_super) {
                     return;
                 }
                 try {
-                    var jsonCodec = JSONCodec();
+                    var jsonCodec = (0, nats_ws_1.JSONCodec)();
                     var testStepRunCompletedEventArgsJs = jsonCodec.decode(message === null || message === void 0 ? void 0 : message.data);
-                    var testStepRunCompletedEventArgs = TestStepRunCompletedEventArgs.fromJS(testStepRunCompletedEventArgsJs);
+                    var testStepRunCompletedEventArgs = DTOs_1.TestStepRunCompletedEventArgs.fromJS(testStepRunCompletedEventArgsJs);
                     listener(null, testStepRunCompletedEventArgs);
                 }
                 catch (error) {
@@ -152,9 +155,9 @@ var SystemClient = /** @class */ (function (_super) {
                     return;
                 }
                 try {
-                    var jsonCodec = JSONCodec();
+                    var jsonCodec = (0, nats_ws_1.JSONCodec)();
                     var testPlanRunStartEventArgsJs = jsonCodec.decode(message === null || message === void 0 ? void 0 : message.data);
-                    var testPlanRunStartEventArgs = TestPlanRunStartEventArgs.fromJS(testPlanRunStartEventArgsJs);
+                    var testPlanRunStartEventArgs = DTOs_1.TestPlanRunStartEventArgs.fromJS(testPlanRunStartEventArgsJs);
                     listener(null, testPlanRunStartEventArgs);
                 }
                 catch (error) {
@@ -179,9 +182,9 @@ var SystemClient = /** @class */ (function (_super) {
                     return;
                 }
                 try {
-                    var jsonCodec = JSONCodec();
+                    var jsonCodec = (0, nats_ws_1.JSONCodec)();
                     var testPlanRunCompletedEventArgsJs = jsonCodec.decode(message === null || message === void 0 ? void 0 : message.data);
-                    var testPlanRunCompletedEventArgs = TestPlanRunCompletedEventArgs.fromJS(testPlanRunCompletedEventArgsJs);
+                    var testPlanRunCompletedEventArgs = DTOs_1.TestPlanRunCompletedEventArgs.fromJS(testPlanRunCompletedEventArgsJs);
                     listener(null, testPlanRunCompletedEventArgs);
                 }
                 catch (error) {
@@ -190,5 +193,5 @@ var SystemClient = /** @class */ (function (_super) {
             } }));
     };
     return SystemClient;
-}(BaseClient));
-export { SystemClient };
+}(BaseClient_1.BaseClient));
+exports.SystemClient = SystemClient;

package/lib/index.js

@@ -1,5 +1,25 @@
-export { RunnerClient } from './RunnerClient';
-export { SessionClient } from './SessionClient';
-export { SystemClient } from './SystemClient';
-export * from './DTOs';
-export * from 'nats.ws';
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __exportStar = (this && this.__exportStar) || function(m, exports) {
+    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.SystemClient = exports.SessionClient = exports.RunnerClient = void 0;
+var RunnerClient_1 = require("./RunnerClient");
+Object.defineProperty(exports, "RunnerClient", { enumerable: true, get: function () { return RunnerClient_1.RunnerClient; } });
+var SessionClient_1 = require("./SessionClient");
+Object.defineProperty(exports, "SessionClient", { enumerable: true, get: function () { return SessionClient_1.SessionClient; } });
+var SystemClient_1 = require("./SystemClient");
+Object.defineProperty(exports, "SystemClient", { enumerable: true, get: function () { return SystemClient_1.SystemClient; } });
+__exportStar(require("./DTOs"), exports);
+__exportStar(require("nats.ws"), exports);

package/lib/requestDTOs.js

@@ -1 +1,2 @@
-export {};
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

package/package.json

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