@opentap/runner-client 2.11.0-alpha.1.2 → 2.11.0-alpha.1.3

package/lib/SystemClient.d.ts

@@ -1,5 +1,5 @@
 import { ConnectionOptions, Subscription, SubscriptionOptions } from 'nats.ws';
-import { ErrorResponse, RunnerDeletedEvent, RunnerRegisteredEvent, RunnerUpdatedEvent, TestPlanRunCompletedEventArgs, TestPlanRunStartEventArgs, TestStepRunCompletedEventArgs, TestStepRunStartEventArgs } from './DTOs';
+import { ErrorResponse, RunnerEvent, TestPlanRunCompletedEventArgs, TestPlanRunStartEventArgs, TestStepRunCompletedEventArgs, TestStepRunStartEventArgs } from './DTOs';
 import { BaseClient } from './BaseClient';
 export interface RunnerLifetimeEvent {
     RunnerId: string;
@@ -15,30 +15,14 @@ export declare class SystemClient extends BaseClient {
      * @returns {Subscription}
      */
     subscribeLifetimeEventListener(listener: (error: ErrorResponse | null, message: RunnerLifetimeEvent | null) => void, options?: SubscriptionOptions): Subscription;
-    /**
-     * Subscribe to the runner registered events for the given Runner ID.
-     * Wildcard can be used to receive all runner registered events.
-     * @param  {string} runnerId
-     * @param  {(error:ErrorResponse|null,message:RunnerRegisteredEvent|null)=>void} listener
-     * @param  {SubscriptionOptions} options?
-     */
-    subscribeRunnerRegisteredEvents(runnerId: string, listener: (error: ErrorResponse | null, message: RunnerRegisteredEvent | null) => void, options?: SubscriptionOptions): Subscription;
     /**
      * Subscribe to the runner updated events for the given Runner ID.
      * Wildcard can be used to receive all runner updated events.
      * @param  {string} runnerId
-     * @param  {(error:ErrorResponse|null,message:RunnerUpdatedEvent|null)=>void} listener
-     * @param  {SubscriptionOptions} options?
-     */
-    subscribeRunnerUpdatedEvents(runnerId: string, listener: (error: ErrorResponse | null, message: RunnerUpdatedEvent | null) => void, options?: SubscriptionOptions): Subscription;
-    /**
-     * Subscribe to the runner deleted events for the given Runner ID.
-     * Wildcard can be used to receive all runner deleted events.
-     * @param  {string} runnerId
-     * @param  {(error:ErrorResponse|null,message:RunnerDeletedEvent|null)=>void} listener
+     * @param  {(error:ErrorResponse|null,message:RunnerEvent|null)=>void} listener
      * @param  {SubscriptionOptions} options?
      */
-    subscribeRunnerDeletedEvents(runnerId: string, listener: (error: ErrorResponse | null, message: RunnerDeletedEvent | null) => void, options?: SubscriptionOptions): Subscription;
+    subscribeRunnerUpdatedEvents(runnerId: string, listener: (error: ErrorResponse | null, message: RunnerEvent | null) => void, options?: SubscriptionOptions): Subscription;
     /**
      * Subscribe to the test step run start events for the given Runner and Run ID.
      * Wildcard can be used for the Runner or Run ID to receive all test step run start events.

package/lib/SystemClient.js

@@ -25,7 +25,7 @@ var __assign = (this && this.__assign) || function () {
     return __assign.apply(this, arguments);
 };
 import { JSONCodec } from 'nats.ws';
-import { TestPlanRunCompletedEventArgs, TestPlanRunStartEventArgs, TestStepRunCompletedEventArgs, TestStepRunStartEventArgs, } from './DTOs';
+import { RunnerEvent, TestPlanRunCompletedEventArgs, TestPlanRunStartEventArgs, TestStepRunCompletedEventArgs, TestStepRunStartEventArgs, } from './DTOs';
 import { BaseClient } from './BaseClient';
 var SystemClient = /** @class */ (function (_super) {
     __extends(SystemClient, _super);
@@ -56,36 +56,11 @@ var SystemClient = /** @class */ (function (_super) {
                 }
             } }));
     };
-    /**
-     * Subscribe to the runner registered events for the given Runner ID.
-     * Wildcard can be used to receive all runner registered events.
-     * @param  {string} runnerId
-     * @param  {(error:ErrorResponse|null,message:RunnerRegisteredEvent|null)=>void} listener
-     * @param  {SubscriptionOptions} options?
-     */
-    SystemClient.prototype.subscribeRunnerRegisteredEvents = function (runnerId, listener, options) {
-        var _this = this;
-        var subject = "RunnerRegistry.".concat(runnerId, ".Events.Registered");
-        return this.subscribe(subject, __assign(__assign({}, options), { callback: function (error, message) {
-                if (error) {
-                    listener(_this.natsErrorHandler(error, subject), null);
-                    return;
-                }
-                try {
-                    var jsonCodec = JSONCodec();
-                    var data = jsonCodec.decode(message === null || message === void 0 ? void 0 : message.data);
-                    listener(null, data);
-                }
-                catch (error) {
-                    listener(_this.natsErrorHandler(error, subject), null);
-                }
-            } }));
-    };
     /**
      * Subscribe to the runner updated events for the given Runner ID.
      * Wildcard can be used to receive all runner updated events.
      * @param  {string} runnerId
-     * @param  {(error:ErrorResponse|null,message:RunnerUpdatedEvent|null)=>void} listener
+     * @param  {(error:ErrorResponse|null,message:RunnerEvent|null)=>void} listener
      * @param  {SubscriptionOptions} options?
      */
     SystemClient.prototype.subscribeRunnerUpdatedEvents = function (runnerId, listener, options) {
@@ -98,32 +73,7 @@ var SystemClient = /** @class */ (function (_super) {
                 }
                 try {
                     var jsonCodec = JSONCodec();
-                    var data = jsonCodec.decode(message === null || message === void 0 ? void 0 : message.data);
-                    listener(null, data);
-                }
-                catch (error) {
-                    listener(_this.natsErrorHandler(error, subject), null);
-                }
-            } }));
-    };
-    /**
-     * Subscribe to the runner deleted events for the given Runner ID.
-     * Wildcard can be used to receive all runner deleted events.
-     * @param  {string} runnerId
-     * @param  {(error:ErrorResponse|null,message:RunnerDeletedEvent|null)=>void} listener
-     * @param  {SubscriptionOptions} options?
-     */
-    SystemClient.prototype.subscribeRunnerDeletedEvents = function (runnerId, listener, options) {
-        var _this = this;
-        var subject = "RunnerRegistry.".concat(runnerId, ".Events.Deleted");
-        return this.subscribe(subject, __assign(__assign({}, options), { callback: function (error, message) {
-                if (error) {
-                    listener(_this.natsErrorHandler(error, subject), null);
-                    return;
-                }
-                try {
-                    var jsonCodec = JSONCodec();
-                    var data = jsonCodec.decode(message === null || message === void 0 ? void 0 : message.data);
+                    var data = RunnerEvent.fromJS(jsonCodec.decode(message === null || message === void 0 ? void 0 : message.data));
                     listener(null, data);
                 }
                 catch (error) {

package/package.json

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