From c785a7b7f04d5257817067e770e0a93355b672cb Mon Sep 17 00:00:00 2001 From: admin Date: Tue, 15 Sep 2026 16:38:43 +0800 Subject: [PATCH] =?UTF-8?q?feat(admin):=20=E3=80=8C24h=20=E7=83=AD?= =?UTF-8?q?=E5=8A=9B=E3=80=8D=E9=A1=B5=20hourly.html=20=E2=80=94=E2=80=94?= =?UTF-8?q?=20=E7=9B=B4=E6=8E=A5=E8=AF=BB=20meta.jsonl=20=E8=81=9A?= =?UTF-8?q?=E5=90=88=20(1.0.28)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 断言)。 --- tests/gateway/e2e.sh | 1 + www/assets/core.js | 3 +- www/assets/hourly.js | 363 +++++++++++++++++++++++++++++++++++++++++++ www/hourly.html | 85 ++++++++++ 4 files changed, 451 insertions(+), 1 deletion(-) create mode 100644 www/assets/hourly.js create mode 100644 www/hourly.html diff --git a/tests/gateway/e2e.sh b/tests/gateway/e2e.sh index 7ce0e8d..86eafef 100755 --- a/tests/gateway/e2e.sh +++ b/tests/gateway/e2e.sh @@ -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)" diff --git a/www/assets/core.js b/www/assets/core.js index c132393..5a9ab49 100644 --- a/www/assets/core.js +++ b/www/assets/core.js @@ -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 = { diff --git a/www/assets/hourly.js b/www/assets/hourly.js new file mode 100644 index 0000000..3de0125 --- /dev/null +++ b/www/assets/hourly.js @@ -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 = '
所选区间内还没有审计数据
'; + 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 = '
所选区间内请求数/token 均为 0
'; + 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 += ''; + + // X 轴小时标签(0..23) + html += ''; + for (var h = 0; h < 24; h++) { + if (h % 3 !== 0 && h !== 23) continue; // 间隔 3 小时画标签,末端加 23 + html += '' + h + ''; + } + html += ''; + + // 行:slot label + 24 个色块 + html += ''; + for (var r = 0; r < bySlot.length; r++) { + var slot = bySlot[r]; + var yTop = HEAT_TOP + r * ROW_H; + + // slot 名 + html += '' + + esc(slot.slot) + ''; + + // 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 += ''; + html += '' + esc(slot.slot) + ' @ ' + h2 + ':00 — ' + metricLabel(metric) + ' ' + + fmt(v, metric) + ''; + // 高值显示数字(≥30% 才显示,避免全屏数字) + if (ratio >= 0.3 && v > 0) { + var txt = fmt(v, metric); + html += '' + txt + ''; + } + } + } + html += ''; + + // 图例(底部):色阶 + html += ''; + html += '0'; + var legSteps = 6; + for (var s2 = 1; s2 <= legSteps; s2++) { + var ratio2 = s2 / legSteps; + var xx = ratio2 * 180; + html += ''; + } + html += '' + IP.chart.fmtNum(max) + ''; + html += '最深 = ' + metricLabel(metric) + ' ' + fmt(max, metric) + ''; + html += ''; + + html += ''; + 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 = '区间内没有请求'; + return; + } + body.innerHTML = flat.map(function (r) { + return '' + esc(r.slot) + '' + + '' + days[0] + '...' + days[days.length - 1] + '' + + '' + r.h + ':00' + + '' + r.req + '' + + '' + IP.chart.fmtNum(r.tin) + '' + + '' + IP.chart.fmtNum(r.tout) + '' + + ''; + }).join(''); + } + + // ─────────────────────────────────────────────────────────────────────── + // 日历列表 + // ─────────────────────────────────────────────────────────────────────── + function renderDays(days) { + var el = $("hourlyDays"); + if (!days.length) { + el.innerHTML = '审计目录无数据(请确认管理员已启用 LLM 上游,且审计 meta.jsonl 已写入)'; + return; + } + el.innerHTML = '当前可查日期:' + days.length + ' 天' + + '
' + + days.slice(0, 14).map(function (d) { return '' + d + ''; }).join(" · ") + + (days.length > 14 ? ' · …' : '') + ''; + 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 = '
加载中…
'; + + try { + var days = await fetchDays(); + queryDays = pickRecentDays(days, range); + if (!queryDays.length) { + $("hourlyHeatmap").innerHTML = '
审计无数据,请确认已启用上游
'; + 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 = '
加载失败:' + esc(e.message || String(e)) + '
'; + } + } + + 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(); + }); +})(); \ No newline at end of file diff --git a/www/hourly.html b/www/hourly.html new file mode 100644 index 0000000..7493449 --- /dev/null +++ b/www/hourly.html @@ -0,0 +1,85 @@ + + + + + + +24 小时热力 · 尚数网 山海关 + + + +
+ +
+
+
+
+

请求热力(按小时 × 上游)

+
+ 直接读审计 meta.jsonl 聚合,实时反映所有请求(含被拒的 401/404)。 + 数据源与 shm 日桶 / 趋势接口无关——审计落盘即聚合,零延迟。 + 颜色越深 = 请求越多;格内数字为该 (slot, 小时) 的请求数与 token 数。 +
+
+
+ + + + +
+
+ +
+
区间内请求
-
+
区间内入 token
-
+
区间内出 token
-
+
覆盖 slot
-
+
覆盖账号
-
+
数据来源
meta.jsonl
+
+ +
+ +
+
Top 10 繁忙 (slot, 小时) 组合
+ + + + + +
slot日期小时请求入 token出 token
+
+
+ +
+
+
+

审计数据来源

+
+ 审计 meta.jsonl 按天分目录,容量超 AUDIT_MAX_BYTES 时从最旧整目录删; + 取数前先调 /api/admin/audit/days 列出实际可用日期。 +
+
+ +
+
+
+
+ +
+ + + + + + \ No newline at end of file