askui 0.6.1 → 0.7.1

package/dist/cjs/execution/ui-controller-client-interface.d.ts

@@ -14,7 +14,7 @@ import { ProxyAgentArgs } from '../shared/proxy-agent-args';
  * This can be used to reduce the inference time by reducing
  *  the request size in case of a bad internet connection.
  * But it can cause a decrease in the prediction quality.
- * @param {string} inferenceClientUrl - Default: https://inference.askui.com`
+ * @param {string} inferenceServerUrl - Default: https://inference.askui.com`
  * Address of the askui Inference server.
  * @param {AnnotationLevel} annotationLevel - Default: AnnotationLevel.DISABLED
  * Usage of annotate command

package/dist/cjs/lib/download-binaries.d.ts

@@ -7,7 +7,7 @@ declare enum SupportedPlatform {
     WIN32 = "win32"
 }
 export declare function platform(): SupportedPlatform;
-export declare function getBinaryPath(version: string): string;
+export declare function getBinaryFilePath(version: string): string;
 export declare function downloadServerBinaries(binaryVersion: string, proxyAgent?: {
     http: http.Agent;
     https: https.Agent;

package/dist/cjs/lib/download-binaries.js

@@ -1,13 +1,24 @@
 "use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.downloadServerBinaries = exports.getBinaryPath = exports.platform = void 0;
+exports.downloadServerBinaries = exports.getBinaryFilePath = exports.platform = void 0;
 const fs_1 = __importDefault(require("fs"));
 const got_1 = __importDefault(require("got"));
 const os_1 = __importDefault(require("os"));
 const path_1 = __importDefault(require("path"));
+const util_1 = require("util");
+const stream_1 = __importDefault(require("stream"));
 const path_2 = require("../utils/path");
 const logger_1 = require("./logger");
 var SupportedPlatform;
@@ -32,45 +43,47 @@ function platform() {
     throw new Error(`Platform "${pf}" is not supported.`);
 }
 exports.platform = platform;
-function buildBinaryNotAvailbleError(binaryVersion) {
-    return new Error(`It seems that the UI Controller version "${binaryVersion}" for your system "${platform()} ${os_1.default.arch}" is not availble, Please contact as at info@askui.com for more information`);
+function buildBinaryNotAvailableError(binaryVersion) {
+    return new Error(`There was an error during downloading and creating the askui UI Controller. You can try a fresh install.
+   If you specified a binary version it is possible that the askui UI Controller version "${binaryVersion}" 
+   for your system "${platform()} ${os_1.default.arch}" is not available. 
+   If this problem still occurs, please contact us at info@askui.com for more information`);
 }
-function getBinaryPath(version) {
+function getBinaryFilePath(version) {
     return path_1.default.join((0, path_2.getPathToNodeModulesRoot)(), 'release', version, ...binarySubPathsByPlatform[platform()]);
 }
-exports.getBinaryPath = getBinaryPath;
+exports.getBinaryFilePath = getBinaryFilePath;
 function getBinaryDownloadUrl(binaryVersion) {
     const baseUrl = `https://askui-public.s3.eu-central-1.amazonaws.com/releases/askui-ui-controller/${binaryVersion}`;
     const arch = os_1.default.arch();
     return `${baseUrl}/${platform()}/${arch}/${binarySubPathsByPlatform[platform()][1]}`;
 }
 function downloadServerBinaries(binaryVersion, proxyAgent) {
-    return new Promise((resolve, reject) => {
-        const url = getBinaryDownloadUrl(binaryVersion);
-        const binaryOutputPath = getBinaryPath(binaryVersion);
-        const binaryFolder = path_1.default.dirname(binaryOutputPath);
+    return __awaiter(this, void 0, void 0, function* () {
         logger_1.logger.info(`Start downloading UI Controller version "${binaryVersion}"`);
-        if (!(fs_1.default.existsSync(binaryFolder))) {
-            fs_1.default.mkdirSync(binaryFolder, { recursive: true });
-        }
+        const url = getBinaryDownloadUrl(binaryVersion);
+        const binaryFilePath = getBinaryFilePath(binaryVersion);
+        const binaryFolderPath = path_1.default.dirname(binaryFilePath);
+        const tempFilePath = path_1.default.join(binaryFolderPath, 'askui-ui-controller.temp');
+        const pipeline = (0, util_1.promisify)(stream_1.default.pipeline);
         const downloadStream = got_1.default.stream(url, proxyAgent ? { agent: proxyAgent } : {});
-        const fileWriterStream = fs_1.default.createWriteStream(binaryOutputPath);
-        downloadStream.on('error', () => {
-            reject();
-            fs_1.default.unlink(binaryOutputPath, (err) => { logger_1.logger.error(err); });
-            throw buildBinaryNotAvailbleError(binaryVersion);
-        });
-        fileWriterStream
-            .on('error', () => {
-            fs_1.default.unlink(binaryOutputPath, () => { });
-            reject(new Error('oops, an error during the downloaded occurred, try again with fresh install'));
-        })
-            .on('finish', () => {
-            logger_1.logger.info(`UI Controller version ${binaryVersion} for your system "${platform()} ${os_1.default.arch}" was downloaded`);
-            logger_1.logger.debug(`Binary of UI Controller is located at "${binaryOutputPath}".`);
-            resolve();
-        });
-        downloadStream.pipe(fileWriterStream);
+        const fileWriterStream = fs_1.default.createWriteStream(tempFilePath);
+        if (!(fs_1.default.existsSync(binaryFolderPath))) {
+            fs_1.default.mkdirSync(binaryFolderPath, { recursive: true });
+        }
+        try {
+            yield pipeline(downloadStream, fileWriterStream);
+            fs_1.default.rename(tempFilePath, binaryFilePath, () => {
+                logger_1.logger.info(`UI Controller version ${binaryVersion} for your system "${platform()} ${os_1.default.arch}" was downloaded`);
+                logger_1.logger.debug(`Binary of UI Controller is located at "${binaryFilePath}".`);
+            });
+        }
+        catch (error) {
+            logger_1.logger.error(error);
+            fs_1.default.unlink(tempFilePath, (err) => { logger_1.logger.error(err); });
+            throw buildBinaryNotAvailableError(binaryVersion);
+        }
+        return Promise.resolve();
     });
 }
 exports.downloadServerBinaries = downloadServerBinaries;

package/dist/cjs/lib/ui-controller-darwin.js

@@ -14,7 +14,7 @@ class UiControllerDarwin extends ui_controller_facade_1.UiControllerFacade {
         this.makeDiskImageExecutable();
     }
     getStartingCommand() {
-        return `"${path_1.default.dirname(this.binaryPath)}/askui-ui-controller.app/Contents/MacOS/askui-ui-controller"`;
+        return `"${path_1.default.dirname(this.binaryFilePath)}/askui-ui-controller.app/Contents/MacOS/askui-ui-controller"`;
     }
     makeDiskImageExecutable() {
         const mountPoint = '/Volumes/askui-ui-controller.dmg';
@@ -25,11 +25,11 @@ class UiControllerDarwin extends ui_controller_facade_1.UiControllerFacade {
             '-noautofsck',
             '-noautoopen',
             `-mountpoint "${mountPoint}"`,
-            `"${this.binaryPath}"`,
+            `"${this.binaryFilePath}"`,
         ].join(' '));
         const appBaseName = 'askui-ui-controller.app';
         const appSrcPath = `${mountPoint}/${appBaseName}`;
-        const appDestPath = `${path_1.default.dirname(this.binaryPath)}/${appBaseName}`;
+        const appDestPath = `${path_1.default.dirname(this.binaryFilePath)}/${appBaseName}`;
         fs_extra_1.default.removeSync(appDestPath);
         fs_extra_1.default.copySync(appSrcPath, appDestPath);
         (0, child_process_1.exec)(`hdiutil detach "${mountPoint}"`, (_exception, stdout) => logger_1.logger.debug(stdout));

package/dist/cjs/lib/ui-controller-facade.d.ts

@@ -1,6 +1,6 @@
 import { UiControllerArgs, UiControllerArgsWithDefaults } from './ui-controller-args';
 export declare abstract class UiControllerFacade {
-    protected binaryPath: string;
+    protected binaryFilePath: string;
     protected serverLogFile: string;
     protected readonly DefaultmaxWaitingForStartingInMs: number;
     start(args?: UiControllerArgs, maxWaitingForStartingInSeconds?: number): Promise<void>;
@@ -11,7 +11,6 @@ export declare abstract class UiControllerFacade {
     protected makeBinaryExecutable(): void;
     protected runPreStartChecks(): Promise<void>;
     protected waitUntilStarted(args: UiControllerArgsWithDefaults, maxWaitingForStartingInSeconds?: number): Promise<void>;
-    private isBinaryValid;
     private getBinary;
     private startWithDefaults;
 }

package/dist/cjs/lib/ui-controller-facade.js

@@ -27,7 +27,7 @@ const unkown_error_1 = require("./unkown-error");
 const proxy_builder_1 = require("../utils/proxy/proxy-builder");
 class UiControllerFacade {
     constructor() {
-        this.binaryPath = (0, download_binaries_1.getBinaryPath)('latest');
+        this.binaryFilePath = (0, download_binaries_1.getBinaryFilePath)('latest');
         this.DefaultmaxWaitingForStartingInMs = 30 * 1000;
     }
     start(args, maxWaitingForStartingInSeconds) {
@@ -35,7 +35,7 @@ class UiControllerFacade {
             yield this.runPreStartChecks();
             const argsWithDefaults = (0, ui_controller_args_1.createArgsWithDefaults)(args);
             const argsWithLogPath = this.serverLogFilePath(argsWithDefaults);
-            this.binaryPath = (0, download_binaries_1.getBinaryPath)(argsWithLogPath.binaryVersion);
+            this.binaryFilePath = (0, download_binaries_1.getBinaryFilePath)(argsWithLogPath.binaryVersion);
             yield this.getBinary(argsWithLogPath.binaryVersion, argsWithLogPath.overWriteBinary, argsWithLogPath.proxyAgents || (yield (0, proxy_builder_1.buildProxyAgentArgsFromEnvironment)()));
             this.makeBinaryExecutable();
             logger_1.logger.debug(`UI Controller log path "${this.serverLogFile}"`);
@@ -71,7 +71,7 @@ class UiControllerFacade {
         });
     }
     getStartingCommand() {
-        return `"${this.binaryPath}"`;
+        return `"${this.binaryFilePath}"`;
     }
     // eslint-disable-next-line class-methods-use-this
     makeBinaryExecutable() {
@@ -105,19 +105,14 @@ class UiControllerFacade {
             }
         });
     }
-    isBinaryValid() {
-        const sizeThresholdInMB = 100;
-        const binarysizeInMB = fs_extra_1.default.statSync(this.binaryPath).size / (1024 * 1024);
-        return binarysizeInMB > sizeThresholdInMB;
-    }
     getBinary(binaryVersion, overWriteBinary = false, proxyAgent) {
         return __awaiter(this, void 0, void 0, function* () {
-            if (!fs_extra_1.default.existsSync(this.binaryPath) || overWriteBinary || !this.isBinaryValid()) {
-                logger_1.logger.debug(`Currently, no binary of the UI Controller is available at "${this.binaryPath}"`);
+            if (!fs_extra_1.default.existsSync(this.binaryFilePath) || overWriteBinary) {
+                logger_1.logger.debug(`Currently, no binary of the UI Controller is available at "${this.binaryFilePath}"`);
                 yield (0, download_binaries_1.downloadServerBinaries)(binaryVersion, proxyAgent);
             }
             else {
-                logger_1.logger.debug(`Binary of UI Controller is already present at "${this.binaryPath}".`);
+                logger_1.logger.debug(`Binary of UI Controller is already present at "${this.binaryFilePath}".`);
             }
         });
     }

package/dist/cjs/lib/ui-controller-linux.js

@@ -19,7 +19,7 @@ const libfuse_error_1 = require("./libfuse-error");
 class UiControllerLinux extends ui_controller_facade_1.UiControllerFacade {
     // eslint-disable-next-line class-methods-use-this
     makeBinaryExecutable() {
-        (0, child_process_1.exec)(`chmod +x "${this.binaryPath}"`, (_exception, stdout) => logger_1.logger.debug(stdout));
+        (0, child_process_1.exec)(`chmod +x "${this.binaryFilePath}"`, (_exception, stdout) => logger_1.logger.debug(stdout));
     }
     // eslint-disable-next-line class-methods-use-this
     runPreStartChecks() {