bdy 1.18.5-dev → 1.18.6-dev

package/distTs/src/tunnel/cfg.js

@@ -1,12 +1,8 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 const path_1 = require("path");
 const fs_1 = require("fs");
 const utils_1 = require("../utils");
-const input_1 = __importDefault(require("../input"));
 const texts_1 = require("../texts");
 const tunnel_1 = require("../types/tunnel");
 class Cfg {
@@ -71,21 +67,22 @@ class Cfg {
             this.json.tunnels = {};
     }
     async prepareTunnel(tunnelType, target, options, useDefaults) {
-        const type = input_1.default.type(tunnelType);
+        const Input = require('../input').default;
+        const type = Input.type(tunnelType);
         const tunnel = {
             type,
-            target: input_1.default.target(target, type),
+            target: Input.target(target, type),
         };
         if (options.region !== undefined)
-            tunnel.region = input_1.default.region(options.region);
+            tunnel.region = Input.region(options.region);
         else if (useDefaults)
             tunnel.region = this.getRegion();
         if (options.whitelist !== undefined)
-            tunnel.whitelist = input_1.default.whitelist(options.whitelist);
+            tunnel.whitelist = Input.whitelist(options.whitelist);
         else if (useDefaults)
             tunnel.whitelist = this.getWhitelist();
         if (options.timeout !== undefined)
-            tunnel.timeout = input_1.default.timeout(options.timeout);
+            tunnel.timeout = Input.timeout(options.timeout);
         else if (useDefaults)
             tunnel.timeout = this.getTimeout();
         if (type === tunnel_1.TUNNEL_TYPE.HTTP) {
@@ -93,7 +90,7 @@ class Cfg {
             if (options.host !== undefined)
                 tunnel.host = options.host;
             if (options.auth !== undefined) {
-                const { password, login } = input_1.default.auth(options.auth);
+                const { password, login } = Input.auth(options.auth);
                 tunnel.login = login;
                 tunnel.password = password;
                 tunnel.authType = tunnel_1.TUNNEL_HTTP_AUTH_TYPE.BASIC;
@@ -102,34 +99,34 @@ class Cfg {
                 tunnel.authType = tunnel_1.TUNNEL_HTTP_AUTH_TYPE.BUDDY;
             }
             if (options.ca !== undefined)
-                tunnel.ca = input_1.default.ca(options.ca);
+                tunnel.ca = Input.ca(options.ca);
             if (options.serve !== undefined)
-                tunnel.serve = input_1.default.serve(options.serve);
+                tunnel.serve = Input.serve(options.serve);
             if (options.useragent !== undefined)
-                tunnel.useragents = input_1.default.useragents(options.useragent);
+                tunnel.useragents = Input.useragents(options.useragent);
             if (options.header !== undefined)
-                tunnel.headers = input_1.default.headers(options.header);
+                tunnel.headers = Input.headers(options.header);
             if (options.responseHeader !== undefined)
-                tunnel.responseHeaders = input_1.default.headers(options.responseHeader);
+                tunnel.responseHeaders = Input.headers(options.responseHeader);
             if (options.circuitBreaker !== undefined)
-                tunnel.circuitBreaker = input_1.default.circuitBreaker(options.circuitBreaker);
+                tunnel.circuitBreaker = Input.circuitBreaker(options.circuitBreaker);
             tunnel.log = !!options.log;
             tunnel.verify = !!options.verify;
             tunnel.http2 = !!options.http2;
             tunnel.compression = !!options.compression;
         }
         else if (type === tunnel_1.TUNNEL_TYPE.TLS) {
-            tunnel.terminate = input_1.default.terminate(options.terminate);
+            tunnel.terminate = Input.terminate(options.terminate);
             if (options.key !== undefined || options.cert !== undefined) {
-                const { key, cert } = input_1.default.keyCert(options.key, options.cert);
+                const { key, cert } = Input.keyCert(options.key, options.cert);
                 tunnel.key = key;
                 tunnel.cert = cert;
             }
             if (options.ca !== undefined)
-                tunnel.ca = input_1.default.ca(options.ca);
+                tunnel.ca = Input.ca(options.ca);
         }
         if (options.name !== undefined)
-            tunnel.name = input_1.default.name(options.name);
+            tunnel.name = Input.name(options.name);
         return tunnel;
     }
     async addTunnel(name, type, target, options) {

package/distTs/src/tunnel/tunnel.js

@@ -38,6 +38,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 const basic_auth_1 = __importDefault(require("basic-auth"));
 const utils_1 = require("../utils");
+const sshKeygen_1 = require("../sshKeygen");
 const latency_1 = __importDefault(require("./latency"));
 const client_1 = __importDefault(require("./ssh/client"));
 const events_1 = __importDefault(require("events"));
@@ -349,7 +350,7 @@ class Tunnel extends events_1.default {
         super();
         this.httpAuthClient = {};
         if (!sshHostKey)
-            sshHostKey = (0, utils_1.createSshHostKey)();
+            sshHostKey = (0, sshKeygen_1.createSshHostKey)();
         this.agent = agent;
         this.id = id;
         this.cipherKey = node_crypto_1.default

package/distTs/src/utils.js

@@ -37,14 +37,13 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getCurrentVersionWithoutEnv = exports.getVersionWithoutEnv = exports.getVersion = exports.isInstalledByChoco = exports.isInstalledByApt = exports.isInstalledByBrew = exports.isInstalledByNpm = exports.tryGetEmail = exports.execLocally = exports.getHomeDirectory = exports.newCommand = exports.formatBytes = exports.formatHelp = exports.getPlatform = exports.getHostname = exports.isStringRegExp = exports.getWorkingDir = exports.getRootDir = exports.TARGET_ONLY_PORT_REGEX = exports.TARGET_HTTP_REGEX = exports.TARGET_TCP_TLS_REGEX = exports.ApiErrorTunnelsDisabled = exports.ApiErrorWorkspaceFlagged = exports.ApiErrorTunnelLimitReached = exports.ApiErrorAgentLimitReached = exports.ApiErrorDomainRestricted = exports.ApiErrorTargetInvalid = exports.ApiErrorWrongToken = exports.ApiErrorFailedToConnect = exports.ApiErrorAgentNotFound = exports.PACKAGE_AUTH_TYPE = exports.PACKAGE_SCOPE = exports.PACKAGE_TYPE = exports.SANDBOX_SNAPSHOT_STATUS = exports.SANDBOX_APP_STATUS = exports.SANDBOX_SETUP_STATUS = exports.SANDBOX_EXEC_STATUS = exports.SANDBOX_EXEC_RUNTIME = exports.SANDBOX_STATUS = exports.REST_API_ENDPOINT = exports.REST_API_REGION = exports.SUGGESTED_BROWSER_VERSION = exports.DEFAULT_TIMEOUT = exports.TUNNEL_HTTP_CB_MIN_REQUESTS = exports.TUNNEL_HTTP_CB_WINDOW = exports.TUNNEL_MAX_REQUEST_SIZE_TO_SYNC = exports.TUNNEL_HTTP_LOG_MAX_REQUESTS = exports.TUNNEL_HTTP_LOG_MAX_BODY = exports.TUNNEL_HTTP_RATE_WINDOW = exports.TUNNEL_HTTP_RATE_LIMIT = void 0;
-exports.getBasicCommandTls = exports.getBasicCommandHttp = exports.getBasicCommandSandboxEndpoint = exports.getBasicCommandTcp = exports.createSshHostKey = exports.getRealTargetHost = exports.isWindows = exports.isLinux = exports.isOsx = exports.isDocker = exports.sleep = exports.getLatestVersion = exports.getVersionEnv = void 0;
+exports.getBasicCommandTls = exports.getBasicCommandHttp = exports.getBasicCommandSandboxEndpoint = exports.getBasicCommandTcp = exports.getRealTargetHost = exports.isWindows = exports.isLinux = exports.isOsx = exports.isDocker = exports.sleep = exports.getLatestVersion = exports.getVersionEnv = void 0;
 exports.apiErrorCodeToClass = apiErrorCodeToClass;
 exports.isFile = isFile;
 exports.getAppWorkspaceUrl = getAppWorkspaceUrl;
 exports.getAppWorkspaceSettingsUrl = getAppWorkspaceSettingsUrl;
 exports.getAppUrl = getAppUrl;
 exports.getDockerRegistryHostByApiBaseUrl = getDockerRegistryHostByApiBaseUrl;
-exports.fetchOpenApiSchema = fetchOpenApiSchema;
 exports.openApiPrepareUrl = openApiPrepareUrl;
 exports.getOpenApiEndpointByApiBaseUrl = getOpenApiEndpointByApiBaseUrl;
 exports.isValidDomain = isValidDomain;
@@ -56,14 +55,10 @@ exports.getAppHostByApiBaseUrl = getAppHostByApiBaseUrl;
 const node_path_1 = __importDefault(require("node:path"));
 const node_fs_1 = require("node:fs");
 const texts_1 = require("./texts");
-const ssh2_1 = __importDefault(require("ssh2"));
 const node_sea_1 = require("node:sea");
 const commander_1 = require("commander");
 const node_os_1 = __importStar(require("node:os"));
 const node_child_process_1 = require("node:child_process");
-const bundle_1 = require("@scalar/json-magic/bundle");
-const node_1 = require("@scalar/json-magic/bundle/plugins/node");
-const openapi_parser_1 = require("@scalar/openapi-parser");
 exports.TUNNEL_HTTP_RATE_LIMIT = 2000;
 exports.TUNNEL_HTTP_RATE_WINDOW = 60000;
 exports.TUNNEL_HTTP_LOG_MAX_BODY = 5242880; // 5MB
@@ -511,11 +506,6 @@ const getRealTargetHost = (target) => {
     return target || '';
 };
 exports.getRealTargetHost = getRealTargetHost;
-const createSshHostKey = () => {
-    const keys = ssh2_1.default.utils.generateKeyPairSync('ed25519', {});
-    return keys.private;
-};
-exports.createSshHostKey = createSshHostKey;
 const getBasicCommandTcp = () => {
     const commandTcp = (0, exports.newCommand)('tcp');
     commandTcp.alias('TCP');
@@ -671,22 +661,6 @@ function getDockerRegistryHostByApiBaseUrl(baseUrl) {
         return baseUrl.hostname;
     }
 }
-async function fetchOpenApiSchema(baseUrl) {
-    try {
-        const url = getOpenApiEndpointByApiBaseUrl(baseUrl);
-        const data = await (0, bundle_1.bundle)(url, {
-            plugins: [(0, node_1.readFiles)(), (0, node_1.fetchUrls)(), (0, node_1.parseYaml)(), (0, node_1.parseJson)()],
-            treeShake: true,
-        });
-        const { schema } = await (0, openapi_parser_1.dereference)(data);
-        if (schema)
-            return schema;
-    }
-    catch {
-        // do nothing
-    }
-    throw new Error(texts_1.ERR_SCHEMA_FETCH_FAILED);
-}
 function openApiPrepareUrl(url, workspace, project) {
     let preparedUrl = url.replaceAll('{workspace_domain}', workspace);
     if (project)

package/package.json

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