@opentap/runner-client 2.0.0-alpha.2.14 → 2.0.0-alpha.2.16

package/lib/BaseClient.d.ts

@@ -28,7 +28,7 @@ export declare class BaseClient {
      * @param options (optional)
      * @returns Promise of an object
      */
-    protected request<T>(subject: string, payload?: any, options?: RequestOptions): Promise<T>;
+    protected request<T>(subject: string, payload?: any, options?: RequestOptions, isFullSubject?: boolean): Promise<T>;
     /**
      * Handle the error
      * @param error
@@ -63,7 +63,7 @@ export declare class BaseClient {
      * @param options (optional)
      * @returns Promise of an object
      */
-    protected requestChunked<T>(subject: string, options?: RequestOptions): Promise<T>;
+    protected requestChunked<T>(subject: string, options?: RequestOptions, isFullSubject?: boolean): Promise<T>;
     /**
      * Check if the the response is an error from the server.
      * @param {any} response

package/lib/BaseClient.js

@@ -109,14 +109,14 @@ var BaseClient = /** @class */ (function () {
      * @param options (optional)
      * @returns Promise of an object
      */
-    BaseClient.prototype.request = function (subject, payload, options) {
+    BaseClient.prototype.request = function (subject, payload, options, isFullSubject) {
         return __awaiter(this, void 0, void 0, function () {
             var stringCodec, data, headers, opts;
             var _this = this;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
-                        subject = "".concat(this.baseSubject, ".Request.").concat(subject);
+                        subject = isFullSubject ? subject : "".concat(this.baseSubject, ".Request.").concat(subject);
                         if (!this.connection)
                             return [2 /*return*/, Promise.reject("".concat(subject, ": Connection is down! Please try again!"))];
                         if (this.connection.isClosed())
@@ -197,7 +197,7 @@ var BaseClient = /** @class */ (function () {
      */
     BaseClient.prototype.sendChunked = function (subject, payload, options) {
         return __awaiter(this, void 0, void 0, function () {
-            var requestSubject, stringCodec, data, headers, opts, fileDescriptor, getChunk, message, i, response, jsonCodec;
+            var requestSubject, stringCodec, data, headers, opts, fileDescriptor, getChunk, dataSubject, message, i, response, jsonCodec;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -217,19 +217,21 @@ var BaseClient = /** @class */ (function () {
                             var offset = chunk * fileDescriptor.chunkSize;
                             return data.slice(offset, offset + fileDescriptor.chunkSize);
                         };
-                        this.request(subject, fileDescriptor);
-                        i = 0;
-                        _a.label = 1;
+                        return [4 /*yield*/, this.request(subject, fileDescriptor)];
                     case 1:
-                        if (!(i < fileDescriptor.numberOfChunks)) return [3 /*break*/, 4];
-                        return [4 /*yield*/, this.connection.request(requestSubject, getChunk(i), opts)];
+                        dataSubject = _a.sent();
+                        i = 0;
+                        _a.label = 2;
                     case 2:
-                        message = _a.sent();
-                        _a.label = 3;
+                        if (!(i < fileDescriptor.numberOfChunks)) return [3 /*break*/, 5];
+                        return [4 /*yield*/, this.connection.request(dataSubject, getChunk(i), opts)];
                     case 3:
-                        i++;
-                        return [3 /*break*/, 1];
+                        message = _a.sent();
+                        _a.label = 4;
                     case 4:
+                        i++;
+                        return [3 /*break*/, 2];
+                    case 5:
                         if (message && message.data.length !== 0) {
                             jsonCodec = JSONCodec();
                             response = jsonCodec.decode(message.data);
@@ -246,7 +248,7 @@ var BaseClient = /** @class */ (function () {
      * @param options (optional)
      * @returns Promise of an object
      */
-    BaseClient.prototype.requestChunked = function (subject, options) {
+    BaseClient.prototype.requestChunked = function (subject, options, isFullSubject) {
         return __awaiter(this, void 0, void 0, function () {
             var replySubject, requestSubject, headers, opts;
             var _this = this;
@@ -261,9 +263,9 @@ var BaseClient = /** @class */ (function () {
                 opts = __assign(__assign({}, options), { timeout: this.timeout, headers: headers });
                 // eslint-disable-next-line @typescript-eslint/no-unused-vars
                 return [2 /*return*/, new Promise(function (resolve, reject) {
-                        var numberOfChunks = 9999;
-                        var combinedResult = new Uint8Array([]);
+                        var numberOfChunks = -1;
                         var received = 0;
+                        var combinedResult = new Uint8Array([]);
                         var resolveIfComplete = function () {
                             if (received === numberOfChunks) {
                                 resolve(combinedResult);
@@ -279,7 +281,7 @@ var BaseClient = /** @class */ (function () {
                             message.respond(Empty);
                             resolveIfComplete();
                         };
-                        return _this.request(subject, replySubject, opts)
+                        return _this.request(subject, replySubject, opts, isFullSubject)
                             .then(function (fileDescriptor) { return FileDescriptor.fromJS(fileDescriptor); })
                             .then(function (fileDescriptor) {
                             numberOfChunks = fileDescriptor.numberOfChunks;

package/lib/SessionClient.js

@@ -217,7 +217,7 @@ var SessionClient = /** @class */ (function (_super) {
             return Promise.reject('The source of the provided resource is not a nats subject.');
         }
         var subject = resource.source.replace(runnerResourcePrefix, '');
-        return this.requestChunked(subject).then(this.success()).catch(this.error());
+        return this.requestChunked(subject, undefined, true).then(this.success()).catch(this.error());
     };
     /**
      * Load test plan using a test plan TapPackage from a repository

package/package.json

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