pinggy 0.5.3 → 0.5.5

package/README.md

@@ -324,6 +324,7 @@ Extended options provide advanced controls. Specify them as positional values li
 - x:reverseproxy                  Disable built-in reverse-proxy header injection.
 - x:xff                           Add X-Forwarded-For.
 - x:fullurl | x:fullrequesturl    Include original request URL.
+- x:haproxy | x:haproxy:v1 | x:haproxy:v2   Send HAProxy PROXY protocol header to the local server (default v1).
 - w:<cidr>[,<cidr>...]            Whitelist IPs (IPv4 CIDR).
 - k:<token>                       Set Bearer token(s) for auth (repeatable).
 - b:<user:pass>                   Add Basic Auth credentials (repeatable).
@@ -338,6 +339,9 @@ Examples:
 - Allow only a local subnet:
   pinggy w:192.168.1.0/24 -l 8080
 
+- Send the real client IP to a PROXY-protocol-aware backend:
+  pinggy x:haproxy:v2 -l 8080
+
 To generate advanced CLI arguments, use [Configure from Pinggy.io](https://pinggy.io/)
 
 

package/dist/{TunnelManager-OPUMAZFX.js → TunnelManager-ZSVX7U3Z.js}

@@ -1,9 +1,9 @@
 import {
   TunnelAlreadyRunningError,
   TunnelManager
-} from "./chunk-DLNUDW6G.js";
+} from "./chunk-PQSLSIDA.js";
 import "./chunk-UB26QJ4T.js";
-import "./chunk-7G6SJEEA.js";
+import "./chunk-P7WNBN7F.js";
 import "./chunk-GBYF2H4H.js";
 export {
   TunnelAlreadyRunningError,

package/dist/{TunnelTui-QZEWWH2H.js → TunnelTui-S35BNVPO.js}

@@ -1,10 +1,10 @@
 import {
   TunnelManager
-} from "./chunk-DLNUDW6G.js";
+} from "./chunk-PQSLSIDA.js";
 import "./chunk-UB26QJ4T.js";
 import {
   logger
-} from "./chunk-7G6SJEEA.js";
+} from "./chunk-P7WNBN7F.js";
 import "./chunk-GBYF2H4H.js";
 
 // src/tui/blessed/TunnelTui.ts
@@ -150,10 +150,21 @@ var asciiArtPinggyLogo = `
 \u2588\u2588\u2554\u2550\u2550\u2550\u255D \u2588\u2588\u2551\u2588\u2588\u2551\u255A\u2588\u2588\u2557\u2588\u2588\u2551\u2588\u2588\u2551   \u2588\u2588\u2551\u2588\u2588\u2551   \u2588\u2588\u2551 \u255A\u2588\u2588\u2554\u255D  
 \u2588\u2588\u2551     \u2588\u2588\u2551\u2588\u2588\u2551 \u255A\u2588\u2588\u2588\u2588\u2551\u255A\u2588\u2588\u2588\u2588\u2588\u2588\u2554\u255D\u255A\u2588\u2588\u2588\u2588\u2588\u2588\u2554\u255D  \u2588\u2588\u2551   
 \u255A\u2550\u255D     \u255A\u2550\u255D\u255A\u2550\u255D  \u255A\u2550\u2550\u2550\u255D \u255A\u2550\u2550\u2550\u2550\u2550\u255D  \u255A\u2550\u2550\u2550\u2550\u2550\u255D   \u255A\u2550\u255D   `;
+var asciiArtPinggyLogoCompact = "P I N G G Y";
+var asciiArtPinggyLogoMedium = [
+  " ___ ___ _  _  ___  _____   __",
+  "| _ \\_ _| \\| |/ __|/ __\\ \\ / /",
+  "|  _/| || .` | (_ | (_ |\\ V /",
+  "|_| |___|_|\\_|\\___|\\___| |_|"
+].join("\n");
 
 // src/tui/blessed/components/UIComponents.ts
 var MIN_WIDTH_WARNING = 60;
 var SIMPLE_LAYOUT_THRESHOLD = 80;
