From 1becf740c3d9a1b3546776e0a25e59291df4e93f Mon Sep 17 00:00:00 2001 From: kicer Date: Mon, 31 Aug 2026 19:19:04 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=A7=BB=E5=8A=A8=E7=AB=AF?= =?UTF-8?q?=E6=B5=8F=E8=A7=88=E5=99=A8=E4=B8=8B=E8=BD=BD=E5=8D=A1=E4=BD=8F?= =?UTF-8?q?=EF=BC=9A=E4=B8=8B=E8=BD=BD=E5=93=8D=E5=BA=94=E7=A6=81=E7=94=A8?= =?UTF-8?q?=E7=BC=93=E5=AD=98=E5=8D=8F=E5=95=86=EF=BC=88no-store=20+=20?= =?UTF-8?q?=E5=8E=BB=20ETag/Last-Modified=EF=BC=8C=E6=B6=88=E9=99=A4=20304?= =?UTF-8?q?=20=E7=A9=BA=E4=BD=93=E5=8D=A1=E6=AD=BB=EF=BC=89=EF=BC=9B?= =?UTF-8?q?=E5=89=8D=E7=AB=AF=E4=B8=8B=E8=BD=BD=E6=94=B9=20fetch+Blob=20?= =?UTF-8?q?=E7=BB=95=E8=BF=87=E5=8E=9F=E7=94=9F=E4=B8=8B=E8=BD=BD=EF=BC=9B?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=86=85=E7=BD=AE=20basic=20auth=20=E7=9A=84?= =?UTF-8?q?=20Buffer.from=20=E6=8B=BC=E5=86=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/server/public/js/app.js | 28 ++++++++++++++++++++++++++-- app/server/routes/files.js | 14 ++++++++++++-- app/server/server.js | 2 +- 3 files changed, 39 insertions(+), 5 deletions(-) diff --git a/app/server/public/js/app.js b/app/server/public/js/app.js index 10e74e3..c81c9ce 100644 --- a/app/server/public/js/app.js +++ b/app/server/public/js/app.js @@ -359,6 +359,30 @@ function updatePhaseUI(d) { } // ---------- 文件 ---------- +// 下载:fetch + Blob 绕过浏览器原生下载(移动端 Chrome 对 Basic 认证下的 +// Content-Disposition 下载处理有 bug,会卡在“等待中”)。 +// 同源 fetch 会自动携带浏览器缓存的 Basic 认证头,无需在 JS 里处理密码。 +async function downloadFile(name) { + if (!state.sessionId) return; + toast('下载中…'); + try { + const url = '/api/sessions/' + state.sessionId + '/files/download?path=' + encodeURIComponent(name); + const res = await fetch(url); + if (!res.ok) throw new Error('HTTP ' + res.status); + const blob = await res.blob(); + const dlUrl = URL.createObjectURL(blob); + const a = document.createElement('a'); + a.href = dlUrl; + a.download = name.split('/').pop() || 'download'; + document.body.appendChild(a); + a.click(); + a.remove(); + setTimeout(function () { URL.revokeObjectURL(dlUrl); }, 1000); + } catch (e) { + toast('下载失败:' + e.message); + } +} + async function loadFiles() { if (!state.sessionId) return; try { @@ -369,10 +393,9 @@ async function loadFiles() { return; } el.innerHTML = files.map(f => { - const url = '/api/sessions/' + state.sessionId + '/files/download?path=' + encodeURIComponent(f.filename); return '
' + esc(f.filename) + '' + '' + fmtSize(f.size) + '' + - '下载' + + '' + '
'; }).join(''); } catch (e) { toast('读取文件失败:' + e.message); } @@ -380,6 +403,7 @@ async function loadFiles() { // ---------- 主逻辑 ---------- const ui = { + downloadFile(name) { return downloadFile(name); }, openCreate() { $('create-modal').classList.remove('hidden'); $('new-title').focus(); }, closeCreate() { $('create-modal').classList.add('hidden'); }, async createSession() { diff --git a/app/server/routes/files.js b/app/server/routes/files.js index 66e181f..862cd21 100644 --- a/app/server/routes/files.js +++ b/app/server/routes/files.js @@ -70,6 +70,16 @@ router.get('/:id/files', function (req, res) { } }); +// 下载统一响应:禁用一切缓存协商。 +// 默认的 ETag/Last-Modified + Cache-Control: public, max-age=0 会诱导移动端浏览器 +// 先发条件请求拿 304 空体,下载管理器随后卡在“等待中”(桌面 Safari/curl 不受影响)。 +function sendDownload(res, abs) { + res.setHeader('Cache-Control', 'no-store, no-cache, must-revalidate'); + res.setHeader('Pragma', 'no-cache'); + res.setHeader('Expires', '0'); + res.download(abs, path.basename(abs), { acceptRanges: true, lastModified: false, etag: false, maxAge: 0 }); +} + // 下载(支持子目录路径,前端用 ?path=xxx 传入相对路径) router.get('/:id/files/download', function (req, res) { try { @@ -78,7 +88,7 @@ router.get('/:id/files/download', function (req, res) { const abs = resolveInTask(engine.taskDirOf(req.params.id), rel); const st = fs.statSync(abs); if (!st.isFile()) return res.status(400).json({ error: '不是文件' }); - res.download(abs, path.basename(abs)); + sendDownload(res, abs); } catch (err) { res.status(404).json({ error: '文件不存在' }); } @@ -110,7 +120,7 @@ router.get('/:id/files/*', function (req, res) { const abs = resolveInTask(engine.taskDirOf(req.params.id), rel); const st = fs.statSync(abs); if (!st.isFile()) return res.status(400).json({ error: '不是文件' }); - res.download(abs, path.basename(abs)); + sendDownload(res, abs); } catch (err) { res.status(404).json({ error: '文件不存在' }); } diff --git a/app/server/server.js b/app/server/server.js index a204dd8..185ae14 100644 --- a/app/server/server.js +++ b/app/server/server.js @@ -24,7 +24,7 @@ app.use(express.json({ limit: '2mb' })); // 可选 basic auth(若前置 nginx 已做,可不启用) if (cfg.auth && cfg.auth.user) { - const expected = 'Basic ' + Buffer.From(cfg.auth.user + ':' + cfg.auth.password).toString('base64'); + const expected = 'Basic ' + Buffer.from(cfg.auth.user + ':' + cfg.auth.password).toString('base64'); app.use((req, res, next) => { if (req.headers.authorization === expected) return next(); res.set('WWW-Authenticate', 'Basic realm="agent"');