bdy 1.18.5-dev → 1.18.6-dev

package/distTs/src/command/package/download.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 };
 };
@@ -42,10 +9,8 @@ const input_1 = __importDefault(require("../../input"));
 const output_1 = __importDefault(require("../../output"));
 const logger_1 = __importDefault(require("../../logger"));
 const path_1 = require("path");
-const uuid_1 = require("uuid");
 const fs_1 = __importDefault(require("fs"));
 const promises_1 = __importDefault(require("node:stream/promises"));
-const unzipper_1 = __importStar(require("../../unzipper"));
 const commandPackageDownload = (0, utils_1.newCommand)('download', texts_1.DESC_COMMAND_PACKAGE_DOWNLOAD);
 commandPackageDownload.alias('dd');
 commandPackageDownload.option('-w, --workspace <domain>', texts_1.OPTION_REST_API_WORKSPACE);
@@ -56,6 +21,9 @@ commandPackageDownload.argument('<identifier>', texts_1.OPTION_PACKAGE_ID);
 commandPackageDownload.argument('<directory>', texts_1.OPTION_PACKAGE_DOWNLOAD_PATH);
 commandPackageDownload.addHelpText('after', texts_1.EXAMPLE_PACKAGE_DOWNLOAD);
 commandPackageDownload.action(async (id, path, options) => {
+    const { v4 } = require('uuid');
+    const ArchiverExtract = require('../../unzipper').default;
+    const { UNZIPPER_FORMAT } = require('../../unzipper');
     const client = input_1.default.restApiTokenClient();
     const workspace = input_1.default.restApiWorkspace(options.workspace);
     const project = input_1.default.restApiProject(options.project, true);
@@ -134,7 +102,7 @@ commandPackageDownload.action(async (id, path, options) => {
     if (!empty && !options.merge) {
         output_1.default.exitError((0, texts_1.ERR_PACKAGE_DOWNLOAD_NOT_EMPTY_DIR)(dirPath));
     }
-    const zipPath = (0, path_1.join)((0, utils_1.getHomeDirectory)(), `${(0, uuid_1.v4)()}.zip`);
+    const zipPath = (0, path_1.join)((0, utils_1.getHomeDirectory)(), `${v4()}.zip`);
     const clearZip = () => {
         try {
             fs_1.default.rmSync(zipPath);
@@ -151,7 +119,7 @@ commandPackageDownload.action(async (id, path, options) => {
         output_1.default.normal(texts_1.TXT_PACKAGE_DOWNLOADED_ZIP);
         output_1.default.normal(texts_1.TXT_PACKAGE_UNZIPPING);
         let count = 0;
-        await unzipper_1.default.extract(unzipper_1.UNZIPPER_FORMAT.ZIP, zipPath, dirPath, async () => {
+        await ArchiverExtract.extract(UNZIPPER_FORMAT.ZIP, zipPath, dirPath, async () => {
             count += 1;
             output_1.default.clearPreviousLine();
             output_1.default.normal((0, texts_1.TXT_PACKAGE_UNZIPPING_COUNT)(count));

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

@@ -8,10 +8,8 @@ const texts_1 = require("../../texts");
 const input_1 = __importDefault(require("../../input"));
 const output_1 = __importDefault(require("../../output"));
 const logger_1 = __importDefault(require("../../logger"));
-const fflate_1 = __importDefault(require("fflate"));
 const fs_1 = __importDefault(require("fs"));
 const path_1 = require("path");
-const uuid_1 = require("uuid");
 const commandPackagePublish = (0, utils_1.newCommand)('publish', texts_1.DESC_COMMAND_PACKAGE_PUBLISH);
 commandPackagePublish.alias('pub');
 commandPackagePublish.option('-w, --workspace <domain>', texts_1.OPTION_REST_API_WORKSPACE);
@@ -22,13 +20,14 @@ commandPackagePublish.argument('<identifier>', texts_1.OPTION_PACKAGE_ID);
 commandPackagePublish.argument('<directory>', texts_1.OPTION_PACKAGE_PUBLISH_PATH);
 commandPackagePublish.addHelpText('after', texts_1.EXAMPLE_PACKAGE_PUBLISH);
 commandPackagePublish.action(async (id, path, options) => {
+    const { v4 } = require('uuid');
     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.packageSplitIdentifier(id);
     if (!version)
-        version = (0, uuid_1.v4)();
+        version = v4();
     const client = input_1.default.restApiTokenClient();
     const data = await client.getPackageVersionByIdentifier(workspace, project, identifier, version);
     if (!data || !data.domain) {
@@ -113,7 +112,7 @@ commandPackagePublish.action(async (id, path, options) => {
         output_1.default.normal((0, texts_1.TXT_PACKAGE_ENTRIES_FOUND)(entries.length));
     }
     output_1.default.normal((0, texts_1.TXT_PACKAGE_ZIP_ENTRIES)(0));
-    const zipPath = (0, path_1.join)((0, utils_1.getHomeDirectory)(), `${(0, uuid_1.v4)()}.zip`);
+    const zipPath = (0, path_1.join)((0, utils_1.getHomeDirectory)(), `${v4()}.zip`);
     const clearZip = () => {
         try {
             fs_1.default.rmSync(zipPath);
@@ -154,6 +153,7 @@ commandPackagePublish.action(async (id, path, options) => {
     }
 });
 const addEntryToZip = (dirPath, zip, entry) => {
+    const fflate = require('fflate');
     return new Promise((resolve, reject) => {
         const isDir = entry.isDirectory();
         let name = (0, path_1.join)(entry.parentPath.replace(dirPath, ''), entry.name);
@@ -161,7 +161,7 @@ const addEntryToZip = (dirPath, zip, entry) => {
             name += '/';
         else
             name = name.replace(/^\//, '');
-        const file = new fflate_1.default.ZipDeflate(name, {
+        const file = new fflate.ZipDeflate(name, {
             level: 3,
         });
         zip.add(file);
@@ -204,10 +204,11 @@ const addEntriesToZip = async (dirPath, zip, entries, onEntry) => {
     }
 };
 const createZip = (dirPath, zipPath, entries, onEntry) => {
+    const fflate = require('fflate');
     return new Promise((resolve, reject) => {
         const ws = fs_1.default.createWriteStream(zipPath);
         let wasError = false;
-        const zip = new fflate_1.default.Zip((err, data, final) => {
+        const zip = new fflate.Zip((err, data, final) => {
             if (wasError) {
                 // do nothing
             }

package/distTs/src/command/pre.js

@@ -5,9 +5,9 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 const utils_1 = require("../utils");
 const output_1 = __importDefault(require("../output"));
-const manager_1 = __importDefault(require("../agent/manager"));
-const agent_1 = __importDefault(require("../tunnel/api/agent"));
 const commandPre = async (_, command) => {
+    const AgentManager = require('../agent/manager').default;
+    const ApiAgent = require('../tunnel/api/agent').default;
     command.agentStatus = null;
     command.agentStandalone = false;
     command.agentInstalled = false;
@@ -15,14 +15,14 @@ const commandPre = async (_, command) => {
     command.agentId = '';
     try {
         if (!(0, utils_1.isDocker)()) {
-            const hasConfig = manager_1.default.system.hasSystemConfig();
+            const hasConfig = AgentManager.system.hasSystemConfig();
             if (hasConfig) {
                 command.agentInstalled = true;
-                const json = manager_1.default.system.loadSystemConfig();
+                const json = AgentManager.system.loadSystemConfig();
                 command.agentStandalone = !!json.standalone; // nie zawsze to jest bool
                 command.agentId = json.id;
                 command.agentPort = json.port;
-                const api = new agent_1.default(json.port);
+                const api = new ApiAgent(json.port);
                 command.agentStatus = await api.fetchStatus();
             }
         }

package/distTs/src/command/project/link.js

@@ -7,7 +7,6 @@ const utils_1 = require("../../utils");
 const texts_1 = require("../../texts");
 const input_1 = __importDefault(require("../../input"));
 const output_1 = __importDefault(require("../../output"));
-const cfg_1 = __importDefault(require("../../project/cfg"));
 const node_path_1 = require("node:path");
 const node_fs_1 = __importDefault(require("node:fs"));
 const commandProjectLink = (0, utils_1.newCommand)('link', texts_1.DESC_COMMAND_PROJECT_LINK);
@@ -17,10 +16,11 @@ commandProjectLink.option('-g, --git', texts_1.OPT_COMMAND_PROJECT_LINK_GIT);
 commandProjectLink.option('-p, --project <name>', texts_1.OPTION_REST_API_PROJECT);
 commandProjectLink.argument('[directory]', texts_1.OPT_COMMAND_PROJECT_LINK_DIRECTORY);
 commandProjectLink.action(async (dir, options) => {
+    const ProjectCfg = require('../../project/cfg').default;
     output_1.default.handleSignals();
     const { path, git } = await checkPath(dir, options);
     const { workspace, project, url } = await createOrGetProject(path, options);
-    cfg_1.default.init(path, workspace, project);
+    ProjectCfg.init(path, workspace, project);
     output_1.default.okSign();
     output_1.default.normal(texts_1.TXT_COMMAND_PROJECT_LINK_TO, false);
     output_1.default.light(` ${url}`);
@@ -154,6 +154,7 @@ const initRepo = async (workspace, project, path, git, options) => {
     });
 };
 const checkPath = async (dir, options) => {
+    const ProjectCfg = require('../../project/cfg').default;
     if (!dir)
         dir = './';
     const path = (0, node_path_1.resolve)(dir);
@@ -173,7 +174,7 @@ const checkPath = async (dir, options) => {
             output_1.default.exitError((0, texts_1.ERR_COMMAND_PROJECT_LINK_DIR_CREATE)(path));
         }
     }
-    if (cfg_1.default.exists(path)) {
+    if (ProjectCfg.exists(path)) {
         output_1.default.yellow(texts_1.TXT_COMMAND_PROJECT_LINK_DIR_LINKED);
         let relink = options.relink;
         if (!relink) {

package/distTs/src/command/sandbox/cp.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,9 @@ const utils_1 = require("../../utils");
 const texts_1 = require("../../texts");
 const output_1 = __importDefault(require("../../output"));
 const input_1 = __importDefault(require("../../input"));
-const fdir_1 = require("fdir");
 const path_1 = require("path");
 const node_fs_1 = __importDefault(require("node:fs"));
-const uuid_1 = require("uuid");
 const promises_1 = __importDefault(require("node:stream/promises"));
-const unzipper_1 = __importStar(require("../../unzipper"));
 const commandSandboxCp = (0, utils_1.newCommand)('cp', texts_1.DESC_COMMAND_SANDBOX_CP);
 commandSandboxCp.option('-w, --workspace <domain>', texts_1.OPTION_REST_API_WORKSPACE);
 commandSandboxCp.option('-p, --project <name>', texts_1.OPTION_REST_API_PROJECT);
@@ -55,6 +19,7 @@ commandSandboxCp.argument('<source>', texts_1.OPTION_SANDBOX_CP_SOURCE);
 commandSandboxCp.argument('<destination>', texts_1.OPTION_SANDBOX_CP_DEST);
 commandSandboxCp.addHelpText('after', texts_1.EXAMPLE_SANDBOX_CP);
 const upload = async (client, workspace, project, source, destination) => {
+    const { fdir } = require('fdir');
     const { sourcePath, sourceStats } = input_1.default.restApiSandboxUploadSourcePath(source);
     const { identifier, remotePath, isRemoteDir } = input_1.default.restApiSandboxUploadDestinationPath(destination);
     const { sandbox_id } = await client.getSandboxByIdentifier(workspace, project, identifier);
@@ -71,7 +36,7 @@ const upload = async (client, workspace, project, source, destination) => {
     }
     else if (sourceStats.isDirectory()) {
         // Directory copy - get all files recursively
-        const files = new fdir_1.fdir()
+        const files = new fdir()
             .withFullPaths()
             .crawl(sourcePath)
             .sync();
@@ -97,6 +62,9 @@ const upload = async (client, workspace, project, source, destination) => {
     }
 };
 const download = async (client, workspace, project, source, destination, merge, replace) => {
+    const { v4 } = require('uuid');
+    const ArchiverExtract = require('../../unzipper').default;
+    const { UNZIPPER_FORMAT } = require('../../unzipper');
     const { destPath, isDestPathDir } = input_1.default.restApiSandboxDownloadDestinationPath(destination, merge, replace);
     const { sourcePath, identifier } = input_1.default.restApiSandboxDownloadSourcePath(source);
     const { sandbox_id } = await client.getSandboxByIdentifier(workspace, project, identifier);
@@ -116,7 +84,7 @@ const download = async (client, workspace, project, source, destination, merge,
     }
     else {
         const destDirPath = isDestPathDir ? (0, path_1.join)(destPath, name) : destPath;
-        const zipPath = (0, path_1.join)((0, utils_1.getHomeDirectory)(), `${(0, uuid_1.v4)()}.tar.gz`);
+        const zipPath = (0, path_1.join)((0, utils_1.getHomeDirectory)(), `${v4()}.tar.gz`);
         const clearZip = () => {
             try {
                 node_fs_1.default.rmSync(zipPath);
@@ -131,7 +99,7 @@ const download = async (client, workspace, project, source, destination, merge,
             output_1.default.normal(texts_1.TXT_SANDBOX_CP_DOWNLOAD_DONE);
             output_1.default.normal(texts_1.TXT_SANDBOX_UNZIP);
             let count = 0;
-            await unzipper_1.default.extract(unzipper_1.UNZIPPER_FORMAT.TAR_GZ, zipPath, destDirPath, async () => {
+            await ArchiverExtract.extract(UNZIPPER_FORMAT.TAR_GZ, zipPath, destDirPath, async () => {
                 count += 1;
                 output_1.default.clearPreviousLine();
                 output_1.default.normal((0, texts_1.TXT_SANDBOX_UNZIPPING_COUNT)(count));

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',
@@ -41,6 +40,7 @@ commandSandboxCreate.option('--wait-for-configured [seconds]', texts_1.OPTION_SA
 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,

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/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);
 });