Nest shot scripts under Queue jobs, keep the studio from overflowing on phones, and lighten library thumbs and polling so the UI stays responsive.

Co-authored-by: Cursor <cursoragent@cursor.com>

server/api/library/clips/[id]/last-frame.get.ts

@@ -1,4 +1,5 @@
-import { existsSync, readFileSync } from 'node:fs'
+import { existsSync, createReadStream } from 'node:fs'
+import { clipLastFramePath, clipVideoPath, fileEtag, sniffImageType } from '~/server/utils/library'
 
 export default defineEventHandler(async (event) => {
   const { owner } = assertLibraryOwner(event)
@@ -18,8 +19,13 @@ export default defineEventHandler(async (event) => {
       throw createError({ statusCode: 500, statusMessage: `Could not extract the last frame: ${message}` })
     }
   }
-  const buf = readFileSync(framePath)
-  setHeader(event, 'Content-Type', 'image/png')
-  setHeader(event, 'Cache-Control', 'private, no-store')
-  return buf
+  const etag = fileEtag(framePath)
+  setHeader(event, 'ETag', etag)
+  setHeader(event, 'Cache-Control', 'private, max-age=86400, stale-while-revalidate=604800')
+  if (getHeader(event, 'if-none-match') === etag) {
+    setResponseStatus(event, 304)
+    return null
+  }
+  setHeader(event, 'Content-Type', sniffImageType(framePath))
+  return sendStream(event, createReadStream(framePath))
 })

server/api/library/clips/[id]/thumb.get.ts

@@ -1,4 +1,5 @@
-import { existsSync, readFileSync } from 'node:fs'
+import { existsSync, createReadStream } from 'node:fs'
+import { clipThumbPath, fileEtag, sniffImageType } from '~/server/utils/library'
 
 export default defineEventHandler((event) => {
   const { owner } = assertLibraryOwner(event)
@@ -9,8 +10,13 @@ export default defineEventHandler((event) => {
   if (!existsSync(path)) {
     throw createError({ statusCode: 404, statusMessage: 'Thumbnail not found' })
   }
-  const buf = readFileSync(path)
-  setHeader(event, 'Content-Type', imageContentType(buf))
-  setHeader(event, 'Cache-Control', 'private, max-age=3600')
-  return buf
+  const etag = fileEtag(path)
+  setHeader(event, 'ETag', etag)
+  setHeader(event, 'Cache-Control', 'private, max-age=86400, stale-while-revalidate=604800')
+  if (getHeader(event, 'if-none-match') === etag) {
+    setResponseStatus(event, 304)
+    return null
+  }
+  setHeader(event, 'Content-Type', sniffImageType(path))
+  return sendStream(event, createReadStream(path))
 })

server/api/library/index.get.ts

@@ -1,13 +1,12 @@
-export default defineEventHandler(async (event) => {
+export default defineEventHandler((event) => {
   const library = publicLibrary(event)
-  try {
-    const { owner } = assertLibraryOwner(event)
-    const folderId = library.folders.find(folder => folder.unlocked)?.id
-    if (folderId) await importMissingComfyVideos(owner, folderId)
-    await ensureClipThumbnails(owner)
-    await sweepOwnerExtensionStills(owner)
-  } catch {
-    return publicLibrary(event)
+  const light = String(getQuery(event).light || '') === '1'
+  if (!light) {
+    try {
+      const { owner } = assertLibraryOwner(event)
+      const folderId = library.folders.find(folder => folder.unlocked)?.id
+      void maintainLibrary(owner, folderId).catch(() => null)
+    } catch { /* locked or anonymous — still return what we can */ }
   }
-  return publicLibrary(event)
+  return library
 })

server/api/library/stills/[id].get.ts

@@ -1,16 +1,23 @@
-import { existsSync, readFileSync } from 'node:fs'
+import { existsSync, createReadStream } from 'node:fs'
+import { fileEtag, stillPath, stillThumbPath, sniffImageType } from '~/server/utils/library'
 
-export default defineEventHandler((event) => {
+export default defineEventHandler(async (event) => {
   const { owner } = assertLibraryOwner(event)
   const id = String(getRouterParam(event, 'id') || '')
   const still = getStill(owner, id)
   assertFolderAccess(event, still.folderId)
-  const path = stillPath(owner, still.id)
-  if (!existsSync(path)) {
+  const wantThumb = String(getQuery(event).thumb || '') === '1'
+  const path = wantThumb ? await stillThumbPath(owner, id) : stillPath(owner, still.id)
+  if (!path || !existsSync(path)) {
     throw createError({ statusCode: 404, statusMessage: 'Image file is missing' })
   }
-  const buf = readFileSync(path)
-  setHeader(event, 'Content-Type', imageContentType(buf))
-  setHeader(event, 'Cache-Control', 'private, max-age=3600')
-  return buf
+  const etag = fileEtag(path)
+  setHeader(event, 'ETag', etag)
+  setHeader(event, 'Cache-Control', wantThumb ? 'private, max-age=86400, stale-while-revalidate=604800' : 'private, max-age=3600')
+  if (getHeader(event, 'if-none-match') === etag) {
+    setResponseStatus(event, 304)
+    return null
+  }
+  setHeader(event, 'Content-Type', wantThumb ? 'image/jpeg' : sniffImageType(path))
+  return sendStream(event, createReadStream(path))
 })

server/api/studio-queue.get.ts

@@ -1,12 +1,40 @@
+import { listShotQueues, summarizeQueue } from '~/server/utils/shotQueue'
 import { listStudioJobs, summarizeStudioJob } from '~/server/utils/studioQueue'
 
 export default defineEventHandler((event) => {
   const { owner } = assertLibraryOwner(event)
-  const jobs = listStudioJobs(owner)
+  const full = String(getQuery(event).full || '') === '1'
+  const active = listStudioJobs(owner)
     .filter(job => job.status === 'waiting' || job.status === 'running' || job.status === 'held')
-    .map(summarizeStudioJob)
+  const claimed = new Set(active.map(job => job.shotQueueId).filter(Boolean) as string[])
+  const queues = listShotQueues(owner)
+  const byId = new Map(queues.map(queue => [queue.id, queue]))
+  const jobs = active.map((job) => {
+    const shots = job.shotQueueId ? byId.get(job.shotQueueId) || null : null
+    const shotSummary = shots ? summarizeQueue(shots) : null
+    const plannedShots = shotSummary
+      ? undefined
+      : [
+        { prompt: job.payload.prompt, duration: job.payload.duration },
+        ...(job.payload.extensions || [])
+      ]
+    return {
+      ...summarizeStudioJob(job),
+      ...(full ? {
+        shots: shotSummary,
+        plannedShots: plannedShots && plannedShots.length > 1 ? plannedShots : undefined
+      } : {}),
+      completedCount: shotSummary?.completedCount || 0,
+      pendingCount: shotSummary?.pendingCount ?? job.shotCount
+    }
+  })
   return {
     jobs,
+    orphans: full
+      ? queues
+        .filter(queue => !claimed.has(queue.id) && queue.status !== 'complete')
+        .map(summarizeQueue)
+      : [],
     waitingCount: jobs.filter(job => job.status === 'waiting').length
   }
 })