fix(files): keep acknowledgements responsive and fence admission

Author: waleedlatif1

apps/realtime/src/handlers/file-doc-store.test.ts

@@ -39,6 +39,7 @@ interface Backing {
   maxReadStreams: number
   maxReadCount: number
   onSnapshot?: () => Promise<void>
+  onLength?: () => Promise<void>
 }
 
 const state = vi.hoisted(() => ({ backing: null as Backing | null }))
@@ -93,7 +94,10 @@ function makeClient(): any {
         .reverse()
         .slice(0, options?.COUNT)
         .map((entry) => ({ ...entry })),
-    xLen: async (key: string) => (b().streams.get(key) ?? []).length,
+    xLen: async (key: string) => {
+      await b().onLength?.()
+      return (b().streams.get(key) ?? []).length
+    },
     xTrim: async (key: string, _strategy: string, minid: string) => {
       const arr = b().streams.get(key) ?? []
       b().streams.set(
@@ -1131,6 +1135,46 @@ describe('FileDocStore', () => {
     })
   })
 
+  it.each(['client', 'server'] as const)(
+    'does not delay a durable %s append for pending compaction',
+    async (publisher) => {
+      const store = await newStore()
+      await store.seedIfEmpty(NAME, seedFor('base'))
+      const doc = new Y.Doc()
+      await store.attachRoom(NAME, doc)
+      const room = storeInternals(store).rooms.get(NAME)!
+      room.publishes = 63
+      let finishCompaction!: () => void
+      const compaction = new Promise<void>((resolve) => {
+        finishCompaction = resolve
+      })
+      state.backing!.onLength = vi.fn(() => compaction)
+      const publish = (id: string) =>
+        publisher === 'client'
+          ? store.publishClientUpdateAndWait(NAME, id, updateFor(id), 'doc-base')
+          : store.publishAndWait(NAME, updateFor(id), 'doc-base')
+      let accepted = false
+      const pending = publish('first').then(() => {
+        accepted = true
+      })
+      try {
+        await vi.waitFor(() => expect(accepted).toBe(true))
+        expect(room.compacting).toBe(true)
+        expect(state.backing!.streams.get(`filedoc:stream:${NAME}`)).toHaveLength(2)
+        room.publishes = 127
+        await publish('second')
+        expect(state.backing!.onLength).toHaveBeenCalledOnce()
+        expect(state.backing!.streams.get(`filedoc:stream:${NAME}`)).toHaveLength(3)
+      } finally {
+        finishCompaction()
+        await pending
+        await vi.waitFor(() => expect(room.compacting).toBe(false))
+        store.detachRoom(NAME)
+        doc.destroy()
+      }
+    }
+  )
+
   it('compacts on retained bytes before the entry-count threshold can exhaust replay', async () => {
     const streamKey = `filedoc:stream:${NAME}`
     const snapshot = Buffer.from(Y.encodeStateAsUpdate(new Y.Doc())).toString('base64')

apps/realtime/src/handlers/file-doc-store.ts

@@ -513,7 +513,7 @@ export class FileDocStore {
         room.uncompactedDeltaBytes >= COMPACT_ENCODED_BYTES ||
         room.publishes % COMPACT_CHECK_EVERY === 0
       ) {
-        await this.maybeCompact(name)
+        void this.maybeCompact(name)
       }
     }
   }
@@ -595,7 +595,7 @@ export class FileDocStore {
             room.uncompactedDeltaBytes >= COMPACT_ENCODED_BYTES ||
             room.publishes % COMPACT_CHECK_EVERY === 0
           ) {
-            await this.maybeCompact(name)
+            void this.maybeCompact(name)
           }
         }
         return

apps/realtime/src/handlers/file-doc.test.ts

@@ -45,7 +45,11 @@ import {
 } from '@/handlers/file-doc'
 import { FileDocInvalidatedError, getFileDocStore } from '@/handlers/file-doc-store'
 import * as permissions from '@/middleware/permissions'
-import { beginRoomPermissionRead, commitRoomPermission } from '@/middleware/permissions'
+import {
+  beginRoomPermissionRead,
+  commitRoomPermission,
+  ROLE_REVALIDATION_TTL_MS,
+} from '@/middleware/permissions'
 
 type Handler = (...payload: unknown[]) => Promise<void> | void
 
@@ -1146,6 +1150,85 @@ describe('setupWorkspaceFileDocHandlers', () => {
     }
   )
 
