@opentap/runner-client 2.3.1-alpha.1.1 → 2.3.2-alpha.1

package/lib/BaseClient.js

@@ -55,7 +55,7 @@ var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
     return to.concat(ar || Array.prototype.slice.call(from));
 };
 import { ComponentSettingsBase, ComponentSettingsIdentifier, ComponentSettingsListItem, DataGridControl, ErrorResponse, FileDescriptor, ListItemType, ProfileGroup, } from './DTOs';
-import { Empty, ErrorCode, JSONCodec, StringCodec, connect, headers, } from 'nats.ws';
+import { Empty, ErrorCode, JSONCodec, NatsError, StringCodec, connect, headers, } from 'nats.ws';
 import { EventEmitter } from 'events';
 var DEFAULT_TIMEOUT = 40000; // default timeout of 40 seconds
 var Events;
@@ -117,7 +117,7 @@ var BaseClient = /** @class */ (function () {
      */
     BaseClient.prototype.request = function (subject, payload, options, rawResponse, fullSubject) {
         return __awaiter(this, void 0, void 0, function () {
-            var data, headers, timeout, opts, fileDescriptor, getChunk, requestResponse, dataSubject, i, result, error;
+            var originalSubject, data, headers, timeout, opts, fileDescriptor, getChunk, requestResponse, dataSubject, i, result, error, ex_1;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -125,6 +125,7 @@ var BaseClient = /** @class */ (function () {
                         if (!fullSubject) {
                             subject = "".concat(this.baseSubject, ".Request.").concat(subject);
                         }
+                        originalSubject = subject;
                         if (!this.connection)
                             return [2 /*return*/, Promise.reject("".concat(subject, ": Connection is down! Please try again!"))];
                         if (this.connection.isClosed())
@@ -139,27 +140,31 @@ var BaseClient = /** @class */ (function () {
                             var offset = chunk * fileDescriptor.chunkSize;
                             return data.slice(offset, offset + fileDescriptor.chunkSize);
                         };
-                        dataSubject = subject;
-                        i = 0;
                         _a.label = 1;
                     case 1:
-                        if (!(i < fileDescriptor.numberOfChunks)) return [3 /*break*/, 4];
-                        return [4 /*yield*/, this.connection.request(dataSubject, getChunk(i), opts)];
+                        _a.trys.push([1, 9, , 10]);
+                        requestResponse = void 0;
+                        dataSubject = subject;
+                        i = 0;
+                        _a.label = 2;
                     case 2:
+                        if (!(i < fileDescriptor.numberOfChunks)) return [3 /*break*/, 5];
+                        return [4 /*yield*/, this.connection.request(dataSubject, getChunk(i), opts)];
+                    case 3:
                         requestResponse = _a.sent();
                         dataSubject = requestResponse.reply;
-                        _a.label = 3;
-                    case 3:
-                        i++;
-                        return [3 /*break*/, 1];
+                        _a.label = 4;
                     case 4:
-                        if (!(fileDescriptor.fileSize % fileDescriptor.chunkSize === 0)) return [3 /*break*/, 6];
-                        return [4 /*yield*/, this.connection.request(dataSubject, Empty, opts)];
+                        i++;
+                        return [3 /*break*/, 2];
                     case 5:
+                        if (!(fileDescriptor.fileSize % fileDescriptor.chunkSize === 0)) return [3 /*break*/, 7];
+                        return [4 /*yield*/, this.connection.request(dataSubject, Empty, opts)];
+                    case 6:
                         requestResponse = _a.sent();
-                        _a.label = 6;
-                    case 6: return [4 /*yield*/, this.downloadChunkedRequest(requestResponse, rawResponse, opts)];
-                    case 7:
+                        _a.label = 7;
+                    case 7: return [4 /*yield*/, this.downloadChunkedRequest(requestResponse, rawResponse, opts)];
+                    case 8:
                         result = _a.sent();
                         if (this.isErrorResponse(result)) {
                             error = ErrorResponse.fromJS(result);
@@ -167,6 +172,16 @@ var BaseClient = /** @class */ (function () {
                             return [2 /*return*/, Promise.reject(error)];
                         }
                         return [2 /*return*/, result];
+                    case 9:
+                        ex_1 = _a.sent();
+                        if (ex_1 instanceof NatsError) {
+                            return [2 /*return*/, Promise.reject(this.natsErrorHandler(ex_1, originalSubject))];
+                        }
+                        else {
+                            return [2 /*return*/, Promise.reject(ex_1)];
+                        }
+                        return [3 /*break*/, 10];
+                    case 10: return [2 /*return*/];
                 }
             });
         });

package/package.json

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