feat: resume persisted upload jobs after reload
This commit is contained in:
parent
4e15605ffd
commit
032a2a2898
3 changed files with 64 additions and 1 deletions
28
src/components/UploadResumeBootstrap.tsx
Normal file
28
src/components/UploadResumeBootstrap.tsx
Normal file
|
|
@ -0,0 +1,28 @@
|
||||||
|
import { useEffect } from 'react'
|
||||||
|
import toast from 'react-hot-toast'
|
||||||
|
import { listUploads } from '@/services/uploadStore'
|
||||||
|
import { resumeStoredUpload } from '@/services/uploadQueue'
|
||||||
|
|
||||||
|
let started = false
|
||||||
|
|
||||||
|
export function UploadResumeBootstrap() {
|
||||||
|
useEffect(() => {
|
||||||
|
if (started) return
|
||||||
|
started = true
|
||||||
|
void (async () => {
|
||||||
|
const jobs = await listUploads()
|
||||||
|
await Promise.all(jobs.map(async (job) => {
|
||||||
|
try {
|
||||||
|
await resumeStoredUpload(job, (done, total) => {
|
||||||
|
if (done === 0 || done === total) return
|
||||||
|
toast(`Đang tiếp tục upload ${done}/${total}: ${job.files[0]?.name ?? ''}`)
|
||||||
|
})
|
||||||
|
toast.success(`Upload đã hoàn tất: ${job.files[0]?.name ?? 'batch'}`)
|
||||||
|
} catch (error) {
|
||||||
|
toast.error(error instanceof Error ? error.message : 'Không thể resume upload')
|
||||||
|
}
|
||||||
|
}))
|
||||||
|
})().catch(() => undefined)
|
||||||
|
}, [])
|
||||||
|
return null
|
||||||
|
}
|
||||||
|
|
@ -2,6 +2,7 @@ import React from 'react'
|
||||||
import { Outlet, useLocation } from 'react-router-dom'
|
import { Outlet, useLocation } from 'react-router-dom'
|
||||||
import { Sidebar } from './components/Sidebar/Sidebar'
|
import { Sidebar } from './components/Sidebar/Sidebar'
|
||||||
import { Header } from './components/Header/Header'
|
import { Header } from './components/Header/Header'
|
||||||
|
import { UploadResumeBootstrap } from '@/components/UploadResumeBootstrap'
|
||||||
|
|
||||||
export const DashboardLayout: React.FC<{ children?: React.ReactNode }> = ({
|
export const DashboardLayout: React.FC<{ children?: React.ReactNode }> = ({
|
||||||
children,
|
children,
|
||||||
|
|
@ -12,6 +13,7 @@ export const DashboardLayout: React.FC<{ children?: React.ReactNode }> = ({
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<div className={`flex text-slate-900 ${isProjectWorkspaceScreen ? 'h-screen min-h-0 overflow-hidden bg-[var(--project-canvas)]' : 'min-h-screen bg-[#F8FAFC]'}`}>
|
<div className={`flex text-slate-900 ${isProjectWorkspaceScreen ? 'h-screen min-h-0 overflow-hidden bg-[var(--project-canvas)]' : 'min-h-screen bg-[#F8FAFC]'}`}>
|
||||||
|
<UploadResumeBootstrap />
|
||||||
<Sidebar isProjectWorkspace={isProjectWorkspaceScreen} />
|
<Sidebar isProjectWorkspace={isProjectWorkspaceScreen} />
|
||||||
<div className="flex-1 flex flex-col min-w-0">
|
<div className="flex-1 flex flex-col min-w-0">
|
||||||
<Header isProjectWorkspace={isProjectWorkspaceScreen} />
|
<Header isProjectWorkspace={isProjectWorkspaceScreen} />
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,5 @@
|
||||||
import { api } from './api'
|
import { api } from './api'
|
||||||
import { deleteUpload, prepareUploadStorage, saveUpload } from './uploadStore'
|
import { deleteUpload, prepareUploadStorage, saveUpload, type StoredUpload } from './uploadStore'
|
||||||
|
|
||||||
export type UploadTaskStatus = 'pending' | 'uploading' | 'done' | 'error' | 'skipped'
|
export type UploadTaskStatus = 'pending' | 'uploading' | 'done' | 'error' | 'skipped'
|
||||||
|
|
||||||
|
|
@ -329,3 +329,36 @@ export async function uploadFilesBatch(
|
||||||
if (result.failed.length === 0) await deleteUpload(jobId)
|
if (result.failed.length === 0) await deleteUpload(jobId)
|
||||||
return result
|
return result
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export async function resumeStoredUpload(
|
||||||
|
stored: StoredUpload,
|
||||||
|
onProgress?: (done: number, total: number) => void
|
||||||
|
): Promise<void> {
|
||||||
|
const { data: job } = await api.get<{
|
||||||
|
status: string
|
||||||
|
totalFiles: number
|
||||||
|
processedFiles: number
|
||||||
|
items: Array<{ id: string; fileName: string; status: string; putUrl?: string }>
|
||||||
|
}>(`/projects/${stored.projectId}/upload-jobs/${stored.jobId}`)
|
||||||
|
if (job.status === 'done') {
|
||||||
|
await deleteUpload(stored.id)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
const byName = new Map(stored.files.map((file) => [file.name, file]))
|
||||||
|
let done = job.processedFiles
|
||||||
|
onProgress?.(done, job.totalFiles)
|
||||||
|
for (const item of job.items) {
|
||||||
|
if (item.status === 'done') continue
|
||||||
|
const file = byName.get(item.fileName)
|
||||||
|
if (!file || !item.putUrl) throw new Error(`Không tìm thấy file để resume: ${item.fileName}`)
|
||||||
|
const dims = await readDimensions(file)
|
||||||
|
await putWithProgress(item.putUrl, file, file.type || 'image/jpeg', () => undefined)
|
||||||
|
await api.post(
|
||||||
|
`/projects/${stored.projectId}/upload-jobs/${stored.jobId}/items/${item.id}/complete`,
|
||||||
|
{ width: dims.width, height: dims.height }
|
||||||
|
)
|
||||||
|
done += 1
|
||||||
|
onProgress?.(done, job.totalFiles)
|
||||||
|
}
|
||||||
|
await deleteUpload(stored.id)
|
||||||
|
}
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue