pinggy 0.5.3 → 0.5.6

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

@@ -10,7 +10,7 @@ import {
   startDaemon,
   startRemoteManagement,
   stopDaemon
-} from "./chunk-GK2PQ7KX.js";
+} from "./chunk-HN4YLM7U.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, TCP tunnels only (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}"`);
@@ -828,6 +840,20 @@ function hasRemoteManagement(values) {
   const token = values["remote-management"];
   return typeof token === "string" && token.trim().length > 0;
 }
+function validateHaProxy(finalConfig) {
+  if (!finalConfig.haProxy) {
+    return null;
+  }
+  const forwarding = finalConfig.forwarding;
+  const entries = Array.isArray(forwarding) ? forwarding : [];
+  const primaryType = entries.length > 0 ? entries[0].type : void 0;
+  if (primaryType === TunnelType.Tcp) {
+    return null;
+  }
+  return new Error(
+    `HAProxy PROXY protocol (x:haproxy) can only be used with TCP tunnels, but this tunnel is "${primaryType ?? TunnelType.Http}". Make it a TCP tunnel (--type tcp, or the tcp@ server prefix) or drop x:haproxy.`
+  );
+}
 function buildFinalConfig(values, positionals, baseConfig) {
   let token;
   let server;
@@ -890,6 +916,10 @@ function buildFinalConfig(values, positionals, baseConfig) {
   }
   normalizeForwardingToArray(finalConfig, type);
   parseArgs2(finalConfig, remainingPositionals);
+  const haProxyErr = validateHaProxy(finalConfig);
+  if (haProxyErr instanceof Error) {
+    throw haProxyErr;
+  }
   storeJson(finalConfig, saveconf);
   return finalConfig;
 }
@@ -1087,7 +1117,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 +1340,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 +2665,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 +3444,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-3ONQO2XI.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();

package/dist/{chunk-5YHD6M35.js → chunk-YTJEV27N.js}

@@ -62,8 +62,8 @@ var IPCClient = class {
   async stopTunnel(tunnelid) {
     return this.call(Route.StopTunnel, { tunnelid });
   }
-  async restartTunnel(tunnelid) {
-    return this.call(Route.RestartTunnel, { tunnelid });
+  async restartTunnel(tunnelid, noWait) {
+    return this.call(Route.RestartTunnel, { tunnelid, noWait });
   }
   // v1 operations (used by remote management via daemon)
   async startTunnelV1(config, mode, noWait) {

package/dist/{chunk-WM7I57AA.js → chunk-YWXADADB.js}

@@ -1,6 +1,6 @@
 import {
   logger
-} from "./chunk-7G6SJEEA.js";
+} from "./chunk-P7WNBN7F.js";
 import {
   ensureTunnelConfigDir,
   getTunnelConfigDir

package/dist/{configStore-HP3NXPH4.js → configStore-2AZRILVC.js}

@@ -22,8 +22,8 @@ import {
   validateName,
   validateNameForStorage,
   validateNameStrict
-} from "./chunk-WM7I57AA.js";
-import "./chunk-7G6SJEEA.js";
+} from "./chunk-YWXADADB.js";
+import "./chunk-P7WNBN7F.js";
 import "./chunk-GBYF2H4H.js";
 export {
   CONFIG_VERBS,

package/dist/{daemonChild-WIRWKBKB.js → daemonChild-3ONQO2XI.js}

@@ -6,16 +6,16 @@ import {
   trackIPCTunnelStart,
   trackTunnelStart,
   trackTunnelStop
-} from "./chunk-BBPR2LJB.js";
-import "./chunk-GK2PQ7KX.js";
+} from "./chunk-OH6FSLYF.js";
+import "./chunk-HN4YLM7U.js";
 import "./chunk-MT44NAXX.js";
 import {
   DaemonHost
-} from "./chunk-5YHD6M35.js";
-import "./chunk-WM7I57AA.js";
-import "./chunk-DLNUDW6G.js";
+} from "./chunk-YTJEV27N.js";
+import "./chunk-YWXADADB.js";
+import "./chunk-PQSLSIDA.js";
 import "./chunk-UB26QJ4T.js";
-import "./chunk-7G6SJEEA.js";
+import "./chunk-P7WNBN7F.js";
 import "./chunk-GBYF2H4H.js";
 export {
   DaemonHost,