fluxy-bot 0.12.1 → 0.12.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "fluxy-bot",
-  "version": "0.12.1",
+  "version": "0.12.2",
   "releaseNotes": [
     "Adding a way for users to claim their fluxies on the fluxy.bot dashboard",
     "2. ",

package/supervisor/backend.ts

@@ -97,31 +97,47 @@ export function spawnBackend(port: number): ChildProcess {
 }
 
 /** Stop the backend and wait for the process to fully exit before resolving.
- *  This prevents port collisions when restarting (old process must release the port first). */
+ *  This prevents port collisions when restarting (old process must release the port first).
+ *  Concurrent calls return the same promise to avoid double-spawn races. */
+let stopPromise: Promise<void> | null = null;
+
 export function stopBackend(): Promise<void> {
-  return new Promise((resolve) => {
-    if (!child || child.exitCode !== null) {
-      child = null;
-      resolve();
-      return;
-    }
-    intentionallyStopped = true;
-    const dying = child;
+  if (stopPromise) return stopPromise;
+
+  if (!child || child.exitCode !== null) {
     child = null;
-    dying.once('exit', () => resolve());
+    return Promise.resolve();
+  }
+
+  intentionallyStopped = true;
+  const dying = child;
+  child = null;
+
+  stopPromise = new Promise<void>((resolve) => {
+    dying.once('exit', () => {
+      stopPromise = null;
+      resolve();
+    });
     dying.kill();
     // Safety: force kill after 3s if SIGTERM doesn't work
     setTimeout(() => {
       try { dying.kill('SIGKILL'); } catch {}
+      stopPromise = null;
       resolve();
     }, 3000);
   });
+
+  return stopPromise;
 }
 
 export function isBackendAlive(): boolean {
   return child !== null && child.exitCode === null;
 }
 
+export function isBackendStopping(): boolean {
+  return stopPromise !== null;
+}
+
 export function resetBackendRestarts(): void {
   restarts = 0;
 }

package/supervisor/index.ts

@@ -11,7 +11,7 @@ import { log } from '../shared/logger.js';
 import { startTunnel, stopTunnel, isTunnelAlive, restartTunnel, startNamedTunnel, restartNamedTunnel } from './tunnel.js';
 import { createWorkerApp } from '../worker/index.js';
 import { closeDb, getSession, getSetting } from '../worker/db.js';
-import { spawnBackend, stopBackend, getBackendPort, isBackendAlive, resetBackendRestarts } from './backend.js';
+import { spawnBackend, stopBackend, getBackendPort, isBackendAlive, isBackendStopping, resetBackendRestarts } from './backend.js';
 import { updateTunnelUrl, startHeartbeat, stopHeartbeat, disconnect } from '../shared/relay.js';
 import { startFluxyAgentQuery, stopFluxyAgentQuery, type RecentMessage } from './fluxy-agent.js';
 import { ensureFileDirs, saveAttachment, type SavedFile } from './file-saver.js';
@@ -860,6 +860,7 @@ export async function startSupervisor() {
                 if (eventData.usedFileTools || pendingBackendRestart) {
                   console.log('[supervisor] Agent turn ended — restarting backend');
                   pendingBackendRestart = false;
+                  if (backendRestartTimer) { clearTimeout(backendRestartTimer); backendRestartTimer = null; }
                   resetBackendRestarts();
                   stopBackend().then(() => spawnBackend(backendPort));
                 }
@@ -1058,8 +1059,11 @@ export async function startSupervisor() {
       pendingBackendRestart = true;
       return;
     }
+    // Skip if a stop/restart is already in progress (bot:done handler owns the restart)
+    if (isBackendStopping()) return;
     if (backendRestartTimer) clearTimeout(backendRestartTimer);
     backendRestartTimer = setTimeout(async () => {
+      if (isBackendStopping()) return; // re-check after delay
       log.info(`[watcher] ${reason} — restarting backend...`);
       resetBackendRestarts();
       await stopBackend();