同步异常兜底

server/api/admin/site-sync.post.ts

@@ -5,6 +5,7 @@ import {
   resumeSiteSyncJob,
   startSiteSyncJob
 } from '../../utils/backup/runner'
+import { abandonSiteSyncJob } from '../../utils/site-sync/abandon'
 
 interface SiteSyncBody {
   targetBaseUrl?: string
@@ -12,6 +13,7 @@ interface SiteSyncBody {
   conflictMode?: 'skip' | 'overwrite'
   direction?: 'push' | 'pull'
   resumeJobId?: string
+  abandonJobId?: string
 }
 
 export default defineEventHandler(async (event) => {
@@ -22,11 +24,15 @@ export default defineEventHandler(async (event) => {
   const conflictMode = body?.conflictMode === 'skip' ? 'skip' : 'overwrite'
   const direction = body?.direction === 'pull' ? 'pull' : 'push'
 
-  if (!token) {
+  if (!token && !body?.abandonJobId) {
     createApiError(event, 'INVALID_REQUEST', '请输入目标站点管理员 API Token', 400)
   }
 
   try {
+    if (body?.abandonJobId) {
+      const job = await abandonSiteSyncJob(body.abandonJobId, token, user.id)
+      return { job: serializeBackupJob(job) }
+    }
     let job
     if (body?.resumeJobId) {
       job = resumeSiteSyncJob(body.resumeJobId, token, user.id)
@@ -54,6 +60,14 @@ export default defineEventHandler(async (event) => {
     if (error instanceof Error && error.message === 'SITE_SYNC_JOB_NOT_RESUMABLE') {
       createApiError(event, 'INVALID_REQUEST', '该同步任务无法继续', 400)
     }
+    if (body?.abandonJobId) {
+      createApiError(
+        event,
+        'INVALID_REQUEST',
+        error instanceof Error ? error.message : '放弃同步失败',
+        400
+      )
+    }
     throw error
   }
 })

server/api/site-sync/cleanup.post.ts

@@ -0,0 +1,20 @@
+import { requireSiteSyncAuth } from '../../utils/access'
+import { createApiError } from '../../utils/api-error'
+import { cleanupSiteSyncJobArtifacts } from '../../utils/site-sync/artifacts'
+
+interface Body {
+  jobId?: string
+}
+
+export default defineEventHandler(async (event) => {
+  await requireSiteSyncAuth(event)
+  const body = await readBody<Body>(event).catch(() => null)
+  const jobId = body?.jobId?.trim() ?? ''
+  if (!jobId || jobId.length > 128) {
+    createApiError(event, 'INVALID_REQUEST', '缺少同步任务 ID', 400)
+  }
+  return {
+    success: true,
+    ...await cleanupSiteSyncJobArtifacts(jobId)
+  }
+})

server/api/site-sync/complete.post.ts

@@ -0,0 +1,21 @@
+import { requireSiteSyncAuth } from '../../utils/access'
+import { createApiError } from '../../utils/api-error'
+import { validateStorageKey } from '../../utils/image-key'
+import { completeSiteSyncMediaArtifacts } from '../../utils/site-sync/artifacts'
+
+interface Body {
+  jobId?: string
+  mediaKey?: string
+}
+
+export default defineEventHandler(async (event) => {
+  await requireSiteSyncAuth(event)
+  const body = await readBody<Body>(event).catch(() => null)
+  const jobId = body?.jobId?.trim() ?? ''
+  const mediaKey = body?.mediaKey?.trim() ?? ''
+  if (!jobId || jobId.length > 128 || !validateStorageKey(mediaKey)) {
+    createApiError(event, 'INVALID_REQUEST', '同步完成标记参数无效', 400)
+  }
+  completeSiteSyncMediaArtifacts(jobId, mediaKey)
+  return { success: true }
+})

server/api/site-sync/media.post.ts

@@ -2,11 +2,13 @@ import { requireSiteSyncAuth } from '../../utils/access'
 import { createApiError } from '../../utils/api-error'
 import { validateStorageKey } from '../../utils/image-key'
 import { applySiteSyncMedia } from '../../utils/site-sync/apply'
+import { completeSiteSyncMediaArtifacts } from '../../utils/site-sync/artifacts'
 import type { SiteSyncMediaTransfer } from '../../utils/site-sync/protocol'
 
 interface Body {
   media?: SiteSyncMediaTransfer
   conflictMode?: 'skip' | 'overwrite'
+  jobId?: string
 }
 
 export default defineEventHandler(async (event) => {
@@ -18,7 +20,11 @@ export default defineEventHandler(async (event) => {
   }
   const conflictMode = body?.conflictMode === 'skip' ? 'skip' : 'overwrite'
   try {
-    return await applySiteSyncMedia(media, conflictMode, admin.id)
+    const result = await applySiteSyncMedia(media, conflictMode, admin.id)
+    if (body?.jobId) {
+      completeSiteSyncMediaArtifacts(body.jobId, media.key)
+    }
+    return result
   } catch (error) {
     const message = error instanceof Error ? error.message : '媒体同步失败'
     createApiError(event, 'INVALID_REQUEST', message, 400)

server/api/site-sync/object.post.ts

@@ -5,6 +5,7 @@ import { MAX_VIDEO_FILE_SIZE } from '../../utils/constants'
 import { findUserByUsername } from '../../utils/db'
 import { validateStorageKey } from '../../utils/image-key'
 import { getActiveBackend } from '../../utils/storage/resolver'
+import { recordSiteSyncArtifact } from '../../utils/site-sync/artifacts'
 
 function field(form: Awaited<ReturnType<typeof readMultipartFormData>>, name: string): string {
   const part = form?.find(item => item.name === name)
@@ -30,6 +31,7 @@ export default defineEventHandler(async (event) => {
   if (conflictMode === 'skip' && await backend.head(key)) {
     return { success: true, skipped: true }
   }
+  const existedBefore = Boolean(await backend.head(key))
 
   const ownerUsername = field(form, 'ownerUsername')
   const owner = ownerUsername ? findUserByUsername(ownerUsername) : null
@@ -37,6 +39,18 @@ export default defineEventHandler(async (event) => {
     createApiError(event, 'INVALID_REQUEST', `目标站点缺少用户：${ownerUsername}`, 400)
   }
 
+  const jobId = field(form, 'jobId')
+  const mediaKey = field(form, 'mediaKey')
+  if (jobId && validateStorageKey(mediaKey)) {
+    recordSiteSyncArtifact({
+      jobId,
+      mediaKey,
+      key,
+      backendId: backend.id,
+      created: !existedBefore
+    })
+  }
+
   await backend.put(key, new Uint8Array(file.data), {
     originalName: field(form, 'originalName') || file.filename || key.split('/').pop() || 'file',
     uploadedAt: field(form, 'uploadedAt') || new Date().toISOString(),