@shipers-dev/multi 0.10.0 → 0.10.1

package/dist/index.js

@@ -5703,7 +5703,7 @@ import { join as join3, dirname as dirname2 } from "path";
 // package.json
 var package_default = {
   name: "@shipers-dev/multi",
-  version: "0.10.0",
+  version: "0.10.1",
   type: "module",
   bin: {
     "multi-agent": "./dist/index.js"
@@ -6194,30 +6194,38 @@ async function cmdConnect(apiUrl, config) {
   process.on("SIGINT", () => shutdown("SIGINT"));
   process.on("SIGTERM", () => shutdown("SIGTERM"));
   schedule();
+  let restarting = false;
   const restartTunnel = async (reason) => {
-    if (!alive)
+    if (!alive || restarting)
       return;
-    log(`\uD83D\uDD01 Restarting tunnel (${reason})`);
+    restarting = true;
     try {
-      tunnel?.child.kill();
-    } catch {}
-    for (let attempt = 1;alive; attempt++) {
-      const next = await startTunnel(port);
-      if (next) {
-        tunnel = next;
-        log(`\u2601\uFE0F  Tunnel up: ${tunnel.url}`);
-        try {
-          const pending = await heartbeat();
-          if (pending > 0)
-            drainOfflineDispatches(apiUrl, config.deviceId, config.dispatchSecret, db, () => schedule());
-        } catch (e) {
-          log(`heartbeat error after tunnel restart: ${String(e)}`);
+      log(`\uD83D\uDD01 Restarting tunnel (${reason})`);
+      const old = tunnel;
+      tunnel = null;
+      try {
+        old?.child.kill();
+      } catch {}
+      for (let attempt = 1;alive; attempt++) {
+        const next = await startTunnel(port);
+        if (next) {
+          tunnel = next;
+          log(`\u2601\uFE0F  Tunnel up: ${tunnel.url}`);
+          try {
+            const pending = await heartbeat();
+            if (pending > 0)
+              drainOfflineDispatches(apiUrl, config.deviceId, config.dispatchSecret, db, () => schedule());
+          } catch (e) {
+            log(`heartbeat error after tunnel restart: ${String(e)}`);
+          }
+          return;
         }
-        return;
+        const wait = Math.min(30000, 2000 * attempt);
+        log(`tunnel restart failed, retry in ${wait}ms`);
+        await sleep(wait);
       }
-      const wait = Math.min(30000, 2000 * attempt);
-      log(`tunnel restart failed, retry in ${wait}ms`);
-      await sleep(wait);
+    } finally {
+      restarting = false;
     }
   };
   (async () => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@shipers-dev/multi",
-  "version": "0.10.0",
+  "version": "0.10.1",
   "type": "module",
   "bin": {
     "multi-agent": "./dist/index.js"

package/src/index.ts

@@ -481,27 +481,36 @@ async function cmdConnect(apiUrl: string, config: Config) {
   schedule();
 
   // Tunnel self-heal: relaunch cloudflared if child exits or DNS stops resolving.
+  // `restarting` guards against two entries racing (probe-failure + exit-watcher
+  // both firing when we kill the child as part of our own restart).
+  let restarting = false;
   const restartTunnel = async (reason: string) => {
-    if (!alive) return;
-    log(`🔁 Restarting tunnel (${reason})`);
-    try { tunnel?.child.kill(); } catch {}
-    // Small backoff so we don't spam cloudflared edge under prolonged outage.
-    for (let attempt = 1; alive; attempt++) {
-      const next = await startTunnel(port);
-      if (next) {
-        tunnel = next;
-        log(`☁️  Tunnel up: ${tunnel.url}`);
-        try {
-          const pending = await heartbeat();
-          if (pending > 0) void drainOfflineDispatches(apiUrl, config.deviceId!, config.dispatchSecret!, db, () => schedule());
-        } catch (e) {
-          log(`heartbeat error after tunnel restart: ${String(e)}`);
+    if (!alive || restarting) return;
+    restarting = true;
+    try {
+      log(`🔁 Restarting tunnel (${reason})`);
+      const old = tunnel;
+      tunnel = null; // null first so the exit-watcher's `tunnel === t` check skips our own kill
+      try { old?.child.kill(); } catch {}
+      for (let attempt = 1; alive; attempt++) {
+        const next = await startTunnel(port);
+        if (next) {
+          tunnel = next;
+          log(`☁️  Tunnel up: ${tunnel.url}`);
+          try {
+            const pending = await heartbeat();
+            if (pending > 0) void drainOfflineDispatches(apiUrl, config.deviceId!, config.dispatchSecret!, db, () => schedule());
+          } catch (e) {
+            log(`heartbeat error after tunnel restart: ${String(e)}`);
+          }
+          return;
         }
-        return;
+        const wait = Math.min(30000, 2000 * attempt);
+        log(`tunnel restart failed, retry in ${wait}ms`);
+        await sleep(wait);
       }
-      const wait = Math.min(30000, 2000 * attempt);
-      log(`tunnel restart failed, retry in ${wait}ms`);
-      await sleep(wait);
+    } finally {
+      restarting = false;
     }
   };
 
@@ -512,6 +521,7 @@ async function cmdConnect(apiUrl: string, config: Config) {
       if (!t) { await sleep(1000); continue; }
       const code = await t.child.exited;
       if (!alive) return;
+      // If `tunnel` was nulled by restartTunnel, we killed it ourselves — skip.
       if (tunnel === t) await restartTunnel(`cloudflared exited code=${code}`);
     }
   })();