bdy 1.22.9-dev → 1.22.12-dev

package/distTs/package.json

@@ -1,7 +1,7 @@
 {
   "name": "bdy",
   "preferGlobal": false,
-  "version": "1.22.9-dev",
+  "version": "1.22.12-dev",
   "type": "commonjs",
   "license": "MIT",
   "scripts": {

package/distTs/src/agent/agent.js

@@ -214,7 +214,7 @@ class Agent extends events_1.default {
         catch {
             // do nothing
         }
-        process.exit(0);
+        output_1.default.exitNormal();
     }
     refreshIn15(fetch = true, counter = 1) {
         setTimeout(async () => {

package/distTs/src/agent/manager.js

@@ -63,10 +63,10 @@ class AgentManagerClass {
                     this.connections.forEach((socket) => socket.resetAndDestroy());
                 }
                 this.server.close(() => {
-                    process.exit(0);
+                    output_1.default.exitNormal();
                 });
             }
-            setTimeout(() => process.exit(0), 1000);
+            setTimeout(() => output_1.default.exitNormal(), 1000);
         };
         process.on('SIGINT', onExit);
         process.on('SIGTERM', onExit);

package/distTs/src/command/agent/status.js

@@ -51,7 +51,7 @@ const outputStatus = (installed, standalone, version, id, running, enabled, targ
         output_1.default.normal('Problems: ');
         output_1.default.error(status);
     }
-    process.exit(0);
+    output_1.default.exitNormal();
 };
 commandAgentStatus.action(async () => {
     let version = '';

package/distTs/src/command/artifact/download.js

@@ -28,7 +28,7 @@ commandArtifactDownload.action(async (id, path, options) => {
     const workspace = input_1.default.restApiWorkspace(options.workspace);
     const project = input_1.default.restApiProject(options.project, true);
     // eslint-disable-next-line prefer-const
-    let { identifier, version } = input_1.default.artifactSplitIdentifier(id);
+    let { identifier, version } = input_1.default.artifactSplitIdentifier(id, false);
     const data = await client.getArtifactVersionByIdentifier(workspace, project, identifier, version);
     if (!data || !data.domain) {
         output_1.default.exitError(texts_1.ERR_WORKSPACE_NOT_FOUND);

package/distTs/src/command/artifact/publish.js

@@ -24,10 +24,7 @@ commandArtifactPublish.action(async (id, path, options) => {
     let dirPath = input_1.default.resolvePath(path);
     const workspace = input_1.default.restApiWorkspace(options.workspace);
     const project = input_1.default.restApiProject(options.project, true);
-    // eslint-disable-next-line prefer-const
-    let { identifier, version } = input_1.default.artifactSplitIdentifier(id);
-    if (!version)
-        version = v4();
+    const { identifier, version } = input_1.default.artifactSplitIdentifier(id, true);
     const client = input_1.default.restApiTokenClient();
     const data = await client.getArtifactVersionByIdentifier(workspace, project, identifier, version);
     if (!data || !data.domain) {

package/distTs/src/command/tests/visual/session/create.js

@@ -25,8 +25,7 @@ commandSessionCreate.action(async (command, options) => {
     const ctx = createVtContext();
     applyExecOptions(ctx, options);
     try {
-        const browserPath = await getBrowserPath();
-        ctx.browserPath = browserPath;
+        ctx.browserPath = await getBrowserPath();
     }
     catch (error) {
         output_1.default.exitError(`${error}`);
@@ -76,7 +75,7 @@ commandSessionCreate.action(async (command, options) => {
             const t2 = performance.now();
             output_1.default.normal((0, texts_1.DEBUG_EXEC_COMMAND)(t2 - t1));
         }
-        process.exit(spawnedProcessExitCode);
+        output_1.default.exitCode(spawnedProcessExitCode);
     }
     catch (error) {
         await app.close();

package/distTs/src/input.js

@@ -47,6 +47,7 @@ const texts_1 = require("./texts");
 const tunnel_1 = require("./types/tunnel");
 const node_path_1 = __importStar(require("node:path"));
 const cfg_1 = __importDefault(require("./tunnel/cfg"));
+const uuid_1 = require("uuid");
 class Input {
     static timeout(timeout) {
         const t = parseInt(timeout, 10);
@@ -524,16 +525,27 @@ class Input {
         }
         return w;
     }
-    static artifactSplitIdentifier(identifier) {
-        const s = (identifier || '').split('@');
-        if (s.length >= 2) {
-            return {
-                identifier: s[0],
-                version: s[1],
-            };
+    static artifactSplitIdentifier(identifierWithVersion, generateVersion) {
+        let identifier;
+        let version;
+        if (identifierWithVersion.includes(':')) {
+            const s = identifierWithVersion.split(':');
+            identifier = s.shift();
+            version = s.join(':');
         }
+        else if (identifierWithVersion.includes('@')) {
+            const s = identifierWithVersion.split('@');
+            identifier = s.shift();
+            version = s.join('@');
+        }
+        else {
+            identifier = identifierWithVersion;
+        }
+        if (!version && generateVersion)
+            version = (0, uuid_1.v4)();
         return {
-            identifier: s[0],
+            identifier,
+            version
         };
     }
     static restApiSandboxIsUpload(destPath) {

package/distTs/src/output.js

@@ -76,11 +76,15 @@ class Output {
         this.exitNormal(this.getGreenColor(msg));
     }
     static exitNormal(msg) {
-        this.killSpinner();
+        this.clearTerminal();
         if (msg)
             terminal(`${msg}\n`);
         process.exit(0);
     }
+    static exitCode(code) {
+        this.clearTerminal();
+        process.exit(code);
+    }
     static newline() {
         terminal('\n');
     }
@@ -238,11 +242,7 @@ class Output {
     static handleSignals() {
         terminal.on('key', (key) => {
             if (key === 'CTRL_C' || key === 'ESCAPE') {
-                terminal.fullscreen(false);
-                terminal.hideCursor(false);
-                terminal.grabInput(false);
-                terminal('\nCanceled\n');
-                process.exit(0);
+                Output.exitNormal('\nCanceled\n');
             }
         });
     }
@@ -398,11 +398,22 @@ class Output {
             return utils_1.REST_API_REGION.AS;
         return utils_1.REST_API_REGION.ONPREM;
     }
-    static exitError(err) {
+    static clearTerminal() {
         this.killSpinner();
+        terminal.styleReset();
         terminal.fullscreen(false);
         terminal.hideCursor(false);
         terminal.grabInput(false);
+        try {
+            const { getGlobalDispatcher } = require('undici');
+            getGlobalDispatcher().close();
+        }
+        catch {
+            // undici not available
+        }
+    }
+    static exitError(err) {
+        this.clearTerminal();
         const isDebug = process.env.DEBUG === '1';
         let msg;
         if (err instanceof Error) {

package/distTs/src/texts.js

@@ -366,9 +366,9 @@ exports.OPTION_PIPELINE_RUN_PRIORITY = 'Run priority. Can be one of "LOW", "NORM
 exports.OPTION_PIPELINE_RUN_VAR = 'Variable key:value. Can be passed multiple times to pass multiple variables';
 exports.OPTION_PIPELINE_RUN_DELAY = 'The date when the execution should be run. Should be set in the format: 2016-11-18T12:38:16.000Z or 30s, 10m, 3h10m30s';
 exports.OPTION_PIPELINE_RUN_ARGUMENT = 'Human-readable ID of the pipeline';
-exports.OPTION_ARTIFACT_PUBLISH_PATH = 'Path to the directory or file';
-exports.OPTION_ARTIFACT_DOWNLOAD_PATH = 'Path to the directory or file';
-exports.OPTION_ARTIFACT_ID = 'Human-readable ID of the artifact and optionally version: artifact@version';
+exports.OPTION_ARTIFACT_PUBLISH_PATH = 'Path to the directory or file which will be published';
+exports.OPTION_ARTIFACT_DOWNLOAD_PATH = 'Path to the directory where version will be downloaded';
+exports.OPTION_ARTIFACT_ID = 'Human-readable ID of the artifact and optionally version: artifact:version or artifact@version';
 exports.OPTION_ARTIFACT_PUBLISH_CREATE = 'Create artifact if not exists';
 exports.OPTION_ARTIFACT_PUBLISH_OVERWRITE_VERSION = 'Allow overwriting existing version';
 exports.OPTION_ARTIFACT_DOWNLOAD_MERGE = 'Merge contents of the directory with artifact';

package/distTs/src/tunnel/api/agent.js

@@ -20,7 +20,7 @@ const openSocket = (port, path) => {
 };
 const makeRequest = async (port, path, body) => {
     const c = new AbortController();
-    setTimeout(() => {
+    const timer = setTimeout(() => {
         c.abort();
     }, TIMEOUT);
     logger_1.default.debug(`TUNNEL API AGENT REQUEST: :${port}${path}`);
@@ -31,6 +31,7 @@ const makeRequest = async (port, path, body) => {
         method: 'POST',
         signal: c.signal,
     });
+    clearTimeout(timer);
     logger_1.default.debug(`TUNNEL API AGENT RESPONSE: ${response.status}`);
     if (response.status === 404) {
         throw new Error(texts_1.ERR_NOT_FOUND);

package/distTs/src/tunnel/output/interactive/tunnel.js

@@ -9,6 +9,7 @@ const termkit_no_lazy_require_1 = __importDefault(require("terminal-kit/lib/term
 const isbinaryfile_1 = require("isbinaryfile");
 const format_1 = __importDefault(require("../../../format"));
 const tunnel_1 = require("../../../types/tunnel");
+const output_1 = __importDefault(require("../../../output"));
 const COLOR_CYAN = 6;
 const COLOR_LIGHT_GRAY = 7;
 const COLOR_RED = 9;
@@ -848,10 +849,7 @@ class OutputInteractiveTunnel {
         });
     }
     terminate() {
-        this.terminal.fullscreen(false);
-        this.terminal.hideCursor(false);
-        this.terminal.grabInput(false);
-        process.exit();
+        output_1.default.exitNormal();
     }
     animate() {
         this.draw();

package/distTs/src/tunnel/output/noninteractive/tunnel.js

@@ -5,6 +5,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 const format_1 = __importDefault(require("../../../format"));
 const tunnel_1 = require("../../../types/tunnel");
+const output_1 = __importDefault(require("../../../output"));
 class OutputNoninteractiveTunnel {
     tunnel;
     terminal;
@@ -43,7 +44,7 @@ class OutputNoninteractiveTunnel {
         this.status(t, `Response ${logRequest.method} ${logRequest.url} ${logRequest.status} in ${logRequest.time}ms`);
     }
     onStopped() {
-        process.exit();
+        output_1.default.exitNormal();
     }
     start() {
         this.tunnel.on(tunnel_1.TUNNEL_EVENT.OPEN, (t) => this.onOpen(t));

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "bdy",
   "preferGlobal": false,
-  "version": "1.22.9-dev",
+  "version": "1.22.12-dev",
   "type": "commonjs",
   "license": "MIT",
   "scripts": {