Self-hosted personal gallery application with online photo management and albums, supporting Live/Motion Photos, EXIF parsing, geolocation recognition, and an explore map.
TypeScript albumsexif-extractiongeocodinglive-photomotion-photophoto-galleryphoto-sharingwebgl-viewer
fix(upload): bound Cloud upload cancellation and reuse interrupted reservations
Timothy Yin88677d8617e1
diff --git a/apps/cloud/app/composables/useCloudUploads.ts b/apps/cloud/app/composables/useCloudUploads.tsindex 50e65e48..77f1c86a 100644--- a/apps/cloud/app/composables/useCloudUploads.ts+++ b/apps/cloud/app/composables/useCloudUploads.ts@@ -203,6 +203,8 @@ function createCloudUploads() {queue.notify()try {signal.throwIfAborted()+ // Stored before the request so an aborted reservation is reused by requestId.+ localStorage.setItem(cache, id)await api(context,'/uploads',@@ -219,7 +221,6 @@ function createCloudUploads() {signal,)reserved = true- localStorage.setItem(cache, id)signal.throwIfAborted()const plan = await api<CloudUploadPlan>(context,@@ -306,6 +307,7 @@ function createCloudUploads() {entry.status = UploadQueueStatus.Finalizingentry.canAbort = falsequeue.notify()+ // No abort signal: the server may already have published, so cancelling here would mislabel it.if (plan.mode === 'single')await api(context, `/uploads/${id}/complete`, {})}@@ -336,12 +338,31 @@ function createCloudUploads() {entry.warning = t('cloud.messages.uploadInterruptedSelectTheSameFileToResumeIts',)+ const status = error as { statusCode?: number; status?: number } | null+ const code = status?.statusCode ?? status?.status+ if (+ !reserved &&+ !signal.aborted &&+ typeof code === 'number' &&+ code >= 400 &&+ code < 500+ )+ localStorage.removeItem(cache)if (signal.aborted) {if (reserved) {+ // A stalled cancel request must not hold a queue slot.+ let deadline: ReturnType<typeof setTimeout> | undefinedtry {- await cancelSession()+ await Promise.race([+ cancelSession(),+ new Promise<void>((resolve) => {+ deadline = setTimeout(resolve, 10000)+ }),+ ])} catch (cancelError) {console.error('Failed to cancel Cloud upload:', cancelError)+ } finally {+ clearTimeout(deadline)}}}