cycle detect

Author: icecrasher321

apps/sim/app/api/workspaces/[id]/files/download/route.ts

@@ -6,6 +6,7 @@ import { parseRequest } from '@/lib/api/server'
 import { getSession } from '@/lib/auth'
 import { withRouteHandler } from '@/lib/core/utils/with-route-handler'
 import {
+  buildWorkspaceFileFolderPathMap,
   fetchWorkspaceFileBuffer,
   listWorkspaceFileFolders,
   listWorkspaceFiles,
@@ -65,9 +66,10 @@ export const GET = withRouteHandler(
 
     try {
       const [files, folders] = await Promise.all([
-        listWorkspaceFiles(workspaceId),
+        listWorkspaceFiles(workspaceId, { hydrateFolderPaths: false }),
         listWorkspaceFileFolders(workspaceId),
       ])
+      const folderPaths = buildWorkspaceFileFolderPathMap(folders)
       const selectedFolderIds = collectDescendantFolderIds(folderIds, folders)
       const requestedFileIds = new Set(fileIds)
       const filesToZip = files.filter(
@@ -102,8 +104,9 @@ export const GET = withRouteHandler(
       const usedPaths = new Set<string>()
       for (const file of filesToZip) {
         const buffer = await fetchWorkspaceFileBuffer(file)
+        const folderPath = file.folderId ? folderPaths.get(file.folderId) : null
         const basePath =
-          safeZipPath(file.folderPath ? `${file.folderPath}/${file.name}` : file.name) ||
+          safeZipPath(folderPath ? `${folderPath}/${file.name}` : file.name) ||
           safeZipPath(file.name) ||
           file.id
         let zipPath = basePath

apps/sim/app/workspace/[workspaceId]/files/files.tsx

@@ -534,14 +534,18 @@ export function Files() {
     }
 
     const result = new Map<string, Set<string>>()
-    const collect = (folderId: string): Set<string> => {
+    const collect = (folderId: string, seen = new Set<string>()): Set<string> => {
       const cached = result.get(folderId)
       if (cached) return cached
+      if (seen.has(folderId)) return new Set<string>()
 
+      const nextSeen = new Set(seen)
+      nextSeen.add(folderId)
       const descendants = new Set<string>()
       for (const childId of childrenByParent.get(folderId) ?? []) {
+        if (nextSeen.has(childId)) continue
         descendants.add(childId)
-        for (const nestedId of collect(childId)) {
+        for (const nestedId of collect(childId, nextSeen)) {
           descendants.add(nestedId)
         }
       }

apps/sim/lib/uploads/contexts/workspace/workspace-file-folder-manager.ts

@@ -446,8 +446,11 @@ function collectDescendantFolderIds(
   }
 
   const descendants: string[] = []
+  const seen = new Set([folderId])
   const visit = (id: string) => {
     for (const childId of childrenByParent.get(id) ?? []) {
+      if (seen.has(childId)) continue
+      seen.add(childId)
       descendants.push(childId)
       visit(childId)
     }

apps/sim/lib/uploads/contexts/workspace/workspace-file-manager.ts

@@ -29,6 +29,7 @@ import { MAX_WORKSPACE_FILE_SIZE } from '@/lib/uploads/shared/types'
 import { getWorkspaceWithOwner } from '@/lib/workspaces/permissions/utils'
 import { isUuid, sanitizeFileName } from '@/executor/constants'
 import type { UserFile } from '@/executor/types'
+import type { WorkspaceFileFolderRecord } from './workspace-file-folder-manager'
 import {
   assertWorkspaceFileFolderTarget,
   buildWorkspaceFileFolderPathMap,
@@ -69,6 +70,12 @@ export interface WorkspaceFileRecord {
   storageContext?: 'workspace' | 'mothership'
 }
 
+interface ListWorkspaceFilesOptions {
+  scope?: WorkspaceFileScope
+  folders?: WorkspaceFileFolderRecord[]
+  hydrateFolderPaths?: boolean
+}
+
 /**
  * Workspace file key pattern: workspace/{workspaceId}/{timestamp}-{random}-{filename}
  */
@@ -620,10 +627,10 @@ export async function getWorkspaceFileByName(
  */
 export async function listWorkspaceFiles(
   workspaceId: string,
-  options?: { scope?: WorkspaceFileScope }
+  options?: ListWorkspaceFilesOptions
 ): Promise<WorkspaceFileRecord[]> {
   try {
-    const { scope = 'active' } = options ?? {}
+    const { scope = 'active', hydrateFolderPaths = true } = options ?? {}
     const files = await db
       .select()
       .from(workspaceFiles)
@@ -647,8 +654,11 @@ export async function listWorkspaceFiles(
       )
       .orderBy(workspaceFiles.uploadedAt)
 
-    const folders = await listWorkspaceFileFolders(workspaceId, { scope: 'all' })
-    const folderPaths = buildWorkspaceFileFolderPathMap(folders)
+    const needsFolderPaths = hydrateFolderPaths && files.some((file) => file.folderId)
+    const folders = needsFolderPaths
+      ? (options?.folders ?? (await listWorkspaceFileFolders(workspaceId, { scope: 'all' })))
+      : []
+    const folderPaths = needsFolderPaths ? buildWorkspaceFileFolderPathMap(folders) : new Map()
 
     return files.map((file) => mapWorkspaceFileRecord(file, workspaceId, folderPaths))
   } catch (error) {