@opentap/runner-client 2.14.0-alpha.1.4 → 2.14.0

package/lib/BaseClient.js

@@ -145,13 +145,20 @@ var BaseClient = /** @class */ (function () {
                 responsePromise = new Promise(function (resolve, reject) {
                     var messages = [];
                     subscription.callback = function (error, message) {
-                        var _a, _b, _c;
+                        var _a, _b, _c, _d;
                         if (error) {
                             return reject(error);
                         }
                         if (((_a = message.headers) === null || _a === void 0 ? void 0 : _a.code) === 503) {
                             return reject(Error('No responders.'));
                         }
+                        // If the message isn't chunked, we can assume the message is finished after a single message has been received.
+                        var chunkNumber = (_b = message.headers) === null || _b === void 0 ? void 0 : _b.get('ChunkNumber');
+                        // ChunkNumber starts from 1, so this check should be correct
+                        if (!chunkNumber) {
+                            subscription.unsubscribe();
+                            return resolve({ byteArray: message.data, isErrorResponse: ((_c = message.headers) === null || _c === void 0 ? void 0 : _c.get('OpenTapNatsError')) === 'true' });
+                        }
                         // Put all the response chunks in an array in the order they are received
                         messages.push(message);
                         // If the chunk has a size equal to the chunkSize, we should expect another message
@@ -164,28 +171,22 @@ var BaseClient = /** @class */ (function () {
                         // Check if the number of the final message is equal to the number of
                         // messages we received. If this is not the case, we dropped a chunk,
                         // likely due to a network error. In this case, the entire message is invalid.
-                        var finalMessage = message;
-                        var finalMessageNumber = (_b = finalMessage.headers) === null || _b === void 0 ? void 0 : _b.get('ChunkNumber');
-                        if (!finalMessageNumber) {
-                            return reject(Error('Response is not a valid chunk.'));
-                        }
-                        if (parseInt(finalMessageNumber) !== messages.length) {
+                        if (parseInt(chunkNumber) !== messages.length) {
                             return reject(Error("Expected {finalMessageNumber} chunks, but received ".concat(messages.length, ". ") +
                                 "The connection may have been interrupted."));
                         }
                         // Concatenate the payloads
                         // When there are many chunks, doing a single allocation
                         // is significantly faster than concatenating arrays in sequence
-                        var dataArrays = messages.map(function (m) { return m.data; });
-                        var flattenedSize = dataArrays.reduce(function (sum, array) { return sum + array.length; }, 0);
+                        var flattenedSize = messages.reduce(function (sum, array) { return sum + array.data.length; }, 0);
                         var flattenedArray = new Uint8Array(flattenedSize);
                         var k = 0;
-                        dataArrays.map(function (m) {
-                            for (var i = 0; i < m.length; i++) {
-                                flattenedArray[k++] = m[i];
+                        messages.forEach(function (m) {
+                            for (var i = 0; i < m.data.length; i++) {
+                                flattenedArray[k++] = m.data[i];
                             }
                         });
-                        return resolve({ byteArray: flattenedArray, isErrorResponse: ((_c = finalMessage.headers) === null || _c === void 0 ? void 0 : _c.get('OpenTapNatsError')) === 'true' });
+                        return resolve({ byteArray: flattenedArray, isErrorResponse: ((_d = message.headers) === null || _d === void 0 ? void 0 : _d.get('OpenTapNatsError')) === 'true' });
                     };
                 }).then(function (_a) {
                     var byteArray = _a.byteArray, isErrorResponse = _a.isErrorResponse;

package/lib/DTOs.d.ts

@@ -1,7 +1,7 @@
 export declare class Image implements IImage {
     name?: string | undefined;
-    packages?: PackageSpecifier[];
-    repositories?: string[];
+    packages?: PackageSpecifier[] | undefined;
+    repositories?: string[] | undefined;
     id?: string | undefined;
     constructor(data?: IImage);
     init(_data?: any): void;

package/lib/DTOs.js

@@ -15,8 +15,6 @@ var __extends = (this && this.__extends) || (function () {
 })();
 var Image = /** @class */ (function () {
     function Image(data) {
-        this.packages = [];
-        this.repositories = [];
         if (data) {
             for (var property in data) {
                 if (Object.prototype.hasOwnProperty.call(data, property))

package/lib/RunnerClient.d.ts

@@ -1,14 +1,7 @@
-import { Image, RepositoryPackageReference, Session } from './DTOs';
+import { Image, Session } from './DTOs';
 import { BaseClient } from './BaseClient';
 import { ConnectionOptions } from 'nats.ws';
 export declare class RunnerClient extends BaseClient {
-    default: {
-        startSession: (testPlanRepositoryReference?: RepositoryPackageReference, timeout?: number) => Promise<Session>;
-        getImage: () => Promise<Image>;
-        setImage: (image: Image) => Promise<Image>;
-        getSettings: () => Promise<RepositoryPackageReference | undefined>;
-        setSettings: (repositoryPackageReference: RepositoryPackageReference) => Promise<void>;
-    };
     constructor(baseSubject: string, options: ConnectionOptions);
     /**
      * Get the created image with the specified ID.
@@ -33,13 +26,6 @@ export declare class RunnerClient extends BaseClient {
      * @returns {{Promise<Image>}}
      */
     resolveImage(images: Image[], timeout?: number): Promise<Image>;
-    /**
-     * Dry runs to resolve an image from a list of images. Dry run means that no packages will be downloaded.
-     * @param {Image[]} images List of images
-     * @param {number} timeout Optional timeout in milliseconds
-     * @returns {{Promise<Image>}}
-     */
-    resolveImageDryRun(images: Image[], timeout?: number): Promise<Image>;
     /**
      * Shut down a session
      * @param sessionId the ID of the session to shut down

package/lib/RunnerClient.js

@@ -13,56 +13,12 @@ var __extends = (this && this.__extends) || (function () {
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
     };
 })();
-import { Image, RepositoryPackageReference, Session } from './DTOs';
+import { Image, Session } from './DTOs';
 import { BaseClient } from './BaseClient';
 var RunnerClient = /** @class */ (function (_super) {
     __extends(RunnerClient, _super);
     function RunnerClient(baseSubject, options) {
-        var _this = _super.call(this, baseSubject, options) || this;
-        // Contains the endpoints for Defaults in the runner plugin.
-        _this.default = {
-            /* Create a Session based on the dependencies of a TestPlan. Returned
-            Session will have referenced TestPlan pre-loaded. The Session will be
-            created with the base image and base settings. */
-            startSession: function (testPlanRepositoryReference, timeout) {
-                return _this.request('StartDefaultSession', testPlanRepositoryReference !== null && testPlanRepositoryReference !== void 0 ? testPlanRepositoryReference : null, { timeout: timeout })
-                    .then(function (sessionJs) { return Session.fromJS(sessionJs); })
-                    .then(_this.success())
-                    .catch(_this.error());
-            },
-            /* Gets the base image. The base image is always included in the image
-            creation process */
-            getImage: function () {
-                return _this.request('GetDefaultImage')
-                    .then(function (imageJs) { return Image.fromJS(imageJs); })
-                    .then(_this.success())
-                    .catch(_this.error());
-            },
-            /* Sets the base image. The specified image is resolved and set as the
-            base image */
-            setImage: function (image) {
-                return _this.request('SetDefaultImage', image)
-                    .then(function (imageJs) { return Image.fromJS(imageJs); })
-                    .then(_this.success())
-                    .catch(_this.error());
-            },
-            /* Gets the base settings package. The base settings is always included
-            in the image creation process and loaded into the created session */
-            getSettings: function () {
-                return _this.request('GetDefaultSettings')
-                    .then(function (repositoryPackageReferenceJs) {
-                    return repositoryPackageReferenceJs ? RepositoryPackageReference.fromJS(repositoryPackageReferenceJs) : undefined;
-                })
-                    .then(_this.success())
-                    .catch(_this.error());
-            },
-            /* Sets the base settings package. The base settings is always included
-            in the image creation process and loaded into the created session */
-            setSettings: function (repositoryPackageReference) {
-                return _this.request('SetDefaultSettings', repositoryPackageReference).then(_this.success()).catch(_this.error());
-            },
-        };
-        return _this;
+        return _super.call(this, baseSubject, options) || this;
     }
     /**
      * Get the created image with the specified ID.
@@ -111,20 +67,6 @@ var RunnerClient = /** @class */ (function (_super) {
                 .catch(this.error())
             : Promise.reject('images list is not defined or is empty');
     };
-    /**
-     * Dry runs to resolve an image from a list of images. Dry run means that no packages will be downloaded.
-     * @param {Image[]} images List of images
-     * @param {number} timeout Optional timeout in milliseconds
-     * @returns {{Promise<Image>}}
-     */
-    RunnerClient.prototype.resolveImageDryRun = function (images, timeout) {
-        return (images === null || images === void 0 ? void 0 : images.length) > 0
-            ? this.request('ResolveImageDryRun', images, { timeout: timeout })
-                .then(function (imageJs) { return Image.fromJS(imageJs); })
-                .then(this.success())
-                .catch(this.error())
-            : Promise.reject('images list is not defined or is empty');
-    };
     /**
      * Shut down a session
      * @param sessionId the ID of the session to shut down

package/package.json

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