mirror of
https://github.com/shumaiOne/shumai.git
synced 2026-11-19 14:16:29 +00:00
fix(asset): mark asset as failed and display failure state in webui when transcoding fails (#445)
* fix(asset): mark asset as failed and display failure state in webui when transcoding fails * fix(transcode): do not mark asset as failed if media processing already succeeded * test(workflow): add e2e test for video transcode failure status transition * fix(webui): update failed file card badge to top-right Transcoding Failed label with error tooltip
This commit is contained in:
@@ -14,6 +14,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/).
|
||||
|
||||
### Fixed
|
||||
|
||||
- **asset**: Fix an issue where media files remained stuck in a perpetual "Preparing..." state when transcoding failed, by displaying a clear failed status and error details in the file list and file viewer
|
||||
|
||||
* **transcode**: Fix an issue where videos or audio-only files containing attached cover art or picture streams could cause transcoding to fail during poster generation or select a single static image instead of the video
|
||||
|
||||
* **webui**: Fix inconsistent video resolution labels across download menus, mobile file headers, and the video player by correctly deriving resolutions from the video's short side, including portrait videos and 480p videos
|
||||
|
||||
@@ -0,0 +1,2 @@
|
||||
-- AlterEnum
|
||||
ALTER TYPE "AssetStatus" ADD VALUE 'failed';
|
||||
@@ -40,6 +40,7 @@ enum AssetStatus {
|
||||
uploaded
|
||||
processing
|
||||
processed
|
||||
failed
|
||||
trashed
|
||||
pending_purge
|
||||
}
|
||||
|
||||
+1
@@ -36,6 +36,7 @@ export const AssetStatus = {
|
||||
uploaded: 'uploaded',
|
||||
processing: 'processing',
|
||||
processed: 'processed',
|
||||
failed: 'failed',
|
||||
trashed: 'trashed',
|
||||
pending_purge: 'pending_purge'
|
||||
} as const
|
||||
|
||||
+1
-1
File diff suppressed because one or more lines are too long
@@ -209,6 +209,7 @@ declare global {
|
||||
original: OriginalInfo | null
|
||||
isHls?: boolean
|
||||
hls?: HlsInfo
|
||||
error?: string
|
||||
}
|
||||
|
||||
// ----------------------------------------------------------------------
|
||||
|
||||
@@ -145,6 +145,7 @@ export const assetInfoSchema = z.object({
|
||||
.optional(),
|
||||
proxyType: z.enum(['image', 'video', 'audio', 'pdf']).nullable().optional(),
|
||||
metadata: mediaMetadataSchema.optional(),
|
||||
error: z.string().optional(),
|
||||
})
|
||||
.optional(),
|
||||
ancestorFolders: z.array(ancestorFolderSchema).optional(),
|
||||
|
||||
@@ -1111,5 +1111,71 @@ describe.each(['local', 'temporal'] as const)(
|
||||
)
|
||||
expect(masterObj.buffer.toString('utf-8')).toContain('480p/index.m3u8')
|
||||
}, 60000)
|
||||
|
||||
it('should transition both task and asset to failed status with media.error when transcoding fails', async () => {
|
||||
const team = await prisma.team.create({
|
||||
data: { name: 'E2E Failed Transcode Team' },
|
||||
})
|
||||
|
||||
const project = await prisma.project.create({
|
||||
data: { name: 'E2E Failed Transcode Project', teamId: team.id },
|
||||
})
|
||||
|
||||
const storageKey = await prisma.storageKey.create({
|
||||
data: { key: 'projects/e2e/corrupt-video.mp4' },
|
||||
})
|
||||
|
||||
const asset = await prisma.asset.create({
|
||||
data: {
|
||||
name: 'corrupt-video.mp4',
|
||||
type: 'file',
|
||||
status: 'uploaded',
|
||||
mediaType: 'video/mp4',
|
||||
projectId: project.id,
|
||||
storageKeyId: storageKey.id,
|
||||
},
|
||||
})
|
||||
|
||||
const corruptBuffer = Buffer.from('not a valid mp4 media stream at all')
|
||||
await s3Service.putObject(
|
||||
'shumai-e2e-test-bucket-transcode',
|
||||
'projects/e2e/corrupt-video.mp4',
|
||||
corruptBuffer,
|
||||
corruptBuffer.length,
|
||||
'video/mp4',
|
||||
)
|
||||
|
||||
const task = await prisma.workflowTask.create({
|
||||
data: {
|
||||
type: 'transcode_video',
|
||||
status: 'pending',
|
||||
assetId: asset.id,
|
||||
projectId: project.id,
|
||||
teamId: team.id,
|
||||
payload: {
|
||||
projectId: project.id,
|
||||
transcode: {
|
||||
videoStrategy: 'best_match',
|
||||
},
|
||||
},
|
||||
},
|
||||
})
|
||||
|
||||
await expect(workflowService.executeWait(task, 45000)).rejects.toThrow()
|
||||
|
||||
const failedTask = await prisma.workflowTask.findUnique({
|
||||
where: { id: task.id },
|
||||
})
|
||||
expect(failedTask?.status).toBe('failed')
|
||||
|
||||
const updatedAsset = await prisma.asset.findUnique({
|
||||
where: { id: asset.id },
|
||||
})
|
||||
expect(updatedAsset?.status).toBe(AssetStatus.failed)
|
||||
|
||||
const media = updatedAsset?.media as PrismaJson.MediaInfo
|
||||
expect(media?.error).toBeDefined()
|
||||
expect(media?.error?.length).toBeGreaterThan(0)
|
||||
}, 45000)
|
||||
},
|
||||
)
|
||||
|
||||
@@ -38,14 +38,31 @@ export async function completeTask(
|
||||
})
|
||||
}
|
||||
|
||||
export async function failTask(workerQueue: string, taskId: string, err: unknown) {
|
||||
const { updateTaskStatusActivity } = getActivities()
|
||||
export async function failTask(
|
||||
workerQueue: string,
|
||||
taskId: string,
|
||||
err: unknown,
|
||||
assetId?: string,
|
||||
) {
|
||||
const { updateTaskStatusActivity, updateAssetStatusActivity } = getActivities()
|
||||
if (workerQueue) {
|
||||
const errorMsg = err instanceof Error ? err.message : String(err)
|
||||
await executeActivity(workerQueue, updateTaskStatusActivity, {
|
||||
taskId,
|
||||
status: 'failed',
|
||||
output: { error: err instanceof Error ? err.message : String(err) },
|
||||
output: { error: errorMsg },
|
||||
})
|
||||
if (assetId) {
|
||||
try {
|
||||
await executeActivity(workerQueue, updateAssetStatusActivity, {
|
||||
assetId,
|
||||
status: 'failed',
|
||||
error: errorMsg,
|
||||
})
|
||||
} catch (assetErr) {
|
||||
console.error('Failed to update asset status to failed:', assetErr)
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -12,6 +12,7 @@ import {
|
||||
export async function transcodeImageWorkflow(task: WorkflowTask): Promise<void> {
|
||||
let tmpDir: string | undefined
|
||||
let workerQueue = ''
|
||||
let mediaProcessed = false
|
||||
|
||||
try {
|
||||
workerQueue = await getWorkerQueueAndStartTask(task)
|
||||
@@ -90,6 +91,7 @@ export async function transcodeImageWorkflow(task: WorkflowTask): Promise<void>
|
||||
assetId: asset.id,
|
||||
status: 'processed',
|
||||
})
|
||||
mediaProcessed = true
|
||||
|
||||
await executeActivity(workerQueue, createEmbeddingTaskIfEnabledActivity, {
|
||||
assetId: asset.id,
|
||||
@@ -106,7 +108,7 @@ export async function transcodeImageWorkflow(task: WorkflowTask): Promise<void>
|
||||
await completeTask(workerQueue, task.id)
|
||||
} catch (err) {
|
||||
console.error(`transcodeImageWorkflow failed for task ${task.id}:`, err)
|
||||
await failTask(workerQueue, task.id, err)
|
||||
await failTask(workerQueue, task.id, err, mediaProcessed ? undefined : task.assetId)
|
||||
throw err
|
||||
} finally {
|
||||
await cleanupTmpDir(workerQueue, tmpDir)
|
||||
|
||||
@@ -12,6 +12,7 @@ import {
|
||||
export async function transcodePdfWorkflow(task: WorkflowTask): Promise<void> {
|
||||
let tmpDir: string | undefined
|
||||
let workerQueue = ''
|
||||
let mediaProcessed = false
|
||||
|
||||
try {
|
||||
workerQueue = await getWorkerQueueAndStartTask(task)
|
||||
@@ -101,6 +102,7 @@ export async function transcodePdfWorkflow(task: WorkflowTask): Promise<void> {
|
||||
assetId: asset.id,
|
||||
status: 'processed',
|
||||
})
|
||||
mediaProcessed = true
|
||||
|
||||
await executeActivity(workerQueue, createEmbeddingTaskIfEnabledActivity, {
|
||||
assetId: asset.id,
|
||||
@@ -117,7 +119,7 @@ export async function transcodePdfWorkflow(task: WorkflowTask): Promise<void> {
|
||||
await completeTask(workerQueue, task.id)
|
||||
} catch (err) {
|
||||
console.error(`transcodePdfWorkflow failed for task ${task.id}:`, err)
|
||||
await failTask(workerQueue, task.id, err)
|
||||
await failTask(workerQueue, task.id, err, mediaProcessed ? undefined : task.assetId)
|
||||
throw err
|
||||
} finally {
|
||||
await cleanupTmpDir(workerQueue, tmpDir)
|
||||
|
||||
@@ -874,4 +874,129 @@ describe('transcodeVideoWorkflow', () => {
|
||||
)
|
||||
})
|
||||
})
|
||||
|
||||
it('should mark task and asset as failed when an activity fails', async () => {
|
||||
const task: WorkflowTask = {
|
||||
id: 'task-fail',
|
||||
assetId: 'asset-fail',
|
||||
type: WorkflowTaskType.transcode_video,
|
||||
status: WorkflowTaskStatus.pending,
|
||||
sessionId: null,
|
||||
output: null,
|
||||
payload: {
|
||||
projectId: 'proj-1',
|
||||
transcode: { videoStrategy: 'best_match' },
|
||||
},
|
||||
createdAt: new Date(),
|
||||
updatedAt: new Date(),
|
||||
heartbeat: null,
|
||||
teamId: 'team-1',
|
||||
projectId: 'proj-1',
|
||||
uid: 'task-uid',
|
||||
model: null,
|
||||
inputTokens: 0,
|
||||
outputTokens: 0,
|
||||
}
|
||||
|
||||
mockActivities.getAssetActivity.mockResolvedValue({
|
||||
id: 'asset-fail',
|
||||
name: 'fail.mp4',
|
||||
storageKey: { key: 'files/asset-fail/fail.mp4' },
|
||||
status: AssetStatus.uploading,
|
||||
})
|
||||
|
||||
mockActivities.getMediaInfoActivity.mockRejectedValue(new Error('FFprobe failed to read media'))
|
||||
|
||||
await expect(transcodeVideoWorkflow(task)).rejects.toThrow('FFprobe failed to read media')
|
||||
|
||||
expect(mockActivities.updateTaskStatusActivity).toHaveBeenCalledWith({
|
||||
taskId: 'task-fail',
|
||||
status: 'failed',
|
||||
output: { error: 'FFprobe failed to read media' },
|
||||
})
|
||||
|
||||
expect(mockActivities.updateAssetStatusActivity).toHaveBeenCalledWith({
|
||||
assetId: 'asset-fail',
|
||||
status: 'failed',
|
||||
error: 'FFprobe failed to read media',
|
||||
})
|
||||
})
|
||||
|
||||
it('should mark task as failed but keep asset as processed when post-transcode activity fails', async () => {
|
||||
const task: WorkflowTask = {
|
||||
id: 'task-post-fail',
|
||||
assetId: 'asset-post-fail',
|
||||
type: WorkflowTaskType.transcode_video,
|
||||
status: WorkflowTaskStatus.pending,
|
||||
sessionId: null,
|
||||
output: null,
|
||||
payload: {
|
||||
projectId: 'proj-1',
|
||||
transcode: { videoStrategy: 'best_match' },
|
||||
},
|
||||
createdAt: new Date(),
|
||||
updatedAt: new Date(),
|
||||
heartbeat: null,
|
||||
teamId: 'team-1',
|
||||
projectId: 'proj-1',
|
||||
uid: 'task-uid',
|
||||
model: null,
|
||||
inputTokens: 0,
|
||||
outputTokens: 0,
|
||||
}
|
||||
|
||||
mockActivities.getAssetActivity.mockResolvedValue({
|
||||
id: 'asset-post-fail',
|
||||
name: 'video.mp4',
|
||||
storageKey: { key: 'files/asset-post-fail/video.mp4' },
|
||||
status: AssetStatus.uploading,
|
||||
mediaType: 'video/mp4',
|
||||
})
|
||||
|
||||
mockActivities.getMediaInfoActivity.mockResolvedValue({
|
||||
proxyType: 'video',
|
||||
metadata: {
|
||||
originalWidth: 1920,
|
||||
originalHeight: 1080,
|
||||
duration: 10,
|
||||
frameRate: 30,
|
||||
totalFrames: 300,
|
||||
startTimecode: '00:00:00:00',
|
||||
bitRate: 1000,
|
||||
hasAudio: false,
|
||||
format: {},
|
||||
},
|
||||
videoTranscodes: [],
|
||||
imageTranscodes: [],
|
||||
})
|
||||
|
||||
mockActivities.transcodeVideoActivity.mockResolvedValue({
|
||||
key: 'v.mp4',
|
||||
width: 1920,
|
||||
height: 1080,
|
||||
})
|
||||
|
||||
mockActivities.createEmbeddingTaskIfEnabledActivity.mockRejectedValue(
|
||||
new Error('Embedding creation failed'),
|
||||
)
|
||||
|
||||
await expect(transcodeVideoWorkflow(task)).rejects.toThrow('Embedding creation failed')
|
||||
|
||||
expect(mockActivities.updateTaskStatusActivity).toHaveBeenCalledWith({
|
||||
taskId: 'task-post-fail',
|
||||
status: 'failed',
|
||||
output: { error: 'Embedding creation failed' },
|
||||
})
|
||||
|
||||
expect(mockActivities.updateAssetStatusActivity).toHaveBeenCalledWith({
|
||||
assetId: 'asset-post-fail',
|
||||
status: 'processed',
|
||||
})
|
||||
|
||||
expect(mockActivities.updateAssetStatusActivity).not.toHaveBeenCalledWith(
|
||||
expect.objectContaining({
|
||||
status: 'failed',
|
||||
}),
|
||||
)
|
||||
})
|
||||
})
|
||||
|
||||
@@ -17,6 +17,7 @@ import {
|
||||
export async function transcodeVideoWorkflow(task: WorkflowTask): Promise<void> {
|
||||
let tmpDir: string | undefined
|
||||
let workerQueue = ''
|
||||
let mediaProcessed = false
|
||||
|
||||
try {
|
||||
workerQueue = await getWorkerQueueAndStartTask(task)
|
||||
@@ -265,6 +266,7 @@ export async function transcodeVideoWorkflow(task: WorkflowTask): Promise<void>
|
||||
assetId: asset.id,
|
||||
status: 'processed',
|
||||
})
|
||||
mediaProcessed = true
|
||||
|
||||
await executeActivity(workerQueue, createEmbeddingTaskIfEnabledActivity, {
|
||||
assetId: asset.id,
|
||||
@@ -281,7 +283,7 @@ export async function transcodeVideoWorkflow(task: WorkflowTask): Promise<void>
|
||||
await completeTask(workerQueue, task.id)
|
||||
} catch (err) {
|
||||
console.error(`transcodeVideoWorkflow failed for task ${task.id}:`, err)
|
||||
await failTask(workerQueue, task.id, err)
|
||||
await failTask(workerQueue, task.id, err, mediaProcessed ? undefined : task.assetId)
|
||||
throw err
|
||||
} finally {
|
||||
await cleanupTmpDir(workerQueue, tmpDir)
|
||||
|
||||
@@ -382,4 +382,63 @@ describe('FileCard', () => {
|
||||
// The duration badge appears once processing is done.
|
||||
expect(screen.getByText('00:10')).toBeTruthy()
|
||||
})
|
||||
|
||||
it('renders failed state with alert icon and shows creator at bottom when status is failed without a preview', () => {
|
||||
const failedItem: AssetInfo = {
|
||||
...fileItem,
|
||||
status: 'failed',
|
||||
creator: { id: 'u1', name: 'Alice' },
|
||||
} as AssetInfo
|
||||
|
||||
renderComponent({ item: failedItem })
|
||||
|
||||
expect(screen.queryByTestId('file-card-preparing-circle')).toBeNull()
|
||||
const failedState = screen.getByTestId('file-card-failed-state')
|
||||
expect(failedState).toBeTruthy()
|
||||
expect(screen.getByText(/Processing failed|处理失败/i)).toBeTruthy()
|
||||
expect(screen.getByText(/Alice/i)).toBeTruthy()
|
||||
})
|
||||
|
||||
it('renders thumbnail with failed badge in top-right corner, shows error in tooltip on hover, and shows creator at bottom', () => {
|
||||
vi.useFakeTimers()
|
||||
const failedItemWithPreview: AssetInfo = {
|
||||
...fileItem,
|
||||
status: 'failed',
|
||||
creator: { id: 'u1', name: 'Alice' },
|
||||
media: {
|
||||
error: 'FFmpeg transcode failed: exit code 1',
|
||||
},
|
||||
preview: {
|
||||
proxyType: 'video',
|
||||
thumbnailUrl: 'https://example.com/poster.webp',
|
||||
duration: 10,
|
||||
},
|
||||
} as AssetInfo
|
||||
|
||||
renderComponent({ item: failedItemWithPreview })
|
||||
|
||||
const media = screen.getByTestId('file-card-preview-media')
|
||||
expect(media.className).not.toContain('animate-pulse')
|
||||
const badge = screen.getByTestId('file-card-failed-badge')
|
||||
expect(badge).toBeTruthy()
|
||||
expect(badge.textContent).toMatch(/Transcoding Failed|转码失败/i)
|
||||
expect(badge.querySelector('svg')).toBeNull()
|
||||
|
||||
// Failed badge is in the top-right container
|
||||
const rightTopContainer = badge.closest('.absolute.right-2.top-2')
|
||||
expect(rightTopContainer).toBeTruthy()
|
||||
|
||||
// Creator is still shown at the bottom of the card
|
||||
expect(screen.getByText(/Alice/i)).toBeTruthy()
|
||||
|
||||
// Hovering the badge reveals the error message in tooltip
|
||||
fireEvent.pointerMove(badge, { pointerType: 'mouse' })
|
||||
act(() => {
|
||||
vi.advanceTimersByTime(200)
|
||||
})
|
||||
const tooltip = screen.getByRole('tooltip')
|
||||
expect(tooltip).toBeTruthy()
|
||||
expect(tooltip.textContent).toContain('FFmpeg transcode failed: exit code 1')
|
||||
vi.useRealTimers()
|
||||
})
|
||||
})
|
||||
|
||||
@@ -27,6 +27,7 @@ import { cn } from '@/ui/lib/utils'
|
||||
import { useUploadStore } from '@/ui/stores/upload'
|
||||
import { useDraggable, useDroppable } from '@dnd-kit/react'
|
||||
import {
|
||||
AlertCircle,
|
||||
Clock,
|
||||
Download,
|
||||
Edit,
|
||||
@@ -131,15 +132,21 @@ export function FileCard({
|
||||
enabled: shouldPoll,
|
||||
refetchInterval: (query: unknown) => {
|
||||
const data = (query as { state: { data: { status?: string } } }).state.data
|
||||
return data?.status === 'processed' ? false : 1000
|
||||
return data?.status === 'processed' || data?.status === 'failed' || data?.status === 'error'
|
||||
? false
|
||||
: 1000
|
||||
},
|
||||
})
|
||||
|
||||
const displayItem = useMemo(() => {
|
||||
if (item.status === 'processed' || item.status === 'error') {
|
||||
if (item.status === 'processed' || item.status === 'error' || item.status === 'failed') {
|
||||
return item
|
||||
}
|
||||
if (polledItem?.status === 'processed' || polledItem?.status === 'error') {
|
||||
if (
|
||||
polledItem?.status === 'processed' ||
|
||||
polledItem?.status === 'error' ||
|
||||
polledItem?.status === 'failed'
|
||||
) {
|
||||
return polledItem
|
||||
}
|
||||
return polledItem || item
|
||||
@@ -263,10 +270,11 @@ export function FileCard({
|
||||
// A preview (poster thumbnail and/or sprite) can be available before transcoding finishes,
|
||||
// since the poster/sprite are generated and persisted ahead of the proxy transcodes.
|
||||
const hasPreview = Boolean(displayItem.preview?.thumbnailUrl || displayItem.preview?.spriteUrl)
|
||||
const isFailed = displayItem.status === 'failed'
|
||||
const isProcessing = displayItem.status === 'processing' || displayItem.status === 'uploaded'
|
||||
|
||||
// While uploading/transcoding, the creator row is replaced by a short status label so the real
|
||||
// date/author only appears once the asset is ready.
|
||||
// date/author only appears once the asset is ready or failed.
|
||||
const statusText =
|
||||
displayItem.status === 'uploading'
|
||||
? m.uploading()
|
||||
@@ -274,6 +282,8 @@ export function FileCard({
|
||||
? m.preparing()
|
||||
: null
|
||||
|
||||
const failedErrorMessage = displayItem.media?.error || m.processing_failed()
|
||||
|
||||
const previewBadges =
|
||||
daysLeft !== null ||
|
||||
(typeof displayItem.commentsCount === 'number' && displayItem.commentsCount > 0) ? (
|
||||
@@ -322,7 +332,7 @@ export function FileCard({
|
||||
showDropFeedback && 'border-primary outline-1 outline-primary',
|
||||
)}
|
||||
>
|
||||
<div className="absolute left-2 top-2 z-10">
|
||||
<div className="absolute left-2 top-2 z-10 flex items-center gap-1.5">
|
||||
<Checkbox
|
||||
checked={isChecked}
|
||||
onCheckedChange={() => {}}
|
||||
@@ -351,6 +361,27 @@ export function FileCard({
|
||||
displayItem.versionStack.versions.length}
|
||||
</Badge>
|
||||
)}
|
||||
{isFailed && (
|
||||
<TooltipProvider delayDuration={100}>
|
||||
<Tooltip>
|
||||
<TooltipTrigger asChild>
|
||||
<span
|
||||
data-testid="file-card-failed-badge"
|
||||
className="select-none rounded bg-destructive/90 px-1.5 py-0.5 text-xs font-medium text-destructive-foreground shadow-sm cursor-help"
|
||||
>
|
||||
{m.transcoding_failed()}
|
||||
</span>
|
||||
</TooltipTrigger>
|
||||
<TooltipContent
|
||||
side="bottom"
|
||||
data-testid="file-card-failed-tooltip"
|
||||
className="max-w-xs break-words text-xs"
|
||||
>
|
||||
{failedErrorMessage}
|
||||
</TooltipContent>
|
||||
</Tooltip>
|
||||
</TooltipProvider>
|
||||
)}
|
||||
</div>
|
||||
|
||||
<div className="relative aspect-square overflow-hidden bg-muted/30">
|
||||
@@ -364,7 +395,7 @@ export function FileCard({
|
||||
data-testid="file-card-preview-media"
|
||||
className={cn('h-full w-full', isProcessing && 'animate-pulse')}
|
||||
>
|
||||
<FilePreview item={displayItem} showDuration={!isProcessing} />
|
||||
<FilePreview item={displayItem} showDuration={!isProcessing && !isFailed} />
|
||||
</div>
|
||||
{previewBadges}
|
||||
</>
|
||||
@@ -374,7 +405,17 @@ export function FileCard({
|
||||
{m.failed_to_upload()}
|
||||
</span>
|
||||
</div>
|
||||
) : displayItem.status === 'processing' || displayItem.status === 'uploaded' ? (
|
||||
) : isFailed ? (
|
||||
<div
|
||||
data-testid="file-card-failed-state"
|
||||
className="flex flex-col h-full w-full items-center justify-center gap-2 p-3 text-center bg-muted/40"
|
||||
>
|
||||
<AlertCircle className="h-10 w-10 text-destructive/80 shrink-0" />
|
||||
<span className="z-10 text-xs font-semibold text-destructive px-2">
|
||||
{m.processing_failed()}
|
||||
</span>
|
||||
</div>
|
||||
) : isProcessing ? (
|
||||
<div className="flex h-full w-full items-center justify-center">
|
||||
{/* Same geometry as the upload progress ring, but empty inside and no percentage. */}
|
||||
<svg
|
||||
@@ -431,7 +472,7 @@ export function FileCard({
|
||||
}}
|
||||
>
|
||||
<TooltipTrigger asChild>
|
||||
<p ref={creatorRef} className="text-sm text-muted-foreground line-clamp-2 h-[2lh]">
|
||||
<p ref={creatorRef} className="text-sm line-clamp-2 h-[2lh] text-muted-foreground">
|
||||
{statusText ?? creatorText}
|
||||
</p>
|
||||
</TooltipTrigger>
|
||||
|
||||
@@ -134,4 +134,17 @@ describe('FileListItem', () => {
|
||||
|
||||
expect(onDoubleClick).toHaveBeenCalled()
|
||||
})
|
||||
|
||||
it('renders (Processing failed) label when status is failed', () => {
|
||||
const failedItem: AssetInfo = {
|
||||
...mockItem,
|
||||
status: 'failed',
|
||||
} as AssetInfo
|
||||
|
||||
renderComponent({ item: failedItem })
|
||||
|
||||
const failedLabel = screen.getByTestId('file-list-item-failed')
|
||||
expect(failedLabel).toBeTruthy()
|
||||
expect(failedLabel.textContent).toMatch(/Processing failed|处理失败/i)
|
||||
})
|
||||
})
|
||||
|
||||
@@ -1,9 +1,10 @@
|
||||
import type { AssetInfo, FieldValueInfo } from '@shumai/dtos'
|
||||
import { client } from '@/ui/api/client'
|
||||
import { m } from '@/ui/paraglide/messages.js'
|
||||
import { useQuery } from '@tanstack/react-query'
|
||||
|
||||
import { useDraggable } from '@dnd-kit/react'
|
||||
import { File, Folder, MoreVertical, AudioLines } from 'lucide-react'
|
||||
import { AlertCircle, File, Folder, MoreVertical, AudioLines } from 'lucide-react'
|
||||
import React, { useEffect, useMemo, useRef, useState } from 'react'
|
||||
import { cn } from '@/ui/lib/utils'
|
||||
import { formatSize } from '@/ui/lib/format'
|
||||
@@ -90,15 +91,21 @@ export function FileListItem({
|
||||
enabled: shouldPoll,
|
||||
refetchInterval: (query: unknown) => {
|
||||
const data = (query as { state: { data: { status?: string } } }).state.data
|
||||
return data?.status === 'processed' ? false : 1000
|
||||
return data?.status === 'processed' || data?.status === 'failed' || data?.status === 'error'
|
||||
? false
|
||||
: 1000
|
||||
},
|
||||
})
|
||||
|
||||
const displayItem = useMemo(() => {
|
||||
if (item.status === 'processed' || item.status === 'error') {
|
||||
if (item.status === 'processed' || item.status === 'error' || item.status === 'failed') {
|
||||
return item
|
||||
}
|
||||
if (polledItem?.status === 'processed' || polledItem?.status === 'error') {
|
||||
if (
|
||||
polledItem?.status === 'processed' ||
|
||||
polledItem?.status === 'error' ||
|
||||
polledItem?.status === 'failed'
|
||||
) {
|
||||
return polledItem
|
||||
}
|
||||
return polledItem || item
|
||||
@@ -215,6 +222,8 @@ export function FileListItem({
|
||||
<div className="w-8 h-8 shrink-0 flex items-center justify-center bg-muted rounded overflow-hidden">
|
||||
{displayItem.status === 'uploading' ? (
|
||||
<ProgressCircle progress={uploadPercent} className="w-7 h-7" />
|
||||
) : displayItem.status === 'failed' && !displayItem.preview?.thumbnailUrl ? (
|
||||
<AlertCircle className="h-4 w-4 text-destructive" />
|
||||
) : displayItem.preview?.thumbnailUrl ? (
|
||||
<img
|
||||
src={displayItem.preview.thumbnailUrl}
|
||||
@@ -240,7 +249,15 @@ export function FileListItem({
|
||||
/>
|
||||
{displayItem.status === 'error' && (
|
||||
<span className="text-xs text-destructive font-semibold shrink-0">
|
||||
(Failed to upload)
|
||||
{m.failed_to_upload_parenthesized()}
|
||||
</span>
|
||||
)}
|
||||
{displayItem.status === 'failed' && (
|
||||
<span
|
||||
data-testid="file-list-item-failed"
|
||||
className="text-xs text-destructive font-semibold shrink-0"
|
||||
>
|
||||
{m.processing_failed_parenthesized()}
|
||||
</span>
|
||||
)}
|
||||
|
||||
|
||||
@@ -0,0 +1,46 @@
|
||||
// @vitest-environment happy-dom
|
||||
import { cleanup, render, screen } from '@testing-library/react'
|
||||
import React from 'react'
|
||||
import { afterEach, describe, expect, it, vi } from 'vitest'
|
||||
import { DefaultViewer } from './default-viewer'
|
||||
import type { AssetInfo } from '@shumai/dtos'
|
||||
|
||||
vi.mock('@/ui/paraglide/messages.js', () => ({
|
||||
m: new Proxy({}, { get: () => () => '' }),
|
||||
}))
|
||||
|
||||
describe('DefaultViewer', () => {
|
||||
afterEach(() => {
|
||||
cleanup()
|
||||
})
|
||||
it('renders failed state when file status is failed', () => {
|
||||
const file = {
|
||||
id: 'failed-doc',
|
||||
name: 'failed.docx',
|
||||
status: 'failed',
|
||||
media: {
|
||||
error: 'PDF generation failed',
|
||||
},
|
||||
} as unknown as AssetInfo
|
||||
|
||||
render(<DefaultViewer file={file} />)
|
||||
expect(screen.getByTestId('default-viewer-failed-state')).toBeDefined()
|
||||
expect(screen.getByText('PDF generation failed')).toBeDefined()
|
||||
})
|
||||
|
||||
it('renders standard download view when file is not failed', () => {
|
||||
const file = {
|
||||
id: 'file-1',
|
||||
name: 'archive.zip',
|
||||
status: 'processed',
|
||||
sizeByte: 1024,
|
||||
media: {
|
||||
original: { key: 'raw/archive.zip' },
|
||||
},
|
||||
} as unknown as AssetInfo
|
||||
|
||||
render(<DefaultViewer file={file} />)
|
||||
expect(screen.queryByTestId('default-viewer-failed-state')).toBeNull()
|
||||
expect(screen.getByText('Download')).toBeDefined()
|
||||
})
|
||||
})
|
||||
@@ -1,5 +1,6 @@
|
||||
import { client } from '@/ui/api/client'
|
||||
import { Download } from 'lucide-react'
|
||||
import { m } from '@/ui/paraglide/messages.js'
|
||||
import { Download, AlertCircle } from 'lucide-react'
|
||||
import React, { useImperativeHandle } from 'react'
|
||||
import { FileViewerProps, MediaController } from '../types'
|
||||
|
||||
@@ -37,12 +38,40 @@ export const DefaultViewer = React.forwardRef<MediaController, FileViewerProps>(
|
||||
}
|
||||
}
|
||||
|
||||
const isFailed = file.status === 'failed'
|
||||
const errorMessage = file.media?.error
|
||||
|
||||
return (
|
||||
<div className="flex flex-col flex-1 h-full overflow-hidden bg-gray-100 dark:bg-gray-950 relative">
|
||||
<div className="flex-1 flex flex-col-reverse md:flex-row min-h-0 relative">
|
||||
{children}
|
||||
<div className="flex-1 flex items-center justify-center">
|
||||
<p className="text-muted-foreground">Preview unavailable</p>
|
||||
<div className="flex-1 flex items-center justify-center p-6 text-center">
|
||||
{isFailed ? (
|
||||
<div
|
||||
data-testid="default-viewer-failed-state"
|
||||
className="flex flex-col items-center justify-center gap-3 max-w-md"
|
||||
>
|
||||
<AlertCircle className="h-12 w-12 text-destructive/80" />
|
||||
<div className="space-y-1">
|
||||
<h3 className="text-base font-semibold text-foreground">
|
||||
{m.media_processing_failed()}
|
||||
</h3>
|
||||
<p className="text-sm text-muted-foreground">
|
||||
{m.media_processing_failed_desc()}
|
||||
</p>
|
||||
{errorMessage && (
|
||||
<div
|
||||
title={errorMessage}
|
||||
className="mt-3 rounded-lg border border-destructive/20 bg-destructive/10 p-3 text-xs text-destructive text-left line-clamp-3 break-words"
|
||||
>
|
||||
{errorMessage}
|
||||
</div>
|
||||
)}
|
||||
</div>
|
||||
</div>
|
||||
) : (
|
||||
<p className="text-muted-foreground">Preview unavailable</p>
|
||||
)}
|
||||
</div>
|
||||
</div>
|
||||
<div className="relative px-4 py-3 bg-card border-t border-gray-200 dark:border-gray-700 z-10 flex items-center justify-end gap-2 transition-colors duration-200">
|
||||
|
||||
@@ -791,4 +791,20 @@ describe('VideoViewer', () => {
|
||||
vi.useRealTimers()
|
||||
}
|
||||
})
|
||||
|
||||
it('renders failed state when file has no media and status is failed', () => {
|
||||
const failedVideo = {
|
||||
id: 'failed-video',
|
||||
name: 'failed-video.mp4',
|
||||
proxyType: 'video',
|
||||
status: 'failed',
|
||||
media: {
|
||||
error: 'Transcoding failed due to server error',
|
||||
},
|
||||
} as unknown as AssetInfo
|
||||
|
||||
const { getByTestId, getByText } = render(<VideoViewer file={failedVideo} />)
|
||||
expect(getByTestId('video-viewer-failed-state')).toBeDefined()
|
||||
expect(getByText('Transcoding failed due to server error')).toBeDefined()
|
||||
})
|
||||
})
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
import { client } from '@/ui/api/client'
|
||||
import { m } from '@/ui/paraglide/messages.js'
|
||||
import { cn } from '@/ui/lib/utils'
|
||||
import { Play, AudioLines, Loader2 } from 'lucide-react'
|
||||
import { Play, AudioLines, Loader2, AlertCircle } from 'lucide-react'
|
||||
import React, { useCallback, useEffect, useRef, useState, useImperativeHandle } from 'react'
|
||||
import Hls from 'hls.js'
|
||||
import { useFramePlayer } from './use-frame-player'
|
||||
@@ -958,9 +959,34 @@ const VideoViewer = React.forwardRef<MediaController, FileViewerProps>(
|
||||
const isMobile = useIsMobile()
|
||||
|
||||
if (!hasMedia) {
|
||||
if (data.status === 'failed') {
|
||||
const errorMessage = data.media?.error
|
||||
return (
|
||||
<div
|
||||
data-testid="video-viewer-failed-state"
|
||||
className="flex h-full w-full flex-col items-center justify-center gap-3 p-6 text-center"
|
||||
>
|
||||
<AlertCircle className="h-12 w-12 text-destructive/80" />
|
||||
<div className="space-y-1 max-w-md">
|
||||
<h3 className="text-base font-semibold text-foreground">
|
||||
{m.media_processing_failed()}
|
||||
</h3>
|
||||
<p className="text-sm text-muted-foreground">{m.media_processing_failed_desc()}</p>
|
||||
{errorMessage && (
|
||||
<div
|
||||
title={errorMessage}
|
||||
className="mt-3 rounded-lg border border-destructive/20 bg-destructive/10 p-3 text-xs text-destructive text-left line-clamp-3 break-words"
|
||||
>
|
||||
{errorMessage}
|
||||
</div>
|
||||
)}
|
||||
</div>
|
||||
</div>
|
||||
)
|
||||
}
|
||||
return (
|
||||
<div className="flex h-full w-full items-center justify-center">
|
||||
<p className="text-muted-foreground">Media is not available.</p>
|
||||
<p className="text-muted-foreground">{m.media_not_available()}</p>
|
||||
</div>
|
||||
)
|
||||
}
|
||||
|
||||
@@ -783,6 +783,12 @@
|
||||
"failed_to_upload": "Failed to upload",
|
||||
"by": "by",
|
||||
"failed_to_upload_parenthesized": "(Failed to upload)",
|
||||
"processing_failed": "Processing failed",
|
||||
"processing_failed_parenthesized": "(Processing failed)",
|
||||
"transcoding_failed": "Transcoding Failed",
|
||||
"status_failed": "Failed",
|
||||
"media_processing_failed": "Media processing failed",
|
||||
"media_processing_failed_desc": "An error occurred while processing this media file. You can still download the original file.",
|
||||
"n_items_count": "{count} Item(s)",
|
||||
"name_column": "Name",
|
||||
"size_column": "Size",
|
||||
|
||||
@@ -783,6 +783,12 @@
|
||||
"failed_to_upload": "上传失败",
|
||||
"by": "由",
|
||||
"failed_to_upload_parenthesized": "(上传失败)",
|
||||
"processing_failed": "处理失败",
|
||||
"processing_failed_parenthesized": "(处理失败)",
|
||||
"transcoding_failed": "转码失败",
|
||||
"status_failed": "失败",
|
||||
"media_processing_failed": "媒体处理失败",
|
||||
"media_processing_failed_desc": "处理此媒体文件时发生错误。您仍可以下载原始文件。",
|
||||
"n_items_count": "{count} 个项目",
|
||||
"name_column": "名称",
|
||||
"size_column": "大小",
|
||||
|
||||
@@ -48,6 +48,72 @@ describe('Task Activities', () => {
|
||||
expect(updated?.status).toBe(AssetStatus.processing)
|
||||
})
|
||||
|
||||
it('should update asset status to failed and store truncated error message in media', async () => {
|
||||
const asset = await prisma.asset.create({
|
||||
data: {
|
||||
name: 'test-fail.mp4',
|
||||
storageKey: { create: { key: 'test-fail.mp4' } },
|
||||
status: AssetStatus.processing,
|
||||
type: 'file',
|
||||
media: {
|
||||
original: null,
|
||||
videoTranscodes: [],
|
||||
imageTranscodes: [],
|
||||
duration: 10,
|
||||
filesize: 1000,
|
||||
frames: 300,
|
||||
finishedAt: '',
|
||||
metadata: null,
|
||||
},
|
||||
},
|
||||
})
|
||||
|
||||
const longError = 'x'.repeat(600)
|
||||
await updateAssetStatusActivity({
|
||||
assetId: asset.id,
|
||||
status: AssetStatus.failed,
|
||||
error: longError,
|
||||
})
|
||||
|
||||
const updated = await prisma.asset.findUnique({ where: { id: asset.id } })
|
||||
expect(updated?.status).toBe(AssetStatus.failed)
|
||||
const media = updated?.media as PrismaJson.MediaInfo
|
||||
expect(media?.error).toBe('x'.repeat(500))
|
||||
expect(media?.duration).toBe(10)
|
||||
})
|
||||
|
||||
it('should NOT overwrite processed status or inject error when asset is already processed', async () => {
|
||||
const asset = await prisma.asset.create({
|
||||
data: {
|
||||
name: 'already-processed.mp4',
|
||||
storageKey: { create: { key: 'already-processed.mp4' } },
|
||||
status: AssetStatus.processed,
|
||||
type: 'file',
|
||||
media: {
|
||||
original: null,
|
||||
videoTranscodes: [],
|
||||
imageTranscodes: [],
|
||||
duration: 10,
|
||||
filesize: 1000,
|
||||
frames: 300,
|
||||
finishedAt: '2026-01-01T00:00:00Z',
|
||||
metadata: null,
|
||||
},
|
||||
},
|
||||
})
|
||||
|
||||
await updateAssetStatusActivity({
|
||||
assetId: asset.id,
|
||||
status: AssetStatus.failed,
|
||||
error: 'Some post-transcode error',
|
||||
})
|
||||
|
||||
const updated = await prisma.asset.findUnique({ where: { id: asset.id } })
|
||||
expect(updated?.status).toBe(AssetStatus.processed)
|
||||
const media = updated?.media as PrismaJson.MediaInfo
|
||||
expect(media?.error).toBeUndefined()
|
||||
})
|
||||
|
||||
it('should NOT overwrite trashed status when asset is soft-deleted (isDeleted: true)', async () => {
|
||||
const asset = await prisma.asset.create({
|
||||
data: {
|
||||
|
||||
@@ -82,9 +82,34 @@ export async function updateTaskStatusActivity(params: UpdateTaskStatusParams):
|
||||
export interface UpdateAssetStatusParams {
|
||||
assetId: string
|
||||
status: AssetStatus
|
||||
error?: string
|
||||
}
|
||||
|
||||
export async function updateAssetStatusActivity(params: UpdateAssetStatusParams): Promise<void> {
|
||||
if (params.status === AssetStatus.failed) {
|
||||
const asset = await prisma.asset.findUnique({
|
||||
where: { id: params.assetId },
|
||||
select: { media: true, status: true },
|
||||
})
|
||||
// Never overwrite an asset that has already completed media processing
|
||||
if (asset?.status === AssetStatus.processed) {
|
||||
return
|
||||
}
|
||||
const data: Prisma.AssetUpdateInput = { status: params.status }
|
||||
if (params.error !== undefined) {
|
||||
const existingMedia = (asset?.media as PrismaJson.MediaInfo | null) || {}
|
||||
data.media = {
|
||||
...existingMedia,
|
||||
error: params.error.slice(0, 500),
|
||||
} as PrismaJson.MediaInfo
|
||||
}
|
||||
await prisma.asset.updateMany({
|
||||
where: { id: params.assetId, isDeleted: false, status: { not: AssetStatus.processed } },
|
||||
data,
|
||||
})
|
||||
return
|
||||
}
|
||||
|
||||
await prisma.asset.updateMany({
|
||||
where: { id: params.assetId, isDeleted: false },
|
||||
data: { status: params.status },
|
||||
|
||||
Reference in New Issue
Block a user