+  it('rejects a generation invalidated while final authorization is pending', async () => {
+    mockFetchFileDocSeed.mockResolvedValue(seedResult('# Old', 'doc-old'))
+    const { io } = createIo()
+    const pending = setup('socket-final-authorization-invalidation', io)
+    let finishAuthorization!: (permission: 'write') => void
+    const authorization = new Promise<'write'>((resolve) => {
+      finishAuthorization = resolve
+    })
+    const guard = vi
+      .spyOn(permissions, 'resolveCurrentRoomPermission')
+      .mockResolvedValueOnce('write')
+      .mockImplementationOnce(() => authorization)
+    const joining = pending.handlers[FILE_DOC_EVENTS.JOIN]({ fileId: 'file-1', clientId: 1 })
+    try {
+      await vi.waitFor(() => expect(guard).toHaveBeenCalledTimes(2))
+      await getFileDocStore().invalidateDocument(ROOM_NAME, 2)
+      finishAuthorization('write')
+      await joining
+      expect(pending.socket.join).not.toHaveBeenCalledWith(ROOM_NAME)
+      expect(joinSuccessFileId(pending.socket)).toBeUndefined()
+      expect(pending.socket.emit).toHaveBeenCalledWith(
+        FILE_DOC_EVENTS.JOIN_ERROR,
+        expect.objectContaining({ code: 'JOIN_FAILED', retryable: true })
+      )
+      expect(pending.socket.leave).toHaveBeenCalledWith(fileDocAdmissionRoom('file-1'))
+    } finally {
+      finishAuthorization('write')
+      await joining
+      guard.mockRestore()
+    }
+  })
+
+  it.each(['revoked', 'expired'] as const)(
+    'rejects access %s while the final generation check is pending',
+    async (access) => {
+      mockFetchFileDocSeed.mockResolvedValue(seedResult('# Private', 'doc-private'))
+      const { io } = createIo()
+      const pending = setup('socket-generation-authorization-revocation', io)
+      let finishGeneration!: (current: boolean) => void
+      const generation = new Promise<boolean>((resolve) => {
+        finishGeneration = resolve
+      })
+      const guard = vi
+        .spyOn(getFileDocStore(), 'isDocumentGenerationCurrent')
+        .mockImplementationOnce(() => generation)
+      const joining = pending.handlers[FILE_DOC_EVENTS.JOIN]({ fileId: 'file-1', clientId: 1 })
+      const clock = vi.spyOn(Date, 'now')
+      try {
+        await vi.waitFor(() => expect(guard).toHaveBeenCalledOnce())
+        if (access === 'revoked') {
+          commitRoomPermission(
+            'user-1',
+            { type: ROOM_TYPES.WORKSPACE_FILE_DOC, id: 'file-1' },
+            'read',
+            beginRoomPermissionRead()
+          )
+        } else {
+          clock.mockReturnValue(Date.now() + ROLE_REVALIDATION_TTL_MS + 1)
+        }
+        finishGeneration(true)
+        await joining
+        expect(pending.socket.join).not.toHaveBeenCalledWith(ROOM_NAME)
+        expect(joinSuccessFileId(pending.socket)).toBeUndefined()
+        expect(pending.socket.emit).toHaveBeenCalledWith(
+          FILE_DOC_EVENTS.JOIN_ERROR,
+          expect.objectContaining({
+            code: access === 'revoked' ? 'ACCESS_DENIED' : 'JOIN_FAILED',
+            retryable: access === 'expired',
+          })
+        )
+      } finally {
+        clock.mockRestore()
+        finishGeneration(true)
+        await joining
+        guard.mockRestore()
+      }
+    }
+  )
+
   it('receives invalidation while the subscribed generation check is pending', async () => {
     mockFetchFileDocSeed.mockResolvedValue(seedResult('# Old', 'doc-old'))
     const memberships = new Set<string>()

apps/realtime/src/handlers/file-doc.ts

@@ -1476,6 +1476,12 @@ export function setupWorkspaceFileDocHandlers(
         await socket.join(admissionName)
         const joinedVersion =
           Math.max(entry.syncedVersion ?? 0, (await store.getSyncedVersion(name)) ?? 0) || undefined
+        /** Adapter membership can wait; resolve access again before checking the final generation. */
+        const finalPermission = await resolveCurrentRoomPermission(userId, room, FILE_DOC_ACTION)
+        if (!satisfiesRoomMembership(finalPermission, ROOM_TYPES.WORKSPACE_FILE_DOC)) {
+          emitJoinError(socket, fileId, clientId, 'Access denied to file', 'ACCESS_DENIED', false)
+          return
+        }
         const currentDocument = await store.isDocumentGenerationCurrent(name, docIdOf(entry.doc))
         if (!isCurrentJoin()) return
         if (!currentDocument) {
@@ -1489,15 +1495,19 @@ export function setupWorkspaceFileDocHandlers(
           )
           return
         }
-        /** Adapter membership and generation reads can wait; resolve access again before commit. */
-        const finalPermission = await resolveCurrentRoomPermission(userId, room, FILE_DOC_ACTION)
-        if (!satisfiesRoomMembership(finalPermission, ROOM_TYPES.WORKSPACE_FILE_DOC)) {
-          emitJoinError(socket, fileId, clientId, 'Access denied to file', 'ACCESS_DENIED', false)
+        /** The generation read may wait; a revoked or expired access decision must not admit content. */
+        const membershipPermission = peekRoomPermission(userId, room)
+        if (!satisfiesRoomMembership(membershipPermission ?? null, ROOM_TYPES.WORKSPACE_FILE_DOC)) {
+          emitJoinError(
+            socket,
+            fileId,
+            clientId,
+            'File access changed while joining',
+            membershipPermission === undefined ? 'JOIN_FAILED' : 'ACCESS_DENIED',
+            membershipPermission === undefined
+          )
           return
         }
-
-        /** Commit content membership only after the final authorization decision. */
-        if (!isCurrentJoin()) return
         await socket.join(name)
         /** An asynchronous adapter join can be superseded by a leave, switch, or disconnect. */
         if (!isCurrentJoin()) return

apps/sim/app/workspace/[workspaceId]/files/components/file-viewer/rich-markdown-editor/collaboration/file-doc-provider.test.ts

@@ -570,7 +570,9 @@ describe('FileDocProvider', () => {
       await vi.advanceTimersByTimeAsync(UPDATE_BATCH_TEST_WINDOW_MS)
       expect(save).toHaveBeenCalledTimes(2)
       const recovered = new Y.Doc()
-      Y.applyUpdate(recovered, save.mock.calls[1][2])
+      Y.applyUpdate(recovered, save.mock.calls[0][2])
+      expect(recovered.getText('default').toString()).toBe('first')
+      Y.applyUpdate(recovered, save.mock.calls[1][1])
       expect(recovered.getText('default').toString()).toBe('first second')
       recovered.destroy()
       await vi.advanceTimersByTimeAsync(1_000)

apps/sim/app/workspace/[workspaceId]/files/components/file-viewer/rich-markdown-editor/round-trip-safety.test.ts

@@ -245,6 +245,18 @@ describe('isRoundTripSafe', () => {
     expect(normalizeMarkdownContent(source)).toBe(source)
   })
 
+  it.each([
+    '<img src="/image" width>',
+    '<img src="/image" height>',
+    '<img src="/image" width="">',
+    "<img src='/image' height=''>",
+    '<img WIDTH src="/image" height="20">',
+    '[<img src="/image" width height>](/link)',
+  ])('keeps valueless image dimensions in source mode: %s', (source) => {
+    expect(isRoundTripSafe(source)).toBe(false)
+    expect(normalizeMarkdownContent(source)).toBe(source)
+  })
+
   it('allows supported image attributes containing quoted angle brackets', () => {
     expect(isRoundTripSafe('<img src="/image" title="a>b" width="30">')).toBe(true)
     expect(isRoundTripSafe('[<img src="/image" alt="a>b" width="30">](/link)')).toBe(true)

apps/sim/app/workspace/[workspaceId]/files/components/file-viewer/rich-markdown-editor/round-trip-safety.ts

@@ -61,10 +61,16 @@ function inspectHtmlImages(content: string) {
     quotedEntities += tag.raw.match(/"/g)?.length ?? 0
     const attributes = tag.raw.slice(4, -1)
     const seen = new Set<string>()
-    const pattern = /(?:^|\s)([^\s=/>]+)(?:\s*=\s*(?:"[^"]*"|'[^']*'|[^\s"'=<>`]+))?/g
+    const pattern = /(?:^|\s)([^\s=/>]+)(?:\s*=\s*("[^"]*"|'[^']*'|[^\s"'=<>`]+))?/g
     for (const attribute of attributes.matchAll(pattern)) {
       const name = attribute[1].toLowerCase()
-      if (!SUPPORTED_IMAGE_ATTRIBUTES.has(name) || seen.has(name)) {
+      const value = attribute[2]
+      if (
+        !SUPPORTED_IMAGE_ATTRIBUTES.has(name) ||
+        seen.has(name) ||
+        value === undefined ||
+        ((name === 'width' || name === 'height') && (value === '""' || value === "''"))
+      ) {
         images.set(tag.raw, (images.get(tag.raw) ?? 0) + 1)
         break
       }