@opentap/runner-client 2.1.3-alpha.1.5 → 2.1.3-alpha.2.9

package/lib/BaseClient.d.ts

@@ -1,7 +1,5 @@
-/// <reference types="node" />
 import { ComponentSettingsBase, ComponentSettingsIdentifier, ComponentSettingsListItem, DataGridControl, ErrorResponse, FileParameter, FileResponse, ListItemType, ProfileGroup, RepositoryPackageReference, RepositorySettingsPackageDefinition, SettingsTapPackage } from './DTOs';
 import { ConnectionOptions, RequestOptions, Subscription, SubscriptionOptions } from 'nats.ws';
-import { EventEmitter } from 'events';
 export declare class BaseClient {
     private connection;
     private baseSubject;
@@ -105,12 +103,12 @@ export declare class BaseClient {
      * @param listener
      * @returns {EventEmitter}
      */
-    addErrorEventListener(listener: (...args: any[]) => void): EventEmitter;
+    addErrorEventListener(listener: (...args: any[]) => void): void;
     /**
      * Remove an error-event listener.
      * @param listener
      */
-    removeAllErrorEventListener(): void;
+    removeErrorEventListener(listener: (...args: any[]) => void): void;
     /**
      * Retrieve component settings overview
      * @returns {{Promise<ComponentSettingsIdentifier[]>}}

package/lib/BaseClient.js

@@ -58,6 +58,10 @@ import { ComponentSettingsBase, ComponentSettingsIdentifier, ComponentSettingsLi
 import { Empty, ErrorCode, JSONCodec, StringCodec, connect, headers, } from 'nats.ws';
 import { EventEmitter } from 'events';
 var DEFAULT_TIMEOUT = 6000;
+var Events;
+(function (Events) {
+    Events["ERROR"] = "error_event";
+})(Events || (Events = {}));
 var BaseClient = /** @class */ (function () {
     function BaseClient(baseSubject, options) {
         this.domainAccess = new Map();
@@ -139,7 +143,7 @@ var BaseClient = /** @class */ (function () {
                                 }
                                 if (_this.isErrorResponse(response)) {
                                     var error = ErrorResponse.fromJS(response);
-                                    _this.eventEmitter.emit('errorEvent', error);
+                                    _this.eventEmitter.emit(Events.ERROR, error);
                                     return Promise.reject(error);
                                 }
                                 return Promise.resolve(response);
@@ -167,7 +171,7 @@ var BaseClient = /** @class */ (function () {
             default:
                 errorResponse.message = error.message;
         }
-        this.eventEmitter.emit('errorEvent', errorResponse);
+        this.eventEmitter.emit(Events.ERROR, errorResponse);
         return errorResponse;
     };
     /**
@@ -261,7 +265,12 @@ var BaseClient = /** @class */ (function () {
                             }).then(function (byteArray) {
                                 var jsonCodec = JSONCodec();
                                 var response = jsonCodec.decode(byteArray);
-                                return _this.isErrorResponse(response) ? Promise.reject(ErrorResponse.fromJS(response)) : Promise.resolve(response);
+                                if (_this.isErrorResponse(response)) {
+                                    var error = ErrorResponse.fromJS(response);
+                                    _this.eventEmitter.emit(Events.ERROR, error);
+                                    return Promise.reject(error);
+                                }
+                                return Promise.resolve(response);
                             })];
                 }
             });
@@ -324,7 +333,12 @@ var BaseClient = /** @class */ (function () {
                             return Promise.resolve(byteArray);
                         var jsonCodec = JSONCodec();
                         var response = jsonCodec.decode(byteArray);
-                        return _this.isErrorResponse(response) ? Promise.reject(ErrorResponse.fromJS(response)) : Promise.resolve(response);
+                        if (_this.isErrorResponse(response)) {
+                            var error = ErrorResponse.fromJS(response);
+                            _this.eventEmitter.emit(Events.ERROR, error);
+                            return Promise.reject(error);
+                        }
+                        return Promise.resolve(response);
                     })];
             });
         });
@@ -385,7 +399,7 @@ var BaseClient = /** @class */ (function () {
                                 _this.connection = null;
                             }).catch(function (error) {
                                 throw new Error("failed to close connection: ".concat(error));
-                            }).finally(function () { return _this === null || _this === void 0 ? void 0 : _this.removeAllErrorEventListener(); }))];
+                            }))];
                     case 1:
                         _b.sent();
                         _b.label = 2;
@@ -427,15 +441,15 @@ var BaseClient = /** @class */ (function () {
      */
     BaseClient.prototype.addErrorEventListener = function (listener) {
         var _a;
-        return (_a = this.eventEmitter) === null || _a === void 0 ? void 0 : _a.addListener('errorEvent', listener);
+        (_a = this.eventEmitter) === null || _a === void 0 ? void 0 : _a.addListener(Events.ERROR, listener);
     };
     /**
      * Remove an error-event listener.
      * @param listener
      */
-    BaseClient.prototype.removeAllErrorEventListener = function () {
+    BaseClient.prototype.removeErrorEventListener = function (listener) {
         var _a;
-        (_a = this.eventEmitter) === null || _a === void 0 ? void 0 : _a.removeAllListeners('errorEvent');
+        (_a = this.eventEmitter) === null || _a === void 0 ? void 0 : _a.removeListener(Events.ERROR, listener);
     };
     /**
      * Retrieve component settings overview

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opentap/runner-client",
-  "version": "2.1.3-alpha.1.5",
+  "version": "2.1.3-alpha.2.9",
   "description": "This is the web client for the OpenTAP Runner.",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",