pinggy 0.5.6 → 0.5.8

package/CLAUDE.md

@@ -48,7 +48,7 @@ CLI code calls `TunnelClient` (`src/daemon/tunnelClient.ts`), the public facade
 
 Single daemon per user. State lives under `~/.config/pinggy/` on Linux/macOS or `%APPDATA%/pinggy/` on Windows (helper: `src/utils/configDir.ts`):
 
-- `daemon.json`: `{pid, port, startedAt}`.
+- `daemon.json`: `{pid, port, startedAt, host, ipcVersion}`. `ipcVersion` is `IPC_VERSION` from `src/daemon/ipc/ipcRoutes.ts`. `ensureDaemonRunning()` refuses a live daemon whose version differs and tells the user to run `pinggy daemon stop`. Bump `IPC_VERSION` on any incompatible IPC or WebSocket change.
 - `daemon-state.json`: detached tunnel configs for crash recovery (`src/daemon/stateStore.ts`). Deleted on clean shutdown; replayed on next start.
 - `daemon.log`: SDK + daemon logs. CLI logs stay separate.
 - `tunnels/<name>_<configId>.json`: saved tunnel configs from `pinggy config save`.
@@ -95,8 +95,12 @@ tsup bundles to `dist/` (CJS + ESM). tsc type-checks only (`npm run build:tsc`).
 
 ## English Style
 
-- **No em-dashes.** Use a period, colon, or restructure the sentence. No obvious characters or constructions used by LLMs and AI.
+- **Hyphen only.** The hyphen (-) is the only dash. No em-dash and no en-dash anywhere in any file. This includes numeric ranges (write 1-20) and empty-cell placeholders in tables. Use a period, a colon, or restructure the sentence instead.
+- **No AI-sounding text.** Do not use words, phrases, or symbols typical of LLM output.
+- **No emoji in the codebase.** Documentation may use one only if it is very apt.
+- **Simple English.** Say things in a straightforward way. Keep every technical term and its exact meaning. Use simple but accurate technical terms, not jargon.
 - **Short phrases.** Enough to convey technical meaning. Nothing more.
+- **No metaphor or personification** in technical statements. State the behavior literally. Write "a partial report is scored and enters the benchmark", never "a partial is a full citizen".
 - **No filler words.** Cut: "in order to", "it is important to note", "please note that", "essentially", "basically", "simply".
 - **No passive voice** unless the subject is unknown or irrelevant.
 - **No nominalizations.** Prefer "detect" over "perform detection"; "configure" over "apply configuration".
@@ -110,3 +114,12 @@ tsup bundles to `dist/` (CJS + ESM). tsc type-checks only (`npm run build:tsc`).
 ## Code Style
 - **No dead code.** Remove unused imports, functions, and variables immediately. `ruff` enforces this.
 - **Small functions.** If a function needs a comment to explain its sections, split it.
+
+## Answering Questions
+
+- **A question is not a change request.** When asked a question, do not change code. Answer it.
+
+## Commit Messages
+
+- **Plain change description.** Write the message as a human author would: what changed and why.
+- **No assistant attribution.** Do not mention Claude, AI, or any assistant. No `Co-Authored-By` assistant trailer, no "Generated with" line, no tool attribution.

package/README.md

@@ -287,7 +287,7 @@ These flags apply to the CLI invocation. For daemon-wide log level and per-tunne
 ### **AutoReconnect**
 | Flag | Description |
 |------|-------------|
-| `--autoreconnect`, `-a` | Automatically reconnect tunnel on failure (enabled by default; pass `false` to disable) |
+| `--no-autoreconnect`, `-a` | Disable automatic reconnection on failure. Enabled by default, and it keeps retrying until the tunnel is back (no attempt limit) |
 
 ---
 

package/dist/{chunk-HN4YLM7U.js → chunk-B6IKYBLU.js}

