fix: 支持备份恢复与站点同步的大文件上传 版本更新到1.5.4

- 备份恢复的 multipart 分支改用 Web FormData,移除旧解析器约 128 MB 的限制
- 初始化恢复新增 application/octet-stream 流式写盘,前端改为直接上传文件流,避免整包进入内存
- 站点同步改用 Web FormData,并在读取请求体前拒绝超过 500 MB 的文件
- 新增 multipart 字段、重复字段和文件读取回归测试

验证:
- 2 GB 测试备份包流式恢复预览成功,服务内存保持低位
- 130 MB 站点同步上传成功
- 原有备份预览及图片、视频、文件上传正常
- npm test 234 项通过;npm run typecheck 与 eslint 通过
This commit is contained in:
tianmo committed 2026-10-19 15:26:13 +08:00
1 parent 3759422222
commit 58424fe55d
7 files changed
+107 -34

No files matched your search

+2 -3
View File
@@ -97,11 +97,10 @@ async function submitRestore() {
if (!restoreFile.value || restoreLoading.value) return if (!restoreFile.value || restoreLoading.value) return
restoreLoading.value = true restoreLoading.value = true
try { try {
const form = new FormData()
form.append('file', restoreFile.value)
const data = await $fetch<{ job: { id: string } }>('/api/setup/restore', { const data = await $fetch<{ job: { id: string } }>('/api/setup/restore', {
method: 'POST', method: 'POST',
body: form body: restoreFile.value,
headers: { 'content-type': 'application/octet-stream' }
}) })
restoreJobId.value = data.job.id restoreJobId.value = data.job.id
restorePollTimer = setInterval(() => { restorePollTimer = setInterval(() => {
+2 -2
View File
@@ -1,12 +1,12 @@
{ {
"name": "pichost", "name": "pichost",
"version": "1.5.3", "version": "1.5.4",
"lockfileVersion": 3, "lockfileVersion": 3,
"requires": true, "requires": true,
"packages": { "packages": {
"": { "": {
"name": "pichost", "name": "pichost",
"version": "1.5.3", "version": "1.5.4",
"hasInstallScript": true, "hasInstallScript": true,
"license": "GPL-3.0-only", "license": "GPL-3.0-only",
"dependencies": { "dependencies": {
+1 -1
View File
@@ -1,6 +1,6 @@
{ {
"name": "pichost", "name": "pichost",
"version": "1.5.3", "version": "1.5.4",
"description": "Self-hosted image hosting for your NAS / home server — Nuxt admin UI, local disk or S3-compatible storage, server-side WebP compression, referer protection, Twikoo/EasyImage compatible.", "description": "Self-hosted image hosting for your NAS / home server — Nuxt admin UI, local disk or S3-compatible storage, server-side WebP compression, referer protection, Twikoo/EasyImage compatible.",
"homepage": "https://github.com/O96u/PicHost#readme", "homepage": "https://github.com/O96u/PicHost#readme",
"repository": { "repository": {
+10 -8
View File
@@ -1,4 +1,4 @@
import type { H3Event } from 'h3' import { readFormData, type H3Event } from 'h3'
import { requireAdminAuth } from '../../../utils/access' import { requireAdminAuth } from '../../../utils/access'
import { createApiError } from '../../../utils/api-error' import { createApiError } from '../../../utils/api-error'
import { serializeBackupJob } from '../../../utils/backup/api' import { serializeBackupJob } from '../../../utils/backup/api'
@@ -14,6 +14,7 @@ import {
import { createWriteStream, promises as fs } from 'node:fs' import { createWriteStream, promises as fs } from 'node:fs'
import { basename, dirname, join } from 'node:path' import { basename, dirname, join } from 'node:path'
import { pipeline } from 'node:stream/promises' import { pipeline } from 'node:stream/promises'
import { readFormDataFiles } from '../../../utils/multipart-form'
interface RestoreBody { interface RestoreBody {
archiveName?: string archiveName?: string
@@ -75,21 +76,22 @@ async function resolveRestoreInput(event: H3Event, userId: number): Promise<{
} }
if (contentType.includes('multipart/form-data')) { if (contentType.includes('multipart/form-data')) {
const form = await readMultipartFormData(event) const form = await readFormData(event)
const filePart = form?.find(part => part.name === 'file' && part.data?.length) const filePart = readFormDataFiles(form, ['file'])[0]
if (!filePart?.data) { if (!filePart) {
createApiError(event, 'INVALID_REQUEST', '请上传备份文件', 400) createApiError(event, 'INVALID_REQUEST', '请上传备份文件', 400)
} }
const conflictField = form?.find(part => part.name === 'conflictMode')?.data?.toString('utf8') const conflictField = form.get('conflictMode')
const dryRunField = form?.find(part => part.name === 'dryRun')?.data?.toString('utf8') const dryRunField = form.get('dryRun')
const dryRun = dryRunField === 'true' const dryRun = dryRunField === 'true'
const fileBytes = new Uint8Array(await filePart.arrayBuffer())
if (dryRun) { if (dryRun) {
const tempDir = getBackupStagingDir(`upload-preview-${Date.now()}`) const tempDir = getBackupStagingDir(`upload-preview-${Date.now()}`)
await fs.mkdir(tempDir, { recursive: true }) await fs.mkdir(tempDir, { recursive: true })
const archivePath = join(tempDir, 'package.phost.tar.gz') const archivePath = join(tempDir, 'package.phost.tar.gz')
await fs.writeFile(archivePath, filePart.data) await fs.writeFile(archivePath, fileBytes)
return { return {
archivePath, archivePath,
body: { body: {
@@ -105,7 +107,7 @@ async function resolveRestoreInput(event: H3Event, userId: number): Promise<{
await fs.mkdir(getBackupsDir(), { recursive: true }) await fs.mkdir(getBackupsDir(), { recursive: true })
const safeName = `upload-${Date.now()}${BACKUP_ARCHIVE_EXT}` const safeName = `upload-${Date.now()}${BACKUP_ARCHIVE_EXT}`
const archivePath = join(getBackupsDir(), safeName) const archivePath = join(getBackupsDir(), safeName)
await fs.writeFile(archivePath, filePart.data) await fs.writeFile(archivePath, fileBytes)
return { return {
archivePath, archivePath,
body: { body: {
+28 -8
View File
@@ -1,25 +1,45 @@
import { getHeader, readFormData, type H3Event } from 'h3'
import { createApiError } from '../../utils/api-error' import { createApiError } from '../../utils/api-error'
import { isInitialized } from '../../utils/auth' import { isInitialized } from '../../utils/auth'
import { serializeBackupJob } from '../../utils/backup/api' import { serializeBackupJob } from '../../utils/backup/api'
import { startFullRestoreJob } from '../../utils/backup/runner' import { startFullRestoreJob } from '../../utils/backup/runner'
import { BACKUP_ARCHIVE_EXT, getBackupsDir } from '../../utils/backup/paths' import { BACKUP_ARCHIVE_EXT, getBackupsDir } from '../../utils/backup/paths'
import { readFormDataFiles } from '../../utils/multipart-form'
import { join } from 'node:path' import { join } from 'node:path'
import { promises as fs } from 'node:fs' import { createWriteStream, promises as fs } from 'node:fs'
import { pipeline } from 'node:stream/promises'
async function saveRestoreUpload(event: H3Event, archivePath: string): Promise<void> {
const contentType = getHeader(event, 'content-type') ?? ''
try {
if (contentType.includes('application/octet-stream')) {
await pipeline(event.node.req, createWriteStream(archivePath))
} else {
const form = await readFormData(event)
const file = readFormDataFiles(form, ['file'])[0]
if (!file) {
createApiError(event, 'INVALID_REQUEST', '请上传备份文件', 400)
}
await fs.writeFile(archivePath, new Uint8Array(await file.arrayBuffer()))
}
const stat = await fs.stat(archivePath)
if (stat.size === 0) {
createApiError(event, 'INVALID_REQUEST', '备份文件为空', 400)
}
} catch (error) {
await fs.rm(archivePath, { force: true }).catch(() => {})
throw error
}
}
export default defineEventHandler(async (event) => { export default defineEventHandler(async (event) => {
if (isInitialized()) { if (isInitialized()) {
createApiError(event, 'FORBIDDEN', '系统已初始化,请在存储页恢复备份', 403) createApiError(event, 'FORBIDDEN', '系统已初始化,请在存储页恢复备份', 403)
} }
const form = await readMultipartFormData(event)
const filePart = form?.find(part => part.name === 'file' && part.data?.length)
if (!filePart?.data) {
createApiError(event, 'INVALID_REQUEST', '请上传备份文件', 400)
}
await fs.mkdir(getBackupsDir(), { recursive: true }) await fs.mkdir(getBackupsDir(), { recursive: true })
const archivePath = join(getBackupsDir(), `setup-restore-${Date.now()}${BACKUP_ARCHIVE_EXT}`) const archivePath = join(getBackupsDir(), `setup-restore-${Date.now()}${BACKUP_ARCHIVE_EXT}`)
await fs.writeFile(archivePath, filePart.data) await saveRestoreUpload(event, archivePath)
try { try {
const job = startFullRestoreJob(archivePath, 'overwrite') const job = startFullRestoreJob(archivePath, 'overwrite')
+16 -12
View File
@@ -1,4 +1,4 @@
import { readMultipartFormData } from 'h3' import { getHeader, readFormData } from 'h3'
import { requireSiteSyncAuth } from '../../utils/access' import { requireSiteSyncAuth } from '../../utils/access'
import { createApiError } from '../../utils/api-error' import { createApiError } from '../../utils/api-error'
import { MAX_VIDEO_FILE_SIZE } from '../../utils/constants' import { MAX_VIDEO_FILE_SIZE } from '../../utils/constants'
@@ -6,23 +6,27 @@ import { findUserByUsername } from '../../utils/db'
import { validateStorageKey } from '../../utils/image-key' import { validateStorageKey } from '../../utils/image-key'
import { getActiveBackend } from '../../utils/storage/resolver' import { getActiveBackend } from '../../utils/storage/resolver'
import { recordSiteSyncArtifact } from '../../utils/site-sync/artifacts' import { recordSiteSyncArtifact } from '../../utils/site-sync/artifacts'
import { readFormDataFiles } from '../../utils/multipart-form'
function field(form: Awaited<ReturnType<typeof readMultipartFormData>>, name: string): string { function field(form: FormData, name: string): string {
const part = form?.find(item => item.name === name) const value = form.get(name)
return part?.data?.length ? new TextDecoder().decode(part.data).trim() : '' return typeof value === 'string' ? value.trim() : ''
} }
export default defineEventHandler(async (event) => { export default defineEventHandler(async (event) => {
await requireSiteSyncAuth(event) await requireSiteSyncAuth(event)
const form = await readMultipartFormData(event) const contentLength = Number(getHeader(event, 'content-length') || 0)
if (!form?.length) createApiError(event, 'INVALID_REQUEST', '未收到同步数据', 400) if (contentLength > MAX_VIDEO_FILE_SIZE + 1024 * 1024) {
createApiError(event, 'FILE_TOO_LARGE', '同步文件超过 500 MB', 413)
}
const form = await readFormData(event)
const key = field(form, 'key') const key = field(form, 'key')
const file = form.find(part => part.name === 'file' && part.data?.length) const file = readFormDataFiles(form, ['file'])[0]
if (!validateStorageKey(key) || !file?.data) { if (!validateStorageKey(key) || !file) {
createApiError(event, 'INVALID_REQUEST', '同步文件参数无效', 400) createApiError(event, 'INVALID_REQUEST', '同步文件参数无效', 400)
} }
if (file.data.length > MAX_VIDEO_FILE_SIZE) { if (file.size > MAX_VIDEO_FILE_SIZE) {
createApiError(event, 'FILE_TOO_LARGE', '同步文件超过 500 MB', 413) createApiError(event, 'FILE_TOO_LARGE', '同步文件超过 500 MB', 413)
} }
@@ -51,11 +55,11 @@ export default defineEventHandler(async (event) => {
}) })
} }
await backend.put(key, new Uint8Array(file.data), { await backend.put(key, new Uint8Array(await file.arrayBuffer()), {
originalName: field(form, 'originalName') || file.filename || key.split('/').pop() || 'file', originalName: field(form, 'originalName') || file.name || key.split('/').pop() || 'file',
uploadedAt: field(form, 'uploadedAt') || new Date().toISOString(), uploadedAt: field(form, 'uploadedAt') || new Date().toISOString(),
contentType: file.type || field(form, 'contentType') || 'application/octet-stream', contentType: file.type || field(form, 'contentType') || 'application/octet-stream',
size: file.data.length, size: file.size,
userId: owner?.id ?? null, userId: owner?.id ?? null,
mediaType: key.startsWith('videos/') mediaType: key.startsWith('videos/')
? 'video' ? 'video'
+48
View File
@@ -0,0 +1,48 @@
import { describe, expect, it } from 'vitest'
import { readFormData, type H3Event } from 'h3'
import {
readFormDataFieldValues,
readFormDataFiles
} from './multipart-form'
async function parseFormData(form: FormData): Promise<FormData> {
const request = new Request('http://localhost/upload', {
method: 'POST',
body: form
})
return readFormData({ web: { request } } as unknown as H3Event)
}
describe('web FormData helpers', () => {
it('reads text fields and files from a multipart request', async () => {
const form = new FormData()
form.append('key', ' videos/2026/10/test.mov ')
form.append('tagNames', '["a","b"]')
form.append(
'file',
new File([new Uint8Array(1024)], 'test.mov', { type: 'video/quicktime' })
)
const parsed = await parseFormData(form)
expect(parsed.get('key')).toBe(' videos/2026/10/test.mov ')
expect(readFormDataFieldValues(parsed, 'tagNames')).toEqual(['a', 'b'])
expect(readFormDataFiles(parsed, ['file'])[0]).toMatchObject({
name: 'test.mov',
size: 1024,
type: 'video/quicktime'
})
})
it('keeps repeated field values and ignores empty files', async () => {
const form = new FormData()
form.append('tagNames', 'a,b')
form.append('tagNames', 'c')
form.append('files', new File([], 'empty.txt'))
const parsed = await parseFormData(form)
expect(readFormDataFieldValues(parsed, 'tagNames')).toEqual(['a,b', 'c'])
expect(readFormDataFiles(parsed, ['files'])).toEqual([])
})
})