Merge pull request #6043 from simstudioai/collab-review-fixes

improvement(realtime): post-review fixes for collab dirty-state + relay lifecycle

Author: waleedlatif1

apps/realtime/src/index.ts

@@ -112,7 +112,13 @@ async function main() {
     logger.info(`Health check available at: http://localhost:${PORT}/health`)
   })
 
+  let shuttingDown = false
   const shutdown = async () => {
+    // SIGINT and SIGTERM both bind this; a double signal (or SIGTERM then SIGINT during the drain)
+    // must not run the whole teardown twice — that means a second forced-exit timer and a second
+    // Redis quit (which throws "The client is closed").
+    if (shuttingDown) return
+    shuttingDown = true
     logger.info('Shutting down Socket.IO server...')
 
     accessRevalidation.stop()
@@ -145,6 +151,15 @@ async function main() {
       logger.error('Error during FileDocStore shutdown:', error)
     }
 
+    // Close local client connections so `httpServer.close()` can complete its callback and exit
+    // gracefully — otherwise open websockets keep it hanging until the forced-exit timer below.
+    // Local-only: a rolling deploy must not disconnect clients pinned to other pods.
+    try {
+      io.local.disconnectSockets(true)
+    } catch (error) {
+      logger.error('Error disconnecting sockets on shutdown:', error)
+    }
+
     httpServer.close(() => {
       logger.info('Socket.IO server closed')
       process.exit(0)

apps/realtime/src/routes/http.ts

@@ -169,13 +169,12 @@ export function createHttpHandler(roomManager: IRoomManager, logger: Logger) {
       try {
         const body = await readRequestBody(req)
         const { workspaceId } = JSON.parse(body)
-        if (typeof workspaceId === 'string' && workspaceId.length > 0) {
-          roomManager.emitToRoom(
-            { type: ROOM_TYPES.WORKSPACE_FILES, id: workspaceId },
-            'workspace-files-changed',
-            { workspaceId, timestamp: Date.now() }
-          )
-        }
+        if (!isNonEmptyString(workspaceId)) return sendError(res, 'Invalid workspaceId', 400)
+        roomManager.emitToRoom(
+          { type: ROOM_TYPES.WORKSPACE_FILES, id: workspaceId },
+          'workspace-files-changed',
+          { workspaceId, timestamp: Date.now() }
+        )
         sendSuccess(res)
       } catch (error) {
         logger.error('Error handling workspace files changed notification:', error)

apps/sim/app/workspace/[workspaceId]/files/components/file-viewer/use-editable-file-content.ts

@@ -257,9 +257,16 @@ export function useEditableFileContent({
       ),
   })
 
+  // When the client can't autosave it isn't the durability owner: the collaborative editor holds
+  // `canAutosave` permanently false because the relay persists the doc server-side (debounced + on
+  // last-disconnect), so `savedContent` never advances and raw `isDirty` would latch true after any
+  // local OR remote keystroke — surfacing a spurious "Unsaved changes" navigation prompt whose
+  // "Discard" discards nothing real. With nothing the user can save, there is nothing to warn about.
+  const isDirtyForCaller = canAutosave && isDirty
+
   useEffect(() => {
-    onDirtyChangeRef.current?.(isDirty)
-  }, [isDirty])
+    onDirtyChangeRef.current?.(isDirtyForCaller)
+  }, [isDirtyForCaller])
 
   useEffect(() => {
     onSaveStatusChangeRef.current?.(
@@ -307,6 +314,6 @@ export function useEditableFileContent({
     hasContentError: streamingContent === undefined && Boolean(error) && !isInitialized,
     saveStatus,
     saveImmediately,
-    isDirty,
+    isDirty: isDirtyForCaller,
   }
 }

apps/sim/app/workspace/[workspaceId]/files/hooks/use-workspace-files-room.ts

@@ -41,9 +41,14 @@ export function useWorkspaceFilesRoom(workspaceId: string): void {
     const join = () => socket.emit('join-workspace-files', { workspaceId })
 
     // A fresh (re)connect gets a fresh retry budget, so a prior full exhaustion doesn't leave the
-    // socket unable to retry a failed re-join until the next success.
+    // socket unable to retry a failed re-join until the next success. Cancel any retry still pending
+    // from before the reconnect so it can't fire a duplicate join after this immediate one.
     const handleConnect = () => {
       retries = 0
+      if (retryTimer) {
+        clearTimeout(retryTimer)
+        retryTimer = null
+      }
       join()
     }