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

package/lib/BaseClient.d.ts

@@ -9,7 +9,6 @@ interface BaseClientRequestOptions {
 }
 export declare class BaseClient {
     private connection;
-    private subscriptionConnection;
     private baseSubject;
     private connectionOptions;
     private domainAccess;
@@ -22,9 +21,13 @@ export declare class BaseClient {
     /** Set request access token */
     set accessToken(value: string);
     /** Get request headers */
-    get headers(): Headers;
+    get headers(): {
+        [key: string]: string;
+    };
     /** Set request headers */
-    set headers(value: Headers);
+    set headers(value: {
+        [key: string]: string;
+    });
     /** Get timeout */
     get timeout(): number;
     /** Set timeout in milliseconds. Default is 40000 milliseconds */

package/lib/BaseClient.js

@@ -1,3 +1,4 @@
+"use strict";
 var __assign = (this && this.__assign) || function () {
     __assign = Object.assign || function(t) {
         for (var s, i = 1, n = arguments.length; i < n; i++) {
@@ -45,10 +46,12 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
         if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
     }
 };
-import { ComponentSettingsBase, ComponentSettingsIdentifier, ComponentSettingsListItem, DataGridControl, ErrorResponse, FileDescriptor, ListItemType, ProfileGroup, } from './DTOs';
-import { Empty, ErrorCode, JSONCodec, StringCodec, connect, headers, } from 'nats.ws';
-import { EventEmitter } from 'events';
-import { v4 as uuidv4 } from 'uuid';
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.BaseClient = void 0;
+var DTOs_1 = require("./DTOs");
+var nats_ws_1 = require("nats.ws");
+var events_1 = require("events");
+var uuid_1 = require("uuid");
 var DEFAULT_TIMEOUT = 40000; // default timeout of 40 seconds
 var Events;
 (function (Events) {
@@ -57,11 +60,11 @@ var Events;
 var BaseClient = /** @class */ (function () {
     function BaseClient(baseSubject, options) {
         this.domainAccess = new Map();
-        this._headers = new Headers();
+        this._headers = {};
         this.baseSubject = baseSubject;
         this.connectionOptions = __assign({}, options) || {};
         this.connectionOptions.timeout = (options === null || options === void 0 ? void 0 : options.timeout) || DEFAULT_TIMEOUT;
-        this.eventEmitter = new EventEmitter();
+        this.eventEmitter = new events_1.EventEmitter();
     }
     Object.defineProperty(BaseClient.prototype, "accessToken", {
         /** Get request access token */
@@ -100,7 +103,7 @@ var BaseClient = /** @class */ (function () {
         configurable: true
     });
     BaseClient.prototype.withTimeout = function (promise, timeout) {
-        return Promise.race([promise, new Promise(function (_, reject) { return setTimeout(function () { return reject(new Error(ErrorCode.Timeout)); }, timeout); })]);
+        return Promise.race([promise, new Promise(function (_, reject) { return setTimeout(function () { return reject(new Error(nats_ws_1.ErrorCode.Timeout)); }, timeout); })]);
     };
     /**
      * Send a request to the nats server.
@@ -126,15 +129,15 @@ var BaseClient = /** @class */ (function () {
                 data = this.encode(payload);
                 headers = this.buildHeaders();
                 timeout = (options === null || options === void 0 ? void 0 : options.timeout) || this.timeout;
-                replySubject = "".concat(subject, ".Reply.").concat(uuidv4());
+                replySubject = "".concat(subject, ".Reply.").concat((0, uuid_1.v4)());
                 serverMaxPayload = (_b = (_a = this.connection) === null || _a === void 0 ? void 0 : _a.info) === null || _b === void 0 ? void 0 : _b.max_payload;
                 chunkSize = serverMaxPayload ? serverMaxPayload - 50000 : 512000;
                 // The Session and the Client need to agree on the chunk size. Put it in a header.
                 headers.append('ChunkSize', chunkSize.toString());
-                requestId = uuidv4();
+                requestId = (0, uuid_1.v4)();
                 headers.append('RequestId', requestId);
                 opts = __assign(__assign({}, options === null || options === void 0 ? void 0 : options.publishOptions), { headers: headers, reply: replySubject });
-                fileDescriptor = new FileDescriptor(data.length, chunkSize);
+                fileDescriptor = new DTOs_1.FileDescriptor(data.length, chunkSize);
                 chunkNumber = 1;
                 headers.set('ChunkNumber', chunkNumber.toString());
                 getChunk = function (chunk) {
@@ -193,10 +196,10 @@ var BaseClient = /** @class */ (function () {
                     if (byteArray.length === 0) {
                         return Promise.resolve(undefined);
                     }
-                    var jsonCodec = JSONCodec();
+                    var jsonCodec = (0, nats_ws_1.JSONCodec)();
                     // If a raw response is requested, we should avoid decoding the bytes.
                     var response = (options === null || options === void 0 ? void 0 : options.rawResponse) ? byteArray : jsonCodec.decode(byteArray);
-                    return isErrorResponse ? Promise.reject(ErrorResponse.fromJS(response)) : Promise.resolve(response);
+                    return isErrorResponse ? Promise.reject(DTOs_1.ErrorResponse.fromJS(response)) : Promise.resolve(response);
                 });
                 chunk = getChunk(0);
                 this.connection.publish(subject, chunk, opts);
@@ -211,7 +214,7 @@ var BaseClient = /** @class */ (function () {
                 // an empty message
                 if (data.length > 0 && data.length % fileDescriptor.chunkSize === 0) {
                     headers.set('ChunkNumber', chunkNumber.toString());
-                    this.connection.publish(subject, Empty, opts);
+                    this.connection.publish(subject, nats_ws_1.Empty, opts);
                 }
                 // Now that we have sent the terminating chunk, the result should arrive on our promise.
                 return [2 /*return*/, this.withTimeout(responsePromise, timeout).catch(function (err) {
@@ -228,11 +231,11 @@ var BaseClient = /** @class */ (function () {
      * @returns
      */
     BaseClient.prototype.natsErrorHandler = function (error, subject) {
-        var errorResponse = new ErrorResponse(error);
+        var errorResponse = new DTOs_1.ErrorResponse(error);
         errorResponse.subject = subject;
         errorResponse.stackTrace = error === null || error === void 0 ? void 0 : error.stack;
         switch (error === null || error === void 0 ? void 0 : error.code) {
-            case ErrorCode.NoResponders:
+            case nats_ws_1.ErrorCode.NoResponders:
                 errorResponse.message = 'No Responders';
                 break;
             default:
@@ -246,11 +249,14 @@ var BaseClient = /** @class */ (function () {
      * @returns {MsgHdrs} Header object
      */
     BaseClient.prototype.buildHeaders = function () {
-        var _a, _b;
-        var _headers = headers();
+        var _a;
+        var _headers = (0, nats_ws_1.headers)();
         this._accessToken && _headers.set('Authorization', this._accessToken);
         (_a = this.domainAccess) === null || _a === void 0 ? void 0 : _a.forEach(function (value, key) { return _headers.append('DomainAuthorization', "".concat(key, "|").concat(value)); });
-        (_b = this._headers) === null || _b === void 0 ? void 0 : _b.forEach(function (value, key) { return _headers.append(key, value); });
+        Object.entries(this._headers).forEach(function (_a) {
+            var key = _a[0], value = _a[1];
+            return _headers.append(key, value);
+        });
         return _headers;
     };
     /**
@@ -262,21 +268,21 @@ var BaseClient = /** @class */ (function () {
     BaseClient.prototype.subscribe = function (subject, options) {
         if (!subject)
             throw Error('Subject is not defined!');
-        if (!this.subscriptionConnection)
+        if (!this.connection)
             throw Error('Connection is not up yet! Please try again later!');
-        if (this.subscriptionConnection.isClosed())
+        if (this.connection.isClosed())
             throw Error('Connection has been closed! Please reconnect!');
         var natsSubject = "".concat(this.baseSubject, ".").concat(subject);
-        return this.subscriptionConnection.subscribe(natsSubject, options);
+        return this.connection.subscribe(natsSubject, options);
     };
     BaseClient.prototype.encode = function (payload) {
         if (!payload) {
-            return Empty;
+            return nats_ws_1.Empty;
         }
         if (payload instanceof Uint8Array) {
             return payload;
         }
-        return StringCodec().encode(JSON.stringify(payload));
+        return (0, nats_ws_1.StringCodec)().encode(JSON.stringify(payload));
     };
     /**
      * Create a connection to the nats server.
@@ -296,11 +302,9 @@ var BaseClient = /** @class */ (function () {
                         _a.label = 1;
                     case 1:
                         _a.trys.push([1, 3, , 4]);
-                        return [4 /*yield*/, Promise.all([connect(this.connectionOptions), connect(this.connectionOptions)])
-                                .then(function (_a) {
-                                var connection = _a[0], subscriptionConnection = _a[1];
+                        return [4 /*yield*/, (0, nats_ws_1.connect)(this.connectionOptions)
+                                .then(function (connection) {
                                 _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)); })];
@@ -317,24 +321,21 @@ var BaseClient = /** @class */ (function () {
      * Close the connection.
      */
     BaseClient.prototype.close = function () {
-        var _a, _b;
+        var _a;
         return __awaiter(this, void 0, void 0, function () {
             var _this = this;
-            return __generator(this, function (_c) {
-                switch (_c.label) {
+            return __generator(this, function (_b) {
+                switch (_b.label) {
                     case 0:
-                        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 () {
+                        if (!this.connection) return [3 /*break*/, 2];
+                        return [4 /*yield*/, ((_a = this.connection) === null || _a === void 0 ? void 0 : _a.close().then(function () {
                                 _this.connection = null;
-                                _this.subscriptionConnection = null;
-                            })
-                                .catch(function (error) {
+                            }).catch(function (error) {
                                 throw new Error("failed to close connection: ".concat(error));
-                            })];
+                            }))];
                     case 1:
-                        _c.sent();
-                        _c.label = 2;
+                        _b.sent();
+                        _b.label = 2;
                     case 2: return [2 /*return*/];
                 }
             });
@@ -391,7 +392,7 @@ var BaseClient = /** @class */ (function () {
         return this.request('GetComponentSettingsOverview')
             .then(function (componentSettingsIdentifiers) {
             return componentSettingsIdentifiers.map(function (componentSettingsIdentifier) {
-                return ComponentSettingsIdentifier.fromJS(componentSettingsIdentifier);
+                return DTOs_1.ComponentSettingsIdentifier.fromJS(componentSettingsIdentifier);
             });
         })
             .then(this.success())
@@ -407,7 +408,7 @@ var BaseClient = /** @class */ (function () {
     BaseClient.prototype.setComponentSettings = function (groupName, name, returnedSettings) {
         var setComponentSettingsRequest = { groupName: groupName, name: name, returnedSettings: returnedSettings };
         return this.request('SetComponentSettings', setComponentSettingsRequest)
-            .then(function (componentSettingsBase) { return ComponentSettingsBase.fromJS(componentSettingsBase); })
+            .then(function (componentSettingsBase) { return DTOs_1.ComponentSettingsBase.fromJS(componentSettingsBase); })
             .then(this.success())
             .catch(this.error());
     };
@@ -420,7 +421,7 @@ var BaseClient = /** @class */ (function () {
     BaseClient.prototype.getComponentSettings = function (groupName, name) {
         var getComponentSettingsRequest = { groupName: groupName, name: name };
         return this.request('GetComponentSettings', getComponentSettingsRequest)
-            .then(function (componentSettingsBase) { return ComponentSettingsBase.fromJS(componentSettingsBase); })
+            .then(function (componentSettingsBase) { return DTOs_1.ComponentSettingsBase.fromJS(componentSettingsBase); })
             .then(this.success())
             .catch(this.error());
     };
@@ -434,7 +435,7 @@ var BaseClient = /** @class */ (function () {
     BaseClient.prototype.getComponentSettingsListItem = function (groupName, name, index) {
         var getComponentSettingsListItemRequest = { groupName: groupName, name: name, index: index };
         return this.request('GetComponentSettingsListItem', getComponentSettingsListItemRequest)
-            .then(function (componentSettingsListItem) { return ComponentSettingsListItem.fromJS(componentSettingsListItem); })
+            .then(function (componentSettingsListItem) { return DTOs_1.ComponentSettingsListItem.fromJS(componentSettingsListItem); })
             .then(this.success())
             .catch(this.error());
     };
@@ -449,7 +450,7 @@ var BaseClient = /** @class */ (function () {
     BaseClient.prototype.setComponentSettingsListItem = function (groupName, name, index, item) {
         var setComponentSettingsListItemRequest = { groupName: groupName, name: name, index: index, item: item };
         return this.request('SetComponentSettingsListItem', setComponentSettingsListItemRequest)
-            .then(function (componentSettingsListItem) { return ComponentSettingsListItem.fromJS(componentSettingsListItem); })
+            .then(function (componentSettingsListItem) { return DTOs_1.ComponentSettingsListItem.fromJS(componentSettingsListItem); })
             .then(this.success())
             .catch(this.error());
     };
@@ -469,7 +470,7 @@ var BaseClient = /** @class */ (function () {
             propertyName: propertyName,
         };
         return this.request('GetComponentSettingDataGrid', getComponentSettingDataGridRequest)
-            .then(function (dataGridControl) { return DataGridControl.fromJS(dataGridControl); })
+            .then(function (dataGridControl) { return DTOs_1.DataGridControl.fromJS(dataGridControl); })
             .then(this.success())
             .catch(this.error());
     };
@@ -491,7 +492,7 @@ var BaseClient = /** @class */ (function () {
             dataGridControl: dataGridControl,
         };
         return this.request('SetComponentSettingDataGrid', setComponentSettingDataGridRequest)
-            .then(function (dataGridControl) { return DataGridControl.fromJS(dataGridControl); })
+            .then(function (dataGridControl) { return DTOs_1.DataGridControl.fromJS(dataGridControl); })
             .then(this.success())
             .catch(this.error());
     };
@@ -513,7 +514,7 @@ var BaseClient = /** @class */ (function () {
             typeName: typeName,
         };
         return this.request('AddComponentSettingDataGridItemType', addComponentSettingDataGridItemTypeRequest)
-            .then(function (dataGridControl) { return DataGridControl.fromJS(dataGridControl); })
+            .then(function (dataGridControl) { return DTOs_1.DataGridControl.fromJS(dataGridControl); })
             .then(this.success())
             .catch(this.error());
     };
@@ -533,7 +534,7 @@ var BaseClient = /** @class */ (function () {
             propertyName: propertyName,
         };
         return this.request('AddComponentSettingDataGridItem', getComponentSettingDataGridRequest)
-            .then(function (dataGridControl) { return DataGridControl.fromJS(dataGridControl); })
+            .then(function (dataGridControl) { return DTOs_1.DataGridControl.fromJS(dataGridControl); })
             .then(this.success())
             .catch(this.error());
     };
@@ -553,7 +554,7 @@ var BaseClient = /** @class */ (function () {
             propertyName: propertyName,
         };
         return this.request('GetComponentSettingDataGridTypes', getComponentSettingDataGridRequest)
-            .then(function (listItemTypes) { return listItemTypes.map(function (listItemType) { return ListItemType.fromJS(listItemType); }); })
+            .then(function (listItemTypes) { return listItemTypes.map(function (listItemType) { return DTOs_1.ListItemType.fromJS(listItemType); }); })
             .then(this.success())
             .catch(this.error());
     };
@@ -564,7 +565,7 @@ var BaseClient = /** @class */ (function () {
      */
     BaseClient.prototype.setComponentSettingsProfiles = function (returnedSettings) {
         return this.request('SetComponentSettingsProfiles', returnedSettings)
-            .then(function (profileGroups) { return profileGroups.map(function (profileGroup) { return ProfileGroup.fromJS(profileGroup); }); })
+            .then(function (profileGroups) { return profileGroups.map(function (profileGroup) { return DTOs_1.ProfileGroup.fromJS(profileGroup); }); })
             .then(this.success())
             .catch(this.error());
     };
@@ -574,7 +575,7 @@ var BaseClient = /** @class */ (function () {
      */
     BaseClient.prototype.getComponentSettingsProfiles = function () {
         return this.request('GetComponentSettingsProfiles')
-            .then(function (profileGroups) { return profileGroups.map(function (profileGroup) { return ProfileGroup.fromJS(profileGroup); }); })
+            .then(function (profileGroups) { return profileGroups.map(function (profileGroup) { return DTOs_1.ProfileGroup.fromJS(profileGroup); }); })
             .then(this.success())
             .catch(this.error());
     };
@@ -605,7 +606,7 @@ var BaseClient = /** @class */ (function () {
      */
     BaseClient.prototype.loadComponentSettingsFromRepository = function (packageReference) {
         return this.request('LoadComponentSettingsFromRepository', packageReference)
-            .then(function (errorResponses) { return errorResponses.map(function (errorResponse) { return ErrorResponse.fromJS(errorResponse); }); })
+            .then(function (errorResponses) { return errorResponses.map(function (errorResponse) { return DTOs_1.ErrorResponse.fromJS(errorResponse); }); })
             .then(this.success())
             .catch(this.error());
     };
@@ -628,7 +629,7 @@ var BaseClient = /** @class */ (function () {
     BaseClient.prototype.getComponentSettingsListAvailableTypes = function (groupName, name) {
         var getComponentSettingsRequest = { groupName: groupName, name: name };
         return this.request('GetComponentSettingsListAvailableTypes', getComponentSettingsRequest)
-            .then(function (listItemTypes) { return listItemTypes.map(function (listItemType) { return ListItemType.fromJS(listItemType); }); })
+            .then(function (listItemTypes) { return listItemTypes.map(function (listItemType) { return DTOs_1.ListItemType.fromJS(listItemType); }); })
             .then(this.success())
             .catch(this.error());
     };
@@ -642,7 +643,7 @@ var BaseClient = /** @class */ (function () {
     BaseClient.prototype.addComponentSettingsListItem = function (groupName, name, typeName) {
         var addComponentSettingsListItemRequest = { groupName: groupName, name: name, typeName: typeName };
         return this.request('AddComponentSettingsListItem', addComponentSettingsListItemRequest)
-            .then(function (componentSettingsBase) { return ComponentSettingsBase.fromJS(componentSettingsBase); })
+            .then(function (componentSettingsBase) { return DTOs_1.ComponentSettingsBase.fromJS(componentSettingsBase); })
             .then(this.success())
             .catch(this.error());
     };
@@ -662,4 +663,4 @@ var BaseClient = /** @class */ (function () {
     };
     return BaseClient;
 }());
-export { BaseClient };
+exports.BaseClient = BaseClient;