bdy 1.18.4-dev → 1.18.6-dev

package/distTs/src/command/sandbox/create.js

@@ -7,7 +7,6 @@ const utils_1 = require("../../utils");
 const texts_1 = require("../../texts");
 const output_1 = __importDefault(require("../../output"));
 const input_1 = __importDefault(require("../../input"));
-const human_id_1 = __importDefault(require("human-id"));
 const VALID_RESOURCES = [
     '1x2',
     '2x4',
@@ -31,16 +30,17 @@ commandSandboxCreate.option('-i, --identifier <identifier>', texts_1.OPTION_SAND
 commandSandboxCreate.option('--os <image>', texts_1.OPTION_SANDBOX_OS);
 commandSandboxCreate.option('--snapshot <snapshot-name>', texts_1.OPTION_SANDBOX_FROM_SNAPSHOT);
 commandSandboxCreate.option('--resources <spec>', texts_1.OPTION_SANDBOX_RESOURCES);
-commandSandboxCreate.option('--install-command <commands...>', texts_1.OPTION_SANDBOX_INSTALL_COMMANDS);
-commandSandboxCreate.option('--run-command <command>', texts_1.OPTION_SANDBOX_RUN_COMMAND);
+commandSandboxCreate.option('--boot-command <commands...>', texts_1.OPTION_SANDBOX_INSTALL_COMMANDS);
+commandSandboxCreate.option('--app-command <commands...>', texts_1.OPTION_SANDBOX_APP_COMMAND);
 commandSandboxCreate.option('--app-dir <directory>', texts_1.OPTION_SANDBOX_APP_DIR);
-commandSandboxCreate.option('--app-type <type>', texts_1.OPTION_SANDBOX_APP_TYPE);
 commandSandboxCreate.option('--tag <tags...>', texts_1.OPTION_SANDBOX_TAGS);
 commandSandboxCreate.option('--yaml <content|@path>', texts_1.OPTION_SANDBOX_YAML);
 commandSandboxCreate.option('--wait-for-running [seconds]', texts_1.OPTION_SANDBOX_WAIT_RUNNING);
 commandSandboxCreate.option('--wait-for-configured [seconds]', texts_1.OPTION_SANDBOX_WAIT_CONFIGURED);
+commandSandboxCreate.option('--wait-for-apps [seconds]', texts_1.OPTION_SANDBOX_WAIT_APPS);
 commandSandboxCreate.addHelpText('after', texts_1.EXAMPLE_SANDBOX_CREATE);
 commandSandboxCreate.action(async (options) => {
+    const humanId = require('human-id').default;
     const workspace = input_1.default.restApiWorkspace(options.workspace);
     const project = input_1.default.restApiProject(options.project);
     const client = input_1.default.restApiTokenClient();
@@ -58,7 +58,7 @@ commandSandboxCreate.action(async (options) => {
     }
     else {
         const timestamp = Date.now().toString(36);
-        const baseName = (0, human_id_1.default)({ separator: '-', capitalize: false });
+        const baseName = humanId({ separator: '-', capitalize: false });
         const defaultIdentifier = `${baseName}-${timestamp}`;
         const body = {
             name: options.name || options.identifier || baseName,
@@ -79,21 +79,18 @@ commandSandboxCreate.action(async (options) => {
         if (options.resources) {
             body.resources = options.resources;
         }
-        if (options.installCommand) {
-            body.install_commands = options.installCommand.join('\n');
+        if (options.bootCommand) {
+            body.first_boot_commands = options.bootCommand.join('\n');
         }
         if (options.tags) {
             body.tags = options.tags;
         }
-        if (options.runCommand) {
-            body.run_command = options.runCommand;
+        if (options.appCommand) {
+            body.apps = options.appCommand;
         }
         if (options.appDir) {
             body.app_dir = options.appDir;
         }
-        if (options.appType) {
-            body.app_type = options.app_type;
-        }
         output_1.default.normal((0, texts_1.TXT_SANDBOX_CREATING)(body.name, body.identifier));
         result = await client.createSandbox(workspace, project, body);
     }
@@ -124,6 +121,19 @@ commandSandboxCreate.action(async (options) => {
             output_1.default.exitError(texts_1.ERR_SANDBOX_SETUP_TIMEOUT);
         }
     }
+    if (options.waitForApps) {
+        output_1.default.normal(texts_1.TXT_SANDBOX_WAITING_APPS);
+        const timeout = parseInt(options.waitForApps, 10) || 300;
+        try {
+            const status = await client.sandboxWaitForApps(workspace, sandboxId, timeout);
+            if (status !== utils_1.SANDBOX_APP_STATUS.RUNNING) {
+                output_1.default.exitError(texts_1.ERR_SANDBOX_APP_FAILED);
+            }
+        }
+        catch {
+            output_1.default.exitError(texts_1.ERR_SANDBOX_APPS_TIMEOUT);
+        }
+    }
     output_1.default.exitSuccess((0, texts_1.TXT_SANDBOX_CREATED)(result.identifier, result.html_url));
 });
 exports.default = commandSandboxCreate;

package/distTs/src/command/sandbox/logs.js

@@ -0,0 +1,26 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const utils_1 = require("../../utils");
+const texts_1 = require("../../texts");
+const input_1 = __importDefault(require("../../input"));
+const output_1 = __importDefault(require("../../output"));
+const commandSandboxLogs = (0, utils_1.newCommand)('logs', texts_1.DESC_COMMAND_SANDBOX_LOGS);
+commandSandboxLogs.hideVersionUpdate = true;
+commandSandboxLogs.option('-w, --workspace <domain>', texts_1.OPTION_REST_API_WORKSPACE);
+commandSandboxLogs.option('-p, --project <name>', texts_1.OPTION_REST_API_PROJECT);
+commandSandboxLogs.argument('<identifier>', texts_1.OPTION_SANDBOX_IDENTIFIER);
+commandSandboxLogs.action(async (identifier, options) => {
+    const workspace = input_1.default.restApiWorkspace(options.workspace);
+    const project = input_1.default.restApiProject(options.project);
+    const client = input_1.default.restApiTokenClient();
+    const { sandbox_id } = await client.getSandboxByIdentifier(workspace, project, identifier);
+    if (!sandbox_id) {
+        output_1.default.exitError(texts_1.ERR_SANDBOX_NOT_FOUND);
+    }
+    const { boot_logs } = await client.getSandbox(workspace, sandbox_id);
+    output_1.default.exitNormal((boot_logs || []).join('\n'));
+});
+exports.default = commandSandboxLogs;

package/distTs/src/command/sandbox/snapshot/create.js

@@ -7,7 +7,6 @@ const utils_1 = require("../../../utils");
 const texts_1 = require("../../../texts");
 const output_1 = __importDefault(require("../../../output"));
 const input_1 = __importDefault(require("../../../input"));
-const human_id_1 = __importDefault(require("human-id"));
 const commandSandboxSnapshotCreate = (0, utils_1.newCommand)('create', texts_1.DESC_COMMAND_SANDBOX_SNAPSHOT_CREATE);
 commandSandboxSnapshotCreate.alias('add');
 commandSandboxSnapshotCreate.option('-w, --workspace <domain>', texts_1.OPTION_REST_API_WORKSPACE);
@@ -17,6 +16,7 @@ commandSandboxSnapshotCreate.argument('<identifier>', texts_1.OPTION_SANDBOX_IDE
 commandSandboxSnapshotCreate.option('--wait [seconds]', texts_1.OPTION_SANDBOX_WAIT);
 commandSandboxSnapshotCreate.addHelpText('after', `\nEXAMPLES:${texts_1.EXAMPLE_SANDBOX_SNAPSHOT_CREATE}`);
 commandSandboxSnapshotCreate.action(async (identifier, options) => {
+    const humanId = require('human-id').default;
     const workspace = input_1.default.restApiWorkspace(options.workspace);
     const project = input_1.default.restApiProject(options.project);
     const client = input_1.default.restApiTokenClient();
@@ -24,7 +24,7 @@ commandSandboxSnapshotCreate.action(async (identifier, options) => {
     if (!sandbox_id) {
         output_1.default.exitError(texts_1.ERR_SANDBOX_NOT_FOUND);
     }
-    const defaultName = 'snapshot-' + (0, human_id_1.default)({ separator: '-', capitalize: false });
+    const defaultName = 'snapshot-' + humanId({ separator: '-', capitalize: false });
     const snapshotName = options.name || defaultName;
     const body = {
         name: snapshotName,

package/distTs/src/command/sandbox/update.js

@@ -13,6 +13,7 @@ commandSandboxUpdate.option('-w, --workspace <domain>', texts_1.OPTION_REST_API_
 commandSandboxUpdate.option('-p, --project <name>', texts_1.OPTION_REST_API_PROJECT);
 commandSandboxUpdate.option('--wait-for-running [seconds]', texts_1.OPTION_SANDBOX_WAIT_RUNNING);
 commandSandboxUpdate.option('--wait-for-configured [seconds]', texts_1.OPTION_SANDBOX_WAIT_CONFIGURED);
+commandSandboxUpdate.option('--wait-for-apps [seconds]', texts_1.OPTION_SANDBOX_WAIT_APPS);
 commandSandboxUpdate.argument('<identifier>', texts_1.OPTION_SANDBOX_IDENTIFIER);
 commandSandboxUpdate.argument('<yaml|@yaml path>', texts_1.OPTION_SANDBOX_YAML);
 commandSandboxUpdate.action(async (identifier, yamlFile, options) => {
@@ -55,6 +56,19 @@ commandSandboxUpdate.action(async (identifier, yamlFile, options) => {
             output_1.default.exitError(texts_1.ERR_SANDBOX_SETUP_TIMEOUT);
         }
     }
+    if (options.waitForApps) {
+        output_1.default.normal(texts_1.TXT_SANDBOX_WAITING_APPS);
+        const timeout = parseInt(options.waitForApps, 10) || 300;
+        try {
+            const status = await client.sandboxWaitForApps(workspace, sandbox_id, timeout);
+            if (status !== utils_1.SANDBOX_APP_STATUS.RUNNING) {
+                output_1.default.exitError(texts_1.ERR_SANDBOX_APP_FAILED);
+            }
+        }
+        catch {
+            output_1.default.exitError(texts_1.ERR_SANDBOX_APPS_TIMEOUT);
+        }
+    }
     output_1.default.exitSuccess((0, texts_1.TXT_SANDBOX_UPDATED)(result.identifier, result.html_url));
 });
 exports.default = commandSandboxUpdate;

package/distTs/src/command/sandbox.js

@@ -19,6 +19,8 @@ const endpoint_1 = __importDefault(require("./sandbox/endpoint"));
 const exec_1 = __importDefault(require("./sandbox/exec"));
 const update_1 = __importDefault(require("./sandbox/update"));
 const yaml_1 = __importDefault(require("./sandbox/yaml"));
+const logs_1 = __importDefault(require("./sandbox/logs"));
+const app_1 = __importDefault(require("./sandbox/app"));
 const commandSandbox = (0, utils_1.newCommand)('sandbox', texts_1.DESC_COMMAND_SANDBOX);
 commandSandbox.alias('sb');
 commandSandbox.addCommand(create_1.default);
@@ -31,8 +33,10 @@ commandSandbox.addCommand(start_1.default);
 commandSandbox.addCommand(stop_1.default);
 commandSandbox.addCommand(restart_1.default);
 commandSandbox.addCommand(status_1.default);
+commandSandbox.addCommand(logs_1.default);
 commandSandbox.addCommand(cp_1.default);
 commandSandbox.addCommand(exec_1.default);
+commandSandbox.addCommand(app_1.default);
 commandSandbox.addCommand(snapshot_1.default);
 commandSandbox.addCommand(endpoint_1.default);
 exports.default = commandSandbox;

package/distTs/src/command/scrape.js

@@ -6,18 +6,12 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const utils_1 = require("../utils");
 const commander_1 = require("commander");
 const texts_1 = require("../texts");
-const validation_1 = require("../visualTest/validation");
 const output_1 = __importDefault(require("../output"));
-const requests_1 = require("../visualTest/requests");
 const node_zlib_1 = require("node:zlib");
-const tar_stream_1 = __importDefault(require("tar-stream"));
 const promises_1 = require("node:stream/promises");
 const node_fs_1 = require("node:fs");
 const node_path_1 = __importDefault(require("node:path"));
 const promises_2 = require("node:fs/promises");
-const context_1 = require("../visualTest/context");
-const ci_info_1 = require("@buddy-works/ci-info");
-const validation_2 = require("./scrape/validation");
 const commandScrape = (0, utils_1.newCommand)('scrape', texts_1.DESC_COMMAND_VT_SCRAPE);
 commandScrape.argument('[url]', texts_1.OPTION_SCRAPE_URL);
 commandScrape.option('--follow', texts_1.OPTION_SCRAPE_FOLLOW, false);
@@ -47,22 +41,28 @@ commandScrape.option('--localStorage <items...>', texts_1.OPTION_SCRAPE_LOCAL_ST
 commandScrape.option('--delay <delay>', texts_1.OPTION_SCRAPE_DELAY, '0');
 commandScrape.option('--outputDir <dir>', texts_1.OPTION_SCRAPE_OUTPUT_DIR, '.');
 commandScrape.action(async (inputUrl, options) => {
-    if (!(0, validation_1.checkToken)('scrape')) {
+    const { checkToken } = require('../visualTest/validation');
+    const { downloadScrapPackage, sendScrap } = require('../visualTest/requests');
+    const { setCiAndCommitInfo } = require('../visualTest/context');
+    const { validateInputAndOptions } = require('./scrape/validation');
+    const { getCiAndGitInfo } = require('@buddy-works/ci-info');
+    const tar = require('tar-stream');
+    if (!checkToken('scrape')) {
         output_1.default.exitError(texts_1.ERR_MISSING_SCRAPE_TOKEN);
     }
-    const { url, follow, respectRobots, outputTypes, outputDir, fullPage, colorScheme, browsers, devices, cookies, requestHeaders, delay, waitForSelectors, localStorage, } = (0, validation_2.validateInputAndOptions)(inputUrl, options);
+    const { url, follow, respectRobots, outputTypes, outputDir, fullPage, colorScheme, browsers, devices, cookies, requestHeaders, delay, waitForSelectors, localStorage, } = validateInputAndOptions(inputUrl, options);
     try {
-        const ciAndGitInfo = await (0, ci_info_1.getCiAndGitInfo)({});
-        (0, context_1.setCiAndCommitInfo)(ciAndGitInfo);
-        const { buildId } = await (0, requests_1.sendScrap)(url, follow, respectRobots, outputTypes, fullPage, colorScheme, browsers, devices, cookies, requestHeaders, delay, waitForSelectors, localStorage);
+        const ciAndGitInfo = await getCiAndGitInfo({});
+        setCiAndCommitInfo(ciAndGitInfo);
+        const { buildId } = await sendScrap(url, follow, respectRobots, outputTypes, fullPage, colorScheme, browsers, devices, cookies, requestHeaders, delay, waitForSelectors, localStorage);
         const status = await watchSessionStatus(buildId);
         if (!status.ok) {
             output_1.default.exitError(`Scrape session failed: ${status.error}`);
         }
         output_1.default.normal('Downloading scrape package');
-        const scrapPackageStream = await (0, requests_1.downloadScrapPackage)(buildId);
+        const scrapPackageStream = await downloadScrapPackage(buildId);
         const brotliDecompressor = (0, node_zlib_1.createBrotliDecompress)();
-        const unpack = tar_stream_1.default.extract();
+        const unpack = tar.extract();
         unpack.on('entry', async (header, stream, next) => {
             const currentDir = process.cwd();
             const preparedOutputDir = outputDir.startsWith('.')
@@ -94,8 +94,9 @@ commandScrape.action(async (inputUrl, options) => {
     }
 });
 async function watchSessionStatus(buildId) {
+    const { connectToScrapSession } = require('../visualTest/requests');
     return new Promise((resolve) => {
-        const eventSource = (0, requests_1.connectToScrapSession)(buildId);
+        const eventSource = connectToScrapSession(buildId);
         eventSource.addEventListener('SESSION_STATUS', (event) => {
             const data = JSON.parse(event.data);
             if (data.status === 'STARTED') {

package/distTs/src/command/tunnel/http.js

@@ -4,12 +4,9 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 const utils_1 = require("../../utils");
-const cfg_1 = __importDefault(require("../../tunnel/cfg"));
 const output_1 = __importDefault(require("../../output"));
 const texts_1 = require("../../texts");
-const buddy_1 = __importDefault(require("../../tunnel/api/buddy"));
 const tunnel_1 = require("../../types/tunnel");
-const input_1 = __importDefault(require("../../input"));
 const commandHttp = (0, utils_1.getBasicCommandHttp)();
 commandHttp.description(texts_1.DESC_COMMAND_HTTP);
 commandHttp.option('-s, --serve <directory>', texts_1.OPTION_SERVE);
@@ -17,15 +14,18 @@ commandHttp.option('--token <token>', texts_1.OPTION_TOKEN);
 commandHttp.argument('[protocol://host:port]', texts_1.OPTION_TARGET);
 commandHttp.addHelpText('after', `\nEXAMPLES:${(0, texts_1.EXAMPLE_TUNNEL_HTTP)(false)}`);
 commandHttp.action(async (target, options) => {
-    const { host, token } = await input_1.default.tunnelToken(options.token);
-    const prepared = await cfg_1.default.prepareTunnel(tunnel_1.TUNNEL_TYPE.HTTP, target, options, true);
+    const ApiBuddy = require('../../tunnel/api/buddy').default;
+    const Input = require('../../input').default;
+    const Cfg = require('../../tunnel/cfg').default;
+    const { host, token } = await Input.tunnelToken(options.token);
+    const prepared = await Cfg.prepareTunnel(tunnel_1.TUNNEL_TYPE.HTTP, target, options, true);
     await output_1.default.spinner(texts_1.TXT_OPENING_TUNNEL);
-    const agent = await buddy_1.default.register(false, false, true, false, host, token, [], (region) => {
-        cfg_1.default.setRegionIfNotSet(region);
+    const agent = await ApiBuddy.register(false, false, true, false, host, token, [], (region) => {
+        Cfg.setRegionIfNotSet(region);
     });
     await agent.start();
     agent.startRefreshingConfiguration();
-    const tunnel = await buddy_1.default.addTunnel(agent.id, agent.host, agent.token, prepared);
+    const tunnel = await ApiBuddy.addTunnel(agent.id, agent.host, agent.token, prepared);
     agent.addTunnel(tunnel);
     output_1.default.tunnel(tunnel);
 });

package/distTs/src/command/tunnel/start.js

@@ -3,29 +3,29 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-const cfg_1 = __importDefault(require("../../tunnel/cfg"));
 const output_1 = __importDefault(require("../../output"));
 const texts_1 = require("../../texts");
-const buddy_1 = __importDefault(require("../../tunnel/api/buddy"));
 const utils_1 = require("../../utils");
-const input_1 = __importDefault(require("../../input"));
 const commandStart = (0, utils_1.newCommand)('start', texts_1.DESC_COMMAND_START);
 commandStart.option('--token <token>', texts_1.OPTION_TOKEN);
 commandStart.argument('<name>', texts_1.OPTION_NAME);
 commandStart.addHelpText('after', `\nEXAMPLES:${texts_1.EXAMPLE_TUNNEL_START}`);
 commandStart.action(async (name, options) => {
-    if (!cfg_1.default.hasTunnel(name)) {
+    const ApiBuddy = require('../../tunnel/api/buddy').default;
+    const Input = require('../../input').default;
+    const Cfg = require('../../tunnel/cfg').default;
+    if (!Cfg.hasTunnel(name)) {
         output_1.default.exitError((0, texts_1.ERR_TUNNEL_NOT_FOUND)(name));
     }
-    const { token, host } = await input_1.default.tunnelToken(options.token);
-    const prepared = cfg_1.default.getTunnel(name);
+    const { token, host } = await Input.tunnelToken(options.token);
+    const prepared = Cfg.getTunnel(name);
     await output_1.default.spinner(texts_1.TXT_OPENING_TUNNEL);
-    const agent = await buddy_1.default.register(false, false, true, false, host, token, [], (region) => {
-        cfg_1.default.setRegionIfNotSet(region);
+    const agent = await ApiBuddy.register(false, false, true, false, host, token, [], (region) => {
+        Cfg.setRegionIfNotSet(region);
     });
     await agent.start();
     agent.startRefreshingConfiguration();
-    const tunnel = await buddy_1.default.addTunnel(agent.id, agent.host, agent.token, prepared);
+    const tunnel = await ApiBuddy.addTunnel(agent.id, agent.host, agent.token, prepared);
     agent.addTunnel(tunnel);
     output_1.default.tunnel(tunnel);
 });

package/distTs/src/command/tunnel/tcp.js

@@ -4,27 +4,27 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 const utils_1 = require("../../utils");
-const cfg_1 = __importDefault(require("../../tunnel/cfg"));
 const output_1 = __importDefault(require("../../output"));
 const texts_1 = require("../../texts");
-const buddy_1 = __importDefault(require("../../tunnel/api/buddy"));
 const tunnel_1 = require("../../types/tunnel");
-const input_1 = __importDefault(require("../../input"));
 const commandTcp = (0, utils_1.getBasicCommandTcp)();
 commandTcp.description(texts_1.DESC_COMMAND_TCP);
 commandTcp.option('--token <token>', texts_1.OPTION_TOKEN);
 commandTcp.argument('[host:port]', texts_1.OPTION_TARGET);
 commandTcp.addHelpText('after', `\nEXAMPLES:${(0, texts_1.EXAMPLE_TUNNEL_TCP)(false)}`);
 commandTcp.action(async (target, options) => {
-    const { host, token } = await input_1.default.tunnelToken(options.token);
-    const prepared = await cfg_1.default.prepareTunnel(tunnel_1.TUNNEL_TYPE.TCP, target, options, true);
+    const ApiBuddy = require('../../tunnel/api/buddy').default;
+    const Input = require('../../input').default;
+    const Cfg = require('../../tunnel/cfg').default;
+    const { host, token } = await Input.tunnelToken(options.token);
+    const prepared = await Cfg.prepareTunnel(tunnel_1.TUNNEL_TYPE.TCP, target, options, true);
     await output_1.default.spinner(texts_1.TXT_OPENING_TUNNEL);
-    const agent = await buddy_1.default.register(false, false, true, false, host, token, [], (region) => {
-        cfg_1.default.setRegionIfNotSet(region);
+    const agent = await ApiBuddy.register(false, false, true, false, host, token, [], (region) => {
+        Cfg.setRegionIfNotSet(region);
     });
     await agent.start();
     agent.startRefreshingConfiguration();
-    const tunnel = await buddy_1.default.addTunnel(agent.id, agent.host, agent.token, prepared);
+    const tunnel = await ApiBuddy.addTunnel(agent.id, agent.host, agent.token, prepared);
     agent.addTunnel(tunnel);
     output_1.default.tunnel(tunnel);
 });

package/distTs/src/command/tunnel/tls.js

@@ -4,27 +4,27 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 const utils_1 = require("../../utils");
-const cfg_1 = __importDefault(require("../../tunnel/cfg"));
 const output_1 = __importDefault(require("../../output"));
 const texts_1 = require("../../texts");
-const buddy_1 = __importDefault(require("../../tunnel/api/buddy"));
 const tunnel_1 = require("../../types/tunnel");
-const input_1 = __importDefault(require("../../input"));
 const commandTls = (0, utils_1.getBasicCommandTls)();
 commandTls.description(texts_1.DESC_COMMAND_TLS);
 commandTls.option('--token <token>', texts_1.OPTION_TOKEN);
 commandTls.argument('[host:port]', texts_1.OPTION_TARGET);
 commandTls.addHelpText('after', `\nEXAMPLES:${(0, texts_1.EXAMPLE_TUNNEL_TLS)(false)}`);
 commandTls.action(async (target, options) => {
-    const { token, host } = await input_1.default.tunnelToken(options.token);
-    const prepared = await cfg_1.default.prepareTunnel(tunnel_1.TUNNEL_TYPE.TLS, target, options, true);
+    const ApiBuddy = require('../../tunnel/api/buddy').default;
+    const Input = require('../../input').default;
+    const Cfg = require('../../tunnel/cfg').default;
+    const { token, host } = await Input.tunnelToken(options.token);
+    const prepared = await Cfg.prepareTunnel(tunnel_1.TUNNEL_TYPE.TLS, target, options, true);
     await output_1.default.spinner(texts_1.TXT_OPENING_TUNNEL);
-    const agent = await buddy_1.default.register(false, false, true, false, host, token, [], (region) => {
-        cfg_1.default.setRegionIfNotSet(region);
+    const agent = await ApiBuddy.register(false, false, true, false, host, token, [], (region) => {
+        Cfg.setRegionIfNotSet(region);
     });
     await agent.start();
     agent.startRefreshingConfiguration();
-    const tunnel = await buddy_1.default.addTunnel(agent.id, agent.host, agent.token, prepared);
+    const tunnel = await ApiBuddy.addTunnel(agent.id, agent.host, agent.token, prepared);
     agent.addTunnel(tunnel);
     output_1.default.tunnel(tunnel);
 });

package/distTs/src/command/ut/upload.js

@@ -1,37 +1,4 @@
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
@@ -40,12 +7,7 @@ const utils_1 = require("../../utils");
 const texts_1 = require("../../texts");
 const output_1 = __importDefault(require("../../output"));
 const commander_1 = require("commander");
-const zod_1 = __importStar(require("zod"));
-const fdir_1 = require("fdir");
-const picomatch_1 = __importDefault(require("picomatch"));
 const node_path_1 = __importDefault(require("node:path"));
-const ci_1 = require("../../unitTest/ci");
-const requests_1 = require("../../unitTest/requests");
 const token = process.env.BUDDY_UT_TOKEN || '';
 const commandUtUpload = (0, utils_1.newCommand)('upload', texts_1.DESC_COMMAND_UT_UPLOAD);
 commandUtUpload.argument('<glob>', texts_1.OPTION_UPLOAD_REPORT_GLOB);
@@ -54,11 +16,13 @@ commandUtUpload.addOption(new commander_1.Option('--format <format>', texts_1.OP
     .makeOptionMandatory());
 commandUtUpload.option('--dryRun', texts_1.OPTION_UPLOAD_DRY_RUN);
 commandUtUpload.action(async (input, options) => {
+    const { getCiInfo } = require('../../unitTest/ci');
+    const { sendUploadRequest } = require('../../unitTest/requests');
     if (!token) {
         output_1.default.exitError(texts_1.ERR_MISSING_UT_TOKEN);
     }
     const { glob, dryRun } = validateInputAndOptions(input, options);
-    const ciInfo = await (0, ci_1.getCiInfo)();
+    const ciInfo = await getCiInfo();
     const { absolutePattern, files } = findFilesByGlob(glob);
     if (files.length === 0) {
         output_1.default.exitError(`No files matched the provided glob: ${absolutePattern}`);
@@ -70,15 +34,17 @@ commandUtUpload.action(async (input, options) => {
         });
         output_1.default.exitSuccess('Dry run completed');
     }
-    await (0, requests_1.sendUploadRequest)(files, ciInfo);
+    await sendUploadRequest(files, ciInfo);
     output_1.default.exitSuccess('Upload completed');
 });
 exports.default = commandUtUpload;
 function validateInputAndOptions(input, options) {
-    const globSchema = zod_1.default.string();
-    const optionsSchema = zod_1.default.object({
-        format: zod_1.default.enum(['junit-xml']),
-        dryRun: zod_1.default.boolean().optional(),
+    const z = require('zod').default;
+    const { ZodError } = require('zod');
+    const globSchema = z.string();
+    const optionsSchema = z.object({
+        format: z.enum(['junit-xml']),
+        dryRun: z.boolean().optional(),
     });
     try {
         const glob = globSchema.parse(input);
@@ -90,7 +56,7 @@ function validateInputAndOptions(input, options) {
         };
     }
     catch (error) {
-        if (error instanceof zod_1.ZodError) {
+        if (error instanceof ZodError) {
             output_1.default.exitError(error.errors.map((e) => `${e.path}: ${e.message}`).join(', '));
         }
         else {
@@ -99,8 +65,10 @@ function validateInputAndOptions(input, options) {
     }
 }
 function findFilesByGlob(pattern) {
+    const { fdir } = require('fdir');
+    const picomatch = require('picomatch');
     const cwd = process.cwd();
-    const scan = picomatch_1.default.scan(pattern);
+    const scan = picomatch.scan(pattern);
     if (!scan.isGlob) {
         return {
             absolutePattern: pattern,
@@ -109,10 +77,10 @@ function findFilesByGlob(pattern) {
     }
     if (node_path_1.default.isAbsolute(pattern)) {
         const root = scan.base;
-        const files = new fdir_1.fdir().withFullPaths().glob(pattern).crawl(root).sync();
+        const files = new fdir().withFullPaths().glob(pattern).crawl(root).sync();
         return { absolutePattern: pattern, files };
     }
     const preparedPattern = node_path_1.default.resolve(cwd, pattern);
-    const files = new fdir_1.fdir().withFullPaths().glob(preparedPattern).crawl().sync();
+    const files = new fdir().withFullPaths().glob(preparedPattern).crawl().sync();
     return { absolutePattern: preparedPattern, files };
 }

package/distTs/src/command/vt/close.js

@@ -5,19 +5,19 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 const utils_1 = require("../../utils");
 const texts_1 = require("../../texts");
-const validation_1 = require("../../visualTest/validation");
-const requests_1 = require("../../visualTest/requests");
 const output_1 = __importDefault(require("../../output"));
 const commandVtClose = (0, utils_1.newCommand)('close', texts_1.DESC_COMMAND_VT_CLOSE);
 commandVtClose.action(async () => {
-    if (!(0, validation_1.checkToken)('vt')) {
+    const { checkBuildId, checkToken } = require('../../visualTest/validation');
+    const { closeSession } = require('../../visualTest/requests');
+    if (!checkToken('vt')) {
         output_1.default.exitError(texts_1.ERR_MISSING_VT_TOKEN);
     }
-    if (!(0, validation_1.checkBuildId)()) {
+    if (!checkBuildId()) {
         output_1.default.exitError(texts_1.ERR_MISSING_BUILD_ID);
     }
     try {
-        const { message } = await (0, requests_1.closeSession)();
+        const { message } = await closeSession();
         output_1.default.exitNormal(message);
     }
     catch (error) {

package/distTs/src/command/vt/compare.js

@@ -5,14 +5,8 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 const utils_1 = require("../../utils");
 const texts_1 = require("../../texts");
-const validation_1 = require("../../visualTest/validation");
 const output_1 = __importDefault(require("../../output"));
-const linkUtils_1 = require("../../visualTest/linkUtils");
 const node_fs_1 = require("node:fs");
-const requests_1 = require("../../visualTest/requests");
-const validation_2 = require("./compare/validation");
-const context_1 = require("../../visualTest/context");
-const ci_info_1 = require("@buddy-works/ci-info");
 const commandVtCompare = (0, utils_1.newCommand)('compare', texts_1.DESC_COMMAND_VT_COMPARE);
 commandVtCompare.option('--urls <urls>', texts_1.OPTION_COMPARE_URLS);
 commandVtCompare.option('--sitemap <sitemap>', texts_1.OPTION_COMPARE_SITEMAP);
@@ -27,11 +21,17 @@ commandVtCompare.option('--header <headers...>', texts_1.OPTION_COMPARE_HEADER);
 commandVtCompare.option('--delay <delays...>', texts_1.OPTION_COMPARE_DELAY);
 commandVtCompare.option('--waitFor <waitFors...>', texts_1.OPTION_COMPARE_WAIT_FOR);
 commandVtCompare.action(async (options) => {
-    const validatedOptions = (0, validation_2.validateOptions)(options);
-    if (!(0, validation_1.checkToken)('vt')) {
+    const { getCiAndGitInfo, formattedCiInfo } = require('@buddy-works/ci-info');
+    const { checkToken } = require('../../visualTest/validation');
+    const { addProtocolIfMissing } = require('../../visualTest/linkUtils');
+    const { sendCompareLinks } = require('../../visualTest/requests');
+    const { checkIfMinimalOptionsAreProvided, validateOptions } = require('./compare/validation');
+    const { setCiAndCommitInfo } = require('../../visualTest/context');
+    const validatedOptions = validateOptions(options);
+    if (!checkToken('vt')) {
         output_1.default.exitError(texts_1.ERR_MISSING_VT_TOKEN);
     }
-    if (!(0, validation_2.checkIfMinimalOptionsAreProvided)(validatedOptions)) {
+    if (!checkIfMinimalOptionsAreProvided(validatedOptions)) {
         output_1.default.exitError(texts_1.ERR_MISSING_URLS);
     }
     let urls = [];
@@ -45,7 +45,7 @@ commandVtCompare.action(async (options) => {
         urls = urls.concat(urlsList);
     }
     if (validatedOptions.sitemap) {
-        sitemapSource = (0, linkUtils_1.addProtocolIfMissing)(validatedOptions.sitemap);
+        sitemapSource = addProtocolIfMissing(validatedOptions.sitemap);
     }
     const { filteredUrls, duplicates } = filterDuplicates(urls);
     if (duplicates.length > 0) {
@@ -58,11 +58,11 @@ commandVtCompare.action(async (options) => {
     else if (filteredUrls.length > 1) {
         output_1.default.normal(`List of urls:\n${filteredUrls.join('\n')}`);
     }
-    const ciAndGitInfo = await (0, ci_info_1.getCiAndGitInfo)({});
-    output_1.default.normal((0, ci_info_1.formattedCiInfo)(ciAndGitInfo));
-    (0, context_1.setCiAndCommitInfo)(ciAndGitInfo);
+    const ciAndGitInfo = await getCiAndGitInfo({});
+    output_1.default.normal(formattedCiInfo(ciAndGitInfo));
+    setCiAndCommitInfo(ciAndGitInfo);
     try {
-        const { message } = await (0, requests_1.sendCompareLinks)(filteredUrls, validatedOptions, sitemapSource);
+        const { message } = await sendCompareLinks(filteredUrls, validatedOptions, sitemapSource);
         output_1.default.exitSuccess(message);
     }
     catch (error) {
@@ -70,14 +70,16 @@ commandVtCompare.action(async (options) => {
     }
 });
 function getUrlsFromUrlOption(urls) {
-    return urls.split(',').map((url) => (0, linkUtils_1.addProtocolIfMissing)(url).trim());
+    const { addProtocolIfMissing } = require('../../visualTest/linkUtils');
+    return urls.split(',').map((url) => addProtocolIfMissing(url).trim());
 }
 function getUrlsFromUrlFile(urlsFile) {
+    const { addProtocolIfMissing } = require('../../visualTest/linkUtils');
     const urlsFromFile = (0, node_fs_1.readFileSync)(urlsFile, 'utf-8');
     return urlsFromFile
         .split('\n')
         .filter((url) => url.trim().length > 0)
-        .map((url) => (0, linkUtils_1.addProtocolIfMissing)(url).trim());
+        .map((url) => addProtocolIfMissing(url).trim());
 }
 function filterDuplicates(urls) {
     const seen = new Set();