perf: 会话详情去掉全量文件列表,隧道响应加 gzip
GET /api/sessions/:id 每次都递归扫一遍任务目录返回 files 字段,本地这个会话的目录 是整个仓库,10544 个文件 = 1.4MB,而前端从来没读过它(文件树走 /api/files 按目录 懒加载)。删掉后响应 1.4MB → 4.8KB,后端也省掉每次 10544 次 statSync。 client.js 对可压缩响应先缓冲再 gzip(SSE、超 8MB、压不动 10% 的除外), 跨境链路带宽是瓶颈,首屏 15 个资源 714KB → 234KB。 实测:会话详情经隧道 7s → 0.16s,首屏 3.5s → 1.2s。
This commit is contained in:
@@ -198,16 +198,16 @@ router.get('/:id', wrap((req, res) => {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
const taskDir = engine.taskDirOf(session.id);
|
|
||||||
// 定时任务状态(scheduler.js / schedule 工具;每会话至多一行,无则 null)。
|
// 定时任务状态(scheduler.js / schedule 工具;每会话至多一行,无则 null)。
|
||||||
// 列表接口故意不带此字段,避免 N+1;前端进会话详情时才拉。
|
// 列表接口故意不带此字段,避免 N+1;前端进会话详情时才拉。
|
||||||
const schedule = db.prepare(
|
const schedule = db.prepare(
|
||||||
'SELECT cron_expr, prompt, next_run_at, last_run_at, last_status, last_note FROM scheduled_tasks WHERE session_id = ?'
|
'SELECT cron_expr, prompt, next_run_at, last_run_at, last_status, last_note FROM scheduled_tasks WHERE session_id = ?'
|
||||||
).get(session.id) || null;
|
).get(session.id) || null;
|
||||||
|
// 不再返回 files:文件树由 /api/files 按目录懒加载(routes/files.js),
|
||||||
|
// 这里全量递归扫一遍纯属浪费——曾让每次切会话多传 1.4MB(10544 个文件)。
|
||||||
res.json({
|
res.json({
|
||||||
session,
|
session,
|
||||||
messages,
|
messages,
|
||||||
files: listTaskFiles(taskDir),
|
|
||||||
schedule,
|
schedule,
|
||||||
running: !!(engine.getRun(session.id) || {}).looping,
|
running: !!(engine.getRun(session.id) || {}).looping,
|
||||||
// 待投递队列(刷新/换设备后条幅能原样恢复):只在服务端内存里,重启即空
|
// 待投递队列(刷新/换设备后条幅能原样恢复):只在服务端内存里,重启即空
|
||||||
|
|||||||
@@ -9,6 +9,7 @@
|
|||||||
const fs = require('node:fs');
|
const fs = require('node:fs');
|
||||||
const path = require('node:path');
|
const path = require('node:path');
|
||||||
const http = require('node:http');
|
const http = require('node:http');
|
||||||
|
const zlib = require('node:zlib');
|
||||||
const YAML = require('yaml');
|
const YAML = require('yaml');
|
||||||
const WebSocket = require('ws');
|
const WebSocket = require('ws');
|
||||||
|
|
||||||
@@ -105,6 +106,11 @@ function onMessage(raw) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// gzip 阈值:小于 1KB 压了反而亏(gzip 头开销),超过 8MB 不进内存直接流式
|
||||||
|
const COMPRESSIBLE = /^(text\/|application\/(json|javascript|xml|x-javascript)|image\/svg)/i;
|
||||||
|
const GZ_MIN = 1024;
|
||||||
|
const GZ_MAX = 8 * 1024 * 1024;
|
||||||
|
|
||||||
async function handleRequest(id, st) {
|
async function handleRequest(id, st) {
|
||||||
const { meta, chunks, ac } = st;
|
const { meta, chunks, ac } = st;
|
||||||
const svc = pickService(meta);
|
const svc = pickService(meta);
|
||||||
@@ -132,9 +138,30 @@ async function handleRequest(id, st) {
|
|||||||
});
|
});
|
||||||
const outHeaders = {};
|
const outHeaders = {};
|
||||||
r.headers.forEach((v, k) => { outHeaders[k] = v; });
|
r.headers.forEach((v, k) => { outHeaders[k] = v; });
|
||||||
|
const ct = String(outHeaders['content-type'] || '');
|
||||||
|
const cl = Number(outHeaders['content-length']) || 0;
|
||||||
delete outHeaders['content-encoding']; // 体已被 fetch 解压,长度也对不上,统一走 chunked
|
delete outHeaders['content-encoding']; // 体已被 fetch 解压,长度也对不上,统一走 chunked
|
||||||
delete outHeaders['content-length'];
|
delete outHeaders['content-length'];
|
||||||
delete outHeaders['transfer-encoding'];
|
delete outHeaders['transfer-encoding'];
|
||||||
|
|
||||||
|
// 可压缩、大小已知且在阈值内:缓冲后 gzip 再发。跨境链路上带宽是瓶颈,
|
||||||
|
// JS/CSS/JSON 能压到 1/4 左右。SSE 不能缓冲(会毁掉流式),大文件不进内存,
|
||||||
|
// 已压缩的二进制(图片/zip)压了反而变大——这几种都走下面的原路径。
|
||||||
|
if (COMPRESSIBLE.test(ct) && !/event-stream/i.test(ct) && cl > 0 && cl <= GZ_MAX) {
|
||||||
|
const buf = Buffer.from(await r.arrayBuffer());
|
||||||
|
const gz = buf.length >= GZ_MIN ? zlib.gzipSync(buf, { level: 6 }) : null;
|
||||||
|
if (gz && gz.length < buf.length * 0.9) { // 压不动(已压缩/随机数据)就发明文
|
||||||
|
outHeaders['content-encoding'] = 'gzip';
|
||||||
|
send({ id, ev: 'head', status: r.status, headers: outHeaders });
|
||||||
|
send({ id, ev: 'data', b64: gz.toString('base64') });
|
||||||
|
} else {
|
||||||
|
send({ id, ev: 'head', status: r.status, headers: outHeaders });
|
||||||
|
send({ id, ev: 'data', b64: buf.toString('base64') });
|
||||||
|
}
|
||||||
|
send({ id, ev: 'end' });
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
send({ id, ev: 'head', status: r.status, headers: outHeaders });
|
send({ id, ev: 'head', status: r.status, headers: outHeaders });
|
||||||
if (r.body) {
|
if (r.body) {
|
||||||
for await (const chunk of r.body) send({ id, ev: 'data', b64: Buffer.from(chunk).toString('base64') });
|
for await (const chunk of r.body) send({ id, ev: 'data', b64: Buffer.from(chunk).toString('base64') });
|
||||||
|
|||||||
Reference in New Issue
Block a user