fix: only restore backup when gateway needs to start, not on every request

The catch-all route and /api/status were calling restoreIfNeeded on EVERY
request, including WebSocket reconnects from the browser. If a reconnect
happened after a sync stored a backup handle, restoreIfNeeded would mount
a FUSE overlay. The next createBackup would then reset the overlay, wiping
upper-layer files (like the marker).

Fix: check if the gateway is already running FIRST. Only call
restoreIfNeeded if the gateway needs to be started.

Author: andreasjansson

src/index.ts

@@ -258,23 +258,25 @@ app.all('*', async (c) => {
 
   console.log('[PROXY] Handling request:', url.pathname);
 
-  // Restore from backup before starting the gateway.
-  // This is only called here (catch-all) and from /api/status — NOT from admin
-  // routes like sync or debug/cli, because the SDK resets the FUSE overlay on
-  // createBackup, wiping upper-layer writes.
-  try {
-    await Promise.race([
-      restoreIfNeeded(sandbox, c.env.BACKUP_BUCKET),
-      new Promise((_, reject) => setTimeout(() => reject(new Error('Restore timeout')), 15_000)),
-    ]);
-  } catch (err) {
-    console.error('[PROXY] Backup restore failed/timeout:', err);
-  }
-
   // Check if gateway is already running
   const existingProcess = await findExistingGatewayProcess(sandbox);
   const isGatewayReady = existingProcess !== null && existingProcess.status === 'running';
 
+  // Only restore from backup when the gateway needs to start.
+  // Restoring on every request (including WebSocket reconnects) would mount a
+  // FUSE overlay that interferes with createBackup — the SDK resets the overlay
+  // on backup, wiping upper-layer writes.
+  if (!isGatewayReady) {
+    try {
+      await Promise.race([
+        restoreIfNeeded(sandbox, c.env.BACKUP_BUCKET),
+        new Promise((_, reject) => setTimeout(() => reject(new Error('Restore timeout')), 15_000)),
+      ]);
+    } catch (err) {
+      console.error('[PROXY] Backup restore failed/timeout:', err);
+    }
+  }
+
   // For browser requests (non-WebSocket, non-API), show loading page if gateway isn't ready
   const isWebSocketRequest = request.headers.get('Upgrade')?.toLowerCase() === 'websocket';
   const acceptsHtml = request.headers.get('Accept')?.includes('text/html');

src/routes/public.ts

@@ -35,20 +35,24 @@ publicRoutes.get('/logo-small.png', (c) => {
 publicRoutes.get('/api/status', async (c) => {
   const sandbox = c.get('sandbox');
 
-  // Restore from backup before checking/starting the gateway
-  try {
-    await Promise.race([
-      restoreIfNeeded(sandbox, c.env.BACKUP_BUCKET),
-      new Promise((_, reject) => setTimeout(() => reject(new Error('Restore timeout')), 15_000)),
-    ]);
-  } catch (err) {
-    console.error('[api/status] Backup restore failed/timeout:', err);
-  }
-
   try {
     let process = await findExistingGatewayProcess(sandbox);
     console.log('[api/status] existing process:', process?.id ?? 'none', process?.status ?? '');
     if (!process) {
+      // Restore from backup only when the gateway needs to start.
+      // Restoring while the gateway is running would mount a FUSE overlay
+      // that interferes with createBackup.
+      try {
+        await Promise.race([
+          restoreIfNeeded(sandbox, c.env.BACKUP_BUCKET),
+          new Promise((_, reject) =>
+            setTimeout(() => reject(new Error('Restore timeout')), 15_000),
+          ),
+        ]);
+      } catch (err) {
+        console.error('[api/status] Backup restore failed/timeout:', err);
+      }
+
       // No gateway process found — start it with a short timeout.
       // The loading page polls /api/status every few seconds, so even
       // if this attempt times out, subsequent polls will retry.