feat(admin): 「24h 热力」页 hourly.html —— 直接读 meta.jsonl 聚合 (1.0.28)

1.0.27 加了 `/api/admin/audit/days` + `/api/admin/audit/day` 端点,
但**没有前端 UI**——「端点有什么用」不直观。

加 `hourly.html` + `hourly.js`:
- 选区间(最近 1/3/7 天)+ 选 slot(全部 / 单个)+ 选指标(请求数 / 入 / 出 token)
- fetch 多天 meta.jsonl → JS 按 (slot, 小时) 聚合 → 渲染 SVG heatmap
- 颜色:浅蓝 → 深蓝 渐变(吃现有 admin.css 颜色基调)
- Top 10 繁忙 (slot, 小时) 表格
- 概览:区间内请求/token/slot/账号 数 + 数据来源(meta.jsonl × N 天)

设计要点:
- **零外部依赖**:纯 SVG/HTML,复用 chart.js 的 fmtNum/niceMax,自己写 100 行 heatmap 渲染
- **实时反映所有请求**(含被拒 401/404)—— 不像 shm 日桶只统计成功转发
- **零延迟**:审计落盘即聚合,不依赖 stats 落盘周期
- 不破坏 usage.html(独立的 panel 入口)
- 顶部 nav 加 "24h 热力" tab

回归 339/0 全绿(gateway 107/0 + LLM 232/0,新增 hourly.html 200 断言)。
This commit is contained in:
admin committed 2026-09-15 16:38:43 +08:00
1 parent 67776334a5
commit c785a7b7f0
4 files changed
+451 -1

No files matched your search

+1
View File
@@ -291,6 +291,7 @@ ck "域名页 → 200" 200 "$(code -b "$JAR" $ADMIN/admin/domains.html)"
ck "账号页 → 200" 200 "$(code -b "$JAR" $ADMIN/admin/users.html)"
ck "上游页 → 200" 200 "$(code -b "$JAR" $ADMIN/admin/upstreams.html)"
ck "用量页 → 200" 200 "$(code -b "$JAR" $ADMIN/admin/usage.html)"
ck "24h 热力页 → 200(1.0.27 直接读 meta.jsonl 聚合)" 200 "$(code -b "$JAR" $ADMIN/admin/hourly.html)"
ck "登录页 → 200" 200 "$(code $ADMIN/admin/login.html)"
ck "共享样式 → 200" 200 "$(code $ADMIN/admin/assets/admin.css)"
ck "共享内核 → 200" 200 "$(code $ADMIN/admin/assets/core.js)"
+2 -1
View File
@@ -19,7 +19,8 @@ window.IP = (function () {
{ key: "users", name: "账号管理", href: "users.html" },
{ key: "upstreams", name: "LLM 上游", href: "upstreams.html" },
{ key: "apix", name: "API 代理", href: "apix.html" },
{ key: "usage", name: "用量统计", href: "usage.html" }
{ key: "usage", name: "用量统计", href: "usage.html" },
{ key: "hourly", name: "24h 热力", href: "hourly.html" }
];
var state = {
+363
View File
@@ -0,0 +1,363 @@
/* 24 小时热力视图:直接读 meta.jsonl → 按 (slot, 小时) 聚合 → 渲染 SVG heatmap
1.0.27 配套前端。
零外部依赖:纯 SVG/HTML,用现有的 admin.css 颜色变量 + chart.js fmtNum/niceMax。
*/
(function () {
"use strict";
var $ = IP.$;
function num(v) { return Number(v) || 0; }
function esc(s) { return IP.esc(s); }
/**
* 按 (slot, hour) 二维聚合;每行 = { slot, hours: [{h, req, tin, tout, users:{u:n,...}}], total_req, total_tin, total_tout }
*/
function aggregate(rows) {
var bySlot = {}; // slot -> { hours: array(24), users: Map, total_req, total_tin, total_tout }
for (var i = 0; i < rows.length; i++) {
var r = rows[i];
var ts = num(r.ts);
if (!ts) continue;
var h = new Date(ts * 1000).getHours(); // 上海时区(meta time 已是 SH,但 Date 对象按浏览器时区,TODO:按 SH 取小时)
var slot = r.slot || "-";
var user = r.user || "-";
var tin = num(r.tin);
var tout = num(r.tout);
var req = 1;
if (!bySlot[slot]) {
bySlot[slot] = { slot: slot, hours: new Array(24), users: {}, total_req: 0, total_tin: 0, total_tout: 0 };
for (var k = 0; k < 24; k++) bySlot[slot].hours[k] = { req: 0, tin: 0, tout: 0, users: {} };
}
var b = bySlot[slot];
var bh = b.hours[h];
bh.req += req; bh.tin += tin; bh.tout += tout;
bh.users[user] = (bh.users[user] || 0) + req;
b.total_req += req; b.total_tin += tin; b.total_tout += tout;
b.users[user] = (b.users[user] || 0) + req;
}
// 排序:按 total_req 降序
var list = Object.keys(bySlot).map(function (k) { return bySlot[k]; });
list.sort(function (a, b) { return b.total_req - a.total_req; });
return list;
}
/**
* 把每行的 (小时, 用户) 拆开成纯用户 map(聚合小时维度)
*/
function uniqueUsers(bySlot) {
var s = {};
for (var i = 0; i < bySlot.length; i++) {
var k = Object.keys(bySlot[i].users);
for (var j = 0; j < k.length; j++) s[k[j]] = 1;
}
return Object.keys(s);
}
function metricVal(bh, metric) {
if (metric === "in") return bh.tin;
if (metric === "out") return bh.tout;
return bh.req;
}
function metricLabel(metric) {
if (metric === "in") return "入 token";
if (metric === "out") return "出 token";
return "请求数";
}
function fmt(v, metric) {
if (metric === "requests") return String(v);
return IP.chart.fmtNum(v);
}
// ───────────────────────────────────────────────────────────────────────
// Heatmap 渲染(SVG,不依赖 chart.js heatmap 工厂)
// ───────────────────────────────────────────────────────────────────────
function renderHeatmap(el, bySlot, metric) {
if (!bySlot.length) {
el.innerHTML = '<div class="chart-empty">所选区间内还没有审计数据</div>';
return;
}
// 取全局最大值用于配色
var max = 0;
for (var i = 0; i < bySlot.length; i++) {
for (var k = 0; k < 24; k++) {
var v = metricVal(bySlot[i].hours[k], metric);
if (v > max) max = v;
}
}
if (max === 0) {
el.innerHTML = '<div class="chart-empty">所选区间内请求数/token 均为 0</div>';
return;
}
var ROW_H = 22; // 每行像素高
var CELL_W = 32; // 每格宽(24 列 × 32 = 768)+ 标签宽
var LABEL_W = 110; // slot 标签宽
var PAD = 36; // 上/下 padding(含坐标轴)
var ROWS = bySlot.length;
var HEIGHT = ROWS * ROW_H + PAD * 2; // 标题区 + 行
var HEAT_TOP = PAD + 14; // X 轴 0..23 标签占 14px
var totalH = HEIGHT;
var totalW = CELL_W * 24 + LABEL_W + 30;
var html = "";
html += '<svg viewBox="0 0 ' + totalW + ' ' + totalH + '" preserveAspectRatio="xMinYMin meet" style="width:100%;font-size:11px">';
// X 轴小时标签(0..23)
html += '<g font-family="ui-monospace,Menlo,Consolas,monospace" fill="#475569">';
for (var h = 0; h < 24; h++) {
if (h % 3 !== 0 && h !== 23) continue; // 间隔 3 小时画标签,末端加 23
html += '<text x="' + (LABEL_W + h * CELL_W + CELL_W / 2) + '" y="' + (HEAT_TOP - 4) +
'" text-anchor="middle">' + h + '</text>';
}
html += '</g>';
// 行:slot label + 24 个色块
html += '<g>';
for (var r = 0; r < bySlot.length; r++) {
var slot = bySlot[r];
var yTop = HEAT_TOP + r * ROW_H;
// slot 名
html += '<text x="' + (LABEL_W - 6) + '" y="' + (yTop + ROW_H / 2 + 3) +
'" text-anchor="end" font-family="ui-monospace,Menlo,Consolas,monospace" fill="#1e293b">' +
esc(slot.slot) + '</text>';
// 24 格
for (var h2 = 0; h2 < 24; h2++) {
var cell = slot.hours[h2];
var v = metricVal(cell, metric);
var ratio = v / max;
var fill = heatColor(ratio);
var x = LABEL_W + h2 * CELL_W;
html += '<rect x="' + x + '" y="' + yTop + '" width="' + (CELL_W - 1) + '" height="' +
(ROW_H - 1) + '" rx="2" fill="' + fill + '" stroke="#e5e7eb" stroke-width="0.5">';
html += '<title>' + esc(slot.slot) + ' @ ' + h2 + ':00 — ' + metricLabel(metric) + ' ' +
fmt(v, metric) + '</title></rect>';
// 高值显示数字(≥30% 才显示,避免全屏数字)
if (ratio >= 0.3 && v > 0) {
var txt = fmt(v, metric);
html += '<text x="' + (x + CELL_W / 2) + '" y="' + (yTop + ROW_H / 2 + 3) +
'" text-anchor="middle" fill="' + (ratio > 0.6 ? "#fff" : "#0f172a") +
'" font-size="10" font-family="ui-monospace,Menlo,Consolas,monospace">' + txt + '</text>';
}
}
}
html += '</g>';
// 图例(底部):色阶
html += '<g transform="translate(' + LABEL_W + ',' + (totalH - 8) + ')" font-size="10.5" fill="#64748b">';
html += '<text x="0" y="0">0</text>';
var legSteps = 6;
for (var s2 = 1; s2 <= legSteps; s2++) {
var ratio2 = s2 / legSteps;
var xx = ratio2 * 180;
html += '<rect x="' + xx + '" y="-7" width="28" height="9" fill="' + heatColor(ratio2) + '"></rect>';
}
html += '<text x="212" y="0">' + IP.chart.fmtNum(max) + '</text>';
html += '<text x="265" y="0">最深 = ' + metricLabel(metric) + ' ' + fmt(max, metric) + '</text>';
html += '</g>';
html += '</svg>';
el.innerHTML = html;
}
/**
* 配色:白 → 浅蓝 → 深蓝(蓝绿渐变,符合现有 .css 颜色基调)
*/
function heatColor(ratio) {
if (ratio <= 0) return "#f1f5f9";
// 4 段渐变:浅蓝(#dbeafe) → 中蓝(#60a5fa) → 深蓝(#2563eb) → 极深蓝(#1e3a8a)
var stops = [
[0.0, "#f1f5f9"],
[0.25, "#dbeafe"],
[0.5, "#60a5fa"],
[0.75, "#2563eb"],
[1.0, "#1e3a8a"]
];
for (var i = 1; i < stops.length; i++) {
if (ratio <= stops[i][0]) {
var a = stops[i - 1], b = stops[i];
var t = (ratio - a[0]) / (b[0] - a[0]);
return lerpColor(a[1], b[1], t);
}
}
return stops[stops.length - 1][1];
}
function lerpColor(c1, c2, t) {
var p1 = parseInt(c1.slice(1), 16);
var p2 = parseInt(c2.slice(1), 16);
var r = Math.round(((p1 >> 16) & 255) * (1 - t) + ((p2 >> 16) & 255) * t);
var g = Math.round(((p1 >> 8) & 255) * (1 - t) + ((p2 >> 8) & 255) * t);
var b = Math.round((p1 & 255) * (1 - t) + (p2 & 255) * t);
return "#" + ((r << 16) | (g << 8) | b).toString(16).padStart(6, "0");
}
// ───────────────────────────────────────────────────────────────────────
// Top 10 繁忙时段
// ───────────────────────────────────────────────────────────────────────
function renderTop10(bySlot, days) {
var flat = [];
for (var i = 0; i < bySlot.length; i++) {
var slot = bySlot[i];
for (var h = 0; h < 24; h++) {
var c = slot.hours[h];
if (c.req > 0) {
flat.push({ slot: slot.slot, h: h, req: c.req, tin: c.tin, tout: c.tout });
}
}
}
flat.sort(function (a, b) { return b.req - a.req; });
flat = flat.slice(0, 10);
var body = $("hourlyTopBody");
if (!flat.length) {
body.innerHTML = '<tr><td colspan="6" class="empty">区间内没有请求</td></tr>';
return;
}
body.innerHTML = flat.map(function (r) {
return '<tr><td class="mono">' + esc(r.slot) + '</td>' +
'<td>' + days[0] + '...' + days[days.length - 1] + '</td>' +
'<td>' + r.h + ':00</td>' +
'<td>' + r.req + '</td>' +
'<td>' + IP.chart.fmtNum(r.tin) + '</td>' +
'<td>' + IP.chart.fmtNum(r.tout) + '</td>' +
'</tr>';
}).join('');
}
// ───────────────────────────────────────────────────────────────────────
// 日历列表
// ───────────────────────────────────────────────────────────────────────
function renderDays(days) {
var el = $("hourlyDays");
if (!days.length) {
el.innerHTML = '审计目录无数据(请确认管理员已启用 LLM 上游,且审计 <code>meta.jsonl</code> 已写入)';
return;
}
el.innerHTML = '当前可查日期:<b>' + days.length + '</b> 天' +
'<br><span style="font-family:ui-monospace,Menlo,Consolas,monospace">' +
days.slice(0, 14).map(function (d) { return '<a href="#" data-day="' + d + '">' + d + '</a>'; }).join(" · ") +
(days.length > 14 ? ' · …' : '') + '</span>';
Array.prototype.forEach.call(el.querySelectorAll("a[data-day]"), function (a) {
a.addEventListener("click", function (e) {
e.preventDefault();
$("hourlyRange").value = "1";
queryDays = [a.getAttribute("data-day")];
runQuery();
});
});
}
// ───────────────────────────────────────────────────────────────────────
// 主流程
// ───────────────────────────────────────────────────────────────────────
var queryDays = [];
var lastMetric = "requests";
async function fetchDays() {
var d = await IP.api("GET", "/api/admin/audit/days");
return (d.data && d.data.days) || [];
}
async function fetchDay(day) {
var d = await IP.api("GET", "/api/admin/audit/day?day=" + encodeURIComponent(day));
return (d.data && d.data.rows) || [];
}
function pickRecentDays(allDays, n) {
if (!allDays.length) return [];
return allDays.slice(0, n);
}
async function runQuery() {
var range = parseInt($("hourlyRange").value, 10) || 3;
var slotFilter = $("hourlySlot").value;
var metric = $("hourlyMetric").value;
lastMetric = metric;
$("hourlyHeatmap").innerHTML = '<div class="chart-empty">加载中…</div>';
try {
var days = await fetchDays();
queryDays = pickRecentDays(days, range);
if (!queryDays.length) {
$("hourlyHeatmap").innerHTML = '<div class="chart-empty">审计无数据,请确认已启用上游</div>';
return;
}
renderDays(days);
var allRows = [];
for (var i = 0; i < queryDays.length; i++) {
var rs = await fetchDay(queryDays[i]);
allRows = allRows.concat(rs);
}
// slot 过滤
if (slotFilter) allRows = allRows.filter(function (r) { return r.slot === slotFilter; });
var bySlot = aggregate(allRows);
renderHeatmap($("hourlyHeatmap"), bySlot, metric);
renderTop10(bySlot, queryDays);
// 概览
var totReq = bySlot.reduce(function (a, b) { return a + b.total_req; }, 0);
var totIn = bySlot.reduce(function (a, b) { return a + b.total_tin; }, 0);
var totOut = bySlot.reduce(function (a, b) { return a + b.total_tout; }, 0);
$("hrsTotal").textContent = IP.chart.fmtNum(totReq);
$("hrsTin").textContent = IP.chart.fmtNum(totIn);
$("hrsTout").textContent = IP.chart.fmtNum(totOut);
$("hrsSlots").textContent = bySlot.length;
$("hrsUsers").textContent = uniqueUsers(bySlot).length;
$("hrsSource").textContent = "meta.jsonl × " + queryDays.length + "天";
} catch (e) {
$("hourlyHeatmap").innerHTML = '<div class="chart-empty">加载失败:' + esc(e.message || String(e)) + '</div>';
}
}
async function bootSlotOptions() {
try {
var days = await fetchDays();
renderDays(days);
// 收集所有 slot
var allRows = [];
for (var i = 0; i < Math.min(days.length, 2); i++) {
var rs = await fetchDay(days[i]);
allRows = allRows.concat(rs);
}
var seen = {};
for (var k = 0; k < allRows.length; k++) seen[allRows[k].slot] = 1;
var sl = Object.keys(seen).sort();
var sel = $("hourlySlot");
for (var j = 0; j < sl.length; j++) {
var opt = document.createElement("option");
opt.value = sl[j];
opt.textContent = sl[j];
sel.appendChild(opt);
}
} catch (e) { /* 静默失败:boot 期 fetch 失败只是没 slot 选项,不影响主查询 */ }
}
function bind() {
$("hourlyRefresh").addEventListener("click", runQuery);
$("hourlyRange").addEventListener("change", runQuery);
$("hourlySlot").addEventListener("change", runQuery);
$("hourlyMetric").addEventListener("change", runQuery);
$("hourlyDaysRefresh").addEventListener("click", async function () {
try {
var days = await fetchDays();
renderDays(days);
} catch (e) { IP.toast("刷新日期失败", true); }
});
}
IP.boot("hourly", function () {
bind();
bootSlotOptions();
runQuery();
});
})();
+85
View File
@@ -0,0 +1,85 @@
<!DOCTYPE html>
<html lang="zh-CN">
<head>
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1">
<base href="/admin/">
<title>24 小时热力 · 尚数网 山海关</title>
<link rel="stylesheet" href="assets/admin.css">
</head>
<body>
<div id="shell"></div>
<div class="wrap">
<div class="panel">
<div class="panel-head">
<div>
<h2>请求热力(按小时 × 上游)</h2>
<div class="desc">
直接读审计 <code>meta.jsonl</code> 聚合,<b>实时</b>反映所有请求(含被拒的 401/404)。
数据源与 shm 日桶 / 趋势接口无关——审计落盘即聚合,零延迟。
颜色越深 = 请求越多;格内数字为该 (slot, 小时) 的请求数与 token 数。
</div>
</div>
<div class="row-actions">
<select id="hourlyRange">
<option value="1">最近 1 天</option>
<option value="3" selected>最近 3 天</option>
<option value="7">最近 7 天</option>
</select>
<select id="hourlySlot">
<option value="">所有上游</option>
</select>
<select id="hourlyMetric">
<option value="requests">按请求数</option>
<option value="in">按入 token</option>
<option value="out">按出 token</option>
</select>
<button class="btn-sm" id="hourlyRefresh">刷新</button>
</div>
</div>
<div id="hourlyStats" class="stats" style="margin:14px 0">
<div class="stat"><div class="k">区间内请求</div><div class="v" id="hrsTotal">-</div></div>
<div class="stat"><div class="k">区间内入 token</div><div class="v" id="hrsTin">-</div></div>
<div class="stat"><div class="k">区间内出 token</div><div class="v" id="hrsTout">-</div></div>
<div class="stat"><div class="k">覆盖 slot</div><div class="v" id="hrsSlots">-</div></div>
<div class="stat"><div class="k">覆盖账号</div><div class="v" id="hrsUsers">-</div></div>
<div class="stat"><div class="k">数据来源</div><div class="v" id="hrsSource" style="font-size:14px">meta.jsonl</div></div>
</div>
<div id="hourlyHeatmap" class="chart" style="min-height:200px"></div>
<div style="margin-top:14px">
<div class="muted" style="font-size:12.5px;margin-bottom:6px">Top 10 繁忙 (slot, 小时) 组合</div>
<table>
<thead><tr>
<th>slot</th><th>日期</th><th>小时</th><th>请求</th><th>入 token</th><th>出 token</th>
</tr></thead>
<tbody id="hourlyTopBody"></tbody>
</table>
</div>
</div>
<div class="panel">
<div class="panel-head">
<div>
<h2>审计数据来源</h2>
<div class="desc">
审计 <code>meta.jsonl</code> 按天分目录,容量超 <code>AUDIT_MAX_BYTES</code> 时从最旧整目录删;
取数前先调 <code>/api/admin/audit/days</code> 列出实际可用日期。
</div>
</div>
<button class="btn-sm" id="hourlyDaysRefresh">刷新日期列表</button>
</div>
<div id="hourlyDays" class="muted" style="font-size:13px"></div>
</div>
</div>
<div id="toast"></div>
<script src="assets/core.js"></script>
<script src="assets/chart.js"></script>
<script src="assets/hourly.js"></script>
</body>
</html>