@opentap/runner-client 2.0.0-alpha.2.13 → 2.0.0-alpha.2.15

package/lib/BaseClient.js

@@ -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);
@@ -264,6 +266,11 @@ var BaseClient = /** @class */ (function () {
                         var numberOfChunks = 9999;
                         var combinedResult = new Uint8Array([]);
                         var received = 0;
+                        var resolveIfComplete = function () {
+                            if (received === numberOfChunks) {
+                                resolve(combinedResult);
+                            }
+                        };
                         var subscription = _this.connection.subscribe(replySubject);
                         subscription.callback = function (error, message) {
                             if (error) {
@@ -272,15 +279,13 @@ var BaseClient = /** @class */ (function () {
                             combinedResult = new Uint8Array(__spreadArray(__spreadArray([], Array.from(combinedResult), true), Array.from(message === null || message === void 0 ? void 0 : message.data), true));
                             received++;
                             message.respond(Empty);
-                            if (received === numberOfChunks) {
-                                resolve(combinedResult);
-                            }
+                            resolveIfComplete();
                         };
-                        return _this.request(subject, replySubject, opts).then(function (fileDescriptor) {
+                        return _this.request(subject, replySubject, opts)
+                            .then(function (fileDescriptor) { return FileDescriptor.fromJS(fileDescriptor); })
+                            .then(function (fileDescriptor) {
                             numberOfChunks = fileDescriptor.numberOfChunks;
-                            if (received === numberOfChunks) {
-                                resolve(combinedResult);
-                            }
+                            resolveIfComplete();
                         });
                     }).then(function (byteArray) {
                         var jsonCodec = JSONCodec();

package/lib/DTOs.d.ts

@@ -449,7 +449,7 @@ export declare class FileDescriptor implements IFileDescriptor {
     private readonly defaultChunkSize;
     constructor(fileSize: number, chunkSize?: number);
     init(_data?: any): void;
-    static fromJS(data: any): Resource;
+    static fromJS(data: any): FileDescriptor;
     toJSON(data?: any): any;
 }
 export interface IFileDescriptor {

package/lib/DTOs.js

@@ -1318,7 +1318,7 @@ var FileDescriptor = /** @class */ (function () {
     };
     FileDescriptor.fromJS = function (data) {
         data = typeof data === 'object' ? data : {};
-        var result = new Resource();
+        var result = new FileDescriptor(0);
         result.init(data);
         return result;
     };

package/package.json

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