@opentap/runner-client 2.17.0 → 2.18.0-alpha.1.1

package/lib/DTOs.d.ts

@@ -450,6 +450,18 @@ export interface IPictureControl extends ISetting {
     mimeType?: string | undefined;
     resource?: Resource | undefined;
 }
+export declare class PluginTypeSelectorControl extends Setting implements IPluginTypeSelectorControl {
+    availableValues: AvailableValue[];
+    selectedIndex?: number;
+    constructor(data?: IPluginTypeSelectorControl);
+    init(_data?: any): void;
+    static fromJS(data: any): PluginTypeSelectorControl;
+    toJSON(data?: any): any;
+}
+export interface IPluginTypeSelectorControl extends ISetting {
+    availableValues: AvailableValue[];
+    selectedIndex?: number;
+}
 export declare class Resource implements IResource {
     source?: string | undefined;
     constructor(data?: IResource);

package/lib/DTOs.js

@@ -526,6 +526,11 @@ var Setting = /** @class */ (function (_super) {
             result_14.init(data);
             return result_14;
         }
+        if (data['ControlType'] === 'PluginTypeSelectorControl') {
+            var result_15 = new PluginTypeSelectorControl();
+            result_15.init(data);
+            return result_15;
+        }
         var result = new Setting();
         result.init(data);
         return result;
@@ -1017,9 +1022,9 @@ var TextBoxControl = /** @class */ (function (_super) {
     TextBoxControl.fromJS = function (data) {
         data = typeof data === 'object' ? data : {};
         if (data['ControlType'] === 'ComboBoxControl') {
-            var result_15 = new ComboBoxControl();
-            result_15.init(data);
-            return result_15;
+            var result_16 = new ComboBoxControl();
+            result_16.init(data);
+            return result_16;
         }
         var result = new TextBoxControl();
         result.init(data);
@@ -1318,6 +1323,49 @@ var PictureControl = /** @class */ (function (_super) {
     return PictureControl;
 }(Setting));
 export { PictureControl };
+var PluginTypeSelectorControl = /** @class */ (function (_super) {
+    __extends(PluginTypeSelectorControl, _super);
+    function PluginTypeSelectorControl(data) {
+        var _this = _super.call(this, data) || this;
+        _this.availableValues = [];
+        _this._discriminator = 'PluginTypeSelectorControl';
+        return _this;
+    }
+    PluginTypeSelectorControl.prototype.init = function (_data) {
+        _super.prototype.init.call(this, _data);
+        if (_data) {
+            if (Array.isArray(_data['AvailableValues'])) {
+                this.availableValues = [];
+                for (var _i = 0, _a = _data['AvailableValues']; _i < _a.length; _i++) {
+                    var item = _a[_i];
+                    this.availableValues.push(AvailableValue.fromJS(item));
+                }
+            }
+            this.selectedIndex = _data['SelectedIndex'];
+        }
+    };
+    PluginTypeSelectorControl.fromJS = function (data) {
+        data = typeof data === 'object' ? data : {};
+        var result = new PluginTypeSelectorControl();
+        result.init(data);
+        return result;
+    };
+    PluginTypeSelectorControl.prototype.toJSON = function (data) {
+        data = typeof data === 'object' ? data : {};
+        if (Array.isArray(this.availableValues)) {
+            data['AvailableValues'] = [];
+            for (var _i = 0, _a = this.availableValues; _i < _a.length; _i++) {
+                var item = _a[_i];
+                data['AvailableValues'].push(item.toJSON());
+            }
+        }
+        data['SelectedIndex'] = this.selectedIndex;
+        _super.prototype.toJSON.call(this, data);
+        return data;
+    };
+    return PluginTypeSelectorControl;
+}(Setting));
+export { PluginTypeSelectorControl };
 var Resource = /** @class */ (function () {
     function Resource(data) {
         if (data) {
@@ -1673,40 +1721,40 @@ var SessionEventArgs = /** @class */ (function () {
     SessionEventArgs.fromJS = function (data) {
         data = typeof data === 'object' ? data : {};
         if (data['SessionEventType'] === 'SessionStartInitiated') {
-            var result_16 = new SessionStartInitiated();
-            result_16.init(data);
-            return result_16;
-        }
-        if (data['SessionEventType'] === 'SessionStarted') {
-            var result_17 = new SessionStarted();
+            var result_17 = new SessionStartInitiated();
             result_17.init(data);
             return result_17;
         }
-        if (data['SessionEventType'] === 'SessionStartFailed') {
-            var result_18 = new SessionStartFailed();
+        if (data['SessionEventType'] === 'SessionStarted') {
+            var result_18 = new SessionStarted();
             result_18.init(data);
             return result_18;
         }
-        if (data['SessionEventType'] === 'SessionShutdownInitiated') {
-            var result_19 = new SessionShutdownInitiated();
+        if (data['SessionEventType'] === 'SessionStartFailed') {
+            var result_19 = new SessionStartFailed();
             result_19.init(data);
             return result_19;
         }
-        if (data['SessionEventType'] === 'SessionShutdown') {
-            var result_20 = new SessionShutdown();
+        if (data['SessionEventType'] === 'SessionShutdownInitiated') {
+            var result_20 = new SessionShutdownInitiated();
             result_20.init(data);
             return result_20;
         }
-        if (data['SessionEventType'] === 'SessionShutdownFailed') {
-            var result_21 = new SessionShutdownFailed();
+        if (data['SessionEventType'] === 'SessionShutdown') {
+            var result_21 = new SessionShutdown();
             result_21.init(data);
             return result_21;
         }
-        if (data['SessionEventType'] === 'SessionInactivityLimitHit') {
-            var result_22 = new SessionInactivityLimitHit();
+        if (data['SessionEventType'] === 'SessionShutdownFailed') {
+            var result_22 = new SessionShutdownFailed();
             result_22.init(data);
             return result_22;
         }
+        if (data['SessionEventType'] === 'SessionInactivityLimitHit') {
+            var result_23 = new SessionInactivityLimitHit();
+            result_23.init(data);
+            return result_23;
+        }
         var result = new SessionEventArgs();
         result.init(data);
         return result;
@@ -1918,20 +1966,20 @@ var ImageEventArgs = /** @class */ (function () {
     ImageEventArgs.fromJS = function (data) {
         data = typeof data === 'object' ? data : {};
         if (data['ImageEventType'] === 'ImageCreating') {
-            var result_23 = new ImageCreating();
-            result_23.init(data);
-            return result_23;
-        }
-        if (data['ImageEventType'] === 'ImageCreated') {
-            var result_24 = new ImageCreated();
+            var result_24 = new ImageCreating();
             result_24.init(data);
             return result_24;
         }
-        if (data['ImageEventType'] === 'ImageCreationFailed') {
-            var result_25 = new ImageCreationFailed();
+        if (data['ImageEventType'] === 'ImageCreated') {
+            var result_25 = new ImageCreated();
             result_25.init(data);
             return result_25;
         }
+        if (data['ImageEventType'] === 'ImageCreationFailed') {
+            var result_26 = new ImageCreationFailed();
+            result_26.init(data);
+            return result_26;
+        }
         var result = new ImageEventArgs();
         result.init(data);
         return result;
@@ -2342,9 +2390,9 @@ var TestStep = /** @class */ (function () {
     TestStep.fromJS = function (data) {
         data = typeof data === 'object' ? data : {};
         if (data['TestStepTypeOrInstance'] === 'TestStepType') {
-            var result_26 = new TestStepType();
-            result_26.init(data);
-            return result_26;
+            var result_27 = new TestStepType();
+            result_27.init(data);
+            return result_27;
         }
         var result = new TestStep();
         result.init(data);
@@ -3028,70 +3076,70 @@ var SessionEvent = /** @class */ (function () {
     SessionEvent.fromJS = function (data) {
         data = typeof data === 'object' ? data : {};
         if (data['discriminator'] === 'SessionTimeoutEventArgs') {
-            var result_27 = new SessionTimeoutEventArgs();
-            result_27.init(data);
-            return result_27;
-        }
-        if (data['discriminator'] === 'StartingEventArgs') {
-            var result_28 = new StartingEventArgs();
+            var result_28 = new SessionTimeoutEventArgs();
             result_28.init(data);
             return result_28;
         }
-        if (data['discriminator'] === 'StartedEventArgs') {
-            var result_29 = new StartedEventArgs();
+        if (data['discriminator'] === 'StartingEventArgs') {
+            var result_29 = new StartingEventArgs();
             result_29.init(data);
             return result_29;
         }
-        if (data['discriminator'] === 'StoppingEventArgs') {
-            var result_30 = new StoppingEventArgs();
+        if (data['discriminator'] === 'StartedEventArgs') {
+            var result_30 = new StartedEventArgs();
             result_30.init(data);
             return result_30;
         }
-        if (data['discriminator'] === 'StoppedEventArgs') {
-            var result_31 = new StoppedEventArgs();
+        if (data['discriminator'] === 'StoppingEventArgs') {
+            var result_31 = new StoppingEventArgs();
             result_31.init(data);
             return result_31;
         }
-        if (data['discriminator'] === 'TestPlanChangeEventArgs') {
-            var result_32 = new TestPlanChangeEventArgs();
+        if (data['discriminator'] === 'StoppedEventArgs') {
+            var result_32 = new StoppedEventArgs();
             result_32.init(data);
             return result_32;
         }
-        if (data['discriminator'] === 'TestPlanExecutionStateChangedEventArgs') {
-            var result_33 = new TestPlanExecutionStateChangedEventArgs();
+        if (data['discriminator'] === 'TestPlanChangeEventArgs') {
+            var result_33 = new TestPlanChangeEventArgs();
             result_33.init(data);
             return result_33;
         }
-        if (data['discriminator'] === 'SettingsChangedEventArgs') {
-            var result_34 = new SettingsChangedEventArgs();
+        if (data['discriminator'] === 'TestPlanExecutionStateChangedEventArgs') {
+            var result_34 = new TestPlanExecutionStateChangedEventArgs();
             result_34.init(data);
             return result_34;
         }
-        if (data['discriminator'] === 'TestStepChangeEventArgs') {
-            var result_35 = new TestStepChangeEventArgs();
+        if (data['discriminator'] === 'SettingsChangedEventArgs') {
+            var result_35 = new SettingsChangedEventArgs();
             result_35.init(data);
             return result_35;
         }
-        if (data['discriminator'] === 'BreakEventArgs') {
-            var result_36 = new BreakEventArgs();
+        if (data['discriminator'] === 'TestStepChangeEventArgs') {
+            var result_36 = new TestStepChangeEventArgs();
             result_36.init(data);
             return result_36;
         }
-        if (data['discriminator'] === 'UserInputRequestEventArgs') {
-            var result_37 = new UserInputRequestEventArgs();
+        if (data['discriminator'] === 'BreakEventArgs') {
+            var result_37 = new BreakEventArgs();
             result_37.init(data);
             return result_37;
         }
-        if (data['discriminator'] === 'UserInputRequestCompletedEventArgs') {
-            var result_38 = new UserInputRequestCompletedEventArgs();
+        if (data['discriminator'] === 'UserInputRequestEventArgs') {
+            var result_38 = new UserInputRequestEventArgs();
             result_38.init(data);
             return result_38;
         }
-        if (data['discriminator'] === 'TestPlanSettingsChangedEventArgs') {
-            var result_39 = new TestPlanSettingsChangedEventArgs();
+        if (data['discriminator'] === 'UserInputRequestCompletedEventArgs') {
+            var result_39 = new UserInputRequestCompletedEventArgs();
             result_39.init(data);
             return result_39;
         }
+        if (data['discriminator'] === 'TestPlanSettingsChangedEventArgs') {
+            var result_40 = new TestPlanSettingsChangedEventArgs();
+            result_40.init(data);
+            return result_40;
+        }
         var result = new SessionEvent();
         result.init(data);
         return result;
@@ -3490,15 +3538,15 @@ var TestStepRunEvent = /** @class */ (function () {
     TestStepRunEvent.fromJS = function (data) {
         data = typeof data === 'object' ? data : {};
         if (data['discriminator'] === 'TestStepRunStartEventArgs') {
-            var result_40 = new TestStepRunStartEventArgs();
-            result_40.init(data);
-            return result_40;
-        }
-        if (data['discriminator'] === 'TestStepRunCompletedEventArgs') {
-            var result_41 = new TestStepRunCompletedEventArgs();
+            var result_41 = new TestStepRunStartEventArgs();
             result_41.init(data);
             return result_41;
         }
+        if (data['discriminator'] === 'TestStepRunCompletedEventArgs') {
+            var result_42 = new TestStepRunCompletedEventArgs();
+            result_42.init(data);
+            return result_42;
+        }
         var result = new TestStepRunEvent();
         result.init(data);
         return result;
@@ -3598,15 +3646,15 @@ var TestPlanRunEvent = /** @class */ (function () {
     TestPlanRunEvent.fromJS = function (data) {
         data = typeof data === 'object' ? data : {};
         if (data['discriminator'] === 'TestPlanRunStartEventArgs') {
-            var result_42 = new TestPlanRunStartEventArgs();
-            result_42.init(data);
-            return result_42;
-        }
-        if (data['discriminator'] === 'TestPlanRunCompletedEventArgs') {
-            var result_43 = new TestPlanRunCompletedEventArgs();
+            var result_43 = new TestPlanRunStartEventArgs();
             result_43.init(data);
             return result_43;
         }
+        if (data['discriminator'] === 'TestPlanRunCompletedEventArgs') {
+            var result_44 = new TestPlanRunCompletedEventArgs();
+            result_44.init(data);
+            return result_44;
+        }
         var result = new TestPlanRunEvent();
         result.init(data);
         return result;
@@ -3698,20 +3746,20 @@ var RunnerEvent = /** @class */ (function () {
     RunnerEvent.fromJS = function (data) {
         data = typeof data === 'object' ? data : {};
         if (data['type'] === 'RunnerRegisteredEvent') {
-            var result_44 = new RunnerRegisteredEvent();
-            result_44.init(data);
-            return result_44;
-        }
-        if (data['type'] === 'RunnerUpdatedEvent') {
-            var result_45 = new RunnerUpdatedEvent();
+            var result_45 = new RunnerRegisteredEvent();
             result_45.init(data);
             return result_45;
         }
-        if (data['type'] === 'RunnerDeletedEvent') {
-            var result_46 = new RunnerDeletedEvent();
+        if (data['type'] === 'RunnerUpdatedEvent') {
+            var result_46 = new RunnerUpdatedEvent();
             result_46.init(data);
             return result_46;
         }
+        if (data['type'] === 'RunnerDeletedEvent') {
+            var result_47 = new RunnerDeletedEvent();
+            result_47.init(data);
+            return result_47;
+        }
         var result = new RunnerEvent();
         result.init(data);
         return result;

package/lib/SessionClient.js

@@ -87,37 +87,45 @@ var SessionClient = /** @class */ (function (_super) {
      * @returns Subscription array: Result and Test Run subscriptions
      */
     SessionClient.prototype.connectSessionResults = function (resultHandler, testRunHandler, options) {
+        var resultCallback = function (error, encodedMessage) {
+            return new Promise(function (resolve) {
+                if (error) {
+                    resultHandler(undefined, error);
+                    return;
+                }
+                try {
+                    var jsonCodec = JSONCodec();
+                    var resultJs = jsonCodec.decode(encodedMessage === null || encodedMessage === void 0 ? void 0 : encodedMessage.data);
+                    var result = Result.fromJS(resultJs);
+                    resultHandler(result, error);
+                }
+                catch (error) {
+                    resultHandler(undefined, error);
+                }
+                resolve();
+            });
+        };
+        var testRunCallback = function (error, encodedMessage) {
+            return new Promise(function (resolve) {
+                if (error) {
+                    testRunHandler(undefined, error);
+                    return;
+                }
+                try {
+                    var jsonCodec = JSONCodec();
+                    var testRunJs = jsonCodec.decode(encodedMessage === null || encodedMessage === void 0 ? void 0 : encodedMessage.data);
+                    var testRun = TestRun.fromJS(testRunJs);
+                    testRunHandler(testRun, error);
+                }
+                catch (error) {
+                    testRunHandler(undefined, error);
+                }
+                resolve();
+            });
+        };
         return [
-            this.subscribe('OnResult', __assign(__assign({}, options), { callback: function (error, encodedMessage) {
-                    if (error) {
-                        resultHandler(undefined, error);
-                        return;
-                    }
-                    try {
-                        var jsonCodec = JSONCodec();
-                        var resultJs = jsonCodec.decode(encodedMessage === null || encodedMessage === void 0 ? void 0 : encodedMessage.data);
-                        var result = Result.fromJS(resultJs);
-                        resultHandler(result, error);
-                    }
-                    catch (error) {
-                        resultHandler(undefined, error);
-                    }
-                } })),
-            this.subscribe('OnTestRun', __assign(__assign({}, options), { callback: function (error, encodedMessage) {
-                    if (error) {
-                        testRunHandler(undefined, error);
-                        return;
-                    }
-                    try {
-                        var jsonCodec = JSONCodec();
-                        var testRunJs = jsonCodec.decode(encodedMessage === null || encodedMessage === void 0 ? void 0 : encodedMessage.data);
-                        var testRun = TestRun.fromJS(testRunJs);
-                        testRunHandler(testRun, error);
-                    }
-                    catch (error) {
-                        testRunHandler(undefined, error);
-                    }
-                } })),
+            this.subscribe('OnResult', __assign(__assign({}, options), { callback: resultCallback })),
+            this.subscribe('OnTestRun', __assign(__assign({}, options), { callback: testRunCallback })),
         ];
     };
     /**

package/package.json

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