bdy 1.11.0-dev → 1.12.0-dev

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

@@ -8,10 +8,10 @@ const output_1 = __importDefault(require("../../../output"));
 const cfg_1 = __importDefault(require("../../../tunnel/cfg"));
 const texts_1 = require("../../../texts");
 const manager_1 = __importDefault(require("../../../agent/manager"));
-const utils_2 = require("../../../utils");
 const tunnel_1 = __importDefault(require("../../../agent/socket/tunnel"));
 const agent_1 = __importDefault(require("../../../tunnel/api/agent"));
-const commandAgentTunnelTcp = (0, utils_2.getBasicCommandTcp)();
+const tunnel_2 = require("../../../types/tunnel");
+const commandAgentTunnelTcp = (0, utils_1.getBasicCommandTcp)();
 commandAgentTunnelTcp.description(texts_1.DESC_COMMAND_TCP);
 commandAgentTunnelTcp.option('-f, --follow', texts_1.OPTION_FOLLOW);
 commandAgentTunnelTcp.argument('[host:port]', texts_1.OPTION_TARGET);
@@ -20,7 +20,7 @@ commandAgentTunnelTcp.action(async (target, options) => {
     if (!isEnabled) {
         output_1.default.exitError(texts_1.ERR_AGENT_NOT_ENABLED);
     }
-    const prepared = await cfg_1.default.prepareTunnel(utils_1.TUNNEL_TCP, target, options, true);
+    const prepared = await cfg_1.default.prepareTunnel(tunnel_2.TUNNEL_TYPE.TCP, target, options, true);
     try {
         await output_1.default.spinner(texts_1.TXT_OPENING_TUNNEL);
         const json = manager_1.default.system.loadSystemConfig();

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

@@ -9,9 +9,9 @@ const cfg_1 = __importDefault(require("../../../tunnel/cfg"));
 const texts_1 = require("../../../texts");
 const tunnel_1 = __importDefault(require("../../../agent/socket/tunnel"));
 const manager_1 = __importDefault(require("../../../agent/manager"));
-const utils_2 = require("../../../utils");
 const agent_1 = __importDefault(require("../../../tunnel/api/agent"));
-const commandAgentTunnelTls = (0, utils_2.getBasicCommandTls)();
+const tunnel_2 = require("../../../types/tunnel");
+const commandAgentTunnelTls = (0, utils_1.getBasicCommandTls)();
 commandAgentTunnelTls.description(texts_1.DESC_COMMAND_TLS);
 commandAgentTunnelTls.option('-f, --follow', texts_1.OPTION_FOLLOW);
 commandAgentTunnelTls.argument('[host:port]', texts_1.OPTION_TARGET);
@@ -20,7 +20,7 @@ commandAgentTunnelTls.action(async (target, options) => {
     if (!isEnabled) {
         output_1.default.exitError(texts_1.ERR_AGENT_NOT_ENABLED);
     }
-    const prepared = await cfg_1.default.prepareTunnel(utils_1.TUNNEL_TLS, target, options, true);
+    const prepared = await cfg_1.default.prepareTunnel(tunnel_2.TUNNEL_TYPE.TLS, target, options, true);
     try {
         await output_1.default.spinner(texts_1.TXT_OPENING_TUNNEL);
         const json = manager_1.default.system.loadSystemConfig();

package/distTs/src/command/config/add/http.js

@@ -8,8 +8,8 @@ const input_1 = __importDefault(require("../../../input"));
 const cfg_1 = __importDefault(require("../../../tunnel/cfg"));
 const output_1 = __importDefault(require("../../../output"));
 const texts_1 = require("../../../texts");
-const utils_2 = require("../../../utils");
-const commandConfigAddHttp = (0, utils_2.getBasicCommandHttp)();
+const tunnel_1 = require("../../../types/tunnel");
+const commandConfigAddHttp = (0, utils_1.getBasicCommandHttp)();
 commandConfigAddHttp.description(texts_1.DESC_COMMAND_CONFIG_ADD_HTTP);
 commandConfigAddHttp.option('-f, --force', texts_1.OPTION_FORCE);
 commandConfigAddHttp.argument('<name>', texts_1.OPTION_NAME);
@@ -19,7 +19,7 @@ commandConfigAddHttp.action(async (n, target, options) => {
     if (cfg_1.default.hasTunnel(name) && !options.force) {
         output_1.default.exitError(texts_1.ERR_TUNNEL_ALREADY_EXISTS);
     }
-    await cfg_1.default.addTunnel(name, utils_1.TUNNEL_HTTP, target, options);
+    await cfg_1.default.addTunnel(name, tunnel_1.TUNNEL_TYPE.HTTP, target, options);
     output_1.default.exitSuccess(texts_1.TXT_TUNNEL_ADDED);
 });
 exports.default = commandConfigAddHttp;

package/distTs/src/command/config/add/tcp.js

@@ -8,8 +8,8 @@ const input_1 = __importDefault(require("../../../input"));
 const cfg_1 = __importDefault(require("../../../tunnel/cfg"));
 const output_1 = __importDefault(require("../../../output"));
 const texts_1 = require("../../../texts");
-const utils_2 = require("../../../utils");
-const commandConfigAddTcp = (0, utils_2.getBasicCommandTcp)();
+const tunnel_1 = require("../../../types/tunnel");
+const commandConfigAddTcp = (0, utils_1.getBasicCommandTcp)();
 commandConfigAddTcp.description(texts_1.DESC_COMMAND_CONFIG_ADD_TCP);
 commandConfigAddTcp.option('-f, --force', texts_1.OPTION_FORCE);
 commandConfigAddTcp.argument('<name>', texts_1.OPTION_NAME);
@@ -19,7 +19,7 @@ commandConfigAddTcp.action(async (n, target, options) => {
     if (cfg_1.default.hasTunnel(name) && !options.force) {
         output_1.default.exitError(texts_1.ERR_TUNNEL_ALREADY_EXISTS);
     }
-    await cfg_1.default.addTunnel(name, utils_1.TUNNEL_TCP, target, options);
+    await cfg_1.default.addTunnel(name, tunnel_1.TUNNEL_TYPE.TCP, target, options);
     output_1.default.exitSuccess(texts_1.TXT_TUNNEL_ADDED);
 });
 exports.default = commandConfigAddTcp;

package/distTs/src/command/config/add/tls.js

@@ -8,8 +8,8 @@ const input_1 = __importDefault(require("../../../input"));
 const cfg_1 = __importDefault(require("../../../tunnel/cfg"));
 const output_1 = __importDefault(require("../../../output"));
 const texts_1 = require("../../../texts");
-const utils_2 = require("../../../utils");
-const commandConfigAddTls = (0, utils_2.getBasicCommandTls)();
+const tunnel_1 = require("../../../types/tunnel");
+const commandConfigAddTls = (0, utils_1.getBasicCommandTls)();
 commandConfigAddTls.description(texts_1.DESC_COMMAND_CONFIG_ADD_TLS);
 commandConfigAddTls.option('-f, --force', texts_1.OPTION_FORCE);
 commandConfigAddTls.argument('<name>', texts_1.OPTION_NAME);
@@ -19,7 +19,7 @@ commandConfigAddTls.action(async (n, target, options) => {
     if (cfg_1.default.hasTunnel(name) && !options.force) {
         output_1.default.exitError(texts_1.ERR_TUNNEL_ALREADY_EXISTS);
     }
-    await cfg_1.default.addTunnel(name, utils_1.TUNNEL_TLS, target, options);
+    await cfg_1.default.addTunnel(name, tunnel_1.TUNNEL_TYPE.TLS, target, options);
     output_1.default.exitSuccess(texts_1.TXT_TUNNEL_ADDED);
 });
 exports.default = commandConfigAddTls;

package/distTs/src/command/config/get/region.js

@@ -12,4 +12,4 @@ const commandConfigGetRegion = (0, utils_1.newCommand)('region', texts_1.DESC_CO
 commandConfigGetRegion.action(() => {
     output_1.default.exitNormal(format_1.default.region(cfg_1.default.getRegion()));
 });
-module.exports = commandConfigGetRegion;
+exports.default = commandConfigGetRegion;

package/distTs/src/command/pre.js

@@ -43,7 +43,7 @@ const commandPre = async (_, command) => {
         output_1.default.newCliVersion(command.latestVersion);
     }
     else if (newAgent) {
-        output_1.default.newAgentVersion(command.latestVersion);
+        output_1.default.newAgentVersion();
     }
 };
 exports.default = commandPre;

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

@@ -8,6 +8,7 @@ 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 commandHttp = (0, utils_1.getBasicCommandHttp)();
 commandHttp.description(texts_1.DESC_COMMAND_HTTP);
 commandHttp.option('-s, --serve <directory>', texts_1.OPTION_SERVE);
@@ -16,7 +17,7 @@ commandHttp.argument('[protocol://host:port]', texts_1.OPTION_TARGET);
 commandHttp.action(async (target, options) => {
     if (options.token)
         cfg_1.default.setToken(options.token);
-    const prepared = await cfg_1.default.prepareTunnel(utils_1.TUNNEL_HTTP, target, options, true);
+    const prepared = await cfg_1.default.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, cfg_1.default.getTokenHost(), cfg_1.default.getToken(), (region) => {
         cfg_1.default.setRegionIfNotSet(region);

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

@@ -7,16 +7,16 @@ const utils_1 = require("../../utils");
 const cfg_1 = __importDefault(require("../../tunnel/cfg"));
 const output_1 = __importDefault(require("../../output"));
 const texts_1 = require("../../texts");
-const utils_2 = require("../../utils");
 const buddy_1 = __importDefault(require("../../tunnel/api/buddy"));
-const commandTcp = (0, utils_2.getBasicCommandTcp)();
+const tunnel_1 = require("../../types/tunnel");
+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.action(async (target, options) => {
     if (options.token)
         cfg_1.default.setToken(options.token);
-    const prepared = await cfg_1.default.prepareTunnel(utils_1.TUNNEL_TCP, target, options, true);
+    const prepared = await cfg_1.default.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, cfg_1.default.getTokenHost(), cfg_1.default.getToken(), (region) => {
         cfg_1.default.setRegionIfNotSet(region);

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

@@ -7,18 +7,18 @@ const utils_1 = require("../../utils");
 const cfg_1 = __importDefault(require("../../tunnel/cfg"));
 const output_1 = __importDefault(require("../../output"));
 const texts_1 = require("../../texts");
-const utils_2 = require("../../utils");
 const buddy_1 = __importDefault(require("../../tunnel/api/buddy"));
-const commandTls = (0, utils_2.getBasicCommandTls)();
+const tunnel_1 = require("../../types/tunnel");
+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.action(async (target, options) => {
     if (options.token)
         cfg_1.default.setToken(options.token);
-    const prepared = await cfg_1.default.prepareTunnel(utils_1.TUNNEL_TLS, target, options, true);
+    const prepared = await cfg_1.default.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, cfg_1.default.getTokenHost(), cfg_1.default.getToken(), (region) => {
+    const agent = await buddy_1.default.register(false, false, cfg_1.default.getTokenHost(), cfg_1.default.getToken(), (region) => {
         cfg_1.default.setRegionIfNotSet(region);
     });
     await agent.start();

package/distTs/src/format.js

@@ -4,7 +4,8 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 const utils_1 = require("./utils");
-const punycode_js_1 = __importDefault(require("punycode.js"));
+const punycode_1 = __importDefault(require("punycode/"));
+const tunnel_1 = require("./types/tunnel");
 class Format {
     static date() {
         const dt = new Date();
@@ -66,14 +67,14 @@ class Format {
         return this.region(region);
     }
     static identify(identifyType) {
-        if (identifyType === utils_1.TUNNEL_IDENTIFIED_HTTP1)
+        if (identifyType === tunnel_1.TUNNEL_HTTP_IDENTIFY.HTTP1)
             return 'Ver. 1.1';
         return 'Ver. 2';
     }
     static terminate(terminate) {
-        if (terminate === utils_1.TLS_TERMINATE_AT_AGENT)
+        if (terminate === tunnel_1.TUNNEL_TERMINATE_AT.AGENT)
             return 'AGENT';
-        if (terminate === utils_1.TLS_TERMINATE_AT_REGION)
+        if (terminate === tunnel_1.TUNNEL_TERMINATE_AT.REGION)
             return 'REGION';
         return 'TARGET';
     }
@@ -105,32 +106,30 @@ class Format {
     static entryHost(tunnel) {
         let host = '';
         host += tunnel.subdomain;
-        if (!tunnel.customDomain) {
-            host += '.';
-            host += tunnel.region.toLowerCase();
-            host += '-';
-            host += tunnel.sshId;
-        }
+        host += '.';
+        host += (tunnel.region || '').toLowerCase();
+        host += '-';
+        host += tunnel.sshId;
         host += '.';
         host += tunnel.domain;
         return host;
     }
     static entryHostEncoded(tunnel) {
-        return punycode_js_1.default.toASCII(this.entryHost(tunnel));
+        return punycode_1.default.toASCII(this.entryHost(tunnel));
     }
     static entry(tunnel) {
         let entry = '';
-        if (tunnel.type === utils_1.TUNNEL_HTTP)
+        if (tunnel.type === tunnel_1.TUNNEL_TYPE.HTTP)
             entry += 'https://';
         entry += this.entryHost(tunnel);
-        if (tunnel.type === utils_1.TUNNEL_TCP)
+        if (tunnel.type === tunnel_1.TUNNEL_TYPE.TCP)
             entry += `:${tunnel.sshForwardPort}`;
-        else if (tunnel.type === utils_1.TUNNEL_TLS)
+        else if (tunnel.type === tunnel_1.TUNNEL_TYPE.TLS)
             entry += ':443';
         return entry;
     }
     static target(type, target) {
-        if (type === utils_1.TUNNEL_HTTP) {
+        if (type === tunnel_1.TUNNEL_TYPE.HTTP) {
             let port = '80';
             let host = 'localhost';
             let proto = 'http';

package/distTs/src/index.js

@@ -20,7 +20,7 @@ process.on('uncaughtException', (err) => {
     logger_1.default.fatal(err);
     output_1.default.exitError(err);
 });
-const program = (0, utils_1.newCommand)(null, texts_1.DESC_PROGRAM);
+const program = (0, utils_1.newCommand)('', texts_1.DESC_PROGRAM);
 program.hook('preAction', pre_1.default);
 program.configureHelp({
     formatHelp: utils_1.formatHelp,

package/distTs/src/input.js

@@ -28,12 +28,13 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 const output_1 = __importDefault(require("./output"));
 const netmask_1 = __importDefault(require("netmask"));
-const punycode_js_1 = __importDefault(require("punycode.js"));
+const punycode_1 = __importDefault(require("punycode/"));
 const fs_1 = __importStar(require("fs"));
 const tls_1 = __importDefault(require("tls"));
 const crypto_1 = __importDefault(require("crypto"));
 const utils_1 = require("./utils");
 const texts_1 = require("./texts");
+const tunnel_1 = require("./types/tunnel");
 class Input {
     static timeout(timeout) {
         const t = parseInt(timeout, 10);
@@ -131,20 +132,18 @@ class Input {
         if (!region)
             output_1.default.exitError((0, texts_1.ERR_REGION_IS_NOT_VALID)(''));
         region = region.toUpperCase();
-        if (![utils_1.REGION_EU, utils_1.REGION_US].includes(region)) {
+        const vals = Object.values(tunnel_1.TUNNEL_REGION);
+        if (!vals.includes(region)) {
             output_1.default.exitError((0, texts_1.ERR_REGION_IS_NOT_VALID)(region));
         }
         return region;
     }
     static terminate(terminate) {
         if (!terminate)
-            return utils_1.TLS_TERMINATE_AT_REGION;
+            return tunnel_1.TUNNEL_TERMINATE_AT.REGION;
         terminate = terminate.toUpperCase();
-        if (![
-            utils_1.TLS_TERMINATE_AT_AGENT,
-            utils_1.TLS_TERMINATE_AT_REGION,
-            utils_1.TLS_TERMINATE_AT_TARGET,
-        ].includes(terminate)) {
+        const vals = Object.values(tunnel_1.TUNNEL_TERMINATE_AT);
+        if (!vals.includes(terminate)) {
             output_1.default.exitError((0, texts_1.ERR_TERMINATE_IS_NOT_VALID)(terminate));
         }
         return terminate;
@@ -164,7 +163,8 @@ class Input {
         // http://user:pass@localhost
         // http://user:pass@localhost:80
         let port;
-        if ([utils_1.TUNNEL_TCP, utils_1.TUNNEL_TLS].includes(type)) {
+        const types = [tunnel_1.TUNNEL_TYPE.TCP, tunnel_1.TUNNEL_TYPE.TLS];
+        if (types.includes(type)) {
             const m = target.match(utils_1.TARGET_TCP_TLS_REGEX);
             if (!m) {
                 output_1.default.exitError((0, texts_1.ERR_TARGET_IS_NOT_VALID)(target));
@@ -197,7 +197,7 @@ class Input {
             }
         }
         Input.port(port);
-        return punycode_js_1.default.toUnicode(target);
+        return punycode_1.default.toUnicode(target);
     }
     static port(port) {
         const p = parseInt(port, 10);
@@ -207,9 +207,10 @@ class Input {
     }
     static type(type) {
         if (!type)
-            return utils_1.TUNNEL_TCP;
+            return tunnel_1.TUNNEL_TYPE.TCP;
         type = type.toUpperCase();
-        if (![utils_1.TUNNEL_TCP, utils_1.TUNNEL_TLS, utils_1.TUNNEL_HTTP].includes(type)) {
+        const vals = [tunnel_1.TUNNEL_TYPE.HTTP, tunnel_1.TUNNEL_TYPE.TLS, tunnel_1.TUNNEL_TYPE.TCP];
+        if (!vals.includes(type)) {
             output_1.default.exitError((0, texts_1.ERR_TYPE_IS_NOT_VALID)(type));
         }
         return type;

package/distTs/src/logger.js

@@ -8,7 +8,7 @@ const path_1 = require("path");
 const fs_1 = __importDefault(require("fs"));
 const utils_1 = require("./utils");
 class Logger {
-    rootPath = null;
+    rootPath;
     logPath = null;
     log1Path = null;
     logStream = null;
@@ -18,6 +18,8 @@ class Logger {
         this.rootPath = (0, utils_1.getHomeDirectory)();
     }
     checkLogSize() {
+        if (!this.logPath || !this.log1Path)
+            return;
         try {
             const s = fs_1.default.statSync(this.logPath);
             if (s.size > 5242880) {
@@ -57,20 +59,17 @@ class Logger {
         }
         return this.p;
     }
-    error(...args) {
-        this.getPino().error(...args);
+    error(obj, ...args) {
+        this.getPino().error(obj, ...args);
     }
-    info(...args) {
-        this.getPino().info(...args);
+    info(obj, ...args) {
+        this.getPino().info(obj, ...args);
     }
-    debug(...args) {
-        this.getPino().debug(...args);
+    debug(obj, ...args) {
+        this.getPino().debug(obj, ...args);
     }
-    trace() {
-        this.getPino().trace();
-    }
-    fatal(...args) {
-        this.getPino().fatal(...args);
+    fatal(obj, ...args) {
+        this.getPino().fatal(obj, ...args);
     }
     stack() {
         this.getPino().info(new Error().stack);
@@ -82,7 +81,7 @@ class Logger {
         }
         if (this.logStream) {
             try {
-                this.logStream.close();
+                fs_1.default.closeSync(this.logStream);
             }
             catch {
                 // do nothing

package/distTs/src/tunnel/agent.js

@@ -11,6 +11,9 @@ const texts_1 = require("../texts");
 const CONNECTION_TIMEOUT = 5000;
 const STREAM_LIMIT = 10;
 class TunnelAgent {
+    static httpAgent1;
+    static httpsAgent1;
+    static http2Clients;
     static getHttp1() {
         if (!this.httpAgent1) {
             this.httpAgent1 = new http_1.default.Agent({
@@ -40,7 +43,6 @@ class TunnelAgent {
             const client = http2_1.default.connect(authority, {
                 rejectUnauthorized: verify,
                 maxSessionMemory: 100,
-                noDelay: true,
                 servername,
             });
             client.once('close', () => {

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

@@ -51,6 +51,7 @@ const makeRequest = async (port, path, body) => {
     return data;
 };
 class ApiAgent {
+    port;
     constructor(port) {
         this.port = port;
     }

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

@@ -3,6 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.ApiBuddyClass = void 0;
 const https_1 = require("https");
 const tunnel_1 = __importDefault(require("../tunnel"));
 const logger_1 = __importDefault(require("../../logger"));
@@ -135,5 +136,6 @@ class ApiBuddyClass {
         return makeRequest('https://es.buddy.works', '/ip', null, 'GET', false);
     }
 }
+exports.ApiBuddyClass = ApiBuddyClass;
 const ApiBuddy = new ApiBuddyClass();
 exports.default = ApiBuddy;

package/distTs/src/tunnel/cfg.js

@@ -9,7 +9,11 @@ const jsonwebtoken_1 = require("jsonwebtoken");
 const utils_1 = require("../utils");
 const input_1 = __importDefault(require("../input"));
 const texts_1 = require("../texts");
+const tunnel_1 = require("../types/tunnel");
 class Cfg {
+    dir;
+    file;
+    json;
     constructor() {
         this.dir = (0, utils_1.getHomeDirectory)();
         this.file = (0, path_1.resolve)(this.dir, 'cfg.json');
@@ -85,7 +89,7 @@ class Cfg {
             tunnel.timeout = input_1.default.timeout(options.timeout);
         else if (useDefaults)
             tunnel.timeout = this.getTimeout();
-        if (type === utils_1.TUNNEL_HTTP) {
+        if (type === tunnel_1.TUNNEL_TYPE.HTTP) {
             if (options.host !== undefined)
                 tunnel.host = options.host;
             if (options.auth !== undefined) {
@@ -110,7 +114,7 @@ class Cfg {
             tunnel.http2 = !!options.http2;
             tunnel.compression = !!options.compression;
         }
-        else if (type === utils_1.TUNNEL_TLS) {
+        else if (type === tunnel_1.TUNNEL_TYPE.TLS) {
             tunnel.terminate = input_1.default.terminate(options.terminate);
             if (options.key !== undefined || options.cert !== undefined) {
                 const { key, cert } = input_1.default.keyCert(options.key, options.cert);

package/distTs/src/tunnel/compression.js

@@ -7,31 +7,34 @@ const zlib_1 = __importDefault(require("zlib"));
 const mime_db_1 = __importDefault(require("mime-db"));
 const accept_negotiator_1 = require("@fastify/accept-negotiator");
 const stream_1 = __importDefault(require("stream"));
-const utils_1 = require("../utils");
+const tunnel_1 = require("../types/tunnel");
 class TunnelCompression {
     static detect(canCompress, reqHeaders, resHeaders) {
-        if (!canCompress || resHeaders['content-encoding'])
-            return utils_1.TUNNEL_COMPRESSION_METHOD_IDENTITY; // already compressed
-        const contentType = resHeaders['content-type'] || 'application/json';
+        if (!canCompress || resHeaders['content-encoding']) {
+            return tunnel_1.TUNNEL_COMPRESSION_METHOD.IDENTITY; // already compressed
+        }
+        const contentType = (resHeaders['content-type'] || 'application/json');
         const mimeData = mime_db_1.default[contentType.split(';', 1)[0].trim().toLowerCase()];
-        if (!mimeData || !mimeData.compressible)
-            return utils_1.TUNNEL_COMPRESSION_METHOD_IDENTITY;
-        const encoding = (0, accept_negotiator_1.negotiate)(reqHeaders['accept-encoding'] || '', [
-            utils_1.TUNNEL_COMPRESSION_METHOD_BR,
-            utils_1.TUNNEL_COMPRESSION_METHOD_GZIP,
-            utils_1.TUNNEL_COMPRESSION_METHOD_DEFLATE,
+        if (!mimeData || !mimeData.compressible) {
+            return tunnel_1.TUNNEL_COMPRESSION_METHOD.IDENTITY;
+        }
+        const acceptEncoding = (reqHeaders['accept-encoding'] || '');
+        const encoding = (0, accept_negotiator_1.negotiate)(acceptEncoding, [
+            tunnel_1.TUNNEL_COMPRESSION_METHOD.BR,
+            tunnel_1.TUNNEL_COMPRESSION_METHOD.GZIP,
+            tunnel_1.TUNNEL_COMPRESSION_METHOD.DEFLATE,
         ]);
         if (!encoding)
-            return utils_1.TUNNEL_COMPRESSION_METHOD_IDENTITY;
+            return tunnel_1.TUNNEL_COMPRESSION_METHOD.IDENTITY;
         return encoding;
     }
     static compress(method) {
         let outStream;
-        if (method === utils_1.TUNNEL_COMPRESSION_METHOD_BR)
+        if (method === tunnel_1.TUNNEL_COMPRESSION_METHOD.BR)
             outStream = zlib_1.default.createBrotliCompress();
-        else if (method === utils_1.TUNNEL_COMPRESSION_METHOD_GZIP)
+        else if (method === tunnel_1.TUNNEL_COMPRESSION_METHOD.GZIP)
             outStream = zlib_1.default.createGzip();
-        else if (method === utils_1.TUNNEL_COMPRESSION_METHOD_DEFLATE)
+        else if (method === tunnel_1.TUNNEL_COMPRESSION_METHOD.DEFLATE)
             outStream = zlib_1.default.createDeflate();
         else
             outStream = new stream_1.default.PassThrough();

package/distTs/src/tunnel/dns.js

@@ -2,46 +2,37 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const dns_1 = require("dns");
 class TunnelDns {
-    constructor(sshIp, domain, customDomain, subdomain, region, sshId) {
+    region;
+    sshId;
+    sshIp;
+    domain;
+    subdomain;
+    valid;
+    checking;
+    ts;
+    constructor(sshIp, domain, subdomain, region, sshId) {
         this.region = region;
         this.sshId = sshId;
         this.sshIp = sshIp;
         this.domain = domain;
         this.subdomain = subdomain;
-        this.customDomain = customDomain;
         this.valid = false;
         this.checking = true;
         this.ts = null;
     }
     check() {
         const r = new dns_1.Resolver();
-        let hostname;
-        if (this.customDomain) {
-            hostname = `${this.subdomain}.${this.domain}`;
-            r.resolve4(hostname, (err, a1) => {
-                if (err || !a1 || a1.length !== 1) {
-                    this.valid = false;
-                    this.checking = false;
-                }
-                else {
-                    this.valid = a1[0] === this.sshIp;
-                    this.checking = false;
-                }
-            });
-        }
-        else {
-            hostname = `${this.subdomain}.${this.region.toLowerCase()}-${this.sshId}.${this.domain}`;
-            r.resolve4(hostname, (err, a2) => {
-                if (err || !a2 || a2.length !== 1) {
-                    this.valid = false;
-                    this.checking = false;
-                }
-                else {
-                    this.valid = a2[0] === this.sshIp;
-                    this.checking = false;
-                }
-            });
-        }
+        const hostname = `${this.subdomain}.${this.region.toLowerCase()}-${this.sshId}.${this.domain}`;
+        r.resolve4(hostname, (err, a2) => {
+            if (err || !a2 || a2.length !== 1) {
+                this.valid = false;
+                this.checking = false;
+            }
+            else {
+                this.valid = a2[0] === this.sshIp;
+                this.checking = false;
+            }
+        });
     }
     startChecking() {
         this.stopChecking();

package/distTs/src/tunnel/html.js

@@ -4,6 +4,8 @@ const fs_1 = require("fs");
 const node_sea_1 = require("node:sea");
 const path_1 = require("path");
 class TunnelHtml {
+    static html404;
+    static html504;
     static get404() {
         if (!this.html404) {
             if ((0, node_sea_1.isSea)()) {