bdy 1.8.19-dev → 1.8.21-dev

package/distTs/package.json

@@ -1,7 +1,7 @@
 {
   "name": "bdy",
   "preferGlobal": false,
-  "version": "1.8.19-dev",
+  "version": "1.8.21-dev",
   "type": "commonjs",
   "license": "MIT",
   "scripts": {
@@ -31,6 +31,7 @@
     "jsonwebtoken": "9.0.2",
     "mime-db": "1.52.0",
     "mime-types": "2.1.35",
+    "punycode": "2.3.1",
     "netmask": "2.0.2",
     "node-fetch": "3.3.2",
     "node-forge": "1.3.1",

package/distTs/src/agent/manager.js

@@ -95,6 +95,7 @@ class AgentManagerClass {
                     type: tunnel.type,
                     target: tunnel.target,
                     domain: tunnel.domain,
+                    customDomain: tunnel.customDomain,
                     subdomain: tunnel.subdomain,
                     serve: tunnel.serve,
                     status: tunnel.status,

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

@@ -64,6 +64,7 @@ class AgentSocketTunnel extends events_1.default {
         this.subdomain = data.subdomain;
         this.sshId = data.sshId;
         this.domain = data.domain;
+        this.customDomain = data.customDomain;
         this.sshForwardPort = data.sshForwardPort;
     }
     upsertHttpLog(data) {

package/distTs/src/agent/socket.js

@@ -68,6 +68,7 @@ class AgentSocket {
             target: t.target,
             subdomain: t.subdomain,
             domain: t.domain,
+            customDomain: t.customDomain,
             sshId: t.sshId,
             sshForwardPort: t.sshForwardPort,
             ...data,
@@ -189,6 +190,7 @@ class AgentSocket {
             id: this.tunnel.id,
             subdomain: this.tunnel.subdomain,
             domain: this.tunnel.domain,
+            customDomain: this.tunnel.customDomain,
             sshId: this.tunnel.sshId,
             sshForwardPort: this.tunnel.sshForwardPort,
         });

package/distTs/src/format.js

@@ -106,11 +106,12 @@ class Format {
     static entryHost(tunnel) {
         let host = '';
         host += tunnel.subdomain;
-        host += '.';
-        // todo custom domain
-        host += tunnel.region.toLowerCase();
-        host += '-';
-        host += tunnel.sshId;
+        if (!tunnel.customDomain) {
+            host += '.';
+            host += tunnel.region.toLowerCase();
+            host += '-';
+            host += tunnel.sshId;
+        }
         host += '.';
         host += tunnel.domain;
         return host;

package/distTs/src/input.js

@@ -38,11 +38,13 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 const output_js_1 = __importDefault(require("./output.js"));
 const netmask_1 = __importDefault(require("netmask"));
+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_js_1 = require("./utils.js");
 const texts_js_1 = require("./texts.js");
+const logger_1 = __importDefault(require("./logger"));
 class Input {
     static timeout(timeout) {
         const t = parseInt(timeout, 10);
@@ -90,19 +92,23 @@ class Input {
         return r;
     }
     static subdomain(subdomain) {
-        if (!/^[a-z0-9-]+$/i.test(subdomain)) {
+        const encoded = punycode_1.default.toASCII(subdomain);
+        if (!/^[a-z0-9-]+$/i.test(encoded)) {
             output_js_1.default.exitError((0, texts_js_1.ERR_SUBDOMAIN_IS_NOT_VALID)(subdomain));
         }
         if (subdomain.length < 5) {
             output_js_1.default.exitError((0, texts_js_1.ERR_SUBDOMAIN_IS_TOO_SHORT)(subdomain));
         }
-        if (subdomain.length > 63) {
+        if (encoded.length > 63) {
             output_js_1.default.exitError((0, texts_js_1.ERR_SUBDOMAIN_IS_TOO_LONG)(subdomain));
         }
         return subdomain;
     }
     static domain(domain) {
-        if (!/^(?:[A-z0-9](?:[A-z0-9-]{0,61}[A-z0-9])?\.)+[A-z0-9][A-z0-9-]{0,61}[A-z0-9]$/i.test(domain)) {
+        const encoded = punycode_1.default.toASCII(domain);
+        logger_1.default.info(domain);
+        logger_1.default.info(encoded);
+        if (!/^(?:[A-z0-9](?:[A-z0-9-]{0,61}[A-z0-9])?\.)+[A-z0-9][A-z0-9-]{0,61}[A-z0-9]$/i.test(encoded)) {
             output_js_1.default.exitError((0, texts_js_1.ERR_DOMAIN_IS_NOT_VALID)(domain));
         }
         return domain;

package/distTs/src/tunnel/dns.js

@@ -2,38 +2,54 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const dns_1 = require("dns");
 class TunnelDns {
-    constructor(sshIp, domain, subdomain, region, sshId) {
+    constructor(sshIp, domain, customDomain, 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();
-        // todo custom domain
-        const hostname = `${this.subdomain}.${this.region.toLowerCase()}-${this.sshId}.${this.domain}`;
-        r.resolveCname(hostname, (err, a1) => {
-            if (err || !a1 || a1.length !== 1) {
-                this.valid = false;
-                this.checking = false;
-            }
-            else {
-                r.resolve4(a1[0], (err, a2) => {
-                    if (err || !a2 || a2.length !== 1) {
-                        this.valid = false;
-                        this.checking = false;
-                    }
-                    else {
-                        this.valid = a2[0] === this.sshIp;
-                        this.checking = false;
-                    }
-                });
-            }
-        });
+        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.resolveCname(hostname, (err, a1) => {
+                if (err || !a1 || a1.length !== 1) {
+                    this.valid = false;
+                    this.checking = false;
+                }
+                else {
+                    r.resolve4(a1[0], (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.js

@@ -21,7 +21,7 @@ const format_1 = __importDefault(require("./format"));
 const texts_js_1 = require("./texts.js");
 const dns_js_1 = __importDefault(require("./tunnel/dns.js"));
 class Tunnel extends events_1.default {
-    constructor({ id, type, target, region, timeout, domain, subdomain, whitelist, tlsSettings, httpSettings, sshSettings, sshHostKey, }) {
+    constructor({ id, type, target, region, timeout, domain, customDomain, subdomain, whitelist, tlsSettings, httpSettings, sshSettings, sshHostKey, }) {
         super();
         if (!sshHostKey)
             sshHostKey = (0, utils_js_1.createSshHostKey)();
@@ -33,6 +33,7 @@ class Tunnel extends events_1.default {
             region,
             timeout,
             domain,
+            customDomain,
             subdomain,
             whitelist,
             tlsSettings,
@@ -40,12 +41,13 @@ class Tunnel extends events_1.default {
             sshSettings,
         });
     }
-    create({ type, target, region, timeout, domain, subdomain, whitelist, tlsSettings, httpSettings, sshSettings, }) {
+    create({ type, target, region, timeout, domain, customDomain, subdomain, whitelist, tlsSettings, httpSettings, sshSettings, }) {
         this.type = type;
         this.region = region;
         this.target = target;
         this.whitelist = whitelist || [];
         this.domain = domain;
+        this.customDomain = !!customDomain;
         this.subdomain = subdomain;
         this.timeout = timeout || utils_js_1.DEFAULT_TIMEOUT;
         this.useragents = [];
@@ -135,7 +137,7 @@ class Tunnel extends events_1.default {
         this.ssh = null;
         this.started = false;
     }
-    recreate({ type, target, region, timeout, domain, subdomain, whitelist, tlsSettings, httpSettings, sshSettings, }) {
+    recreate({ type, target, region, timeout, domain, customDomain, subdomain, whitelist, tlsSettings, httpSettings, sshSettings, }) {
         const started = this.started;
         this.stop(false);
         this.create({
@@ -144,6 +146,7 @@ class Tunnel extends events_1.default {
             region,
             timeout,
             domain,
+            customDomain,
             subdomain,
             whitelist,
             tlsSettings,
@@ -547,7 +550,7 @@ class Tunnel extends events_1.default {
             this.targetLatency.startChecking();
         }
         // dns health
-        this.dns = new dns_js_1.default(this.sshIp, this.domain, this.subdomain, this.region, this.sshId);
+        this.dns = new dns_js_1.default(this.sshIp, this.domain, this.customDomain, this.subdomain, this.region, this.sshId);
         this.dns.startChecking();
         if (this.type === utils_js_1.TUNNEL_TLS && this.terminate === utils_js_1.TLS_TERMINATE_AT_AGENT) {
             // tls

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "bdy",
   "preferGlobal": false,
-  "version": "1.8.19-dev",
+  "version": "1.8.21-dev",
   "type": "commonjs",
   "license": "MIT",
   "scripts": {
@@ -31,6 +31,7 @@
     "jsonwebtoken": "9.0.2",
     "mime-db": "1.52.0",
     "mime-types": "2.1.35",
+    "punycode": "2.3.1",
     "netmask": "2.0.2",
     "node-fetch": "3.3.2",
     "node-forge": "1.3.1",