Skip to content

Self-hosted personal gallery application with online photo management and albums, supporting Live/Motion Photos, EXIF parsing, geolocation recognition, and an explore map.

refactor(upload): centralize queue and transport status values

Ahmet Ömera86c2b540e2d
diff --git a/app/components/ui/UploadQueueItem.vue b/app/components/ui/UploadQueueItem.vue
index a8002dc9..0a712f41 100644
--- a/app/components/ui/UploadQueueItem.vue
+++ b/app/components/ui/UploadQueueItem.vue
@@ -1,41 +1,17 @@
<script lang="ts" setup>
import { motion, AnimatePresence } from 'motion-v'
import { computed, ref, watch, nextTick, onUnmounted } from 'vue'
-
-interface UploadFile {
- file: File
- fileName: string
- fileId: string
- status:
- | 'waiting'
- | 'preparing'
- | 'uploading'
- | 'finalizing'
- | 'processing'
- | 'completed'
- | 'error'
- | 'skipped'
- | 'blocked'
- stage?: string | null
- progress?: number
- error?: string
- warning?: string
- taskId?: number
- uploadProgress?: {
- loaded: number
- total: number
- percentage: number
- speed?: number
- timeRemaining?: number
- speedText?: string
- timeRemainingText?: string
- }
- canAbort?: boolean
- abortUpload?: () => void
-}
+import type { UploadingFile } from '~~/shared/types/uploading-file'
+import {
+ UploadQueueStatus,
+ isAbortableUploadStatus,
+ isActiveUploadStatus,
+ isDismissibleUploadStatus,
+ isSkippedOrBlockedUploadStatus,
+} from '~~/shared/utils/upload-status'
const props = defineProps<{
- uploadingFile: UploadFile
+ uploadingFile: UploadingFile
fileId: string
}>()
@@ -53,29 +29,21 @@ const fileIcon = computed(() => {
return 'tabler:file'
})
-const statusColor = computed(() => {
- switch (props.uploadingFile.status) {
- case 'waiting':
- return 'neutral'
- case 'preparing':
- return 'primary'
- case 'uploading':
- case 'finalizing':
- return 'primary'
- case 'processing':
- return 'info'
- case 'completed':
- return 'success'
- case 'error':
- return 'error'
- case 'skipped':
- return 'warning'
- case 'blocked':
- return 'error'
- default:
- return 'neutral'
- }
-})
+const STATUS_COLOR = {
+ [UploadQueueStatus.Waiting]: 'neutral',
+ [UploadQueueStatus.Preparing]: 'primary',
+ [UploadQueueStatus.Uploading]: 'primary',
+ [UploadQueueStatus.Finalizing]: 'primary',
+ [UploadQueueStatus.Processing]: 'info',
+ [UploadQueueStatus.Completed]: 'success',
+ [UploadQueueStatus.Error]: 'error',
+ [UploadQueueStatus.Skipped]: 'warning',
+ [UploadQueueStatus.Blocked]: 'error',
+} as const satisfies Record<UploadQueueStatus, string>
+
+const statusColor = computed(
+ () => STATUS_COLOR[props.uploadingFile.status] ?? 'neutral',
+)
// 获取处理阶段文本
const getStageText = (stage: string) => {
@@ -84,7 +52,9 @@ const getStageText = (stage: string) => {
metadata: $t('dashboard.photos.uploadQueueItem.stage.metadata'),
thumbnail: $t('dashboard.photos.uploadQueueItem.stage.thumbnail'),
exif: $t('dashboard.photos.uploadQueueItem.stage.exif'),
- 'reverse-geocoding': $t('dashboard.photos.uploadQueueItem.stage.reverseGeocoding'),
+ 'reverse-geocoding': $t(
+ 'dashboard.photos.uploadQueueItem.stage.reverseGeocoding',
+ ),
'live-photo': $t('dashboard.photos.uploadQueueItem.stage.livePhoto'),
}
return stageMap[stage] || stage
@@ -111,7 +81,10 @@ let processingTimer: NodeJS.Timeout | null = null
watch(
() => props.uploadingFile.status,
async (newStatus, oldStatus) => {
- if (newStatus === 'completed' && oldStatus !== 'completed') {
+ if (
+ newStatus === UploadQueueStatus.Completed &&
+ oldStatus !== UploadQueueStatus.Completed
+ ) {
await nextTick()
// 延迟触发粒子动画,让完成指示器先显示
setTimeout(() => {
@@ -124,18 +97,24 @@ watch(
}
// 处理状态变化时的时间跟踪
- if (newStatus === 'processing' && oldStatus !== 'processing') {
+ if (
+ newStatus === UploadQueueStatus.Processing &&
+ oldStatus !== UploadQueueStatus.Processing
+ ) {
// 开始处理,记录时间
processingStartTime.value = Date.now()
showProcessingWarning.value = false
// 30秒后显示警告
processingTimer = setTimeout(() => {
- if (props.uploadingFile.status === 'processing') {
+ if (props.uploadingFile.status === UploadQueueStatus.Processing) {
showProcessingWarning.value = true
}
}, 30000)
- } else if (oldStatus === 'processing' && newStatus !== 'processing') {
+ } else if (
+ oldStatus === UploadQueueStatus.Processing &&
+ newStatus !== UploadQueueStatus.Processing
+ ) {
// 处理结束,清理定时器和状态
if (processingTimer) {
clearTimeout(processingTimer)
@@ -184,8 +163,12 @@ const generateParticleStyle = (index: number) => {
<motion.div
class="relative shrink-0"
:transition="{
- duration: uploadingFile.status === 'processing' ? 2 : 0.3,
- repeat: uploadingFile.status === 'processing' ? Infinity : 0,
+ duration:
+ uploadingFile.status === UploadQueueStatus.Processing ? 2 : 0.3,
+ repeat:
+ uploadingFile.status === UploadQueueStatus.Processing
+ ? Infinity
+ : 0,
ease: 'linear',
}"
>
@@ -223,7 +206,7 @@ const generateParticleStyle = (index: number) => {
<!-- 完成指示器 -->
<motion.div
- v-if="uploadingFile.status === 'completed'"
+ v-if="uploadingFile.status === UploadQueueStatus.Completed"
class="absolute -top-2 -right-2 size-5 bg-green-900 rounded-full border-2 border-white dark:border-neutral-800 flex items-center justify-center"
:initial="{ scale: 0 }"
:animate="{ scale: 1 }"
@@ -237,7 +220,7 @@ const generateParticleStyle = (index: number) => {
<!-- 跳过指示器 -->
<motion.div
- v-if="uploadingFile.status === 'skipped'"
+ v-if="uploadingFile.status === UploadQueueStatus.Skipped"
class="absolute -top-2 -right-2 size-5 bg-yellow-600 rounded-full border-2 border-white dark:border-neutral-800 flex items-center justify-center"
:initial="{ scale: 0 }"
:animate="{ scale: 1 }"
@@ -251,7 +234,7 @@ const generateParticleStyle = (index: number) => {
<!-- 阻止指示器 -->
<motion.div
- v-if="uploadingFile.status === 'blocked'"
+ v-if="uploadingFile.status === UploadQueueStatus.Blocked"
class="absolute -top-2 -right-2 size-5 bg-red-600 rounded-full border-2 border-white dark:border-neutral-800 flex items-center justify-center"
:initial="{ scale: 0 }"
:animate="{ scale: 1 }"
@@ -266,7 +249,10 @@ const generateParticleStyle = (index: number) => {
<!-- 完成粒子动画 -->
<AnimatePresence>
<motion.div
- v-if="showParticles && uploadingFile.status === 'completed'"
+ v-if="
+ showParticles &&
+ uploadingFile.status === UploadQueueStatus.Completed
+ "
class="absolute -top-2 -right-2 size-5 pointer-events-none"
:initial="{ opacity: 0 }"
:animate="{ opacity: 1 }"
@@ -298,9 +284,7 @@ const generateParticleStyle = (index: number) => {
>
<span>{{ formatBytes(uploadingFile.file.size) }}</span>
<span
- v-if="
- uploadingFile.status === 'uploading'
- "
+ v-if="uploadingFile.status === UploadQueueStatus.Uploading"
class="inline tabular-nums"
>
• {{ uploadingFile.uploadProgress?.speedText || '0 B/s' }}
@@ -314,7 +298,7 @@ const generateParticleStyle = (index: number) => {
<!-- 中止上传按钮 -->
<motion.div
v-if="
- (uploadingFile.status === 'uploading' || uploadingFile.status === 'finalizing') &&
+ isAbortableUploadStatus(uploadingFile.status) &&
uploadingFile.canAbort
"
:initial="{ opacity: 0, scale: 0.8 }"
@@ -334,12 +318,7 @@ const generateParticleStyle = (index: number) => {
<!-- 清除按钮 -->
<motion.div
- v-if="
- uploadingFile.status === 'completed' ||
- uploadingFile.status === 'error' ||
- uploadingFile.status === 'skipped' ||
- uploadingFile.status === 'blocked'
- "
+ v-if="isDismissibleUploadStatus(uploadingFile.status)"
:initial="{ opacity: 0, scale: 0.8 }"
:animate="{ opacity: 1, scale: 1 }"
:exit="{ opacity: 0, scale: 0.8 }"
@@ -360,11 +339,7 @@ const generateParticleStyle = (index: number) => {
<!-- 进度条区域 -->
<AnimatePresence>
<motion.div
- v-if="
- uploadingFile.status === 'uploading' ||
- uploadingFile.status === 'finalizing' ||
- uploadingFile.status === 'processing'
- "
+ v-if="isActiveUploadStatus(uploadingFile.status)"
:initial="{ opacity: 0, height: 0 }"
:animate="{ opacity: 1, height: 'auto' }"
:exit="{ opacity: 0, height: 0 }"
@@ -373,7 +348,7 @@ const generateParticleStyle = (index: number) => {
>
<!-- 上传进度 -->
<div
- v-if="uploadingFile.status === 'uploading'"
+ v-if="uploadingFile.status === UploadQueueStatus.Uploading"
class="space-y-1"
>
<div class="flex justify-between items-center">
@@ -402,19 +377,30 @@ const generateParticleStyle = (index: number) => {
<div
class="text-xs text-neutral-500 dark:text-neutral-400 tabular-nums"
>
- {{ $t('dashboard.photos.uploadQueueItem.progress.remainingTime', [uploadingFile.uploadProgress?.timeRemainingText || '—']) }}
+ {{
+ $t('dashboard.photos.uploadQueueItem.progress.remainingTime', [
+ uploadingFile.uploadProgress?.timeRemainingText || '—',
+ ])
+ }}
</div>
</div>
<!-- 处理进度 -->
- <div v-if="uploadingFile.status === 'finalizing'" class="space-y-1">
+ <div
+ v-if="uploadingFile.status === UploadQueueStatus.Finalizing"
+ class="space-y-1"
+ >
<span class="text-xs text-neutral-600 dark:text-neutral-400">
{{ $t('dashboard.photos.uploadQueueItem.status.finalizing') }}
</span>
- <UProgress :model-value="null" animation="swing" color="primary" />
+ <UProgress
+ :model-value="null"
+ animation="swing"
+ color="primary"
+ />
</div>
<div
- v-if="uploadingFile.status === 'processing'"
+ v-if="uploadingFile.status === UploadQueueStatus.Processing"
class="space-y-1"
>
<div class="flex justify-between items-center">
@@ -442,7 +428,10 @@ const generateParticleStyle = (index: number) => {
<!-- 错误信息 -->
<AnimatePresence>
<motion.div
- v-if="uploadingFile.status === 'error' && uploadingFile.error"
+ v-if="
+ uploadingFile.status === UploadQueueStatus.Error &&
+ uploadingFile.error
+ "
:initial="{ opacity: 0, height: 0, y: -10 }"
:animate="{ opacity: 1, height: 'auto', y: 0 }"
:exit="{ opacity: 0, height: 0, y: -10 }"
@@ -465,9 +454,8 @@ const generateParticleStyle = (index: number) => {
<AnimatePresence>
<motion.div
v-if="
- (uploadingFile.status === 'skipped' ||
- uploadingFile.status === 'blocked') &&
- uploadingFile.error
+ isSkippedOrBlockedUploadStatus(uploadingFile.status) &&
+ uploadingFile.error
"
:initial="{ opacity: 0, height: 0, y: -10 }"
:animate="{ opacity: 1, height: 'auto', y: 0 }"
@@ -477,10 +465,14 @@ const generateParticleStyle = (index: number) => {
>
<UAlert
:description="uploadingFile.error"
- :color="uploadingFile.status === 'blocked' ? 'error' : 'warning'"
+ :color="
+ uploadingFile.status === UploadQueueStatus.Blocked
+ ? 'error'
+ : 'warning'
+ "
variant="soft"
:icon="
- uploadingFile.status === 'blocked'
+ uploadingFile.status === UploadQueueStatus.Blocked
? 'tabler:ban'
: 'tabler:player-track-next'
"
@@ -516,7 +508,10 @@ const generateParticleStyle = (index: number) => {
<!-- 处理时间警告 -->
<AnimatePresence>
<motion.div
- v-if="showProcessingWarning && uploadingFile.status === 'processing'"
+ v-if="
+ showProcessingWarning &&
+ uploadingFile.status === UploadQueueStatus.Processing
+ "
:initial="{ opacity: 0, height: 0, y: -10 }"
:animate="{ opacity: 1, height: 'auto', y: 0 }"
:exit="{ opacity: 0, height: 0, y: -10 }"
@@ -524,7 +519,9 @@ const generateParticleStyle = (index: number) => {
class="mt-3"
>
<UAlert
- :description="$t('dashboard.photos.uploadQueueItem.alerts.longProcessing')"
+ :description="
+ $t('dashboard.photos.uploadQueueItem.alerts.longProcessing')
+ "
color="info"
variant="soft"
icon="tabler:info-circle"
@@ -538,7 +535,7 @@ const generateParticleStyle = (index: number) => {
<!-- 成功动画 -->
<AnimatePresence>
<motion.div
- v-if="uploadingFile.status === 'completed'"
+ v-if="uploadingFile.status === UploadQueueStatus.Completed"
:initial="{ opacity: 0, scale: 0.8, y: 10 }"
:animate="{
opacity: 1,
diff --git a/app/components/ui/UploadQueuePanel.vue b/app/components/ui/UploadQueuePanel.vue
index 82bcb65b..d6863df7 100644
--- a/app/components/ui/UploadQueuePanel.vue
+++ b/app/components/ui/UploadQueuePanel.vue
@@ -1,39 +1,16 @@
<script lang="ts" setup>
import { motion, AnimatePresence } from 'motion-v'
-
-interface UploadFile {
- file: File
- fileName: string
- fileId: string
- status:
- | 'waiting'
- | 'preparing'
- | 'uploading'
- | 'finalizing'
- | 'processing'
- | 'completed'
- | 'error'
- | 'skipped'
- | 'blocked'
- stage?: string | null
- progress?: number
- error?: string
- taskId?: number
- uploadProgress?: {
- loaded: number
- total: number
- percentage: number
- speed?: number
- timeRemaining?: number
- speedText?: string
- timeRemainingText?: string
- }
- canAbort?: boolean
- abortUpload?: () => void
-}
+import type { UploadingFile } from '~~/shared/types/uploading-file'
+import {
+ UploadQueueStatus,
+ isAbortableUploadStatus,
+ isActiveUploadStatus,
+ isQueuedUploadStatus,
+ isSkippedOrBlockedUploadStatus,
+} from '~~/shared/utils/upload-status'
const props = defineProps<{
- uploadingFiles: Map<string, UploadFile>
+ uploadingFiles: Map<string, UploadingFile>
collapsed?: boolean
}>()
@@ -52,24 +29,17 @@ const stats = computed(() => {
const files = Array.from(props.uploadingFiles.values())
return {
total: files.length,
- waiting: files.filter((f) => f.status === 'waiting').length,
- uploading: files.filter(
- (f) => f.status === 'uploading' || f.status === 'finalizing',
- ).length,
- processing: files.filter((f) => f.status === 'processing').length,
- completed: files.filter((f) => f.status === 'completed').length,
- error: files.filter((f) => f.status === 'error').length,
- skipped: files.filter((f) => f.status === 'skipped').length,
- blocked: files.filter((f) => f.status === 'blocked').length,
- active: files.filter(
- (f) =>
- f.status === 'uploading' ||
- f.status === 'finalizing' ||
- f.status === 'processing',
- ).length,
- pending: files.filter(
- (f) => f.status === 'waiting' || f.status === 'preparing',
- ).length,
+ waiting: files.filter((f) => f.status === UploadQueueStatus.Waiting).length,
+ uploading: files.filter((f) => isAbortableUploadStatus(f.status)).length,
+ processing: files.filter((f) => f.status === UploadQueueStatus.Processing)
+ .length,
+ completed: files.filter((f) => f.status === UploadQueueStatus.Completed)
+ .length,
+ error: files.filter((f) => f.status === UploadQueueStatus.Error).length,
+ skipped: files.filter((f) => f.status === UploadQueueStatus.Skipped).length,
+ blocked: files.filter((f) => f.status === UploadQueueStatus.Blocked).length,
+ active: files.filter((f) => isActiveUploadStatus(f.status)).length,
+ pending: files.filter((f) => isQueuedUploadStatus(f.status)).length,
}
})
@@ -80,22 +50,28 @@ const overallProgress = computed(() => {
let totalProgress = 0
files.forEach((file) => {
- if (file.status === 'completed') {
+ if (file.status === UploadQueueStatus.Completed) {
// 完成状态:100%
totalProgress += 100
- } else if (file.status === 'uploading' && file.progress !== undefined) {
+ } else if (
+ file.status === UploadQueueStatus.Uploading &&
+ file.progress !== undefined
+ ) {
// 上传中:上传进度 * 0.7(上传占总进度的70%)
totalProgress += file.progress * 0.7
- } else if (file.status === 'processing' || file.status === 'finalizing') {
+ } else if (
+ file.status === UploadQueueStatus.Processing ||
+ file.status === UploadQueueStatus.Finalizing
+ ) {
// 处理中:上传完成(70%)
totalProgress += 70
- } else if (file.status === 'preparing') {
+ } else if (file.status === UploadQueueStatus.Preparing) {
// 准备中:0%
totalProgress += 0
- } else if (file.status === 'waiting') {
+ } else if (file.status === UploadQueueStatus.Waiting) {
// 等待状态:0%
totalProgress += 0
- } else if (file.status === 'skipped' || file.status === 'blocked') {
+ } else if (isSkippedOrBlockedUploadStatus(file.status)) {
// 跳过或被阻止:0%(不参与进度计算)
totalProgress += 0
}
diff --git a/app/composables/useUpload.ts b/app/composables/useUpload.ts
index af2bb366..7b8a98a9 100644
--- a/app/composables/useUpload.ts
+++ b/app/composables/useUpload.ts
@@ -1,4 +1,8 @@
import { UPLOAD_CHUNK_SIZE } from '~~/shared/utils/upload'
+import {
+ UploadTransportStatus,
+ isInFlightTransportStatus,
+} from '~~/shared/utils/upload-status'
import type { UploadPlan, UploadPart } from '~~/shared/types/upload'
export interface UploadProgress {
@@ -10,7 +14,7 @@ export interface UploadProgress {
}
export interface UploadStatus {
- status: 'idle' | 'uploading' | 'finalizing' | 'success' | 'error' | 'aborted'
+ status: UploadTransportStatus
progress: UploadProgress
error?: string
startTime?: number
@@ -57,7 +61,7 @@ export function useUpload(options: UseUploadOptions = {}) {
// 响应式状态
const uploadStatus = ref<UploadStatus>({
- status: 'idle',
+ status: UploadTransportStatus.Idle,
progress: {
loaded: 0,
total: 0,
@@ -151,11 +155,14 @@ export function useUpload(options: UseUploadOptions = {}) {
const percentage =
total > 0
? Math.min(
- uploadStatus.value.status === 'uploading' ? 99 : 100,
+ uploadStatus.value.status === UploadTransportStatus.Uploading
+ ? 99
+ : 100,
Math.floor((loaded / total) * 100),
)
: 0
- const finalizing = uploadStatus.value.status === 'finalizing'
+ const finalizing =
+ uploadStatus.value.status === UploadTransportStatus.Finalizing
const metrics = calculateSpeed(loaded)
const progress: UploadProgress = {
@@ -174,7 +181,7 @@ export function useUpload(options: UseUploadOptions = {}) {
speedSamples.length = 0
transferred = 0
updateStatus({
- status: 'idle',
+ status: UploadTransportStatus.Idle,
progress: {
loaded: 0,
total: 0,
@@ -198,8 +205,11 @@ export function useUpload(options: UseUploadOptions = {}) {
resetStatus()
cancelled = false
active = true
- updateStatus({ status: 'uploading', startTime: Date.now() })
- callbacks.onStatusChange?.('uploading')
+ updateStatus({
+ status: UploadTransportStatus.Uploading,
+ startTime: Date.now(),
+ })
+ callbacks.onStatusChange?.(UploadTransportStatus.Uploading)
const plan: UploadPlan =
typeof target === 'string'
? {
@@ -223,10 +233,10 @@ export function useUpload(options: UseUploadOptions = {}) {
loadedTotal += next - previous
if (
loadedTotal >= file.size &&
- uploadStatus.value.status === 'uploading'
+ uploadStatus.value.status === UploadTransportStatus.Uploading
) {
- updateStatus({ status: 'finalizing' })
- callbacks.onStatusChange?.('finalizing')
+ updateStatus({ status: UploadTransportStatus.Finalizing })
+ callbacks.onStatusChange?.(UploadTransportStatus.Finalizing)
}
updateProgress(loadedTotal, file.size)
}
@@ -408,10 +418,10 @@ export function useUpload(options: UseUploadOptions = {}) {
)
if (failure) throw failure
if (cancelled) throw new Error(t('upload.runtimeError.aborted'))
- updateStatus({ status: 'finalizing' })
+ updateStatus({ status: UploadTransportStatus.Finalizing })
updateProgress(file.size, file.size)
callbacks.onProgress?.(uploadStatus.value.progress)
- callbacks.onStatusChange?.('finalizing')
+ callbacks.onStatusChange?.(UploadTransportStatus.Finalizing)
response = await request(
'POST',
signedUrl,
@@ -434,15 +444,20 @@ export function useUpload(options: UseUploadOptions = {}) {
)
}
if (cancelled) throw new Error(t('upload.runtimeError.aborted'))
- updateStatus({ status: 'success', endTime: Date.now() })
+ updateStatus({
+ status: UploadTransportStatus.Success,
+ endTime: Date.now(),
+ })
updateProgress(file.size, file.size)
callbacks.onProgress?.(uploadStatus.value.progress)
- callbacks.onStatusChange?.('success')
+ callbacks.onStatusChange?.(UploadTransportStatus.Success)
callbacks.onSuccess?.(response)
return response
} catch (error) {
const message = error instanceof Error ? error.message : String(error)
- const status = cancelled ? 'aborted' : 'error'
+ const status = cancelled
+ ? UploadTransportStatus.Aborted
+ : UploadTransportStatus.Error
updateStatus({ status, error: message, endTime: Date.now() })
callbacks.onStatusChange?.(status)
if (cancelled) callbacks.onAbort?.()
@@ -494,12 +509,20 @@ export function useUpload(options: UseUploadOptions = {}) {
// 计算属性
const isUploading = computed(() =>
- ['uploading', 'finalizing'].includes(uploadStatus.value.status),
+ isInFlightTransportStatus(uploadStatus.value.status),
+ )
+ const isIdle = computed(
+ () => uploadStatus.value.status === UploadTransportStatus.Idle,
+ )
+ const isSuccess = computed(
+ () => uploadStatus.value.status === UploadTransportStatus.Success,
+ )
+ const isError = computed(
+ () => uploadStatus.value.status === UploadTransportStatus.Error,
+ )
+ const isAborted = computed(
+ () => uploadStatus.value.status === UploadTransportStatus.Aborted,
)
- const isIdle = computed(() => uploadStatus.value.status === 'idle')
- const isSuccess = computed(() => uploadStatus.value.status === 'success')
- const isError = computed(() => uploadStatus.value.status === 'error')
- const isAborted = computed(() => uploadStatus.value.status === 'aborted')
const canAbort = computed(() => isUploading.value && currentXHR !== null)
// 格式化的进度信息
diff --git a/app/pages/dashboard/photos.vue b/app/pages/dashboard/photos.vue
index 46744c54..96329f25 100644
--- a/app/pages/dashboard/photos.vue
+++ b/app/pages/dashboard/photos.vue
@@ -1,6 +1,14 @@
<script lang="ts" setup>
import type { FormSubmitEvent, TableColumn } from '@nuxt/ui'
-import type { Photo, PipelineQueueItem } from '~~/server/utils/db'
+import type { Photo } from '~~/server/utils/db'
+import type { UploadingFile } from '~~/shared/types/uploading-file'
+import {
+ UploadQueueStatus,
+ UploadTransportStatus,
+ isAbortableUploadStatus,
+ isClearableUploadStatus,
+ isInFlightTransportStatus,
+} from '~~/shared/utils/upload-status'
import { h, resolveComponent } from 'vue'
import { Icon, UBadge } from '#components'
import ThumbImage from '~/components/ui/ThumbImage.vue'
@@ -104,39 +112,6 @@ const fetchReactions = async (photoIds: string[]) => {
}
}
-interface UploadingFile {
- file: File
- fileName: string
- fileId: string
- status:
- | 'waiting'
- | 'preparing'
- | 'uploading'
- | 'finalizing'
- | 'processing'
- | 'completed'
- | 'error'
- | 'skipped'
- | 'blocked'
- stage?: PipelineQueueItem['statusStage'] | null
- progress?: number
- error?: string
- warning?: string
- taskId?: number
- signedUrlResponse?: { signedUrl: string; fileKey: string; expiresIn: number }
- uploadProgress?: {
- loaded: number
- total: number
- percentage: number
- speed?: number
- timeRemaining?: number
- speedText?: string
- timeRemainingText?: string
- }
- canAbort?: boolean
- abortUpload?: () => void
-}
-
const uploadingFiles = ref<Map<string, UploadingFile>>(new Map())
interface EditFormState {
@@ -283,14 +258,14 @@ const uploadImage = async (
file,
fileName,
fileId,
- status: 'preparing',
+ status: UploadQueueStatus.Preparing,
canAbort: false,
abortUpload: () => uploadManager.abortUpload(),
}
uploadingFiles.value.set(fileId, uploadingFile)
} else {
// 更新现有条目的状态和回调
- uploadingFile.status = 'preparing'
+ uploadingFile.status = UploadQueueStatus.Preparing
uploadingFile.canAbort = false
uploadingFile.warning = undefined
uploadingFile.abortUpload = () => uploadManager.abortUpload()
@@ -299,7 +274,7 @@ const uploadImage = async (
try {
// 第一步:获取预签名 URL
- uploadingFile.status = 'preparing'
+ uploadingFile.status = UploadQueueStatus.Preparing
const signedUrlResponse = await $fetch('/api/photos', {
method: 'POST',
body: {
@@ -314,7 +289,7 @@ const uploadImage = async (
// 检查是否为跳过模式(重复文件)
if (signedUrlResponse.skipped) {
- uploadingFile.status = 'skipped'
+ uploadingFile.status = UploadQueueStatus.Skipped
uploadingFile.progress = 100
uploadingFile.canAbort = false
uploadingFile.error =
@@ -342,7 +317,7 @@ const uploadImage = async (
uploadingFiles.value = new Map(uploadingFiles.value)
}
- uploadingFile.status = 'uploading'
+ uploadingFile.status = UploadQueueStatus.Uploading
uploadingFile.canAbort = true
uploadingFile.progress = 0
uploadingFiles.value = new Map(uploadingFiles.value)
@@ -364,14 +339,15 @@ const uploadImage = async (
}
uploadingFiles.value = new Map(uploadingFiles.value)
},
- onStatusChange: (status: string) => {
- uploadingFile.canAbort = status === 'uploading' || status === 'finalizing'
- if (status === 'finalizing') uploadingFile.status = 'finalizing'
+ onStatusChange: (status: UploadTransportStatus) => {
+ uploadingFile.canAbort = isInFlightTransportStatus(status)
+ if (status === UploadTransportStatus.Finalizing)
+ uploadingFile.status = UploadQueueStatus.Finalizing
uploadingFiles.value = new Map(uploadingFiles.value)
},
onSuccess: async (_xhr: XMLHttpRequest) => {
// 第三步:上传完成,提交到队列任务
- uploadingFile.status = 'processing'
+ uploadingFile.status = UploadQueueStatus.Processing
uploadingFile.progress = 100
uploadingFile.canAbort = false
uploadingFile.stage = null // 重置 stage,准备显示任务状态
@@ -405,20 +381,20 @@ const uploadImage = async (
if (resp.success) {
uploadingFile.taskId = resp.taskId
- uploadingFile.status = 'processing'
+ uploadingFile.status = UploadQueueStatus.Processing
uploadingFiles.value = new Map(uploadingFiles.value)
// 开始任务状态检查
startTaskStatusCheck(resp.taskId, fileId)
} else {
- uploadingFile.status = 'error'
+ uploadingFile.status = UploadQueueStatus.Error
uploadingFile.error = $t(
'dashboard.photos.messages.taskSubmitFailed',
)
uploadingFiles.value = new Map(uploadingFiles.value)
}
} catch (processError: any) {
- uploadingFile.status = 'error'
+ uploadingFile.status = UploadQueueStatus.Error
uploadingFile.error = `${$t('dashboard.photos.messages.taskSubmitFailed')}: ${processError.message}`
uploadingFile.canAbort = false
uploadingFiles.value = new Map(uploadingFiles.value)
@@ -428,12 +404,12 @@ const uploadImage = async (
const isConflict = /\b409\b|Conflict/i.test(error)
if (isConflict) {
- uploadingFile.status = 'blocked'
+ uploadingFile.status = UploadQueueStatus.Blocked
uploadingFile.error = $t('upload.duplicate.block.message', {
fileName,
})
} else {
- uploadingFile.status = 'error'
+ uploadingFile.status = UploadQueueStatus.Error
uploadingFile.error = error
}
@@ -442,7 +418,7 @@ const uploadImage = async (
},
})
} catch (error: any) {
- uploadingFile.status = 'error'
+ uploadingFile.status = UploadQueueStatus.Error
uploadingFile.canAbort = false
// 处理重复文件阻止模式的错误
@@ -453,7 +429,7 @@ const uploadImage = async (
(error.data?.duplicate || /Conflict|409/i.test(error.message || ''))
if (isDuplicateConflict) {
- uploadingFile.status = 'blocked'
+ uploadingFile.status = UploadQueueStatus.Blocked
uploadingFile.error =
error.data.message || $t('upload.duplicate.block.message', { fileName })
@@ -639,7 +615,7 @@ const startTaskStatusCheck = (taskId: number, fileId: string) => {
if (response.status === 'completed') {
// 任务完成
- uploadingFile.status = 'completed'
+ uploadingFile.status = UploadQueueStatus.Completed
uploadingFile.stage = null
uploadingFiles.value = new Map(uploadingFiles.value)
@@ -659,7 +635,7 @@ const startTaskStatusCheck = (taskId: number, fileId: string) => {
// }, 2000)
} else if (response.status === 'failed') {
// 任务失败
- uploadingFile.status = 'error'
+ uploadingFile.status = UploadQueueStatus.Error
uploadingFile.error = `${$t('dashboard.photos.messages.error')}: ${response.errorMessage || $t('dashboard.photos.table.cells.unknown')}`
uploadingFile.stage = null
uploadingFiles.value = new Map(uploadingFiles.value)
@@ -680,7 +656,7 @@ const startTaskStatusCheck = (taskId: number, fileId: string) => {
const uploadingFile = uploadingFiles.value.get(fileId)
if (uploadingFile) {
- uploadingFile.status = 'error'
+ uploadingFile.status = UploadQueueStatus.Error
uploadingFile.error = $t(
'dashboard.photos.messages.taskStatusCheckFailed',
)
@@ -715,10 +691,7 @@ const clearCompletedTasks = () => {
const toRemove: string[] = []
for (const [fileId, uploadingFile] of uploadingFiles.value) {
- if (
- uploadingFile.status === 'completed' ||
- uploadingFile.status === 'error'
- ) {
+ if (isClearableUploadStatus(uploadingFile.status)) {
toRemove.push(fileId)
// 清理可能存在的定时器
@@ -763,7 +736,7 @@ const clearAllUploads = () => {
// 如果是正在上传的任务,先中止
if (
- (uploadingFile.status === 'uploading' || uploadingFile.status === 'finalizing') &&
+ isAbortableUploadStatus(uploadingFile.status) &&
uploadingFile.abortUpload
) {
uploadingFile.abortUpload()
@@ -1201,7 +1174,7 @@ const handleUpload = async () => {
file,
fileName: file.name,
fileId,
- status: 'waiting',
+ status: UploadQueueStatus.Waiting,
canAbort: false,
}
nextUploadingFiles.set(fileId, uploadingFile)
diff --git a/shared/types/uploading-file.ts b/shared/types/uploading-file.ts
new file mode 100644
index 00000000..e579b0b9
--- /dev/null
+++ b/shared/types/uploading-file.ts
@@ -0,0 +1,25 @@
+import type { UploadQueueStatus } from '~~/shared/utils/upload-status'
+
+export interface UploadingFile {
+ file: File
+ fileName: string
+ fileId: string
+ status: UploadQueueStatus
+ stage?: string | null
+ progress?: number
+ error?: string
+ warning?: string
+ taskId?: number
+ signedUrlResponse?: { signedUrl: string; fileKey: string; expiresIn: number }
+ uploadProgress?: {
+ loaded: number
+ total: number
+ percentage: number
+ speed?: number
+ timeRemaining?: number
+ speedText?: string
+ timeRemainingText?: string
+ }
+ canAbort?: boolean
+ abortUpload?: () => void
+}
diff --git a/shared/utils/upload-status.ts b/shared/utils/upload-status.ts
new file mode 100644
index 00000000..d1e06449
--- /dev/null
+++ b/shared/utils/upload-status.ts
@@ -0,0 +1,105 @@
+/**
+ * Upload state machines.
+ *
+ * Queue status is the dashboard item lifecycle. Transport status is one
+ * storage upload inside `useUpload`. The names overlap (`uploading`,
+ * `finalizing`, `error`) but the values are not interchangeable:
+ * transport `success` becomes queue `processing`, and transport `aborted`
+ * has no queue equivalent.
+ *
+ * The string values are the in-memory contract. Keep them stable.
+ */
+
+export const UploadQueueStatus = {
+ Waiting: 'waiting',
+ Preparing: 'preparing',
+ Uploading: 'uploading',
+ Finalizing: 'finalizing',
+ Processing: 'processing',
+ Completed: 'completed',
+ Error: 'error',
+ Skipped: 'skipped',
+ Blocked: 'blocked',
+} as const
+
+export type UploadQueueStatus =
+ (typeof UploadQueueStatus)[keyof typeof UploadQueueStatus]
+
+export const UploadTransportStatus = {
+ Idle: 'idle',
+ Uploading: 'uploading',
+ Finalizing: 'finalizing',
+ Success: 'success',
+ Error: 'error',
+ Aborted: 'aborted',
+} as const
+
+export type UploadTransportStatus =
+ (typeof UploadTransportStatus)[keyof typeof UploadTransportStatus]
+
+const ABORTABLE_UPLOAD_STATUSES = new Set<UploadQueueStatus>([
+ UploadQueueStatus.Uploading,
+ UploadQueueStatus.Finalizing,
+])
+
+const QUEUED_UPLOAD_STATUSES = new Set<UploadQueueStatus>([
+ UploadQueueStatus.Waiting,
+ UploadQueueStatus.Preparing,
+])
+
+const CLEARABLE_UPLOAD_STATUSES = new Set<UploadQueueStatus>([
+ UploadQueueStatus.Completed,
+ UploadQueueStatus.Error,
+])
+
+const SKIPPED_OR_BLOCKED_UPLOAD_STATUSES = new Set<UploadQueueStatus>([
+ UploadQueueStatus.Skipped,
+ UploadQueueStatus.Blocked,
+])
+
+const ACTIVE_UPLOAD_STATUSES = new Set<UploadQueueStatus>([
+ ...ABORTABLE_UPLOAD_STATUSES,
+ UploadQueueStatus.Processing,
+])
+
+const DISMISSIBLE_UPLOAD_STATUSES = new Set<UploadQueueStatus>([
+ ...CLEARABLE_UPLOAD_STATUSES,
+ ...SKIPPED_OR_BLOCKED_UPLOAD_STATUSES,
+])
+
+const IN_FLIGHT_TRANSPORT_STATUSES = new Set<UploadTransportStatus>([
+ UploadTransportStatus.Uploading,
+ UploadTransportStatus.Finalizing,
+])
+
+export function isAbortableUploadStatus(status: UploadQueueStatus): boolean {
+ return ABORTABLE_UPLOAD_STATUSES.has(status)
+}
+
+export function isActiveUploadStatus(status: UploadQueueStatus): boolean {
+ return ACTIVE_UPLOAD_STATUSES.has(status)
+}
+
+export function isQueuedUploadStatus(status: UploadQueueStatus): boolean {
+ return QUEUED_UPLOAD_STATUSES.has(status)
+}
+
+export function isDismissibleUploadStatus(status: UploadQueueStatus): boolean {
+ return DISMISSIBLE_UPLOAD_STATUSES.has(status)
+}
+
+export function isClearableUploadStatus(status: UploadQueueStatus): boolean {
+ return CLEARABLE_UPLOAD_STATUSES.has(status)
+}
+
+export function isSkippedOrBlockedUploadStatus(
+ status: UploadQueueStatus,
+): boolean {
+ return SKIPPED_OR_BLOCKED_UPLOAD_STATUSES.has(status)
+}
+
+export function isInFlightTransportStatus(
+ status: UploadTransportStatus,
+): boolean {
+ return IN_FLIGHT_TRANSPORT_STATUSES.has(status)
+}