@@ -1,9 +1,10 @@
 import {
   DaemonHost,
   IPCClient,
+  IPC_VERSION,
   SessionMode,
   ShutdownStatus
-} from "./chunk-YTJEV27N.js";
+} from "./chunk-I4HXBP5G.js";
 import {
   TunnelAlreadyRunningError,
   TunnelManager,
@@ -289,6 +290,8 @@ function pinggyOptionsToTunnelConfigV1(opts, configStoredInCli) {
     serverAddress: opts.serverAddress || "a.pinggy.io:443",
     token: opts.token || "",
     autoReconnect: opts.autoReconnect ?? true,
+    reconnectInterval: opts.reconnectInterval,
+    maxReconnectAttempts: opts.maxReconnectAttempts,
     force: opts.force ?? false,
     webDebugger: opts.webDebugger || "",
     forwarding: opts.forwarding ? opts.forwarding : "",
@@ -1612,6 +1615,19 @@ function getDaemonInfo() {
 function isDaemonRunning() {
   return getDaemonInfo() !== null;
 }
+function daemonIpcVersion(info) {
+  return info.ipcVersion ?? 0;
+}
+function isIpcCompatible(info) {
+  return daemonIpcVersion(info) === IPC_VERSION;
+}
+function ipcMismatchMessage(info) {
+  const versions = `daemon IPC v${daemonIpcVersion(info)}, this CLI expects v${IPC_VERSION}`;
+  if (info.host === DaemonHost.APP) {
+    return `The Pinggy app is running a daemon from a different version (${versions}). Update or restart the Pinggy app.`;
+  }
+  return `A daemon from a different Pinggy CLI version is running (PID ${info.pid}; ${versions}). Run "pinggy daemon stop" and retry. This stops all running tunnels.`;
+}
 function getDaemonSpawnArgs() {
   return {
     command: process.execPath,
@@ -1658,9 +1674,12 @@ async function startDaemon() {
 }
 async function ensureDaemonRunning() {
   const existing = getDaemonInfo();
-  if (existing) return existing;
+  if (existing) {
+    if (!isIpcCompatible(existing)) throw new Error(ipcMismatchMessage(existing));
+    return existing;
+  }
   if (process.versions.electron) {
-    const { runDaemonChild } = await import("./daemonChild-3ONQO2XI.js");
+    const { runDaemonChild } = await import("./daemonChild-ZPZK5F4Q.js");
     const handle = await runDaemonChild({
       installSignalHandlers: false,
       exitOnFailure: false,
@@ -1671,7 +1690,8 @@ async function ensureDaemonRunning() {
       pid: handle.pid,
       port: handle.port,
       startedAt: (/* @__PURE__ */ new Date()).toISOString(),
-      host: DaemonHost.APP
+      host: DaemonHost.APP,
+      ipcVersion: IPC_VERSION
     };
   }
   return startDaemon();
@@ -1682,7 +1702,7 @@ function getInProcessDaemonHandle() {
 async function getActiveTunnelSummaries(origin = "app") {
   const info = getDaemonInfo();
   if (!info) return [];
-  const { IPCClient: IPCClient2 } = await import("./ipcClient-XRL2WUUM.js");
+  const { IPCClient: IPCClient2 } = await import("./ipcClient-URHJKNEH.js");
   const client = new IPCClient2(info.port, origin);
   let tunnels;
   try {
@@ -1729,7 +1749,7 @@ async function stopDaemon() {
   if (!info) return { ok: false, error: "No daemon is running." };
   let daemonErrors = [];
   try {
-    const { IPCClient: IPCClient2 } = await import("./ipcClient-XRL2WUUM.js");
+    const { IPCClient: IPCClient2 } = await import("./ipcClient-URHJKNEH.js");
     const client = new IPCClient2(info.port);
     const result = await client.shutdown();
     logger.debug("Sent shutdown command to daemon", { result });
@@ -1884,6 +1904,9 @@ var WsStream = class {
   subscriptionCount() {
     return this.subscribedTunnels.size;
   }
+  isSubscribed(tunnelId) {
+    return this.subscribedTunnels.has(tunnelId);
+  }
   /** Snapshot of current subscriptions, for the reconnect path to replay. */
   snapshotSubscriptions() {
     return Array.from(this.subscribedTunnels.entries());
@@ -1917,6 +1940,16 @@ var WsStream = class {
   onDisconnect(cb) {
     this.callbacks.disconnect.push(cb);
   }
+  // Removal replaces the array instead of splicing it, so a callback that
+  // unregisters itself while handleMessage is iterating cannot make the
+  // dispatch loop skip the next callback. The removal applies from the next
+  // event on.
+  offStats(cb) {
+    this.callbacks.stats = this.callbacks.stats.filter((c) => c !== cb);
+  }
+  offDisconnect(cb) {
+    this.callbacks.disconnect = this.callbacks.disconnect.filter((c) => c !== cb);
+  }
   onReconnecting(cb) {
     this.callbacks.reconnecting.push(cb);
   }
@@ -2125,6 +2158,12 @@ var DaemonHealth = class {
 var TunnelClient = class _TunnelClient {
   constructor(options = {}) {
     this.ipc = null;
+    // App-compat shim state: registered listeners by id, and the tunnels whose
+    // stream subscription those registrations opened (as opposed to attach()).
+    this.shimStatsListeners = /* @__PURE__ */ new Map();
+    this.shimDisconnectListeners = /* @__PURE__ */ new Map();
+    this.shimSubscribedTunnels = /* @__PURE__ */ new Set();
+    this.shimListenerSeq = 0;
     this.origin = options.origin ?? "cli";
     this.stream = new WsStream(() => {
       if (!this.ipc) throw new Error("TunnelClient not initialized. Call ensureDaemon() first.");
@@ -2272,6 +2311,12 @@ var TunnelClient = class _TunnelClient {
   onDisconnect(cb) {
     this.stream.onDisconnect(cb);
   }
+  offStats(cb) {
+    this.stream.offStats(cb);
+  }
+  offDisconnect(cb) {
+    this.stream.offDisconnect(cb);
+  }
   onReconnecting(cb) {
     this.stream.onReconnecting(cb);
   }
@@ -2309,24 +2354,73 @@ var TunnelClient = class _TunnelClient {
   isDaemonLost() {
     return this.health.isLost();
   }
-  // App-compat shims (register listener + auto-attach in detached mode)
+  // App-compat shims. Each registration is scoped to ONE tunnel, returns an
+  // id, and is undone by the matching unregister call. Before this, every
+  // register appended a callback that saw every subscribed tunnel's events
+  // and could never be removed, so a consumer that registered per page view
+  // received each stats update N times, forever.
+  //
+  // The first registration for a tunnel opens its stream subscription and
+  // the last unregister drops it with a plain unsubscribe. detach() is not
+  // used here on purpose: it closes the client once nothing is subscribed,
+  // which also stops the daemon-health heartbeat, and a stats consumer must
+  // not have that side effect.
   handleRegisterStatsListener(tunnelId, listener) {
-    this.onStats(listener);
-    this.attach(tunnelId, "detached").catch(() => {
-    });
+    const wrapped = (id, stats) => {
+      if (id === tunnelId) listener(id, stats);
+    };
+    const listenerId = this.nextShimListenerId("stats");
+    this.shimStatsListeners.set(listenerId, { tunnelId, wrapped });
+    this.stream.onStats(wrapped);
+    this.subscribeForShim(tunnelId);
+    return listenerId;
+  }
+  handleUnregisterStatsListener(_tunnelId, listenerId) {
+    const entry = this.shimStatsListeners.get(listenerId);
+    if (!entry) return;
+    this.shimStatsListeners.delete(listenerId);
+    this.stream.offStats(entry.wrapped);
+    this.releaseShimSubscription(entry.tunnelId);
   }
   handleRegisterDisconnectListener(tunnelId, listener) {
-    this.onDisconnect(listener);
-    this.attach(tunnelId, "detached").catch(() => {
-    });
-  }
-  handleUnregisterStatsListener(_tunnelId, _listenerId) {
+    const wrapped = (id, error, messages) => {
+      if (id === tunnelId) listener(id, error, messages);
+    };
+    const listenerId = this.nextShimListenerId("disconnect");
+    this.shimDisconnectListeners.set(listenerId, { tunnelId, wrapped });
+    this.stream.onDisconnect(wrapped);
+    this.subscribeForShim(tunnelId);
+    return listenerId;
+  }
+  handleUnregisterDisconnectListener(_tunnelId, listenerId) {
+    const entry = this.shimDisconnectListeners.get(listenerId);
+    if (!entry) return;
+    this.shimDisconnectListeners.delete(listenerId);
+    this.stream.offDisconnect(entry.wrapped);
+    this.releaseShimSubscription(entry.tunnelId);
   }
   async handleGetTunnelStats(tunnelId) {
     this.assertClient();
     return this.ipc.getTunnelStats(tunnelId);
   }
   // Private
+  nextShimListenerId(kind) {
+    this.shimListenerSeq += 1;
+    return `${kind}-${this.shimListenerSeq}`;
+  }
+  subscribeForShim(tunnelId) {
+    if (!this.stream.isSubscribed(tunnelId)) this.shimSubscribedTunnels.add(tunnelId);
+    this.attach(tunnelId, SessionMode.Detached).catch((err) => {
+      logger.debug("Listener subscribe failed", { tunnelId, error: errorMessage(err) });
+    });
+  }
+  releaseShimSubscription(tunnelId) {
+    if (!this.shimSubscribedTunnels.has(tunnelId)) return;
+    for (const entry of this.shimStatsListeners.values()) if (entry.tunnelId === tunnelId) return;
+    for (const entry of this.shimDisconnectListeners.values()) if (entry.tunnelId === tunnelId) return;
+    this.shimSubscribedTunnels.delete(tunnelId);
+    this.stream.unsubscribe(tunnelId);
+  }
   assertClient() {
     if (!this.ipc) {
       throw new Error("TunnelClient not initialized. Call ensureDaemon() first.");
@@ -2351,6 +2445,9 @@ export {
   getRemoteManagementState,
   getDaemonInfo,
   isDaemonRunning,
+  daemonIpcVersion,
+  isIpcCompatible,
+  ipcMismatchMessage,
   startDaemon,
   ensureDaemonRunning,
   getInProcessDaemonHandle,

package/dist/{chunk-YTJEV27N.js → chunk-I4HXBP5G.js}

@@ -2,6 +2,7 @@
 import http from "http";
 
 // src/daemon/ipc/ipcRoutes.ts
+var IPC_VERSION = 1;
 var Route = {
   Ping: "GET /ping",
   ListTunnels: "GET /tunnels",
@@ -166,6 +167,7 @@ var IPCClient = class {
 };
 
 export {
+  IPC_VERSION,
   Route,
   DaemonHost,
   ShutdownStatus,

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

@@ -3,23 +3,27 @@ import {
   TunnelClient,
   TunnelOperations,
   buildRemoteManagementWsUrl,
+  daemonIpcVersion,
   getDaemonInfo,
   initiateRemoteManagement,
+  ipcMismatchMessage,
   isDaemonRunning,
   isErrorResponse,
+  isIpcCompatible,
   startDaemon,
   startRemoteManagement,
   stopDaemon
-} from "./chunk-HN4YLM7U.js";
+} from "./chunk-B6IKYBLU.js";
 import {
   readDaemonConfig
 } from "./chunk-MT44NAXX.js";
 import {
   DaemonHost,
+  IPC_VERSION,
   Route,
   SessionMode,
   ShutdownStatus
-} from "./chunk-YTJEV27N.js";
+} from "./chunk-I4HXBP5G.js";
 import {
   ConfigVerb,
   SUBCOMMANDS,
@@ -271,7 +275,10 @@ var defaultOptions = {
   originalRequestUrl: false,
   allowPreflight: false,
   reverseProxy: true,
-  autoReconnect: true
+  autoReconnect: true,
+  // 0 = never give up: keep retrying every reconnectInterval until the tunnel
+  // is back. Not user-configurable from the CLI on purpose.
+  maxReconnectAttempts: 0
 };
 
 // src/cli/extendedOptions.ts
@@ -879,7 +886,9 @@ function buildFinalConfig(values, positionals, baseConfig) {
     token: token || (configFromFile?.token || (typeof values.token === "string" ? values.token : "")),
     serverAddress: server ? removeIPv6Brackets(server) : configFromFile?.serverAddress || defaultOptions.serverAddress,
     isQRCode: qrCode || (configFromFile?.isQRCode || false),
-    autoReconnect: configFromFile?.autoReconnect ? configFromFile.autoReconnect : defaultOptions.autoReconnect,
+    // `??`, not a truthiness check: a saved `autoReconnect: false` must not
+    // flip back to the default.
+    autoReconnect: configFromFile?.autoReconnect ?? defaultOptions.autoReconnect,
     optional: {
       serve: configFromFile?.optional?.serve || void 0,
       noTui: values.noTui || values.notui || hasRemoteManagement(values) || (configFromFile?.optional?.noTui || false)
@@ -1779,9 +1788,13 @@ async function handleDaemon(args) {
   }
 }
 async function handleDaemonStart() {
-  if (isDaemonRunning()) {
-    const info = getDaemonInfo();
-    printer_default.print(pico2.yellow(`Daemon already running (PID ${info?.pid}, port ${info?.port}). Use: pinggy daemon status for details.`));
+  const info = getDaemonInfo();
+  if (info) {
+    if (!isIpcCompatible(info)) {
+      printer_default.error(ipcMismatchMessage(info));
+      process.exit(1);
+    }
+    printer_default.print(pico2.yellow(`Daemon already running (PID ${info.pid}, port ${info.port}). Use: pinggy daemon status for details.`));
     return;
   }
   const autoConfigs = getAutoStartConfigs();
@@ -1794,8 +1807,8 @@ async function handleDaemonStart() {
     printer_default.print(pico2.cyanBright("Starting daemon..."));
   }
   try {
-    const info = await startDaemon();
-    printer_default.success(`Daemon started PID ${info.pid}.`);
+    const info2 = await startDaemon();
+    printer_default.success(`Daemon started PID ${info2.pid}.`);
   } catch (err) {
     printer_default.error(`Failed to start daemon: ${errorMessage(err)}`);
     process.exit(1);
@@ -1832,6 +1845,10 @@ function handleDaemonStatus() {
   printer_default.print(`  Started:   ${info.startedAt}`);
   printer_default.print(`  Uptime:    ${uptimeStr}`);
   printer_default.print(`  Host:      ${info.host === DaemonHost.APP ? "Pinggy app (in-process)" : "standalone (CLI)"}`);
+  printer_default.print(`  IPC:       v${daemonIpcVersion(info)}`);
+  if (!isIpcCompatible(info)) {
+    printer_default.print(pico2.yellow(`  Warning:   ${ipcMismatchMessage(info)}`));
+  }
 }
 
 // src/cli/subcommand/handlers/psCommand.ts
@@ -2610,7 +2627,8 @@ var IPCServer = class {
       [Route.Ping]: () => ({
         status: "ok",
         pid: process.pid,
-        uptime: Math.floor((Date.now() - this.startedAt) / 1e3)
+        uptime: Math.floor((Date.now() - this.startedAt) / 1e3),
+        ipcVersion: IPC_VERSION
       }),
       [Route.ListTunnels]: async () => {
         const res = await this.ops.handleListV2();
@@ -3403,7 +3421,8 @@ async function runDaemonChild(opts = {}) {
       pid: process.pid,
       port,
       startedAt: (/* @__PURE__ */ new Date()).toISOString(),
-      host: daemonHost
+      host: daemonHost,
+      ipcVersion: IPC_VERSION
     };
     writeDaemonInfo(info);
     logger.info("Daemon info written", info);
@@ -3444,7 +3463,7 @@ async function main() {
     const { values, positionals, hasAnyArgs } = parseCliArgs(cliOptions);
     configureLogger(values);
     if (values["_daemon-child"]) {
-      const { runDaemonChild: runDaemonChild2 } = await import("./daemonChild-3ONQO2XI.js");
+      const { runDaemonChild: runDaemonChild2 } = await import("./daemonChild-ZPZK5F4Q.js");
       await runDaemonChild2();
       return;
     }

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

@@ -6,12 +6,12 @@ import {
   trackIPCTunnelStart,
   trackTunnelStart,
   trackTunnelStop
-} from "./chunk-OH6FSLYF.js";
-import "./chunk-HN4YLM7U.js";
+} from "./chunk-P7XRY5N4.js";
+import "./chunk-B6IKYBLU.js";
 import "./chunk-MT44NAXX.js";
 import {
   DaemonHost
-} from "./chunk-YTJEV27N.js";
+} from "./chunk-I4HXBP5G.js";
 import "./chunk-YWXADADB.js";
 import "./chunk-PQSLSIDA.js";
 import "./chunk-UB26QJ4T.js";

package/dist/index.cjs

@@ -2194,6 +2194,8 @@ function pinggyOptionsToTunnelConfigV1(opts, configStoredInCli) {
     serverAddress: opts.serverAddress || "a.pinggy.io:443",
     token: opts.token || "",
     autoReconnect: opts.autoReconnect ?? true,
+    reconnectInterval: opts.reconnectInterval,
+    maxReconnectAttempts: opts.maxReconnectAttempts,
     force: opts.force ?? false,
     webDebugger: opts.webDebugger || "",
     forwarding: opts.forwarding ? opts.forwarding : "",
@@ -2791,11 +2793,12 @@ var init_handler = __esm({
 });
 
 // src/daemon/ipc/ipcRoutes.ts
-var Route, DaemonHost, ShutdownStatus, SessionMode;
+var IPC_VERSION, Route, DaemonHost, ShutdownStatus, SessionMode;
 var init_ipcRoutes = __esm({
   "src/daemon/ipc/ipcRoutes.ts"() {
     "use strict";
     init_cjs_shims();
+    IPC_VERSION = 1;
     Route = {
       Ping: "GET /ping",
       ListTunnels: "GET /tunnels",
@@ -4093,7 +4096,10 @@ var init_defaults = __esm({
       originalRequestUrl: false,
       allowPreflight: false,
       reverseProxy: true,
-      autoReconnect: true
+      autoReconnect: true,
+      // 0 = never give up: keep retrying every reconnectInterval until the tunnel
+      // is back. Not user-configurable from the CLI on purpose.
+      maxReconnectAttempts: 0
     };
   }
 });
@@ -4697,7 +4703,9 @@ function buildFinalConfig(values, positionals, baseConfig) {
     token: token || (configFromFile?.token || (typeof values.token === "string" ? values.token : "")),
     serverAddress: server ? removeIPv6Brackets(server) : configFromFile?.serverAddress || defaultOptions.serverAddress,
     isQRCode: qrCode || (configFromFile?.isQRCode || false),
-    autoReconnect: configFromFile?.autoReconnect ? configFromFile.autoReconnect : defaultOptions.autoReconnect,
+    // `??`, not a truthiness check: a saved `autoReconnect: false` must not
+    // flip back to the default.
+    autoReconnect: configFromFile?.autoReconnect ?? defaultOptions.autoReconnect,
     optional: {
       serve: configFromFile?.optional?.serve || void 0,
       noTui: values.noTui || values.notui || hasRemoteManagement(values) || (configFromFile?.optional?.noTui || false)
@@ -7527,9 +7535,13 @@ async function handleDaemon(args) {
   }
 }
 async function handleDaemonStart() {
-  if (isDaemonRunning()) {
-    const info = getDaemonInfo();
-    printer_default.print(import_picocolors6.default.yellow(`Daemon already running (PID ${info?.pid}, port ${info?.port}). Use: pinggy daemon status for details.`));
+  const info = getDaemonInfo();
+  if (info) {
+    if (!isIpcCompatible(info)) {
+      printer_default.error(ipcMismatchMessage(info));
+      process.exit(1);
+    }
+    printer_default.print(import_picocolors6.default.yellow(`Daemon already running (PID ${info.pid}, port ${info.port}). Use: pinggy daemon status for details.`));
     return;
   }
   const autoConfigs = getAutoStartConfigs();
@@ -7542,8 +7554,8 @@ async function handleDaemonStart() {
     printer_default.print(import_picocolors6.default.cyanBright("Starting daemon..."));
   }
   try {
-    const info = await startDaemon();
-    printer_default.success(`Daemon started PID ${info.pid}.`);
+    const info2 = await startDaemon();
+    printer_default.success(`Daemon started PID ${info2.pid}.`);
   } catch (err) {
     printer_default.error(`Failed to start daemon: ${errorMessage(err)}`);
     process.exit(1);
@@ -7580,6 +7592,10 @@ function handleDaemonStatus() {
   printer_default.print(`  Started:   ${info.startedAt}`);
   printer_default.print(`  Uptime:    ${uptimeStr}`);
   printer_default.print(`  Host:      ${info.host === DaemonHost.APP ? "Pinggy app (in-process)" : "standalone (CLI)"}`);
+  printer_default.print(`  IPC:       v${daemonIpcVersion(info)}`);
+  if (!isIpcCompatible(info)) {
+    printer_default.print(import_picocolors6.default.yellow(`  Warning:   ${ipcMismatchMessage(info)}`));
+  }
 }
 var import_picocolors6;
 var init_daemonCommandsHandler = __esm({
@@ -8573,7 +8589,8 @@ var init_ipcServer = __esm({
           [Route.Ping]: () => ({
             status: "ok",
             pid: process.pid,
-            uptime: Math.floor((Date.now() - this.startedAt) / 1e3)
+            uptime: Math.floor((Date.now() - this.startedAt) / 1e3),
+            ipcVersion: IPC_VERSION
           }),
           [Route.ListTunnels]: async () => {
             const res = await this.ops.handleListV2();
@@ -9388,7 +9405,8 @@ async function runDaemonChild(opts = {}) {
       pid: process.pid,
       port,
       startedAt: (/* @__PURE__ */ new Date()).toISOString(),
-      host: daemonHost
+      host: daemonHost,
+      ipcVersion: IPC_VERSION
     };
     writeDaemonInfo(info);
     logger.info("Daemon info written", info);
@@ -9475,6 +9493,19 @@ function getDaemonInfo() {
 function isDaemonRunning() {
   return getDaemonInfo() !== null;
 }
+function daemonIpcVersion(info) {
+  return info.ipcVersion ?? 0;
+}
+function isIpcCompatible(info) {
+  return daemonIpcVersion(info) === IPC_VERSION;
+}
+function ipcMismatchMessage(info) {
+  const versions = `daemon IPC v${daemonIpcVersion(info)}, this CLI expects v${IPC_VERSION}`;
+  if (info.host === DaemonHost.APP) {
+    return `The Pinggy app is running a daemon from a different version (${versions}). Update or restart the Pinggy app.`;
+  }
+  return `A daemon from a different Pinggy CLI version is running (PID ${info.pid}; ${versions}). Run "pinggy daemon stop" and retry. This stops all running tunnels.`;
+}
 function getDaemonSpawnArgs() {
   return {
     command: process.execPath,
@@ -9521,7 +9552,10 @@ async function startDaemon() {
 }
 async function ensureDaemonRunning() {
   const existing = getDaemonInfo();
-  if (existing) return existing;
+  if (existing) {
+    if (!isIpcCompatible(existing)) throw new Error(ipcMismatchMessage(existing));
+    return existing;
+  }
   if (process.versions.electron) {
     const { runDaemonChild: runDaemonChild2 } = await Promise.resolve().then(() => (init_daemonChild(), daemonChild_exports));
     const handle = await runDaemonChild2({
@@ -9534,7 +9568,8 @@ async function ensureDaemonRunning() {
       pid: handle.pid,
       port: handle.port,
       startedAt: (/* @__PURE__ */ new Date()).toISOString(),
-      host: DaemonHost.APP
+      host: DaemonHost.APP,
+      ipcVersion: IPC_VERSION
     };
   }
   return startDaemon();
@@ -9773,6 +9808,9 @@ var init_wsStream = __esm({
       subscriptionCount() {
         return this.subscribedTunnels.size;
       }
+      isSubscribed(tunnelId) {
+        return this.subscribedTunnels.has(tunnelId);
+      }
       /** Snapshot of current subscriptions, for the reconnect path to replay. */
       snapshotSubscriptions() {
         return Array.from(this.subscribedTunnels.entries());
@@ -9806,6 +9844,16 @@ var init_wsStream = __esm({
       onDisconnect(cb) {
         this.callbacks.disconnect.push(cb);
       }
+      // Removal replaces the array instead of splicing it, so a callback that
+      // unregisters itself while handleMessage is iterating cannot make the
+      // dispatch loop skip the next callback. The removal applies from the next
+      // event on.
+      offStats(cb) {
+        this.callbacks.stats = this.callbacks.stats.filter((c) => c !== cb);
+      }
+      offDisconnect(cb) {
+        this.callbacks.disconnect = this.callbacks.disconnect.filter((c) => c !== cb);
+      }
       onReconnecting(cb) {
         this.callbacks.reconnecting.push(cb);
       }
@@ -10040,6 +10088,8 @@ var init_tunnelClient = __esm({
     init_cjs_shims();
     init_ipcClient();
     init_daemonManager();
+    init_logger();
+    init_util();
     init_wsStream();
     init_daemonHealth();
     init_daemonTunnelHandler();
@@ -10047,6 +10097,12 @@ var init_tunnelClient = __esm({
     TunnelClient = class _TunnelClient {
       constructor(options = {}) {
         this.ipc = null;
+        // App-compat shim state: registered listeners by id, and the tunnels whose
+        // stream subscription those registrations opened (as opposed to attach()).
+        this.shimStatsListeners = /* @__PURE__ */ new Map();
+        this.shimDisconnectListeners = /* @__PURE__ */ new Map();
+        this.shimSubscribedTunnels = /* @__PURE__ */ new Set();
+        this.shimListenerSeq = 0;
         this.origin = options.origin ?? "cli";
         this.stream = new WsStream(() => {
           if (!this.ipc) throw new Error("TunnelClient not initialized. Call ensureDaemon() first.");
@@ -10194,6 +10250,12 @@ var init_tunnelClient = __esm({
       onDisconnect(cb) {
         this.stream.onDisconnect(cb);
       }
+      offStats(cb) {
+        this.stream.offStats(cb);
+      }
+      offDisconnect(cb) {
+        this.stream.offDisconnect(cb);
+      }
       onReconnecting(cb) {
         this.stream.onReconnecting(cb);
       }
@@ -10231,24 +10293,73 @@ var init_tunnelClient = __esm({
       isDaemonLost() {
         return this.health.isLost();
       }
-      // App-compat shims (register listener + auto-attach in detached mode)
+      // App-compat shims. Each registration is scoped to ONE tunnel, returns an
+      // id, and is undone by the matching unregister call. Before this, every
+      // register appended a callback that saw every subscribed tunnel's events
+      // and could never be removed, so a consumer that registered per page view
+      // received each stats update N times, forever.
+      //
+      // The first registration for a tunnel opens its stream subscription and
+      // the last unregister drops it with a plain unsubscribe. detach() is not
+      // used here on purpose: it closes the client once nothing is subscribed,
+      // which also stops the daemon-health heartbeat, and a stats consumer must
+      // not have that side effect.
       handleRegisterStatsListener(tunnelId, listener) {
-        this.onStats(listener);
-        this.attach(tunnelId, "detached").catch(() => {
-        });
+        const wrapped = (id, stats) => {
+          if (id === tunnelId) listener(id, stats);
+        };
+        const listenerId = this.nextShimListenerId("stats");
+        this.shimStatsListeners.set(listenerId, { tunnelId, wrapped });
+        this.stream.onStats(wrapped);
+        this.subscribeForShim(tunnelId);
+        return listenerId;
+      }
+      handleUnregisterStatsListener(_tunnelId, listenerId) {
+        const entry = this.shimStatsListeners.get(listenerId);
+        if (!entry) return;
+        this.shimStatsListeners.delete(listenerId);
+        this.stream.offStats(entry.wrapped);
+        this.releaseShimSubscription(entry.tunnelId);
       }
       handleRegisterDisconnectListener(tunnelId, listener) {
-        this.onDisconnect(listener);
-        this.attach(tunnelId, "detached").catch(() => {
-        });
-      }
-      handleUnregisterStatsListener(_tunnelId, _listenerId) {
+        const wrapped = (id, error, messages) => {
+          if (id === tunnelId) listener(id, error, messages);
+        };
+        const listenerId = this.nextShimListenerId("disconnect");
+        this.shimDisconnectListeners.set(listenerId, { tunnelId, wrapped });
+        this.stream.onDisconnect(wrapped);
+        this.subscribeForShim(tunnelId);
+        return listenerId;
+      }
+      handleUnregisterDisconnectListener(_tunnelId, listenerId) {
+        const entry = this.shimDisconnectListeners.get(listenerId);
+        if (!entry) return;
+        this.shimDisconnectListeners.delete(listenerId);
+        this.stream.offDisconnect(entry.wrapped);
+        this.releaseShimSubscription(entry.tunnelId);
       }
       async handleGetTunnelStats(tunnelId) {
         this.assertClient();
         return this.ipc.getTunnelStats(tunnelId);
       }
       // Private
+      nextShimListenerId(kind) {
+        this.shimListenerSeq += 1;
+        return `${kind}-${this.shimListenerSeq}`;
+      }
+      subscribeForShim(tunnelId) {
+        if (!this.stream.isSubscribed(tunnelId)) this.shimSubscribedTunnels.add(tunnelId);
+        this.attach(tunnelId, SessionMode.Detached).catch((err) => {
+          logger.debug("Listener subscribe failed", { tunnelId, error: errorMessage(err) });
+        });
+      }
+      releaseShimSubscription(tunnelId) {
+        if (!this.shimSubscribedTunnels.has(tunnelId)) return;
+        for (const entry of this.shimStatsListeners.values()) if (entry.tunnelId === tunnelId) return;
+        for (const entry of this.shimDisconnectListeners.values()) if (entry.tunnelId === tunnelId) return;
+        this.shimSubscribedTunnels.delete(tunnelId);
+        this.stream.unsubscribe(tunnelId);
+      }
       assertClient() {
         if (!this.ipc) {
           throw new Error("TunnelClient not initialized. Call ensureDaemon() first.");

package/dist/index.d.cts

@@ -658,6 +658,7 @@ interface PingResponse {
     status: string;
     pid: number;
     uptime: number;
+    ipcVersion: number;
 }
 type ListTunnelsResponse = (TunnelResponseV2 & {
     mode?: SessionMode;
@@ -991,6 +992,7 @@ declare class WsStream {
     unsubscribe(tunnelId: string): boolean;
     hasSubscriptions(): boolean;
     subscriptionCount(): number;
+    isSubscribed(tunnelId: string): boolean;
     /** Snapshot of current subscriptions, for the reconnect path to replay. */
     snapshotSubscriptions(): Array<[string, SubscriptionInfo]>;
     /**
@@ -1002,6 +1004,8 @@ declare class WsStream {
     onClose(cb: (code: number) => void): void;
     onStats(cb: StatsCallback): void;
     onDisconnect(cb: DisconnectCallback): void;
+    offStats(cb: StatsCallback): void;
+    offDisconnect(cb: DisconnectCallback): void;
     onReconnecting(cb: ReconnectingCallback): void;
     onReconnected(cb: ReconnectedCallback): void;
     onReconnectionFailed(cb: ReconnectionFailedCallback): void;
@@ -1078,6 +1082,10 @@ declare class TunnelClient {
     private origin;
     private stream;
     health: DaemonHealth;
+    private shimStatsListeners;
+    private shimDisconnectListeners;
+    private shimSubscribedTunnels;
+    private shimListenerSeq;
     constructor(options?: TunnelClientOptions);
     ensureDaemon(): Promise<void>;
     static forRemoteManagement(): Promise<TunnelClient>;
@@ -1085,11 +1093,7 @@ declare class TunnelClient {
      * Close the WebSocket connection and cleanup.
      */
     close(): void;
-    ping(): Promise<{
-        status: string;
-        pid: number;
-        uptime: number;
-    }>;
+    ping(): Promise<PingResponse>;
     handleStartV2(config: object, noWait?: boolean, mode?: SessionMode): Promise<TunnelResponseV2 | ErrorResponse>;
     handleStart(config: object, noWait?: boolean, mode?: SessionMode): Promise<TunnelResponse | ErrorResponse>;
     handleUpdateConfig(config: object, noWait?: boolean): Promise<TunnelResponse | ErrorResponse>;
@@ -1119,6 +1123,8 @@ declare class TunnelClient {
     detach(tunnelId: string): void;
     onStats(cb: StatsCallback): void;
     onDisconnect(cb: DisconnectCallback): void;
+    offStats(cb: StatsCallback): void;
+    offDisconnect(cb: DisconnectCallback): void;
     onReconnecting(cb: ReconnectingCallback): void;
     onReconnected(cb: ReconnectedCallback): void;
     onReconnectionFailed(cb: ReconnectionFailedCallback): void;
@@ -1131,10 +1137,14 @@ declare class TunnelClient {
     onDaemonReconnecting(cb: DaemonReconnectingCallback): void;
     onDaemonReconnected(cb: DaemonReconnectedCallback): void;
     isDaemonLost(): boolean;
-    handleRegisterStatsListener(tunnelId: string, listener: (tunnelId: string, stats: TunnelUsageType) => void): void;
-    handleRegisterDisconnectListener(tunnelId: string, listener: (tunnelId: string, error: string, messages: string[]) => void): void;
-    handleUnregisterStatsListener(_tunnelId: string, _listenerId: string): void;
+    handleRegisterStatsListener(tunnelId: string, listener: StatsCallback): string;
+    handleUnregisterStatsListener(_tunnelId: string, listenerId: string): void;
+    handleRegisterDisconnectListener(tunnelId: string, listener: DisconnectCallback): string;
+    handleUnregisterDisconnectListener(_tunnelId: string, listenerId: string): void;
     handleGetTunnelStats(tunnelId: string): Promise<TunnelUsageType[] | ErrorResponse>;
+    private nextShimListenerId;
+    private subscribeForShim;
+    private releaseShimSubscription;
     private assertClient;
 }
 
@@ -1143,6 +1153,8 @@ interface DaemonInfo {
     port: number;
     startedAt: string;
     host?: DaemonHost;
+    /** IPC protocol version the daemon speaks. Absent in daemon.json written by older builds. */
+    ipcVersion?: number;
 }
 
 /**

package/dist/index.d.ts

@@ -658,6 +658,7 @@ interface PingResponse {
     status: string;
     pid: number;
     uptime: number;
+    ipcVersion: number;
 }
 type ListTunnelsResponse = (TunnelResponseV2 & {
     mode?: SessionMode;
@@ -991,6 +992,7 @@ declare class WsStream {
     unsubscribe(tunnelId: string): boolean;
     hasSubscriptions(): boolean;
     subscriptionCount(): number;
+    isSubscribed(tunnelId: string): boolean;
     /** Snapshot of current subscriptions, for the reconnect path to replay. */
     snapshotSubscriptions(): Array<[string, SubscriptionInfo]>;
     /**
@@ -1002,6 +1004,8 @@ declare class WsStream {
     onClose(cb: (code: number) => void): void;
     onStats(cb: StatsCallback): void;
     onDisconnect(cb: DisconnectCallback): void;
+    offStats(cb: StatsCallback): void;
+    offDisconnect(cb: DisconnectCallback): void;
     onReconnecting(cb: ReconnectingCallback): void;
     onReconnected(cb: ReconnectedCallback): void;
     onReconnectionFailed(cb: ReconnectionFailedCallback): void;
@@ -1078,6 +1082,10 @@ declare class TunnelClient {
     private origin;
     private stream;
     health: DaemonHealth;
+    private shimStatsListeners;
+    private shimDisconnectListeners;
+    private shimSubscribedTunnels;
+    private shimListenerSeq;
     constructor(options?: TunnelClientOptions);
     ensureDaemon(): Promise<void>;
     static forRemoteManagement(): Promise<TunnelClient>;
@@ -1085,11 +1093,7 @@ declare class TunnelClient {
      * Close the WebSocket connection and cleanup.
      */
     close(): void;
-    ping(): Promise<{
-        status: string;
-        pid: number;
-        uptime: number;
-    }>;
+    ping(): Promise<PingResponse>;
     handleStartV2(config: object, noWait?: boolean, mode?: SessionMode): Promise<TunnelResponseV2 | ErrorResponse>;
     handleStart(config: object, noWait?: boolean, mode?: SessionMode): Promise<TunnelResponse | ErrorResponse>;
     handleUpdateConfig(config: object, noWait?: boolean): Promise<TunnelResponse | ErrorResponse>;
@@ -1119,6 +1123,8 @@ declare class TunnelClient {
     detach(tunnelId: string): void;
     onStats(cb: StatsCallback): void;
     onDisconnect(cb: DisconnectCallback): void;
+    offStats(cb: StatsCallback): void;
+    offDisconnect(cb: DisconnectCallback): void;
     onReconnecting(cb: ReconnectingCallback): void;
     onReconnected(cb: ReconnectedCallback): void;
     onReconnectionFailed(cb: ReconnectionFailedCallback): void;
@@ -1131,10 +1137,14 @@ declare class TunnelClient {
     onDaemonReconnecting(cb: DaemonReconnectingCallback): void;
     onDaemonReconnected(cb: DaemonReconnectedCallback): void;
     isDaemonLost(): boolean;
-    handleRegisterStatsListener(tunnelId: string, listener: (tunnelId: string, stats: TunnelUsageType) => void): void;
-    handleRegisterDisconnectListener(tunnelId: string, listener: (tunnelId: string, error: string, messages: string[]) => void): void;
-    handleUnregisterStatsListener(_tunnelId: string, _listenerId: string): void;
+    handleRegisterStatsListener(tunnelId: string, listener: StatsCallback): string;
+    handleUnregisterStatsListener(_tunnelId: string, listenerId: string): void;
+    handleRegisterDisconnectListener(tunnelId: string, listener: DisconnectCallback): string;
+    handleUnregisterDisconnectListener(_tunnelId: string, listenerId: string): void;
     handleGetTunnelStats(tunnelId: string): Promise<TunnelUsageType[] | ErrorResponse>;
+    private nextShimListenerId;
+    private subscribeForShim;
+    private releaseShimSubscription;
     private assertClient;
 }
 
@@ -1143,6 +1153,8 @@ interface DaemonInfo {
     port: number;
     startedAt: string;
     host?: DaemonHost;
+    /** IPC protocol version the daemon speaks. Absent in daemon.json written by older builds. */
+    ipcVersion?: number;
 }
 
 /**

package/dist/index.js

@@ -14,8 +14,8 @@ import {
   initiateRemoteManagement,
   isDaemonRunning,
   startRemoteManagement
-} from "./chunk-HN4YLM7U.js";
-import "./chunk-YTJEV27N.js";
+} from "./chunk-B6IKYBLU.js";
+import "./chunk-I4HXBP5G.js";
 import {
   bulkReplace,
   configureStorageLogger,
@@ -139,7 +139,7 @@ async function verifyAndLoad() {
       process.exit(1);
     }
   }
-  await import("./main-WXFARRMN.js");
+  await import("./main-VBWX7HTB.js");
 }
 verifyAndLoad().catch((err) => {
   printer_default.fatal(`Failed to start CLI:, ${err}`);

package/dist/{ipcClient-XRL2WUUM.js → ipcClient-URHJKNEH.js}

@@ -1,6 +1,6 @@
 import {
   IPCClient
-} from "./chunk-YTJEV27N.js";
+} from "./chunk-I4HXBP5G.js";
 export {
   IPCClient
 };

package/dist/{main-WXFARRMN.js → main-VBWX7HTB.js}

@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 import {
   runDaemonChild
-} from "./chunk-OH6FSLYF.js";
+} from "./chunk-P7XRY5N4.js";
 import {
   RemoteManagementUnauthorizedError,
   TunnelOperations,
@@ -13,11 +13,11 @@ import {
   getRemoteManagementState,
   initiateRemoteManagement,
   isDaemonRunning
-} from "./chunk-HN4YLM7U.js";
+} from "./chunk-B6IKYBLU.js";
 import "./chunk-MT44NAXX.js";
 import {
   DaemonHost
-} from "./chunk-YTJEV27N.js";
+} from "./chunk-I4HXBP5G.js";
 import "./chunk-YWXADADB.js";
 import {
   TunnelManager

package/package.json

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