@opentap/runner-client 1.1.0-beta.1 → 1.1.0-beta.10

package/lib/BaseClient.js

@@ -81,21 +81,22 @@ var BaseClient = /** @class */ (function () {
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
-                        if (!subject)
-                            return [2 /*return*/, Promise.reject('Subject is not defined!')];
+                        subject = "".concat(this.baseSubject, ".Request.").concat(subject);
                         if (!this.connection)
-                            return [2 /*return*/, Promise.reject('Connection is not up yet! Please try again later!')];
+                            return [2 /*return*/, Promise.reject("".concat(subject, ": Connection is down! Please try again!"))];
                         if (this.connection.isClosed())
-                            return [2 /*return*/, Promise.reject('Connection has been closed! Please reconnect!')];
-                        subject = "".concat(this.baseSubject, ".Request.").concat(subject);
+                            return [2 /*return*/, Promise.reject("".concat(subject, ": Connection has been closed! Please reconnect!"))];
                         stringCodec = StringCodec();
                         data = payload ? stringCodec.encode(JSON.stringify(payload)) : Empty;
                         opts = __assign(__assign({}, options), { timeout: this.timeout });
                         return [4 /*yield*/, this.connection
                                 .request(subject, data, opts)
                                 .then(function (message) {
-                                var jsonCodec = JSONCodec();
-                                var response = jsonCodec.decode(message === null || message === void 0 ? void 0 : message.data);
+                                var response;
+                                if ((message === null || message === void 0 ? void 0 : message.data.length) !== 0) {
+                                    var jsonCodec = JSONCodec();
+                                    response = jsonCodec.decode(message.data);
+                                }
                                 return _this.isErrorResponse(response)
                                     ? Promise.reject("".concat(JSON.stringify(ErrorResponse.fromJS(response))))
                                     : Promise.resolve(response);
@@ -103,11 +104,11 @@ var BaseClient = /** @class */ (function () {
                                 .catch(function (error) {
                                 switch (error === null || error === void 0 ? void 0 : error.code) {
                                     case ErrorCode.NoResponders:
-                                        return Promise.reject("no responders to ".concat(subject));
+                                        return Promise.reject("No responders to ".concat(subject));
                                     case ErrorCode.Timeout:
-                                        return Promise.reject('request timed out');
+                                        return Promise.reject("".concat(subject, " timed out"));
                                     default:
-                                        return Promise.reject(error);
+                                        return Promise.reject("".concat(subject, ": ").concat(error));
                                 }
                             })];
                     case 1: return [2 /*return*/, _a.sent()];
@@ -178,11 +179,14 @@ var BaseClient = /** @class */ (function () {
     BaseClient.prototype.close = function () {
         var _a;
         return __awaiter(this, void 0, void 0, function () {
+            var _this = this;
             return __generator(this, function (_b) {
                 switch (_b.label) {
                     case 0:
                         if (!this.connection) return [3 /*break*/, 2];
-                        return [4 /*yield*/, ((_a = this.connection) === null || _a === void 0 ? void 0 : _a.close().catch(function (error) {
+                        return [4 /*yield*/, ((_a = this.connection) === null || _a === void 0 ? void 0 : _a.close().then(function () {
+                                _this.connection = null;
+                            }).catch(function (error) {
                                 throw new Error("failed to close connection: ".concat(error));
                             }))];
                     case 1:

package/lib/SessionClient.d.ts

@@ -131,8 +131,9 @@ export declare class SessionClient extends BaseClient {
     /**
      * Set the name of the test plan
      * @param {string} testPlanName
+     * @return {Promise<void>}
      */
-    SetTestPlanName(testPlanName: string): Promise<void>;
+    setTestPlanName(testPlanName: string): Promise<void>;
     /**
      * Retrieve all validation errors present in the test plan
      * @return Retrieved validation errors for loaded TestPlan
@@ -246,7 +247,7 @@ export declare class SessionClient extends BaseClient {
      * @param {Parameter[]} parameters
      * @return RunStatus retrieved
      */
-    runTestPlanMetadata(parameters: Parameter[]): Promise<RunStatus>;
+    runTestPlan(parameters: Parameter[]): Promise<RunStatus>;
     /**
      * Abort test plan execution
      */

package/lib/SessionClient.js

@@ -280,8 +280,9 @@ var SessionClient = /** @class */ (function (_super) {
     /**
      * Set the name of the test plan
      * @param {string} testPlanName
+     * @return {Promise<void>}
      */
-    SessionClient.prototype.SetTestPlanName = function (testPlanName) {
+    SessionClient.prototype.setTestPlanName = function (testPlanName) {
         return this.request('SetTestPlanName', testPlanName).then(this.success()).catch(this.error());
     };
     /**
@@ -480,7 +481,7 @@ var SessionClient = /** @class */ (function (_super) {
      * Retrieve breakpoints set in test plan
      */
     SessionClient.prototype.getBreakpoints = function () {
-        return this.request('SetPauseNext')
+        return this.request('GetBreakpoints')
             .then(function (breakPointsJs) { return BreakPoints.fromJS(breakPointsJs); })
             .then(this.success())
             .catch(this.error());
@@ -508,8 +509,8 @@ var SessionClient = /** @class */ (function (_super) {
      * @param {Parameter[]} parameters
      * @return RunStatus retrieved
      */
-    SessionClient.prototype.runTestPlanMetadata = function (parameters) {
-        return this.request('RunTestPlanMetadata', parameters)
+    SessionClient.prototype.runTestPlan = function (parameters) {
+        return this.request('RunTestPlan', parameters)
             .then(function (runStatusJs) { return RunStatus.fromJS(runStatusJs); })
             .then(this.success())
             .catch(this.error());

package/package.json

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