@opentap/runner-client 1.0.0-beta.73 → 1.0.0-beta.74

package/lib/BaseClient.d.ts

@@ -1,4 +1,4 @@
-import { ConnectionOptions, RequestOptions } from 'nats.ws/cjs/nats.js';
+import { ConnectionOptions, NatsConnection, RequestOptions } from 'nats.ws/cjs/nats.js';
 import { ComponentSettingsBase, ComponentSettingsIdentifier, ComponentSettingsListItem, DataGridControl, ErrorResponse, FileParameter, FileResponse, ListItemType, ProfileGroup, RepositoryPackageReference, RepositorySettingsPackageDefinition, SettingsTapPackage } from './DTOs';
 export declare class BaseClient {
     private _accessToken;
@@ -17,8 +17,10 @@ export declare class BaseClient {
     private _connectionOptions;
     /** Get connection options */
     get connectionOptions(): ConnectionOptions;
+    private _connection;
+    /** Get connection instance */
+    get connection(): NatsConnection;
     private domainAccess;
-    private natsConnection;
     constructor(baseSubject: string, options: ConnectionOptions);
     /**
      * Send a request to the nats server.
@@ -28,8 +30,15 @@ export declare class BaseClient {
      * @returns Promise of an object
      */
     protected request<T>(subject: string, payload?: any, options?: RequestOptions): Promise<T>;
+    /**
+     * Check if the the response is an error from the server.
+     * @param {any} response
+     * @returns {boolean}
+     */
+    private isErrorResponse;
     /**
      * Create a connection to the nats server.
+     * @param {ConnectionOptions} options
      */
     private connect;
     /**

package/lib/BaseClient.js

@@ -35,7 +35,8 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
     }
 };
 // ! import { connect, ConnectionOptions, Empty, JSONCodec, NatsConnection, RequestOptions, StringCodec } from 'nats.ws' if consuming this library in angular >= 13.
-import { connect, Empty, JSONCodec, StringCodec } from 'nats.ws/cjs/nats.js';
+import { connect, Empty, ErrorCode, JSONCodec, StringCodec } from 'nats.ws/cjs/nats.js';
+import { ErrorResponse, } from './DTOs';
 var BaseClient = /** @class */ (function () {
     function BaseClient(baseSubject, options) {
         this.domainAccess = new Map();
@@ -86,6 +87,14 @@ var BaseClient = /** @class */ (function () {
         enumerable: false,
         configurable: true
     });
+    Object.defineProperty(BaseClient.prototype, "connection", {
+        /** Get connection instance */
+        get: function () {
+            return this._connection;
+        },
+        enumerable: false,
+        configurable: true
+    });
     /**
      * Send a request to the nats server.
      * @param subject The subject to request
@@ -97,32 +106,50 @@ var BaseClient = /** @class */ (function () {
         var _a;
         return __awaiter(this, void 0, void 0, function () {
             var stringCodec, data;
+            var _this = this;
             return __generator(this, function (_b) {
                 switch (_b.label) {
                     case 0:
-                        if (!subject || ((_a = this.natsConnection) === null || _a === void 0 ? void 0 : _a.isClosed()))
+                        if (!subject || ((_a = this.connection) === null || _a === void 0 ? void 0 : _a.isClosed()))
                             return [2 /*return*/, Promise.reject()];
                         subject = "".concat(this.baseSubject, ".Request.").concat(subject);
                         stringCodec = StringCodec();
                         data = payload ? stringCodec.encode(JSON.stringify(payload)) : Empty;
-                        return [4 /*yield*/, this.natsConnection
+                        return [4 /*yield*/, this.connection
                                 .request(subject, data, options)
                                 .then(function (message) {
                                 var jsonCodec = JSONCodec();
-                                var responseData = jsonCodec.decode(message.data);
-                                // TODO: implement ErrorResponse handling when server returns an error;
-                                return Promise.resolve(responseData);
+                                var response = jsonCodec.decode(message === null || message === void 0 ? void 0 : message.data);
+                                return _this.isErrorResponse(response)
+                                    ? Promise.reject("".concat(JSON.stringify(ErrorResponse.fromJS(response))))
+                                    : Promise.resolve(response);
                             })
                                 .catch(function (error) {
-                                return Promise.reject(new Error("Request failed: ".concat(error)));
+                                switch (error === null || error === void 0 ? void 0 : error.code) {
+                                    case ErrorCode.NoResponders:
+                                        return Promise.reject("no responders to ".concat(subject));
+                                    case ErrorCode.Timeout:
+                                        return Promise.reject('request timed out');
+                                    default:
+                                        return Promise.reject(error);
+                                }
                             })];
                     case 1: return [2 /*return*/, _b.sent()];
                 }
             });
         });
     };
+    /**
+     * Check if the the response is an error from the server.
+     * @param {any} response
+     * @returns {boolean}
+     */
+    BaseClient.prototype.isErrorResponse = function (response) {
+        return response && typeof response === 'object' && ['Type', 'Message', 'StackTrace', 'Parameter'].every(function (prop) { return prop in response; });
+    };
     /**
      * Create a connection to the nats server.
+     * @param {ConnectionOptions} options
      */
     BaseClient.prototype.connect = function (options) {
         return __awaiter(this, void 0, void 0, function () {
@@ -133,7 +160,7 @@ var BaseClient = /** @class */ (function () {
                     case 0:
                         _a.trys.push([0, 2, , 3]);
                         return [4 /*yield*/, connect(options).then(function (connection) {
-                                _this.natsConnection = connection;
+                                _this._connection = connection;
                             })];
                     case 1:
                         _a.sent();
@@ -155,8 +182,8 @@ var BaseClient = /** @class */ (function () {
             return __generator(this, function (_b) {
                 switch (_b.label) {
                     case 0:
-                        if (!this.natsConnection) return [3 /*break*/, 2];
-                        return [4 /*yield*/, ((_a = this.natsConnection) === null || _a === void 0 ? void 0 : _a.close().catch(function (error) {
+                        if (!this._connection) return [3 /*break*/, 2];
+                        return [4 /*yield*/, ((_a = this._connection) === null || _a === void 0 ? void 0 : _a.close().catch(function (error) {
                                 throw new Error("failed to close connection: ".concat(error));
                             }))];
                     case 1:

package/package.json

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