From 4e15605ffd9d65755a305d2c8b0efe0bb6db94b5 Mon Sep 17 00:00:00 2001 From: hailt Date: Thu, 12 Nov 2026 22:40:28 +0700 Subject: [PATCH] feat: persist upload batches in IndexedDB --- src/services/uploadQueue.ts | 48 ++++++++++++++++++++--------- src/services/uploadStore.ts | 61 +++++++++++++++++++++++++++++++++++++ 2 files changed, 95 insertions(+), 14 deletions(-) create mode 100644 src/services/uploadStore.ts diff --git a/src/services/uploadQueue.ts b/src/services/uploadQueue.ts index 9fc8550..ae1a697 100644 --- a/src/services/uploadQueue.ts +++ b/src/services/uploadQueue.ts @@ -1,4 +1,5 @@ import { api } from './api' +import { deleteUpload, prepareUploadStorage, saveUpload } from './uploadStore' export type UploadTaskStatus = 'pending' | 'uploading' | 'done' | 'error' | 'skipped' @@ -17,6 +18,7 @@ export interface BatchUploadResult { } interface PresignSlot { + id: string fileName: string putUrl: string r2Key: string @@ -243,18 +245,35 @@ export async function uploadFilesBatch( }) const emit = () => onUpdate?.(tasks.map((t) => ({ ...t }))) emit() - - // One presign call per 100 files instead of one per file. - const slots = new Map() const pending = files.filter((f) => tasks.find((t) => t.fileName === f.name)?.status === 'pending') - for (let i = 0; i < pending.length; i += 100) { - const chunk = pending.slice(i, i + 100) - const { data } = await api.post(`/projects/${projectId}/images/batch-presign`, - chunk.map((f) => ({ fileName: f.name, contentType: f.type || 'image/jpeg' })) - ) - data.forEach((s) => slots.set(s.fileName, s)) + if (pending.length === 0) { + return { done: [], failed: [], skipped: tasks.map((t) => t.fileName) } } + await prepareUploadStorage(pending.reduce((sum, file) => sum + file.size, 0)) + const { data: created } = await api.post<{ + job: { id: string } + items: PresignSlot[] + }>(`/projects/${projectId}/upload-jobs`, { + kind: 'images', + files: pending.map((file) => ({ + fileName: file.name, + contentType: file.type || 'image/jpeg', + size: file.size, + })), + }) + const jobId = created.job.id + await saveUpload({ + id: jobId, + projectId, + jobId, + files: pending, + createdAt: Date.now(), + }) + + const slots = new Map() + created.items.forEach((s) => slots.set(s.fileName, s)) + const result: BatchUploadResult = { done: [], failed: [], skipped: [] } tasks.forEach((t) => { if (t.status === 'skipped') result.skipped.push(t.fileName) @@ -285,14 +304,14 @@ export async function uploadFilesBatch( task.progress = r emit() }) - const { data: confirmed } = await api.post<{ id: string }>( - `/projects/${projectId}/images`, - { fileName: file.name, r2Key: slot.r2Key, width: dims.width, height: dims.height } + const { data: confirmed } = await api.post<{ processedFiles: number; imageId: string }>( + `/projects/${projectId}/upload-jobs/${jobId}/items/${slot.id}/complete`, + { width: dims.width, height: dims.height } ) task.status = 'done' task.progress = 1 - task.imageId = confirmed.id - result.done.push({ fileName: file.name, imageId: confirmed.id }) + task.imageId = confirmed.imageId + result.done.push({ fileName: file.name, imageId: confirmed.imageId }) ok = true } catch (err) { task.error = err instanceof Error ? err.message : 'Tải lên thất bại' @@ -307,5 +326,6 @@ export async function uploadFilesBatch( } } await Promise.all(Array.from({ length: Math.min(CONCURRENCY, queue.length) }, worker)) + if (result.failed.length === 0) await deleteUpload(jobId) return result } diff --git a/src/services/uploadStore.ts b/src/services/uploadStore.ts new file mode 100644 index 0000000..cd86b74 --- /dev/null +++ b/src/services/uploadStore.ts @@ -0,0 +1,61 @@ +export interface StoredUpload { + id: string + projectId: string + jobId: string + files: File[] + createdAt: number +} + +const DB_NAME = 'danable-upload-queue' +const DB_VERSION = 1 +const STORE = 'jobs' + +function openDb(): Promise { + return new Promise((resolve, reject) => { + const req = indexedDB.open(DB_NAME, DB_VERSION) + req.onupgradeneeded = () => req.result.createObjectStore(STORE, { keyPath: 'id' }) + req.onsuccess = () => resolve(req.result) + req.onerror = () => reject(req.error) + }) +} + +export async function prepareUploadStorage(bytes: number): Promise { + if (!('indexedDB' in window)) throw new Error('Trình duyệt không hỗ trợ lưu hàng đợi upload') + const estimate = await navigator.storage?.estimate?.() + const available = (estimate?.quota ?? 0) - (estimate?.usage ?? 0) + if (available > 0 && bytes > available * 0.8) { + throw new Error('Không đủ dung lượng trình duyệt để resume upload sau reload') + } + await navigator.storage?.persist?.() +} + +export async function saveUpload(job: StoredUpload): Promise { + const db = await openDb() + await new Promise((resolve, reject) => { + const req = db.transaction(STORE, 'readwrite').objectStore(STORE).put(job) + req.onsuccess = () => resolve() + req.onerror = () => reject(req.error) + }) + db.close() +} + +export async function deleteUpload(id: string): Promise { + const db = await openDb() + await new Promise((resolve, reject) => { + const req = db.transaction(STORE, 'readwrite').objectStore(STORE).delete(id) + req.onsuccess = () => resolve() + req.onerror = () => reject(req.error) + }) + db.close() +} + +export async function listUploads(): Promise { + const db = await openDb() + const jobs = await new Promise((resolve, reject) => { + const req = db.transaction(STORE, 'readonly').objectStore(STORE).getAll() + req.onsuccess = () => resolve(req.result as StoredUpload[]) + req.onerror = () => reject(req.error) + }) + db.close() + return jobs +}