pinggy 0.4.4 → 0.4.5

package/dist/index.cjs

@@ -3154,6 +3154,17 @@ var init_extendedOptions = __esm({
 });
 
 // src/cli/buildConfig.ts
+function removeIPv6Brackets(ip) {
+  if (ip.startsWith("[") && ip.endsWith("]")) {
+    return ip.slice(1, -1);
+  }
+  return ip;
+}
+function isValidServerAddress(host) {
+  const normalized = removeIPv6Brackets(host.trim());
+  if (!normalized) return false;
+  return domainRegex.test(normalized) || (0, import_net2.isIP)(normalized) !== 0;
+}
 function isKeyword(str) {
   return KEYWORDS.has(str.toLowerCase());
 }
@@ -3166,7 +3177,7 @@ function parseUserAndDomain(str) {
   if (!str) return { token, type, server, qrCode, forceFlag };
   if (str.includes("@")) {
     const [user, domain] = str.split("@", 2);
-    if (domainRegex.test(domain)) {
+    if (isValidServerAddress(domain)) {
       let processKeyword2 = function(keyword) {
         if ([import_pinggy4.TunnelType.Http, import_pinggy4.TunnelType.Tcp, import_pinggy4.TunnelType.Tls, import_pinggy4.TunnelType.Udp, import_pinggy4.TunnelType.TlsTcp].includes(keyword)) {
           type = keyword;
@@ -3202,7 +3213,7 @@ function parseUserAndDomain(str) {
         }
       }
     }
-  } else if (domainRegex.test(str)) {
+  } else if (isValidServerAddress(str)) {
     server = str;
   }
   return { token, type, server, qrCode, forceFlag };
@@ -3273,12 +3284,6 @@ function parseLocalPort(finalConfig, values) {
   }
   return null;
 }
-function removeIPv6Brackets(ip) {
-  if (ip.startsWith("[") && ip.endsWith("]")) {
-    return ip.slice(1, -1);
-  }
-  return ip;
-}
 function isValidHostAddress(host) {
   const normalized = removeIPv6Brackets(host.trim());
   if (normalized.length === 0) return false;
@@ -3336,7 +3341,7 @@ function parseAdditionalForwarding(forwarding) {
   }
   const firstPart = parsed[0];
   const [hostPart] = firstPart.split("@");
-  let protocol = "http";
+  let protocol = import_pinggy4.TunnelType.Http;
   let remoteDomainRaw;
   let remotePort = 0;
   if (hostPart.includes("//")) {
@@ -3350,7 +3355,7 @@ function parseAdditionalForwarding(forwarding) {
       return new Error("invalid forwarding address format");
     }
     remoteDomainRaw = domainAndPort[0];
-    if (!remoteDomainRaw || !domainRegex.test(remoteDomainRaw)) {
+    if (!remoteDomainRaw || !isValidServerAddress(remoteDomainRaw)) {
       return new Error("invalid remote domain");
     }
     const parsedRemotePort = toPort(domainAndPort[1]);
@@ -3366,10 +3371,10 @@ function parseAdditionalForwarding(forwarding) {
     }
   } else {
     remoteDomainRaw = hostPart;
-    if (!domainRegex.test(remoteDomainRaw)) {
+    if (!isValidServerAddress(remoteDomainRaw)) {
       return new Error("invalid remote domain");
     }
-    protocol = "http";
+    protocol = import_pinggy4.TunnelType.Http;
     remotePort = 0;
   }
   const localDomain = removeIPv6Brackets(parsed[2] || "localhost");
@@ -3539,7 +3544,7 @@ async function buildFinalConfig(values, positionals) {
     // Apply loaded config on top of defaults
     configId: getRandomId(),
     token: token || (configFromFile?.token || (typeof values.token === "string" ? values.token : "")),
-    serverAddress: server || (configFromFile?.serverAddress || defaultOptions.serverAddress),
+    serverAddress: server ? removeIPv6Brackets(server) : configFromFile?.serverAddress || defaultOptions.serverAddress,
     isQRCode: qrCode || (configFromFile?.isQRCode || false),
     autoReconnect: configFromFile?.autoReconnect ? configFromFile.autoReconnect : defaultOptions.autoReconnect,
     optional: {
@@ -3589,7 +3594,7 @@ var init_buildConfig = __esm({
       "force",
       "qr"
     ]);
-    VALID_PROTOCOLS = ["http", "tcp", "udp", "tls"];
+    VALID_PROTOCOLS = [import_pinggy4.TunnelType.Http, import_pinggy4.TunnelType.Tcp, import_pinggy4.TunnelType.Udp, import_pinggy4.TunnelType.Tls, import_pinggy4.TunnelType.TlsTcp];
   }
 });
 

package/dist/index.js

@@ -104,7 +104,7 @@ async function verifyAndLoad() {
       process.exit(1);
     }
   }
-  await import("./main-PFPDXIRG.js");
+  await import("./main-2RDHMQT7.js");
 }
 verifyAndLoad().catch((err) => {
   printer_default.error(`Failed to start CLI:, ${err}`);

package/dist/{main-PFPDXIRG.js → main-2RDHMQT7.js}

@@ -256,6 +256,17 @@ import fs from "fs";
 import path from "path";
 import { isIP as isIP2 } from "net";
 var domainRegex = /^(?:[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?\.)+[a-zA-Z]{2,}$/;
+function removeIPv6Brackets(ip) {
+  if (ip.startsWith("[") && ip.endsWith("]")) {
+    return ip.slice(1, -1);
+  }
+  return ip;
+}
+function isValidServerAddress(host) {
+  const normalized = removeIPv6Brackets(host.trim());
+  if (!normalized) return false;
+  return domainRegex.test(normalized) || isIP2(normalized) !== 0;
+}
 var KEYWORDS = /* @__PURE__ */ new Set([
   TunnelType.Http,
   TunnelType.Tcp,
@@ -277,7 +288,7 @@ function parseUserAndDomain(str) {
   if (!str) return { token, type, server, qrCode, forceFlag };
   if (str.includes("@")) {
     const [user, domain] = str.split("@", 2);
-    if (domainRegex.test(domain)) {
+    if (isValidServerAddress(domain)) {
       let processKeyword2 = function(keyword) {
         if ([TunnelType.Http, TunnelType.Tcp, TunnelType.Tls, TunnelType.Udp, TunnelType.TlsTcp].includes(keyword)) {
           type = keyword;
@@ -313,7 +324,7 @@ function parseUserAndDomain(str) {
         }
       }
     }
-  } else if (domainRegex.test(str)) {
+  } else if (isValidServerAddress(str)) {
     server = str;
   }
   return { token, type, server, qrCode, forceFlag };
@@ -384,12 +395,6 @@ function parseLocalPort(finalConfig, values) {
   }
   return null;
 }
-function removeIPv6Brackets(ip) {
-  if (ip.startsWith("[") && ip.endsWith("]")) {
-    return ip.slice(1, -1);
-  }
-  return ip;
-}
 function isValidHostAddress(host) {
   const normalized = removeIPv6Brackets(host.trim());
   if (normalized.length === 0) return false;
@@ -416,7 +421,7 @@ function ipv6SafeSplitColon(s) {
   result.push(buf);
   return result;
 }
-var VALID_PROTOCOLS = ["http", "tcp", "udp", "tls"];
+var VALID_PROTOCOLS = [TunnelType.Http, TunnelType.Tcp, TunnelType.Udp, TunnelType.Tls, TunnelType.TlsTcp];
 function parseDefaultForwarding(forwarding) {
   const parts = ipv6SafeSplitColon(forwarding);
   if (parts.length === 3) {
@@ -448,7 +453,7 @@ function parseAdditionalForwarding(forwarding) {
   }
   const firstPart = parsed[0];
   const [hostPart] = firstPart.split("@");
-  let protocol = "http";
+  let protocol = TunnelType.Http;
   let remoteDomainRaw;
   let remotePort = 0;
   if (hostPart.includes("//")) {
@@ -462,7 +467,7 @@ function parseAdditionalForwarding(forwarding) {
       return new Error("invalid forwarding address format");
     }
     remoteDomainRaw = domainAndPort[0];
-    if (!remoteDomainRaw || !domainRegex.test(remoteDomainRaw)) {
+    if (!remoteDomainRaw || !isValidServerAddress(remoteDomainRaw)) {
       return new Error("invalid remote domain");
     }
     const parsedRemotePort = toPort(domainAndPort[1]);
@@ -478,10 +483,10 @@ function parseAdditionalForwarding(forwarding) {
     }
   } else {
     remoteDomainRaw = hostPart;
-    if (!domainRegex.test(remoteDomainRaw)) {
+    if (!isValidServerAddress(remoteDomainRaw)) {
       return new Error("invalid remote domain");
     }
-    protocol = "http";
+    protocol = TunnelType.Http;
     remotePort = 0;
   }
   const localDomain = removeIPv6Brackets(parsed[2] || "localhost");
@@ -651,7 +656,7 @@ async function buildFinalConfig(values, positionals) {
     // Apply loaded config on top of defaults
     configId: getRandomId(),
     token: token || (configFromFile?.token || (typeof values.token === "string" ? values.token : "")),
-    serverAddress: server || (configFromFile?.serverAddress || defaultOptions.serverAddress),
+    serverAddress: server ? removeIPv6Brackets(server) : configFromFile?.serverAddress || defaultOptions.serverAddress,
     isQRCode: qrCode || (configFromFile?.isQRCode || false),
     autoReconnect: configFromFile?.autoReconnect ? configFromFile.autoReconnect : defaultOptions.autoReconnect,
     optional: {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pinggy",
-  "version": "0.4.4",
+  "version": "0.4.5",
   "license": "Apache-2.0",
   "type": "module",
   "description": "Create secure, shareable tunnels to your localhost and manage them from the command line. ",