pinggy 0.4.2 → 0.4.4

package/dist/index.cjs

@@ -3279,6 +3279,11 @@ function removeIPv6Brackets(ip) {
   }
   return ip;
 }
+function isValidHostAddress(host) {
+  const normalized = removeIPv6Brackets(host.trim());
+  if (normalized.length === 0) return false;
+  return normalized === "localhost" || (0, import_net2.isIP)(normalized) !== 0;
+}
 function ipv6SafeSplitColon(s) {
   const result = [];
   let buf = "";
@@ -3412,17 +3417,22 @@ function parseReverseTunnelAddr(finalConfig, values, primaryType) {
 function parseLocalTunnelAddr(finalConfig, values) {
   if (!Array.isArray(values.L) || values.L.length === 0) return null;
   const firstL = values.L[0];
-  const parts = firstL.split(":");
+  const parts = ipv6SafeSplitColon(firstL);
+  let debuggerHost = "localhost";
   let lp;
   if (parts.length === 3) {
     lp = parseInt(parts[0], 10);
   } else if (parts.length === 4) {
+    debuggerHost = removeIPv6Brackets(parts[0]);
     lp = parseInt(parts[1], 10);
   } else {
     return new Error("Incorrect command line arguments: web debugger address incorrect. Please use '-h' option for help.");
   }
+  if (!isValidHostAddress(debuggerHost)) {
+    return new Error(`Invalid debugger host ${debuggerHost}. Please use localhost, IPv4, or IPv6 address.`);
+  }
   if (!Number.isNaN(lp) && isValidPort(lp)) {
-    finalConfig.webDebugger = `localhost:${lp}`;
+    finalConfig.webDebugger = `${debuggerHost}:${lp}`;
   } else {
     return new Error(`Invalid debugger port ${lp}`);
   }
@@ -3556,7 +3566,7 @@ async function buildFinalConfig(values, positionals) {
   storeJson(finalConfig, saveconf);
   return finalConfig;
 }
-var import_pinggy4, import_fs4, import_path4, domainRegex, KEYWORDS, VALID_PROTOCOLS;
+var import_pinggy4, import_fs4, import_path4, import_net2, domainRegex, KEYWORDS, VALID_PROTOCOLS;
 var init_buildConfig = __esm({
   "src/cli/buildConfig.ts"() {
     "use strict";
@@ -3568,6 +3578,7 @@ var init_buildConfig = __esm({
     import_pinggy4 = require("@pinggy/pinggy");
     import_fs4 = __toESM(require("fs"), 1);
     import_path4 = __toESM(require("path"), 1);
+    import_net2 = require("net");
     domainRegex = /^(?:[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?\.)+[a-zA-Z]{2,}$/;
     KEYWORDS = /* @__PURE__ */ new Set([
       import_pinggy4.TunnelType.Http,
@@ -3583,8 +3594,16 @@ var init_buildConfig = __esm({
 });
 
 // src/utils/parseArgs.ts
-function isInlineColonFlag(arg) {
-  return /^-([RL])[A-Za-z0-9._-]*:?$/.test(arg);
+function isAttachedReverseOrLocalFlag(arg) {
+  return /^-[RL].+/.test(arg);
+}
+function shouldMergeReverseOrLocalFragment(current, next) {
+  if (next.startsWith("-")) return false;
+  if (next.startsWith(".")) return true;
+  const body = current.slice(2);
+  if (body.endsWith(":")) return true;
+  if (body.includes("//") && !body.includes(":")) return true;
+  return false;
 }
 function preprocessWindowsArgs(args) {
   if (os2.platform() !== "win32") return args;
@@ -3592,14 +3611,13 @@ function preprocessWindowsArgs(args) {
   let i = 0;
   while (i < args.length) {
     const arg = args[i];
-    if (isInlineColonFlag(arg)) {
-      if (i + 1 < args.length && !args[i + 1].startsWith("-")) {
-        let merged = arg + args[i + 1];
-        i += 2;
-        out.push(merged);
-        continue;
-      }
-      out.push(arg);
+    if (isAttachedReverseOrLocalFlag(arg)) {
+      let merged = arg;
+      while (i + 1 < args.length && shouldMergeReverseOrLocalFragment(merged, args[i + 1])) {
+        merged += args[i + 1];
+        i++;
+      }
+      out.push(merged);
       i++;
       continue;
     }
@@ -3636,7 +3654,7 @@ var init_parseArgs = __esm({
 function getFreePort(webDebugger) {
   return new Promise((resolve, reject) => {
     const tryPort = (portToTry) => {
-      const server = import_net2.default.createServer();
+      const server = import_net3.default.createServer();
       server.unref();
       server.on("error", (err) => {
         if (portToTry !== 0) {
@@ -3662,12 +3680,12 @@ function getFreePort(webDebugger) {
     tryPort(providedPort);
   });
 }
-var import_net2;
+var import_net3;
 var init_getFreePort = __esm({
   "src/utils/getFreePort.ts"() {
     "use strict";
     init_cjs_shims();
-    import_net2 = __toESM(require("net"), 1);
+    import_net3 = __toESM(require("net"), 1);
   }
 });
 

package/dist/index.js

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

package/dist/{main-X7XBLBTU.js → main-PFPDXIRG.js}

@@ -254,6 +254,7 @@ function isValidIpV6Cidr(input) {
 import { TunnelType } from "@pinggy/pinggy";
 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,}$/;
 var KEYWORDS = /* @__PURE__ */ new Set([
   TunnelType.Http,
@@ -389,6 +390,11 @@ function removeIPv6Brackets(ip) {
   }
   return ip;
 }
+function isValidHostAddress(host) {
+  const normalized = removeIPv6Brackets(host.trim());
+  if (normalized.length === 0) return false;
+  return normalized === "localhost" || isIP2(normalized) !== 0;
+}
 function ipv6SafeSplitColon(s) {
   const result = [];
   let buf = "";
@@ -523,17 +529,22 @@ function parseReverseTunnelAddr(finalConfig, values, primaryType) {
 function parseLocalTunnelAddr(finalConfig, values) {
   if (!Array.isArray(values.L) || values.L.length === 0) return null;
   const firstL = values.L[0];
-  const parts = firstL.split(":");
+  const parts = ipv6SafeSplitColon(firstL);
+  let debuggerHost = "localhost";
   let lp;
   if (parts.length === 3) {
     lp = parseInt(parts[0], 10);
   } else if (parts.length === 4) {
+    debuggerHost = removeIPv6Brackets(parts[0]);
     lp = parseInt(parts[1], 10);
   } else {
     return new Error("Incorrect command line arguments: web debugger address incorrect. Please use '-h' option for help.");
   }
+  if (!isValidHostAddress(debuggerHost)) {
+    return new Error(`Invalid debugger host ${debuggerHost}. Please use localhost, IPv4, or IPv6 address.`);
+  }
   if (!Number.isNaN(lp) && isValidPort(lp)) {
-    finalConfig.webDebugger = `localhost:${lp}`;
+    finalConfig.webDebugger = `${debuggerHost}:${lp}`;
   } else {
     return new Error(`Invalid debugger port ${lp}`);
   }
@@ -671,8 +682,16 @@ async function buildFinalConfig(values, positionals) {
 // src/utils/parseArgs.ts
 import { parseArgs as parseArgs2 } from "util";
 import * as os from "os";
-function isInlineColonFlag(arg) {
-  return /^-([RL])[A-Za-z0-9._-]*:?$/.test(arg);
+function isAttachedReverseOrLocalFlag(arg) {
+  return /^-[RL].+/.test(arg);
+}
+function shouldMergeReverseOrLocalFragment(current, next) {
+  if (next.startsWith("-")) return false;
+  if (next.startsWith(".")) return true;
+  const body = current.slice(2);
+  if (body.endsWith(":")) return true;
+  if (body.includes("//") && !body.includes(":")) return true;
+  return false;
 }
 function preprocessWindowsArgs(args) {
   if (os.platform() !== "win32") return args;
@@ -680,14 +699,13 @@ function preprocessWindowsArgs(args) {
   let i = 0;
   while (i < args.length) {
     const arg = args[i];
-    if (isInlineColonFlag(arg)) {
-      if (i + 1 < args.length && !args[i + 1].startsWith("-")) {
-        let merged = arg + args[i + 1];
-        i += 2;
-        out.push(merged);
-        continue;
+    if (isAttachedReverseOrLocalFlag(arg)) {
+      let merged = arg;
+      while (i + 1 < args.length && shouldMergeReverseOrLocalFragment(merged, args[i + 1])) {
+        merged += args[i + 1];
+        i++;
       }
-      out.push(arg);
+      out.push(merged);
       i++;
       continue;
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pinggy",
-  "version": "0.4.2",
+  "version": "0.4.4",
   "license": "Apache-2.0",
   "type": "module",
   "description": "Create secure, shareable tunnels to your localhost and manage them from the command line. ",
@@ -51,7 +51,7 @@
     ]
   },
   "dependencies": {
-    "@pinggy/pinggy": "^0.4.1",
+    "@pinggy/pinggy": "^0.4.2",
     "blessed": "^0.1.81",
     "clipboardy": "^5.0.0",
     "mime": "^4.1.0",