@opentap/runner-client 1.0.0-beta.56 → 1.0.0-beta.58

package/lib/BaseClient.d.ts

@@ -1,4 +1,4 @@
-import { RequestOptions } from 'nats.ws';
+import { ConnectionOptions, RequestOptions } from 'nats.ws';
 import { ComponentSettingsBase, ComponentSettingsIdentifier, ComponentSettingsListItem, DataGridControl, ErrorResponse, FileParameter, FileResponse, ListItemType, ProfileGroup, RepositoryPackageReference, RepositorySettingsPackageDefinition, SettingsTapPackage } from './DTOs';
 export declare class BaseClient {
     private _accessToken;
@@ -11,15 +11,15 @@ export declare class BaseClient {
     get timeout(): number;
     /** Set timeout */
     set timeout(value: number);
-    private _natsServer;
-    /** Get nats server */
-    get natsServer(): string;
     private _baseSubject;
     /** Get subject */
     get baseSubject(): string;
+    private _connectionOptions;
+    /** Get connection options */
+    get connectionOptions(): ConnectionOptions;
     private domainAccess;
     private natsConnection;
-    constructor(baseSubject: string, natsServer?: string);
+    constructor(baseSubject: string, options: ConnectionOptions);
     /**
      * Send a request to the nats server.
      * @param subject The subject to request

package/lib/BaseClient.js

@@ -36,13 +36,14 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
 };
 import { connect, Empty, JSONCodec, StringCodec } from 'nats.ws';
 var BaseClient = /** @class */ (function () {
-    function BaseClient(baseSubject, natsServer) {
-        if (natsServer === void 0) { natsServer = 'ws://localhost:443'; }
+    function BaseClient(baseSubject, options) {
         this.domainAccess = new Map();
         this._baseSubject = baseSubject;
-        this._natsServer = natsServer;
-        if (baseSubject && natsServer)
-            this.connect();
+        this._connectionOptions = options || { servers: 'ws://localhost:443' };
+        var undefinedSubject = function () {
+            throw new Error('A base subject must be specified');
+        };
+        baseSubject ? this.connect(this._connectionOptions) : undefinedSubject();
     }
     Object.defineProperty(BaseClient.prototype, "accessToken", {
         /** Get access token */
@@ -68,18 +69,18 @@ var BaseClient = /** @class */ (function () {
         enumerable: false,
         configurable: true
     });
-    Object.defineProperty(BaseClient.prototype, "natsServer", {
-        /** Get nats server */
+    Object.defineProperty(BaseClient.prototype, "baseSubject", {
+        /** Get subject */
         get: function () {
-            return this._natsServer;
+            return this._baseSubject;
         },
         enumerable: false,
         configurable: true
     });
-    Object.defineProperty(BaseClient.prototype, "baseSubject", {
-        /** Get subject */
+    Object.defineProperty(BaseClient.prototype, "connectionOptions", {
+        /** Get connection options */
         get: function () {
-            return this._baseSubject;
+            return this._connectionOptions;
         },
         enumerable: false,
         configurable: true
@@ -122,15 +123,14 @@ var BaseClient = /** @class */ (function () {
     /**
      * Create a connection to the nats server.
      */
-    BaseClient.prototype.connect = function () {
+    BaseClient.prototype.connect = function (options) {
         return __awaiter(this, void 0, void 0, function () {
-            var options, error_1;
+            var error_1;
             var _this = this;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
                         _a.trys.push([0, 2, , 3]);
-                        options = { servers: this._natsServer };
                         return [4 /*yield*/, connect(options).then(function (connection) {
                                 _this.natsConnection = connection;
                             })];
@@ -139,7 +139,7 @@ var BaseClient = /** @class */ (function () {
                         return [3 /*break*/, 3];
                     case 2:
                         error_1 = _a.sent();
-                        throw new Error("error connecting to ".concat(this.natsServer));
+                        throw new Error("connection to ".concat(options.servers, " failed due to ").concat(error_1));
                     case 3: return [2 /*return*/];
                 }
             });

package/lib/RunnerClient.d.ts

@@ -1,10 +1,11 @@
+import { ConnectionOptions } from 'nats.ws';
 import { BaseClient } from './BaseClient';
 import { Image, Links, Session } from './DTOs';
 export declare class RunnerClient extends BaseClient {
     private http;
     private baseUrl;
     protected jsonParseReviver: ((key: string, value: any) => any) | undefined;
-    constructor(baseSubject: string, server: string);
+    constructor(baseSubject: string, options: ConnectionOptions);
     /**
      * Get the created image with the specified ID.
      * @param imageId

package/lib/RunnerClient.js

@@ -17,8 +17,8 @@ import { BaseClient } from './BaseClient';
 import { ApiException, ErrorResponse, Links, Session } from './DTOs';
 var RunnerClient = /** @class */ (function (_super) {
     __extends(RunnerClient, _super);
-    function RunnerClient(baseSubject, server) {
-        var _this = _super.call(this, baseSubject, server) || this;
+    function RunnerClient(baseSubject, options) {
+        var _this = _super.call(this, baseSubject, options) || this;
         _this.jsonParseReviver = undefined;
         return _this;
     }

package/lib/SessionClient.d.ts

@@ -1,10 +1,11 @@
 import { BreakPoints, CommonContext, CommonSettings, DataGridControl, Image, Interaction, Links, ListItemType, LogList, Parameter, RepositoryPackageDefinition, RepositoryPackageReference, RunStatus, Setting, TestPlan, TestStepType, TestStepValidationError, WatchDog } from './DTOs';
 import { BaseClient } from './BaseClient';
+import { ConnectionOptions } from 'nats.ws';
 export declare class SessionClient extends BaseClient {
     private http;
     private baseUrl;
     protected jsonParseReviver: ((key: string, value: any) => any) | undefined;
-    constructor(baseSubject: string, server: string);
+    constructor(baseSubject: string, options: ConnectionOptions);
     /**
      * Retrieve session logs
      * @param id (optional)

package/lib/SessionClient.js

@@ -17,8 +17,8 @@ import { ApiException, ErrorResponse, Links, MissingLicenseResponse, } from './D
 import { BaseClient } from './BaseClient';
 var SessionClient = /** @class */ (function (_super) {
     __extends(SessionClient, _super);
-    function SessionClient(baseSubject, server) {
-        var _this = _super.call(this, baseSubject, server) || this;
+    function SessionClient(baseSubject, options) {
+        var _this = _super.call(this, baseSubject, options) || this;
         _this.jsonParseReviver = undefined;
         return _this;
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opentap/runner-client",
-  "version": "1.0.0-beta.56",
+  "version": "1.0.0-beta.58",
   "description": "This is the TypeScript Client for the OpenTAP Runner Plugin.",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",