From 5b16d4203123a22068dd851aa957cb841a729ce5 Mon Sep 17 00:00:00 2001 From: kicer Date: Mon, 7 Sep 2026 10:45:31 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=EF=BC=9A=E5=8A=A0=E8=BD=BD?= =?UTF-8?q?=E4=BC=9A=E8=AF=9D=E6=B6=88=E6=81=AF=E6=97=B6=E5=89=A5=E7=A6=BB?= =?UTF-8?q?=20base64=20=E5=9B=BE=E7=89=87=E6=95=B0=E6=8D=AE=EF=BC=8C?= =?UTF-8?q?=E6=8C=89=E9=9C=80=E5=8A=A0=E8=BD=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - sessions.js GET /:id:返回 messages 前 stripBase64FromContent 剥离 image_url 块中的 base64 数据,改为空字符串;并添加 hasImage 标志 - sessions.js 新增 GET /:id/messages/:mid/image 端点:从 DB 原始内容按需解码并返回图片数据 - tasks.js fillToolResult:新增 hasImage msgId 参数;base64 已剥离时显示「加载图片」按钮,用户点击后调用新接口按需获取图片 - tasks.js msgNode:向 fillToolResult 传递 hasImage 和消息 id - SSE 实时工具结果路径(d.image_url)不受影响,仍直接内联展示 显著减少加载会话时的网络传输量,提升含大量图片的会话的加载速度 --- app/server/public/index.html | 6 ++-- app/server/public/js/tasks.js | 35 +++++++++++++++++-- app/server/routes/sessions.js | 65 ++++++++++++++++++++++++++++++++++- 3 files changed, 100 insertions(+), 6 deletions(-) diff --git a/app/server/public/index.html b/app/server/public/index.html index feeb414..d402ce1 100644 --- a/app/server/public/index.html +++ b/app/server/public/index.html @@ -251,7 +251,7 @@ -
后仅写入配置,点击「重启服务」后生效。
+
仅写入配置,点击「重启服务」后生效。
@@ -269,13 +269,13 @@
- +
-
保存后写入 config.yml,点击「服务」页「重启服务」后生效。
+
仅写入配置,点击「重启服务」后生效。
diff --git a/app/server/public/js/tasks.js b/app/server/public/js/tasks.js index 07e78b0..5e6b688 100644 --- a/app/server/public/js/tasks.js +++ b/app/server/public/js/tasks.js @@ -339,9 +339,10 @@ function parseToolContent(content) { return { text: content, imageUrl: null }; } -function fillToolResult(id, content, isError, liveImageUrl) { +function fillToolResult(id, content, isError, liveImageUrl, hasImage, msgId) { const card = document.getElementById('tool-' + id); if (!card) return; + if (msgId) card.dataset.msgId = msgId; if (isError) card.classList.add('error'); card.querySelector('.spin').textContent = isError ? '✕' : '✓'; const parsed = parseToolContent(content); @@ -360,6 +361,36 @@ function fillToolResult(id, content, isError, liveImageUrl) { el.src = img; el.title = '点击放大查看'; pre.insertAdjacentElement('afterend', el); + } else if (!img && hasImage && !card.querySelector('.tool-img-load')) { + // base64 已剥离且非实时图片时,显示「加载图片」按钮(按需从服务端获取) + const btn = document.createElement('button'); + btn.className = 'tool-img-load'; + btn.textContent = '加载图片'; + btn.title = '点击加载图片'; + btn.style.marginTop = '4px'; + btn.onclick = async function () { + btn.textContent = '加载中…'; + btn.disabled = true; + try { + const mid = card.dataset.msgId; + const sessionId = state.sessionId; + if (!mid || !sessionId) { btn.textContent = '加载失败'; return; } + const resp = await fetch('/api/sessions/' + sessionId + '/messages/' + mid + '/image'); + if (!resp.ok) throw new Error('加载失败'); + const blob = await resp.blob(); + const url = URL.createObjectURL(blob); + const el = document.createElement('img'); + el.className = 'tool-img'; + el.src = url; + el.title = '点击放大查看'; + btn.insertAdjacentElement('afterend', el); + btn.remove(); + } catch (e) { + btn.textContent = '加载失败'; + btn.disabled = false; + } + }; + pre.insertAdjacentElement('afterend', btn); } } @@ -378,7 +409,7 @@ function copyBtnHtml(text) { function msgNode(m, cardMap) { if (m.role === 'tool') { if (m.tool_call_id && cardMap && cardMap[m.tool_call_id]) { - fillToolResult(m.tool_call_id, m.content, false); + fillToolResult(m.tool_call_id, m.content, false, null, m.hasImage, m.id); } return null; } diff --git a/app/server/routes/sessions.js b/app/server/routes/sessions.js index f375066..544b58d 100644 --- a/app/server/routes/sessions.js +++ b/app/server/routes/sessions.js @@ -25,6 +25,32 @@ function sendErr(res, err) { res.status(code).json({ error: String(err && err.message || err) }); } +// 从哨兵 JSON __blocks__ 中剥离 base64 图片数据,避免加载会话时传输大体积 base64。 +// 返回新content字符串,以及 hasImage 布尔标志(标识原内容含图片,可用于前端按需加载)。 +function stripBase64FromContent(content) { + if (typeof content !== 'string' || !content.startsWith('{"__blocks__":')) { + return { content, hasImage: false }; + } + try { + const parsed = JSON.parse(content); + if (!Array.isArray(parsed.__blocks__)) return { content, hasImage: false }; + let hasImage = false; + const blocks = parsed.__blocks__.map(block => { + if (block && block.type === 'image_url' && block.image_url && block.image_url.url) { + const url = block.image_url.url; + if (url.startsWith('data:')) { + hasImage = true; + return { type: 'image_url', image_url: { url: '' } }; // 剥离 base64,置空由前端按需加载 + } + } + return block; + }); + return { content: JSON.stringify({ __blocks__: blocks }), hasImage }; + } catch (_) { + return { content, hasImage: false }; + } +} + // 递归列出任务目录文件 function listTaskFiles(dir) { const out = []; @@ -126,7 +152,12 @@ router.get('/:id', wrap((req, res) => { const session = engine.getSession(req.params.id); if (!session) return sendErr(res, Object.assign(new Error('会话不存在'), { status_code: 404 })); const db = engine.getDb(); - const messages = db.prepare('SELECT id, role, content, reasoning, tool_calls, tool_call_id, name, type, is_error, created_at FROM messages WHERE session_id = ? ORDER BY id').all(session.id); + const rows = db.prepare('SELECT id, role, content, reasoning, tool_calls, tool_call_id, name, type, is_error, created_at FROM messages WHERE session_id = ? ORDER BY id').all(session.id); + // 剥离 base64 图片数据,避免大体积传输;前端按 hasImage 标志按需加载图片 + const messages = rows.map(row => { + const { content, hasImage } = stripBase64FromContent(row.content); + return { ...row, content, hasImage }; + }); const taskDir = engine.taskDirOf(session.id); res.json({ session, @@ -137,6 +168,38 @@ router.get('/:id', wrap((req, res) => { }); })); +// 按需加载消息的图片(base64 已剥离,由前端此接口获取) +router.get('/:id/messages/:mid/image', wrap((req, res) => { + const session = engine.getSession(req.params.id); + if (!session) return sendErr(res, Object.assign(new Error('会话不存在'), { status_code: 404 })); + const db = engine.getDb(); + const row = db.prepare( + 'SELECT content FROM messages WHERE id = ? AND session_id = ?' + ).get(req.params.mid, req.params.id); + if (!row) return sendErr(res, Object.assign(new Error('消息不存在'), { status_code: 404 })); + const blocks = (function () { + if (typeof row.content !== 'string' || !row.content.startsWith('{"__blocks__":')) return null; + try { + const parsed = JSON.parse(row.content); + return Array.isArray(parsed.__blocks__) ? parsed.__blocks__ : null; + } catch (_) { return null; } + })(); + if (!blocks) return sendErr(res, Object.assign(new Error('该消息不含图片'), { status_code: 404 })); + const imgBlock = blocks.find(b => b && b.type === 'image_url' && b.image_url && b.image_url.url); + if (!imgBlock || !imgBlock.image_url.url || !imgBlock.image_url.url.startsWith('data:')) { + return sendErr(res, Object.assign(new Error('图片数据不存在或已被清理'), { status_code: 404 })); + } + const url = imgBlock.image_url.url; // e.g. "data:image/jpeg;base64,/9j/..." + const mimeMatch = /^data:([^;]+);base64,/.exec(url); + const mime = mimeMatch ? mimeMatch[1] : 'image/jpeg'; + const base64Data = url.slice(url.indexOf(',') + 1); + const buffer = Buffer.from(base64Data, 'base64'); + res.set('Content-Type', mime); + res.set('Content-Length', buffer.length); + res.set('Cache-Control', 'private, max-age=86400'); + res.send(buffer); +})); + router.post('/:id/bind', wrap((req, res) => { res.json(engine.bindToSession(req.params.id, req.body && req.body.model_id)); }));