refactor(storage): use original filenames and fix download UX

- Store uploaded files as files/{ulid}/{original-name} instead of files/{ulid}/raw
- Store transcoded videos as {stem}-{resolution}.mp4 (e.g. foo-720p.mp4)
- Store transcoded images as {stem}-{width}p.webp (e.g. foo-1920p.webp)
- Add download?: boolean param to presign - only sets Content-Disposition: attachment when true
- Local storage handler only sets Content-Disposition when ?download=1 query param is present
- Add POST /api/files/download-url endpoint for key-based single file downloads
  - Uses ResourceType.Asset for permission check
  - Validates key belongs to the asset's storage directory
- Fix existing download-links API to pass download: true to presign
- Fix breadcrumb navbar download: video shows resolution submenu, others download directly
- Fix video player download: calls download-url API, shows correct file type label
- Remove filename query param hack from presign URLs
- Add sanitizeFilename() and stemFromKey() utility helpers
- Add key field to VideoTranscode DTO interface
This commit is contained in:
yiling
2026-07-02 17:39:23 +08:00
parent 114cdca4ee
commit b7367bb129
22 changed files with 562 additions and 84 deletions
+27
View File
@@ -299,5 +299,32 @@ const route = new Hono<{ Variables: { user: User } }>()
const files = await assetService.getDownloadLinks(req.ids)
return c.json({ files })
})
.post(
'/files/download-url',
zValidator('json', z.object({ key: z.string().min(1), assetId: z.string().min(1) })),
async (c) => {
const user = c.get('user')
const req = c.req.valid('json')
const { key, assetId } = req
// Validate key format
if (!key.startsWith('files/')) {
return c.json({ error: 'Invalid key' }, 400)
}
// Verify user has read access to the asset
await authzService.hasPermission({
user,
permission: Permission.Read,
type: ResourceType.Asset,
id: assetId,
})
// Verify key belongs to the asset and generate download URL
const url = await assetService.getDownloadUrl(assetId, key)
return c.json({ url })
},
)
export default route
+22
View File
@@ -147,6 +147,28 @@ const route = app
return handlePublicShareError(c, err)
}
})
.post(
'/shares/:shareId/files/:fileId/download-url',
zValidator('json', z.object({ key: z.string().min(1) })),
async (c) => {
const fileId = c.req.param('fileId')
const password = c.req.header('x-share-password')
const { key } = c.req.valid('json')
try {
await shareService.verifyPublicAccess(fileId, password)
if (!key.startsWith('files/')) {
return c.json({ error: 'Invalid key' }, 400)
}
const url = await assetService.getDownloadUrl(fileId, key)
return c.json({ url })
} catch (err) {
return handlePublicShareError(c, err)
}
},
)
.get(
'/shares/:shareId/files/:fileId/comments',
zValidator('query', paginationParamsSchema),
+19 -11
View File
@@ -39,7 +39,7 @@ describe('S3 API', () => {
}
})
it('GET /files/* with filename query parameter sets Content-Disposition header', async () => {
it('GET /files/* sets Content-Disposition: attachment only when download=1 query param is present', async () => {
// We need to capture the onFound callback from serveStatic options
// eslint-disable-next-line @typescript-eslint/no-explicit-any
let onFoundCallback: ((path: string, c: any) => void) | undefined
@@ -54,26 +54,34 @@ describe('S3 API', () => {
const { default: route } = await import('./s3')
const app = new Hono().route('/files', route)
// First, verify onFound is called through the mock
await app.request('/files/b1/test.webp?filename=my-file.txt')
await app.request('/files/b1/test.webp?download=1')
expect(onFoundCallback).toBeDefined()
// Test the callback directly
const mockContext = {
req: {
query: (key: string) => (key === 'filename' ? 'my-file.txt' : undefined),
},
// Test with download=1
const mockContextWithDownload = {
req: { query: (key: string) => (key === 'download' ? '1' : undefined) },
header: vi.fn(),
}
if (onFoundCallback) {
onFoundCallback('/files/b1/test.webp', mockContext)
expect(mockContext.header).toHaveBeenCalledWith(
onFoundCallback('/files/b1/test.webp', mockContextWithDownload)
expect(mockContextWithDownload.header).toHaveBeenCalledWith(
'Content-Disposition',
'attachment; filename="my-file.txt"',
'attachment',
)
}
// Test without download param
const mockContextWithout = {
req: { query: () => undefined },
header: vi.fn(),
}
if (onFoundCallback) {
onFoundCallback('/files/b1/test.webp', mockContextWithout)
expect(mockContextWithout.header).not.toHaveBeenCalled()
}
})
it('PUT /files/:bucket/:key calls s3Service.putObject', async () => {
+2 -4
View File
@@ -9,10 +9,8 @@ const route = new Hono()
root: './data',
rewriteRequestPath: (path) => path.replace(/^\/files\//, ''),
onFound: (_path, c) => {
const filename = c.req.query('filename')
if (filename) {
const safeFilename = filename.replace(/["\r\n]/g, '_')
c.header('Content-Disposition', `attachment; filename="${safeFilename}"`)
if (c.req.query('download') === '1') {
c.header('Content-Disposition', 'attachment')
}
},
}),