+var MEDIUM_LOGO_THRESHOLD = 100;
+var FULL_LOGO_THRESHOLD = 120;
+var MEDIUM_LOGO_HEIGHT_THRESHOLD = 26;
+var FULL_LOGO_HEIGHT_THRESHOLD = 34;
 function colorizeGradient(text) {
   const colors = ["red", "yellow", "green", "cyan", "blue", "magenta"];
   const lines = text.split("\n");
@@ -162,6 +173,54 @@ function colorizeGradient(text) {
     return `{${color}-fg}${line}{/${color}-fg}`;
   }).join("\n");
 }
+function colorizeGradientHorizontal(text) {
+  const colors = ["red", "yellow", "green", "cyan", "blue", "magenta"];
+  let colorIndex = 0;
+  return [...text].map((char) => {
+    if (char === " ") return char;
+    const color = colors[colorIndex % colors.length];
+    colorIndex++;
+    return `{${color}-fg}${char}{/${color}-fg}`;
+  }).join("");
+}
+function selectLogo(width, height) {
+  const widthTier = width >= FULL_LOGO_THRESHOLD ? 2 : width >= MEDIUM_LOGO_THRESHOLD ? 1 : 0;
+  const heightTier = height >= FULL_LOGO_HEIGHT_THRESHOLD ? 2 : height >= MEDIUM_LOGO_HEIGHT_THRESHOLD ? 1 : 0;
+  const tier = Math.min(widthTier, heightTier);
+  if (tier === 2) {
+    return { content: colorizeGradient(asciiArtPinggyLogo), boxHeight: 7 };
+  }
+  if (tier === 1) {
+    return { content: colorizeGradient(asciiArtPinggyLogoMedium), boxHeight: 5 };
+  }
+  return {
+    content: `{bold}${colorizeGradientHorizontal(asciiArtPinggyLogoCompact)}{/bold}`,
+    boxHeight: 1
+  };
+}
+function wrapText(text, width) {
+  const lines = [];
+  let current = "";
+  for (const word of text.split(/\s+/).filter(Boolean)) {
+    const candidate = current ? `${current} ${word}` : word;
+    if (candidate.length <= width) {
+      current = candidate;
+      continue;
+    }
+    if (current) {
+      lines.push(current);
+      current = "";
+    }
+    let rest = word;
+    while (rest.length > width) {
+      lines.push(rest.slice(0, width));
+      rest = rest.slice(width);
+    }
+    current = rest;
+  }
+  if (current) lines.push(current);
+  return lines.length ? lines : [""];
+}
 function createWarningUI(screen) {
   return blessed.box({
     parent: screen,
@@ -188,21 +247,26 @@ function createFullUI(screen, urls, greet, tunnelConfig) {
     height: "100%",
     padding: 1
   });
+  const { content: logoContent, boxHeight: logoHeight } = selectLogo(
+    screen.width,
+    screen.height
+  );
   const logoBox = blessed.box({
     parent: mainContainer,
     top: 0,
     left: 0,
     width: "100%",
-    height: 7,
-    content: colorizeGradient(asciiArtPinggyLogo),
+    height: logoHeight,
+    content: logoContent,
     tags: true
   });
+  const contentTop = logoHeight + 1;
   const contentBox = blessed.box({
     parent: mainContainer,
-    top: 8,
+    top: contentTop,
     left: 0,
     width: "100%-2",
-    height: "100%-10",
+    height: `100%-${contentTop + 2}`,
     padding: 0,
     border: {
       type: "line"
@@ -215,20 +279,24 @@ function createFullUI(screen, urls, greet, tunnelConfig) {
   });
   let greetHeight = 0;
   if (greet) {
-    const greetBox = blessed.box({
+    const contentInnerWidth = screen.width - 6;
+    const greetWidth = Math.max(20, Math.floor(contentInnerWidth * 0.6));
+    const greetLines = wrapText(greet, greetWidth);
+    const greetBoxHeight = greetLines.length + 1;
+    blessed.box({
       parent: contentBox,
       top: 0,
       left: "center",
-      width: "60%",
-      height: 4,
-      content: `{bold}${greet}{/bold}`,
+      width: greetWidth,
+      height: greetBoxHeight,
+      content: greetLines.map((line) => `{bold}${line}{/bold}`).join("\n"),
       tags: true,
       align: "center",
       style: {
         fg: "green"
       }
     });
-    greetHeight = 4;
+    greetHeight = greetBoxHeight;
   }
   const upperSectionTop = greetHeight > 0 ? greetHeight : 0;
   const upperSection = blessed.box({
@@ -322,21 +390,22 @@ function createSimpleUI(screen, urls, greet) {
   });
   let currentTop = 0;
   if (greet) {
+    const greetWidth = Math.max(20, Math.floor((screen.width - 2) * 0.9));
+    const greetLines = wrapText(greet, greetWidth);
     blessed.box({
       parent: mainContainer,
       top: currentTop,
       left: "center",
-      width: "90%",
-      height: "shrink",
-      content: `{bold}${greet}{/bold}`,
+      width: greetWidth,
+      height: greetLines.length,
+      content: greetLines.map((line) => `{bold}${line}{/bold}`).join("\n"),
       tags: true,
       align: "center",
       style: {
         fg: "green"
       }
     });
-    const lines = Math.ceil(greet.length / (screen.width * 0.9));
-    currentTop += Math.max(lines, 1) + 1;
+    currentTop += greetLines.length + 1;
   }
   const urlsBox = blessed.box({
     parent: mainContainer,

package/dist/{chunk-BBPR2LJB.js → chunk-NBR2L6LW.js}

@@ -10,7 +10,7 @@ import {
   startDaemon,
   startRemoteManagement,
   stopDaemon
-} from "./chunk-GK2PQ7KX.js";
+} from "./chunk-UX64XCC2.js";
 import {
   readDaemonConfig
 } from "./chunk-MT44NAXX.js";
@@ -19,7 +19,7 @@ import {
   Route,
   SessionMode,
   ShutdownStatus
-} from "./chunk-5YHD6M35.js";
+} from "./chunk-YTJEV27N.js";
 import {
   ConfigVerb,
   SUBCOMMANDS,
@@ -36,7 +36,7 @@ import {
   updateConfigAutoStart,
   updateTunnelConfig,
   validateName
-} from "./chunk-WM7I57AA.js";
+} from "./chunk-YWXADADB.js";
 import {
   TunnelManager,
   detachAllTunnelLoggers,
@@ -48,14 +48,14 @@ import {
   isValidPort,
   printer_default,
   setTunnelLoggingEnabled
-} from "./chunk-DLNUDW6G.js";
+} from "./chunk-PQSLSIDA.js";
 import {
   configureLogger,
   enablePackageLogging,
   getLogLevel,
   logger,
   setLogLevel
-} from "./chunk-7G6SJEEA.js";
+} from "./chunk-P7WNBN7F.js";
 import {
   ensurePinggyConfigDir,
   ensurePinggyLogDir,
@@ -137,6 +137,7 @@ function printHelpMessage() {
   console.log("  x:noreverseproxy        Disable built-in reverse-proxy header injection");
   console.log("  x:localservertls:host   Connect to local HTTPS server with SNI");
   console.log("  x:passpreflight         Pass CORS preflight requests unchanged");
+  console.log("  x:haproxy[:v1|:v2]      Enable HAProxy PROXY protocol (default v1)");
   console.log("  a:Key:Val               Add header");
   console.log("  u:Key:Val               Update header");
   console.log("  r:Key                   Remove header");
@@ -274,6 +275,7 @@ var defaultOptions = {
 };
 
 // src/cli/extendedOptions.ts
+import { HaProxyVersion } from "@pinggy/pinggy";
 import { isIP } from "net";
 function parseExtendedOptions(options, config, localServerTls) {
   if (!options) return localServerTls;
@@ -300,10 +302,20 @@ function parseExtendedOptions(options, config, localServerTls) {
           case "fullrequesturl":
             config.originalRequestUrl = true;
             break;
+          case "haproxy":
+          case "haproxy:v1":
+            config.haProxy = HaProxyVersion.V1;
+            break;
+          case "haproxy:v2":
+            config.haProxy = HaProxyVersion.V2;
+            break;
           default: {
             if (value && (value.startsWith("localServerTls") || value.startsWith("localservertls"))) {
               const parts = value.split(/:(.+)/);
               localServerTls = parts[1] ? parts[1] : "";
+            } else if (value && value.startsWith("haproxy:")) {
+              printer_default.warn(`Invalid HAProxy version in "${opt}". Use x:haproxy, x:haproxy:v1 or x:haproxy:v2`);
+              logger.warn(`Warning: Invalid HAProxy version in "${opt}". Use x:haproxy, x:haproxy:v1 or x:haproxy:v2`);
             } else {
               printer_default.warn(`Unknown extended option "${value}"`);
               logger.warn(`Warning: Unknown extended option "${value}"`);
@@ -1087,7 +1099,7 @@ async function connectTui(opts) {
   const exitMessage = opts.exitMessage || "Stopping tunnel...";
   if (!noTui && process.stdin.isTTY) {
     try {
-      const { TunnelTui } = await import("./TunnelTui-QZEWWH2H.js");
+      const { TunnelTui } = await import("./TunnelTui-S35BNVPO.js");
       const tui = new TunnelTui({
         urls,
         greet,
@@ -1310,7 +1322,7 @@ async function startBackgroundTunnels(configs, values, positionals) {
   client.close();
 }
 async function startAutoStartTunnels() {
-  const { getAutoStartConfigs: getAutoStartConfigs2 } = await import("./configStore-HP3NXPH4.js");
+  const { getAutoStartConfigs: getAutoStartConfigs2 } = await import("./configStore-2AZRILVC.js");
   const configs = getAutoStartConfigs2();
   if (configs.length === 0) {
     printer_default.warn("No configs marked for auto-start. Use: pinggy config auto <name>");
@@ -2635,7 +2647,7 @@ var IPCServer = class {
       },
       [Route.RestartTunnel]: async (req) => {
         if (!req.tunnelid) throw new Error("Missing 'tunnelid' field");
-        return await this.ops.handleRestart(req.tunnelid);
+        return await this.ops.handleRestart(req.tunnelid, req.noWait);
       },
       [Route.UpdateConfig]: async (req) => {
         if (!req.config) throw new Error("Missing 'config' field");
@@ -3414,7 +3426,7 @@ async function main() {
     const { values, positionals, hasAnyArgs } = parseCliArgs(cliOptions);
     configureLogger(values);
     if (values["_daemon-child"]) {
-      const { runDaemonChild: runDaemonChild2 } = await import("./daemonChild-WIRWKBKB.js");
+      const { runDaemonChild: runDaemonChild2 } = await import("./daemonChild-ZACX7V6J.js");
       await runDaemonChild2();
       return;
     }

package/dist/{chunk-7G6SJEEA.js → chunk-P7WNBN7F.js}

@@ -16,7 +16,7 @@ function setLogLevel(level) {
   }
   import("./daemonConfig-G6S46GPJ.js").then(({ writeDaemonConfig }) => writeDaemonConfig({ logLevel: level })).catch(() => {
   });
-  import("./TunnelManager-OPUMAZFX.js").then(({ TunnelManager }) => TunnelManager.getInstance().applyLogLevelToActiveTunnels(level)).catch(() => {
+  import("./TunnelManager-ZSVX7U3Z.js").then(({ TunnelManager }) => TunnelManager.getInstance().applyLogLevelToActiveTunnels(level)).catch(() => {
   });
 }
 var _logger = null;

package/dist/{chunk-DLNUDW6G.js → chunk-PQSLSIDA.js}

@@ -4,7 +4,7 @@ import {
 import {
   getLogLevel,
   logger
-} from "./chunk-7G6SJEEA.js";
+} from "./chunk-P7WNBN7F.js";
 import {
   getTunnelLogPath
 } from "./chunk-GBYF2H4H.js";
@@ -121,7 +121,7 @@ function startSpinner(name = "dots", text = "Loading") {
   }
   currentTimer = setInterval(() => {
     const frame = spinner.frames[i = ++i % spinner.frames.length];
-    process.stdout.write(`\r${pico.cyan(frame)} ${text}`);
+    process.stdout.write(`\r${pico.cyan(frame)} ${text}\x1B[K`);
   }, spinner.interval);
   return () => stopSpinner();
 }
@@ -137,7 +137,7 @@ function stopSpinnerSuccess(message) {
     clearInterval(currentTimer);
     currentTimer = null;
     const finalMessage = message || currentText;
-    process.stdout.write(`\r${pico.green("\u2714")} ${finalMessage}
+    process.stdout.write(`\r${pico.green("\u2714")} ${finalMessage}\x1B[K
 `);
   }
 }
@@ -146,7 +146,7 @@ function stopSpinnerFail(message) {
     clearInterval(currentTimer);
     currentTimer = null;
     const finalMessage = message || currentText;
-    process.stdout.write(`\r${pico.red("\u2716")} ${finalMessage}
+    process.stdout.write(`\r${pico.red("\u2716")} ${finalMessage}\x1B[K
 `);
   }
 }
@@ -724,6 +724,29 @@ var TunnelManager = class _TunnelManager {
     }
     return Promise.reject(new Error(`Either configId or tunnelId must be provided`));
   }
+  /**
+   * Stop a tunnel instance and wait for the stop to settle, capped by a
+   * timeout. Failure is logged, not thrown: the caller replaces the
+   * instance either way and a hung stop must not block that forever.
+   */
+  async stopInstanceGuarded(managed, timeoutMs = 5e3) {
+    let timer;
+    try {
+      await Promise.race([
+        managed.instance.stop(),
+        new Promise((_, reject) => {
+          timer = setTimeout(() => reject(new Error(`Stop timed out after ${timeoutMs}ms`)), timeoutMs);
+        })
+      ]);
+    } catch (e) {
+      logger.warn("Failed to stop tunnel instance before replacement", {
+        tunnelId: managed.tunnelid,
+        error: errorMessage(e)
+      });
+    } finally {
+      if (timer) clearTimeout(timer);
+    }
+  }
   /**
    * Restarts a tunnel with its current configuration.
    * This function will stop the tunnel if it's running and start it again.
@@ -745,6 +768,9 @@ var TunnelManager = class _TunnelManager {
       const currentServe = existingTunnel.serve;
       const autoReconnect = existingTunnel.autoReconnect || false;
       const currentOrigin = existingTunnel.origin;
+      if (!existingTunnel.isStopped) {
+        await this.stopInstanceGuarded(existingTunnel);
+      }
       this.tunnelsByTunnelId.delete(tunnelid);
       this.tunnelsByConfigId.delete(existingTunnel.configId);
       this.tunnelStats.delete(tunnelid);
@@ -779,9 +805,26 @@ var TunnelManager = class _TunnelManager {
       throw new Error(`Failed to restart tunnel: ${error instanceof Error ? error.message : "Unknown error"}`);
     }
   }
+  /**
+   * Carry lifecycle state from a replaced tunnel over to its replacement:
+   * keep createdAt, start the replacement if the old tunnel was running,
+   * otherwise keep it stopped with the original timestamps.
+   */
+  async applyPreservedLifecycle(tunnel, prior) {
+    if (prior.createdAt) {
+      tunnel.createdAt = prior.createdAt;
+    }
+    if (!prior.isStopped) {
+      await this.startTunnel(tunnel.tunnelid);
+      return;
+    }
+    tunnel.isStopped = true;
+    tunnel.startedAt = prior.startedAt;
+    tunnel.stoppedAt = prior.stoppedAt ?? (/* @__PURE__ */ new Date()).toISOString();
+  }
   /**
    * Updates the configuration of an existing tunnel.
-   * 
+   *
    * This method handles the process of updating a tunnel's configuration while preserving
    * its state. If the tunnel is running, it will be stopped, updated, and restarted.
    * In case of failure, it attempts to restore the original configuration.
@@ -808,10 +851,13 @@ var TunnelManager = class _TunnelManager {
     const currentServe = existingTunnel.serve;
     const currentAutoReconnect = existingTunnel.autoReconnect || false;
     const currentOrigin = existingTunnel.origin;
+    const currentCreatedAt = existingTunnel.createdAt;
+    const currentStartedAt = existingTunnel.startedAt;
+    const currentStoppedAt = existingTunnel.stoppedAt;
     const requestedServe = this.resolveServePath(newConfig);
     try {
       if (!isStopped) {
-        void existingTunnel.instance.stop();
+        await this.stopInstanceGuarded(existingTunnel);
       }
       this.tunnelsByTunnelId.delete(currentTunnelId);
       this.tunnelsByConfigId.delete(currentTunnelConfigId);
@@ -823,7 +869,6 @@ var TunnelManager = class _TunnelManager {
       };
       const effectiveServe = requestedServe !== void 0 ? requestedServe : currentServe;
       const effectiveTunnelName = newTunnelName !== void 0 ? newTunnelName : currentTunnelName;
-      let configWithForwarding;
       const newTunnel = await this._createTunnelWithProcessedConfig({
         configId,
         tunnelid: currentTunnelId,
@@ -833,9 +878,12 @@ var TunnelManager = class _TunnelManager {
         serve: effectiveServe,
         autoReconnect: currentAutoReconnect
       });
-      if (!isStopped) {
-        await this.startTunnel(newTunnel.tunnelid);
-      }
+      await this.applyPreservedLifecycle(newTunnel, {
+        isStopped,
+        createdAt: currentCreatedAt,
+        startedAt: currentStartedAt,
+        stoppedAt: currentStoppedAt
+      });
       logger.info("Tunnel configuration updated", {
         tunnelId: newTunnel.tunnelid,
         configId: newTunnel.configId,
@@ -857,9 +905,12 @@ var TunnelManager = class _TunnelManager {
           serve: currentServe,
           autoReconnect: currentAutoReconnect
         });
-        if (!isStopped) {
-          await this.startTunnel(originalTunnel.tunnelid);
-        }
+        await this.applyPreservedLifecycle(originalTunnel, {
+          isStopped,
+          createdAt: currentCreatedAt,
+          startedAt: currentStartedAt,
+          stoppedAt: currentStoppedAt
+        });
         logger.warn("Restored original tunnel configuration after update failure", {
           currentTunnelId,
           error: errorMessage(error)
@@ -1476,6 +1527,9 @@ var TunnelManager = class _TunnelManager {
         try {
           logger.info("Tunnel reconnection completed", { tunnelId, urls });
           const managedTunnel = this.tunnelsByTunnelId.get(tunnelId);
+          if (managedTunnel?.isStopping || managedTunnel?.isStopped) {
+            return;
+          }
           if (managedTunnel) {
             managedTunnel.isStopped = false;
             managedTunnel.startedAt = (/* @__PURE__ */ new Date()).toISOString();