- 当前 (v${versions.length + 1})
+ 当前 (v${_versionPanelState.currentVer})
${currentSize} · ${currentTime}
@@ -186,10 +189,14 @@ function setupVersionUpload(container, fileId) {
input.addEventListener('change', () => {
if (!input.files.length) return;
const file = input.files[0];
- const allowed = ['.html', '.htm', '.md', '.markdown'];
+ const isBundle = input.dataset.isBundle === 'true';
+ const fileType = input.dataset.fileType;
+ const allowed = isBundle
+ ? ['.zip']
+ : (fileType === 'markdown' ? ['.md', '.markdown'] : ['.html', '.htm']);
const ext = file.name.slice(file.name.lastIndexOf('.')).toLowerCase();
if (!allowed.includes(ext)) {
- toast('仅支持 HTML 和 Markdown 文件', 'error');
+ toast(isBundle ? '网站包新版本必须上传 ZIP 文件' : '新版本文件类型必须与原文件一致', 'error');
input.value = '';
return;
}
@@ -711,6 +718,12 @@ function renderPreview(container, hash) {
if (data.is_bundle && Array.isArray(data.entries) && data.entries.length > 0) {
setupBundleTree(data.entries, data.entry_path, data.entries_truncated);
}
+ const versionInput = container.querySelector('#version-file-input');
+ if (versionInput) {
+ versionInput.dataset.isBundle = data.is_bundle ? 'true' : 'false';
+ versionInput.dataset.fileType = data.file_type;
+ versionInput.accept = data.is_bundle ? '.zip' : (data.file_type === 'markdown' ? '.md,.markdown' : '.html,.htm');
+ }
if (spinner) spinner.style.display = 'flex';
iframe.src = API_BASE + `/api/files/${id}/render`;
// 模板菜单项：仅 Markdown 文件且为所有者/admin 可见
diff --git a/routes/files/_shared.js b/routes/files/_shared.js
index 91ba8dc..265aa2a 100644
--- a/routes/files/_shared.js
+++ b/routes/files/_shared.js
@@ -8,19 +8,21 @@ const express = require('express');
const multer = require('multer');
const rateLimit = require('express-rate-limit');
const path = require('path');
-const { dbGet, dbAll, dbRun } = require('../../lib/db');
-const { now, unlinkQuiet, decodeFilename } = require('../../lib/util');
+const { decodeFilename } = require('../../lib/util');
const { UPLOAD_DIR } = require('../../lib/paths');
-const { addUserStorage } = require('../../lib/usage');
+const {
+ MAX_FILE_VERSIONS,
+ generateStoredName,
+ removeStoredObject,
+ copyStoredObject,
+ backupAndApplyVersion,
+ pruneOldVersions,
+} = require('../../lib/file-storage');
// --- 常量 ---
const MAX_FILE_SIZE = 50 * 1024 * 1024; // 50MB
const ALLOWED_UPLOAD_EXTS = ['.html', '.htm', '.md', '.markdown', '.zip']; // 上传（含 ZIP）
const ALLOWED_TEXT_EXTS = ['.html', '.htm', '.md', '.markdown']; // JSON 上传（无 ZIP）
-// 单个文件保留的历史版本数（file_versions 表），超过则自动删除最旧的。
-// 当前版本存在 files 主记录，不计入此上限。env 可配，默认 20。
-// 注：推翻设计文档 013 原定的「version 不设上限」。
-const MAX_FILE_VERSIONS = parseInt(process.env.MAX_FILE_VERSIONS, 10) || 20;
// --- 上传限流 ---
const uploadLimiter = rateLimit({
@@ -55,75 +57,6 @@ const upload = multer({
// JSON body 解析器：上传类端点需要放宽到 50MB（全局默认 1MB）
const largeJson = express.json({ limit: '50mb' });
-// --- 文件名生成：替换原先散落在 5 处的 Date.now()+'-'+Math.round(...)+ext ---
-function generateStoredName(ext) {
- return Date.now() + '-' + Math.round(Math.random() * 1e9) + ext;
-}
-
-// --- 版本备份 + 主记录更新序列 ---
-// 原先在 upload/upload-json/overwrite/overwrite-json/restore 共 5 处重复。
-// 行为零差异：读 nextVer → INSERT 旧版本到 file_versions → UPDATE files 主记录。
-//
-// @param {object} file - 旧 files 行（含 stored_name/size/id）
-// @param {object} next - 新版本数据 { storedName, size }
-// @param {number} recordedBy - 写入 file_versions.uploaded_by 的用户 id。
-// 语义为「被归档那一版内容的原始上传者」，由各处传
-// file.uploaded_by（注意：这不是本次操作者）。
-// @param {string} [source] - 本次上传来源 'web'|'cli'|'mcp'，缺省 'web'。
-// 写入 file_versions.upload_source（该版本被写入时的来源），
-// 并刷新 files.upload_source（最近一次来源）。
-// @param {number} [performedBy] - 写入 file_versions.performed_by 的用户 id。
-// 语义为「触发本次版本创建的操作者」（覆盖/恢复动作的执行者），
-// 与 recordedBy 区分。缺省时回退到 recordedBy，保持向后兼容。
-// @returns {Promise<{ version: number }>} 返回新版本号（nextVer + 1，对齐审计日志语义）
-async function backupAndApplyVersion(file, next, recordedBy, source = 'web', performedBy) {
- const verRow = await dbGet(
- 'SELECT COALESCE(MAX(version), 0) + 1 AS nextVer FROM file_versions WHERE file_id = ?',
- [file.id]
- );
- const nextVer = verRow.nextVer;
- // performed_by 缺省回退到 recordedBy（原始上传者）：旧调用方未传时仍可审计。
- const performedById = performedBy !== undefined ? performedBy : recordedBy;
- await dbRun(
- 'INSERT INTO file_versions (file_id, version, stored_name, size, uploaded_by, upload_source, performed_by) VALUES (?, ?, ?, ?, ?, ?, ?)',
- [file.id, nextVer, file.stored_name, file.size, recordedBy, source, performedById]
- );
- await dbRun(
- 'UPDATE files SET stored_name = ?, size = ?, upload_source = ?, updated_at = ? WHERE id = ?',
- [next.storedName, next.size, source, now(), file.id]
- );
-
- // 维护用户存储量：当前文件大小变化量 = 新版本 - 旧版本
- await addUserStorage(file.uploaded_by, next.size - file.size);
-
- // 超过上限时删除最旧的历史版本（含磁盘文件），避免长期占盘。
- await pruneOldVersions(file.id, MAX_FILE_VERSIONS, file.uploaded_by);
- return { version: nextVer + 1 };
-}
-
-// --- 历史版本裁剪 ---
-// 保留每个文件最近 keep 个历史版本（version 最大的 keep 个），删掉更老的，
-// 同步清理磁盘文件。当前版本在 files 主记录，不参与计数。
-async function pruneOldVersions(fileId, keep, ownerId) {
- if (!Number.isFinite(keep) || keep <= 0) return;
- // version 倒序：前 keep 条保留，其余删除
- const all = await dbAll(
- 'SELECT id, stored_name, size FROM file_versions WHERE file_id = ? ORDER BY version DESC',
- [fileId]
- );
- const toRemove = all.slice(keep);
- let removedBytes = 0;
- for (const v of toRemove) {
- if (v.stored_name) await unlinkQuiet(path.join(UPLOAD_DIR, v.stored_name));
- await dbRun('DELETE FROM file_versions WHERE id = ?', [v.id]);
- if (v.size) removedBytes += v.size;
- }
- // 扣减被删版本占用的存储量
- if (removedBytes > 0 && ownerId) {
- await addUserStorage(ownerId, -removedBytes);
- }
-}
-
// --- 下载 Content-Disposition 头（UTF-8 文件名） ---
// 替换 download 路由两处重复的 encoded + filename*=UTF-8'' 拼接。
function setDownloadHeaders(res, name) {
@@ -149,6 +82,8 @@ module.exports = {
upload,
largeJson,
generateStoredName,
+ removeStoredObject,
+ copyStoredObject,
backupAndApplyVersion,
pruneOldVersions,
setDownloadHeaders,
diff --git a/routes/files/crud.js b/routes/files/crud.js
index 2a17001..8fbc0b9 100644
--- a/routes/files/crud.js
+++ b/routes/files/crud.js
@@ -1,16 +1,14 @@
// 更新 / 删除 / 批量操作路由。
// 从 routes/files.js 提取，行为保持不变。挂在共享 router 上。
-const fs = require('fs');
-const path = require('path');
const { dbGet, dbRun, dbAll } = require('../../lib/db');
const { requireAuth } = require('../../lib/middleware/auth');
-const { unlinkQuiet, clientIp } = require('../../lib/util');
-const { UPLOAD_DIR } = require('../../lib/paths');
+const { clientIp } = require('../../lib/util');
const { deleteFileIndex } = require('../../lib/fts');
const { invalidateRenderCache } = require('../../lib/render-cache');
const { checkFileOwnership } = require('../../lib/middleware/files');
const { subtractFileStorage } = require('../../lib/usage');
+const { removeStoredObject } = require('./_shared');
const logger = require('../../logger');
function registerCrud(router) {
@@ -70,16 +68,14 @@ function registerCrud(router) {
await subtractFileStorage(file);
// 清理版本记录及对应磁盘文件
- const versions = await dbAll('SELECT stored_name FROM file_versions WHERE file_id = ?', [req.params.id]);
+ const versions = await dbAll('SELECT stored_name, is_bundle FROM file_versions WHERE file_id = ?', [req.params.id]);
for (const v of versions) {
- const p = path.join(UPLOAD_DIR, v.stored_name);
- if (fs.existsSync(p)) await unlinkQuiet(p);
+ await removeStoredObject(v.stored_name, v.is_bundle);
}
await dbRun('DELETE FROM file_versions WHERE file_id = ?', [req.params.id]);
// 删除主文件
- const filePath = path.join(UPLOAD_DIR, file.stored_name);
- if (fs.existsSync(filePath)) await unlinkQuiet(filePath);
+ await removeStoredObject(file.stored_name, file.is_bundle);
await dbRun('DELETE FROM files WHERE id = ?', [req.params.id]);
invalidateRenderCache(req.params.id);
logger.audit('file.delete', { fileId: req.params.id, fileName: file.original_name, ip: clientIp(req) });
@@ -120,13 +116,13 @@ function registerCrud(router) {
try {
await dbRun(`DELETE FROM file_tags WHERE file_id IN (${idPlaceholders})`, fileIds);
await dbRun(`DELETE FROM starred_files WHERE file_id IN (${idPlaceholders})`, fileIds);
- const versions = await dbAll(`SELECT stored_name FROM file_versions WHERE file_id IN (${idPlaceholders})`, fileIds);
+ const versions = await dbAll(`SELECT stored_name, is_bundle FROM file_versions WHERE file_id IN (${idPlaceholders})`, fileIds);
for (const v of versions) {
- await unlinkQuiet(path.join(UPLOAD_DIR, v.stored_name));
+ await removeStoredObject(v.stored_name, v.is_bundle);
}
await dbRun(`DELETE FROM file_versions WHERE file_id IN (${idPlaceholders})`, fileIds);
for (const f of files) {
- await unlinkQuiet(path.join(UPLOAD_DIR, f.stored_name));
+ await removeStoredObject(f.stored_name, f.is_bundle);
}
await dbRun(`DELETE FROM files WHERE id IN (${idPlaceholders})`, fileIds);
await dbRun('COMMIT');
diff --git a/routes/files/overwrite.js b/routes/files/overwrite.js
index e107880..09d9b19 100644
--- a/routes/files/overwrite.js
+++ b/routes/files/overwrite.js
@@ -11,6 +11,7 @@ const { UPLOAD_DIR } = require('../../lib/paths');
const { isFtsIndexable, indexFileContent } = require('../../lib/fts');
const { uploadLimiter, upload, largeJson, MAX_FILE_SIZE, backupAndApplyVersion } = require('./_shared');
const { checkFileOwnership } = require('../../lib/middleware/files');
+const { handleZipUpload, translateZipError } = require('../../lib/zip');
const logger = require('../../logger');
function registerOverwrite(router) {
@@ -19,6 +20,20 @@ function registerOverwrite(router) {
if (!req.file) return res.status(400).json({ error: '未上传文件' });
req.file.originalname = decodeFilename(req.file.originalname);
const ext = path.extname(req.file.originalname).toLowerCase();
+ if (ext === '.zip') {
+ try {
+ const zipBuffer = await fs.promises.readFile(req.file.path);
+ await unlinkQuiet(req.file.path);
+ return handleZipUpload(req, res, zipBuffer, { targetFileId: req.params.id });
+ } catch (e) {
+ await unlinkQuiet(req.file.path);
+ if (res.headersSent) return;
+ logger.error({ type: 'app', action: 'zip.overwrite', error: e.message });
+ return res.status(e.statusCode || 500).json({
+ error: e.isUserError ? e.message : translateZipError(e)
+ });
+ }
+ }
let fileType = 'html';
if (ext === '.md' || ext === '.markdown') fileType = 'markdown';
const source = resolveUploadSource(req);
@@ -33,6 +48,10 @@ function registerOverwrite(router) {
await unlinkQuiet(path.join(UPLOAD_DIR, req.file.filename));
return res.status(403).json({ error: '无权操作此文件' });
}
+ if (file.is_bundle) {
+ await unlinkQuiet(path.join(UPLOAD_DIR, req.file.filename));
+ return res.status(400).json({ error: 'ZIP 网站包只能使用 ZIP 文件覆盖' });
+ }
// 校验文件类型
if (file.file_type !== fileType) {
@@ -69,6 +88,27 @@ function registerOverwrite(router) {
}
});
+ // --- ZIP(base64) 显式覆盖 ---
+ router.post('/:id/overwrite-zip-base64', requireAuth, uploadLimiter, largeJson, async (req, res) => {
+ const { name, content } = req.body || {};
+ if (typeof name !== 'string' || path.extname(name).toLowerCase() !== '.zip') {
+ return res.status(400).json({ error: '仅支持 ZIP 文件' });
+ }
+ if (typeof content !== 'string') return res.status(400).json({ error: 'content 必须是字符串' });
+ try {
+ const zipBuffer = Buffer.from(content, 'base64');
+ if (zipBuffer.length > MAX_FILE_SIZE) return res.status(400).json({ error: 'ZIP 文件超过50MB限制' });
+ req.file = { originalname: decodeFilename(name) };
+ return handleZipUpload(req, res, zipBuffer, { targetFileId: req.params.id });
+ } catch (e) {
+ if (res.headersSent) return;
+ logger.error({ type: 'app', action: 'zip.overwrite.base64', error: e.message });
+ return res.status(e.statusCode || 500).json({
+ error: e.isUserError ? e.message : translateZipError(e)
+ });
+ }
+ });
+
// --- JSON 覆盖 ---
router.post('/:id/overwrite-json', requireAuth, uploadLimiter, largeJson, async (req, res) => {
const { content } = req.body || {};
@@ -79,6 +119,7 @@ function registerOverwrite(router) {
const file = await dbGet('SELECT * FROM files WHERE id = ?', [req.params.id]);
if (!file) return res.status(404).json({ error: '文件不存在' });
if (!checkFileOwnership(req, file)) return res.status(403).json({ error: '无权操作此文件' });
+ if (file.is_bundle) return res.status(400).json({ error: 'ZIP 网站包只能使用 ZIP 文件覆盖' });
const size = Buffer.byteLength(content, 'utf-8');
if (size > MAX_FILE_SIZE) return res.status(400).json({ error: '文件大小超过50MB限制' });
diff --git a/routes/files/upload.js b/routes/files/upload.js
index ad6c0bc..18099ba 100644
--- a/routes/files/upload.js
+++ b/routes/files/upload.js
@@ -22,7 +22,15 @@ function registerUpload(router) {
const ext = path.extname(req.file.originalname).toLowerCase();
// ZIP 处理
if (ext === '.zip') {
- return handleZipUpload(req, res, await fs.promises.readFile(req.file.path));
+ try {
+ const zipBuffer = await fs.promises.readFile(req.file.path);
+ await unlinkQuiet(req.file.path);
+ return handleZipUpload(req, res, zipBuffer);
+ } catch (e) {
+ await unlinkQuiet(req.file.path);
+ logger.error({ type: 'app', action: 'zip.multipart', error: e.message });
+ return res.status(500).json({ error: '读取 ZIP 文件失败' });
+ }
}
let fileType = 'html';
if (ext === '.md' || ext === '.markdown') fileType = 'markdown';
@@ -32,11 +40,15 @@ function registerUpload(router) {
// 检查同名文件（按用户隔离：同名只在当前用户命名空间内匹配，
// 不会命中其他用户的同名记录，避免跨用户覆盖）
const existing = await dbGet(
- 'SELECT id, stored_name, size, uploaded_by, file_type, is_public FROM files WHERE original_name = ? AND uploaded_by = ?',
+ 'SELECT id, stored_name, size, uploaded_by, file_type, is_public, is_bundle, entry_path FROM files WHERE original_name = ? AND uploaded_by = ?',
[req.file.originalname, currentUserId(req)]
);
if (existing) {
+ if (existing.is_bundle) {
+ await unlinkQuiet(path.join(UPLOAD_DIR, req.file.filename));
+ return res.status(400).json({ error: '网站包只能使用 ZIP 文件覆盖' });
+ }
// 同名文件：校验文件类型
if (existing.file_type !== fileType) {
// 类型不匹配，清理已上传的文件，拒绝覆盖
@@ -123,11 +135,15 @@ function registerUpload(router) {
// 检查同名文件（按用户隔离，理由同 multipart /upload）
const existing = await dbGet(
- 'SELECT id, stored_name, size, uploaded_by, file_type, is_public, share_key FROM files WHERE original_name = ? AND uploaded_by = ?',
+ 'SELECT id, stored_name, size, uploaded_by, file_type, is_public, share_key, is_bundle, entry_path FROM files WHERE original_name = ? AND uploaded_by = ?',
[decoded, currentUserId(req)]
).catch(() => null);
if (existing) {
+ if (existing.is_bundle) {
+ await unlinkQuiet(filePath);
+ return res.status(400).json({ error: '网站包只能使用 ZIP 文件覆盖' });
+ }
// 同名文件：校验文件类型
if (existing.file_type !== fileType) {
await unlinkQuiet(filePath);
diff --git a/routes/files/versions.js b/routes/files/versions.js
index 88a9771..40b2ed5 100644
--- a/routes/files/versions.js
+++ b/routes/files/versions.js
@@ -3,12 +3,22 @@
const fs = require('fs');
const path = require('path');
+const archiver = require('archiver');
const { dbGet, dbAll, dbRun } = require('../../lib/db');
const { requireAuth } = require('../../lib/middleware/auth');
-const { unlinkQuiet, currentUserId, clientIp, resolveUploadSource } = require('../../lib/util');
+const { currentUserId, clientIp, resolveUploadSource } = require('../../lib/util');
const { UPLOAD_DIR } = require('../../lib/paths');
-const { renderFile } = require('../../lib/render');
-const { generateStoredName, backupAndApplyVersion } = require('./_shared');
+const { renderFile, listBundleEntries } = require('../../lib/render');
+const {
+ generateStoredName,
+ removeStoredObject,
+ copyStoredObject,
+ backupAndApplyVersion,
+ setDownloadHeaders,
+ isWithinBundle,
+} = require('./_shared');
+const { isFtsIndexable, indexFileContent } = require('../../lib/fts');
+const { checkFileOwnership } = require('../../lib/middleware/files');
const { addUserStorage } = require('../../lib/usage');
const logger = require('../../logger');
@@ -21,6 +31,7 @@ function registerVersions(router) {
const versions = await dbAll(
`SELECT fv.id, fv.version, fv.size, fv.created_at, fv.performed_by,
+ fv.is_bundle, fv.entry_path, fv.file_type,
pu.username AS performed_by_name
FROM file_versions fv
LEFT JOIN users pu ON fv.performed_by = pu.id
@@ -53,6 +64,35 @@ function registerVersions(router) {
if (req.userRole !== 'admin' && file?.uploaded_by !== req.userId) {
return res.status(403).json({ error: '无权读取此文件原文' });
}
+ if (!file) return res.status(404).json({ error: '文件不存在' });
+
+ if (ver.is_bundle) {
+ const bundleDir = path.join(UPLOAD_DIR, ver.stored_name);
+ const entryPath = path.join(bundleDir, ver.entry_path || 'index.html');
+ if (!isWithinBundle(entryPath, bundleDir)) {
+ return res.status(403).json({ error: '非法路径' });
+ }
+ let content;
+ try {
+ content = await fs.promises.readFile(entryPath, 'utf-8');
+ } catch (e) {
+ if (e && e.code === 'ENOENT') return res.status(404).json({ error: '版本文件已丢失' });
+ throw e;
+ }
+ const { entries, truncated } = await listBundleEntries(bundleDir);
+ return res.json({
+ id: parseInt(req.params.id),
+ version: ver.version,
+ original_name: file.original_name,
+ file_type: ver.file_type || file.file_type,
+ is_bundle: 1,
+ entry_path: ver.entry_path,
+ content,
+ entries,
+ entries_truncated: truncated,
+ });
+ }
+
let content;
try {
content = await fs.promises.readFile(filePath, 'utf-8');
@@ -84,20 +124,95 @@ function registerVersions(router) {
const file = await dbGet('SELECT * FROM files WHERE id = ?', [req.params.id]);
if (!file) return res.status(404).json({ error: '文件不存在' });
- // 构造一个 file-like 对象，使用历史版本的 stored_name
- const versionFile = { ...file, stored_name: ver.stored_name };
+ // 构造历史版本的完整 file-like 对象，bundle 依赖入口路径与存储形态。
+ const versionFile = {
+ ...file,
+ stored_name: ver.stored_name,
+ size: ver.size,
+ file_type: ver.file_type || file.file_type,
+ is_bundle: ver.is_bundle ? 1 : 0,
+ entry_path: ver.entry_path,
+ updated_at: ver.created_at,
+ asset_base_path: `/api/files/${file.id}/versions/${ver.version}/asset/`,
+ };
await renderFile(res, versionFile);
} catch (e) {
res.status(500).json({ error: '渲染版本失败' });
}
});
+ // --- bundle 历史版本资源 ---
+ router.get('/:id/versions/:ver/asset/*', requireAuth, async (req, res) => {
+ try {
+ const [file, ver] = await Promise.all([
+ dbGet('SELECT * FROM files WHERE id = ?', [req.params.id]),
+ dbGet('SELECT * FROM file_versions WHERE file_id = ? AND version = ?', [req.params.id, req.params.ver]),
+ ]);
+ if (!file) return res.status(404).json({ error: '文件不存在' });
+ if (!ver) return res.status(404).json({ error: '版本不存在' });
+ if (!ver.is_bundle) return res.status(400).json({ error: '非网站包版本' });
+ if (req.userRole !== 'admin' && file.uploaded_by !== req.userId) {
+ return res.status(403).json({ error: '无权读取此文件版本' });
+ }
+
+ const bundleDir = path.join(UPLOAD_DIR, ver.stored_name);
+ const assetPath = path.join(bundleDir, req.params[0]);
+ if (!isWithinBundle(assetPath, bundleDir)) return res.status(403).json({ error: '非法路径' });
+ const stat = await fs.promises.stat(assetPath).catch(() => null);
+ if (!stat || stat.isDirectory()) return res.status(404).json({ error: '资源不存在' });
+ return res.sendFile(path.resolve(assetPath));
+ } catch (e) {
+ if (!res.headersSent) res.status(500).json({ error: '读取版本资源失败' });
+ }
+ });
+
+ // --- 历史版本下载 ---
+ router.get('/:id/versions/:ver/download', requireAuth, async (req, res) => {
+ try {
+ const [file, ver] = await Promise.all([
+ dbGet('SELECT * FROM files WHERE id = ?', [req.params.id]),
+ dbGet('SELECT * FROM file_versions WHERE file_id = ? AND version = ?', [req.params.id, req.params.ver]),
+ ]);
+ if (!file) return res.status(404).json({ error: '文件不存在' });
+ if (!ver) return res.status(404).json({ error: '版本不存在' });
+ if (req.userRole !== 'admin' && file.uploaded_by !== req.userId) {
+ return res.status(403).json({ error: '无权下载此文件版本' });
+ }
+
+ const storedPath = path.join(UPLOAD_DIR, ver.stored_name);
+ setDownloadHeaders(res, file.original_name);
+ if (ver.is_bundle) {
+ res.setHeader('Content-Type', 'application/zip');
+ const archive = archiver('zip', { zlib: { level: 9 } });
+ archive.directory(storedPath, false);
+ archive.on('error', error => {
+ logger.error({ type: 'app', action: 'file.version.download', error: error.message });
+ if (!res.headersSent) res.status(500).json({ error: '版本打包失败' });
+ });
+ archive.pipe(res);
+ await archive.finalize();
+ return;
+ }
+ return res.sendFile(storedPath, error => {
+ if (error && !res.headersSent) {
+ if (error.code === 'ENOENT') return res.status(404).json({ error: '版本文件已丢失' });
+ return res.status(500).json({ error: '版本下载失败' });
+ }
+ });
+ } catch (e) {
+ if (!res.headersSent) res.status(500).json({ error: '版本下载失败' });
+ }
+ });
+
// --- 恢复历史版本 ---
router.post('/:id/versions/:ver/restore', requireAuth, async (req, res) => {
let newStoredName;
+ let newIsBundle = false;
+ let versionApplied = false;
try {
const file = await dbGet('SELECT * FROM files WHERE id = ?', [req.params.id]);
if (!file) return res.status(404).json({ error: '文件不存在' });
+ if (!checkFileOwnership(req, file)) return res.status(403).json({ error: '无权操作此文件' });
const targetVer = await dbGet(
'SELECT * FROM file_versions WHERE file_id = ? AND version = ?',
@@ -105,32 +220,42 @@ function registerVersions(router) {
);
if (!targetVer) return res.status(404).json({ error: '版本不存在' });
- // 读取目标版本文件内容
- const targetPath = path.join(UPLOAD_DIR, targetVer.stored_name);
- let targetContent;
+ newIsBundle = !!targetVer.is_bundle;
+ const targetFileType = targetVer.file_type || file.file_type;
+ const ext = newIsBundle ? '' : (targetFileType === 'markdown' ? '.md' : '.html');
+ newStoredName = generateStoredName(ext);
try {
- targetContent = await fs.promises.readFile(targetPath, 'utf-8');
+ await copyStoredObject(targetVer.stored_name, newStoredName, newIsBundle);
} catch (e) {
if (e && e.code === 'ENOENT') return res.status(404).json({ error: '版本文件已丢失' });
throw e;
}
- // 复制到新磁盘文件
- const ext = file.file_type === 'markdown' ? '.md' : '.html';
- newStoredName = generateStoredName(ext);
- await fs.promises.writeFile(path.join(UPLOAD_DIR, newStoredName), targetContent, 'utf-8');
-
// 当前版本备份并更新主记录。
// 注意：restore 记录的是执行恢复的用户（currentUserId），与 upload/overwrite
// 记录 file.uploaded_by（原始上传者）的语义不同，此处刻意保留原行为。
- const newSize = Buffer.byteLength(targetContent, 'utf-8');
+ const newSize = targetVer.size;
const { version } = await backupAndApplyVersion(
file,
- { storedName: newStoredName, size: newSize },
+ {
+ storedName: newStoredName,
+ size: newSize,
+ fileType: targetFileType,
+ isBundle: newIsBundle,
+ entryPath: targetVer.entry_path,
+ },
currentUserId(req),
resolveUploadSource(req),
currentUserId(req)
);
+ versionApplied = true;
+ if (!newIsBundle && isFtsIndexable(targetFileType, newStoredName)) {
+ try {
+ indexFileContent(file.id, newStoredName);
+ } catch (e) {
+ logger.error({ type: 'app', action: 'file.restore.index', fileId: file.id, error: e.message });
+ }
+ }
logger.audit('file.restore', { fileId: file.id, fileName: file.original_name, restoredVersion: parseInt(req.params.ver), newVersion: version, userId: currentUserId(req), ip: clientIp(req) });
res.json({
@@ -141,7 +266,9 @@ function registerVersions(router) {
size: newSize
});
} catch (e) {
- if (newStoredName) { await unlinkQuiet(path.join(UPLOAD_DIR, newStoredName)); }
+ if (newStoredName && !versionApplied) {
+ await removeStoredObject(newStoredName, newIsBundle).catch(() => {});
+ }
res.status(500).json({ error: '恢复版本失败' });
}
});
@@ -154,20 +281,16 @@ function registerVersions(router) {
[req.params.id, req.params.ver]
);
if (!ver) return res.status(404).json({ error: '版本不存在' });
-
- const file = await dbGet('SELECT uploaded_by FROM files WHERE id = ?', [req.params.id]);
+ const file = await dbGet('SELECT * FROM files WHERE id = ?', [req.params.id]);
+ if (!file) return res.status(404).json({ error: '文件不存在' });
+ if (!checkFileOwnership(req, file)) return res.status(403).json({ error: '无权操作此文件' });
// 删除磁盘文件
- const filePath = path.join(UPLOAD_DIR, ver.stored_name);
- if (fs.existsSync(filePath)) await unlinkQuiet(filePath);
+ await removeStoredObject(ver.stored_name, ver.is_bundle);
// 删除版本记录
await dbRun('DELETE FROM file_versions WHERE id = ?', [ver.id]);
-
- // 扣减该版本占用的存储量
- if (ver.size && file) {
- await addUserStorage(file.uploaded_by, -ver.size);
- }
+ await addUserStorage(file.uploaded_by, -ver.size);
logger.audit('file.version.delete', { fileId: parseInt(req.params.id), version: parseInt(req.params.ver), userId: currentUserId(req), ip: clientIp(req) });
res.json({ success: true });
diff --git a/test/integration/zip-versions.test.js b/test/integration/zip-versions.test.js
new file mode 100644
index 0000000..05d2e92
--- /dev/null
+++ b/test/integration/zip-versions.test.js
@@ -0,0 +1,264 @@
+// ZIP 多版本覆盖集成测试：bundle / batch 同名覆盖、显式覆盖、历史版本生命周期。
+
+const test = require('node:test');
+const assert = require('node:assert');
+const fs = require('fs');
+const path = require('path');
+const request = require('supertest');
+const JSZip = require('jszip');
+const { createTestEnv } = require('../helpers/setup');
+
+process.env.MAX_FILE_VERSIONS = '3';
+
+let env;
+let agent;
+
+async function makeZip(files) {
+ const zip = new JSZip();
+ for (const [name, content] of Object.entries(files)) zip.file(name, content);
+ return zip.generateAsync({ type: 'nodebuffer' });
+}
+
+async function uploadZip(name, files) {
+ const buf = await makeZip(files);
+ return agent.post('/api/files/upload-zip-base64').send({
+ name,
+ content: buf.toString('base64'),
+ isPublic: false,
+ });
+}
+
+async function assertStorageAccounting() {
+ const { dbGet } = require('../../lib/db');
+ const [user, logical] = await Promise.all([
+ dbGet('SELECT total_storage_bytes FROM users WHERE id = 1'),
+ dbGet(`
+ SELECT COALESCE((SELECT SUM(size) FROM files WHERE uploaded_by = 1), 0) +
+ COALESCE((SELECT SUM(size) FROM file_versions WHERE uploaded_by = 1), 0) AS total
+ `),
+ ]);
+ assert.strictEqual(user.total_storage_bytes, logical.total);
+}
+
+test.before(async () => {
+ env = createTestEnv();
+ await env.ready();
+ agent = request.agent(env.app);
+ await agent.post('/api/auth/login').send({
+ username: 'admin',
+ password: 'testpassword123',
+ });
+});
+
+test.after(() => env.cleanup());
+
+test('同名 bundle ZIP 覆盖保持 file ID/share key，并可渲染历史版本', async () => {
+ const first = await uploadZip('versioned-site.zip', {
+ 'index.html': '