yuez/cliproxy-plugin-commandcode
1
0
Fork 0
mirror of https://github.com/zgs225/cliproxy-plugin-commandcode.git synced 2026-09-26 03:32:50 +08:00
Code Issues Packages Projects Releases Wiki Activity

feat(quota): All as default tab with per-key OpenCode cards grouped by provider, bump v0.4.2

Browse Source
This commit is contained in:
yuez
2026-09-20 14:20:01 +08:00
parent 2f1b2fb821
commit 4fdc9ad6c8
3 changed files with 81 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugin/management_test.go
+2 -2
View File
@@ -74,8 +74,8 @@ func TestHandleManagement_QuotaResource(t *testing.T) {
if !strings.Contains(bodyStr, "用量配额") { if !strings.Contains(bodyStr, "用量配额") {
t.Errorf("Body does not contain expected menu text 用量配额") t.Errorf("Body does not contain expected menu text 用量配额")
} }
if !strings.Contains(bodyStr, "v0.4.1") { if !strings.Contains(bodyStr, "v0.4.2") {
t.Errorf("Body does not contain version badge v0.4.0") t.Errorf("Body does not contain version badge v0.4.2")
} }
} }
} }
plugin/plugin.go
+1 -1
View File
@@ -13,7 +13,7 @@ import (
const ( const (
PluginID = "commandcode" PluginID = "commandcode"
PluginName = "commandcode" PluginName = "commandcode"
PluginVersion = "0.4.1" PluginVersion = "0.4.2"
PluginAuthor = "zgs225" PluginAuthor = "zgs225"
PluginRepo = "https://github.com/zgs225/cliproxy-plugin-commandcode" PluginRepo = "https://github.com/zgs225/cliproxy-plugin-commandcode"
PluginLogo = "https://raw.githubusercontent.com/zgs225/cliproxy-plugin-commandcode/main/assets/logo.svg" PluginLogo = "https://raw.githubusercontent.com/zgs225/cliproxy-plugin-commandcode/main/assets/logo.svg"
plugin/quota_page.go
+78 -72
View File
@@ -781,6 +781,17 @@ const QuotaPageHTML = `<!DOCTYPE html>
} }
} }
.all-group-title {
font-size: 13px;
font-weight: 700;
color: var(--text-muted);
margin: 8px 0 10px 2px;
}
.all-group-title:first-child {
margin-top: 0;
}
.all-provider-card { .all-provider-card {
background: var(--bg-card); background: var(--bg-card);
border: 1px solid var(--border-color); border: 1px solid var(--border-color);
@@ -907,7 +918,7 @@ const QuotaPageHTML = `<!DOCTYPE html>
<div> <div>
<div class="brand-title"> <div class="brand-title">
用量配额 用量配额
<span class="version-tag">v0.4.1</span> <span class="version-tag">v0.4.2</span>
</div> </div>
</div> </div>
</div> </div>
@@ -938,9 +949,9 @@ const QuotaPageHTML = `<!DOCTYPE html>
<!-- Tab Bar --> <!-- Tab Bar -->
<div id="tabBar" class="tab-bar"> <div id="tabBar" class="tab-bar">
<button type="button" class="tab-btn active" data-tab="commandcode">Command Code</button> <button type="button" class="tab-btn" data-tab="commandcode">Command Code</button>
<button type="button" class="tab-btn" data-tab="opencode">OpenCode Go</button> <button type="button" class="tab-btn" data-tab="opencode">OpenCode Go</button>
<button type="button" class="tab-btn" data-tab="all">All</button> <button type="button" class="tab-btn active" data-tab="all">All</button>
</div> </div>
<!-- Alert Message --> <!-- Alert Message -->
@@ -976,7 +987,7 @@ const QuotaPageHTML = `<!DOCTYPE html>
</div> </div>
<!-- Tab: Command Code --> <!-- Tab: Command Code -->
<div id="sectionCommandcode" class="tab-section active"> <div id="sectionCommandcode" class="tab-section">
<div id="ccErrorCard" class="error-card"> <div id="ccErrorCard" class="error-card">
<div class="error-card-title"> <div class="error-card-title">
<svg width="16" height="16" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2"><circle cx="12" cy="12" r="10"></circle><line x1="12" y1="8" x2="12" y2="12"></line><line x1="12" y1="16" x2="12.01" y2="16"></line></svg> <svg width="16" height="16" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2"><circle cx="12" cy="12" r="10"></circle><line x1="12" y1="8" x2="12" y2="12"></line><line x1="12" y1="16" x2="12.01" y2="16"></line></svg>
@@ -1135,23 +1146,22 @@ const QuotaPageHTML = `<!DOCTYPE html>
<!-- /Tab: OpenCode Go --> <!-- /Tab: OpenCode Go -->
<!-- Tab: All --> <!-- Tab: All -->
<div id="sectionAll" class="tab-section"> <div id="sectionAll" class="tab-section active">
<div class="all-grid"> <!-- All tab: vertical groups, one group title per provider -->
<div class="all-provider-card"> <div class="all-group-title">Command Code</div>
<div class="all-provider-head"> <div class="all-provider-card">
<span class="all-provider-name">Command Code</span> <div class="all-provider-head">
<span id="allBadgeCommandcode" class="status-badge"><span class="status-dot"></span><span id="allBadgeTextCommandcode">-</span></span> <span id="allBadgeCommandcode" class="status-badge"><span class="status-dot"></span><span id="allBadgeTextCommandcode">-</span></span>
</div>
<div id="allBodyCommandcode" class="all-provider-body">尚未加载</div>
</div> </div>
<div id="allBodyCommandcode" class="all-provider-body">尚未加载</div>
</div>
<div class="all-provider-card"> <div class="all-group-title">OpenCode Go</div>
<div class="all-provider-head"> <div class="all-provider-card">
<span class="all-provider-name">OpenCode Go</span> <div class="all-provider-head">
<span id="allBadgeOpencode" class="status-badge"><span class="status-dot"></span><span id="allBadgeTextOpencode">-</span></span> <span id="allBadgeOpencode" class="status-badge"><span class="status-dot"></span><span id="allBadgeTextOpencode">-</span></span>
</div>
<div id="allBodyOpencode" class="all-provider-body">尚未加载</div>
</div> </div>
<div id="allBodyOpencode" class="all-provider-body">尚未加载</div>
</div> </div>
</div> </div>
<!-- /Tab: All --> <!-- /Tab: All -->
@@ -1239,9 +1249,7 @@ const QuotaPageHTML = `<!DOCTYPE html>
commandcode: { level: "unknown", err: null, data: null }, commandcode: { level: "unknown", err: null, data: null },
opencode: { level: "unknown", err: null, data: null } opencode: { level: "unknown", err: null, data: null }
}; };
let activeTab = "commandcode"; let activeTab = "all";
// Multi-key countdown targets: [{el, target}] across all keys x 3 windows
let ocTargets = [];
function getStoredManagementKey() { function getStoredManagementKey() {
if (inputMgmtKey.value.trim()) { if (inputMgmtKey.value.trim()) {
@@ -1385,6 +1393,9 @@ const QuotaPageHTML = `<!DOCTYPE html>
updateGlobalBadge(); updateGlobalBadge();
} }
// Multi-window countdown elements carry their reset info in data
// attributes (data-reset-at ISO string, or data-reset-secs seconds),
// so updateTimers() can walk every tab容器's .oc-win-reset uniformly
function updateTimers() { function updateTimers() {
if (monthlyTargetTime) { if (monthlyTargetTime) {
timerMonthly.textContent = formatCountdown(monthlyTargetTime); timerMonthly.textContent = formatCountdown(monthlyTargetTime);
@@ -1395,11 +1406,20 @@ const QuotaPageHTML = `<!DOCTYPE html>
if (weeklyTargetTime) { if (weeklyTargetTime) {
timerWeekly.textContent = formatCountdown(weeklyTargetTime); timerWeekly.textContent = formatCountdown(weeklyTargetTime);
} }
for (let i = 0; i < ocTargets.length; i++) { const allResetEls = document.querySelectorAll(".oc-win-reset");
const t = ocTargets[i]; for (let i = 0; i < allResetEls.length; i++) {
if (t && t.el) { const el = allResetEls[i];
t.el.textContent = t.target ? formatCountdown(t.target) : "-"; let target = null;
const at = el.getAttribute("data-reset-at");
if (at) {
const t = new Date(at);
if (!isNaN(t.getTime())) target = t;
} }
if (!target) {
const secs = Number(el.getAttribute("data-reset-secs"));
if (secs > 0) target = new Date(Date.now() + secs * 1000);
}
el.textContent = target ? formatCountdown(target) : "-";
} }
} }
@@ -1493,7 +1513,6 @@ const QuotaPageHTML = `<!DOCTYPE html>
updateTimers(); updateTimers();
} }
function renderOpencode(data) { function renderOpencode(data) {
providerState.opencode.err = null; providerState.opencode.err = null;
providerState.opencode.data = data; providerState.opencode.data = data;
@@ -1507,8 +1526,21 @@ const QuotaPageHTML = `<!DOCTYPE html>
ocContent.style.display = ""; ocContent.style.display = "";
ocErrorCard.classList.remove("show"); ocErrorCard.classList.remove("show");
ocTargets = [];
// All tab 的 OpenCode 组与本 tab 共用同一套逐 key 渲染逻辑
const rendered = renderOpenCodeKeyGroups(keys);
ocContent.innerHTML = rendered.html;
updateTimers();
setProviderStatus("opencode", rendered.worst);
}
// Shared per-key group renderer: the OpenCode tab and the All tab's
// OpenCode group both consume this to avoid logic drift. Returns
// { html, worst }. Countdown info is stamped into data-reset-at (ISO
// string) or data-reset-secs (seconds) attributes on .oc-win-reset
// elements, so updateTimers() uniformly walks every tab container.
function renderOpenCodeKeyGroups(keys) {
const WIN_DEFS = [ const WIN_DEFS = [
{ name: "Rolling 5h", key: "rolling" }, { name: "Rolling 5h", key: "rolling" },
{ name: "Weekly", key: "weekly" }, { name: "Weekly", key: "weekly" },
@@ -1533,15 +1565,19 @@ const QuotaPageHTML = `<!DOCTYPE html>
if (rank[level] > rank[keyWorst]) keyWorst = level; if (rank[level] > rank[keyWorst]) keyWorst = level;
if (rank[level] > rank[worst]) worst = level; if (rank[level] > rank[worst]) worst = level;
// reset_at 优先；缺失/不可解析时回退 reset_in_seconds；皆无显示 "-" // reset_at 优先；缺失/不可解析时回退 reset_in_seconds；皆无显 "-"
let target = null; let resetAt = "";
let resetSecs = "";
if (w.reset_at) { if (w.reset_at) {
const t = new Date(w.reset_at); const t = new Date(w.reset_at);
if (!isNaN(t.getTime())) target = t; if (!isNaN(t.getTime())) resetAt = t.toISOString();
} }
if (!target && w.reset_in_seconds > 0) { if (!resetAt && w.reset_in_seconds > 0) {
target = new Date(Date.now() + Number(w.reset_in_seconds) * 1000); resetSecs = String(w.reset_in_seconds);
} }
const resetAttr = resetAt
? " data-reset-at=\"" + esc(resetAt) + "\""
: (resetSecs ? " data-reset-secs=\"" + esc(resetSecs) + "\"" : "");
const pctText = pct === null ? "-" : Math.round(pct) + "%"; const pctText = pct === null ? "-" : Math.round(pct) + "%";
const pctCls = level === "exceeded" ? " bad" : pct !== null && pct >= 80 ? " warn" : ""; const pctCls = level === "exceeded" ? " bad" : pct !== null && pct >= 80 ? " warn" : "";
@@ -1551,9 +1587,8 @@ const QuotaPageHTML = `<!DOCTYPE html>
'<span class="oc-win-name">' + def.name + '</span>' + '<span class="oc-win-name">' + def.name + '</span>' +
'<div class="progress-track oc-win-bar"><div class="progress-bar' + barCls + '" style="width:' + (pct === null ? 0 : pct) + '%"></div></div>' + '<div class="progress-track oc-win-bar"><div class="progress-bar' + barCls + '" style="width:' + (pct === null ? 0 : pct) + '%"></div></div>' +
'<span class="oc-win-pct' + pctCls + '">' + pctText + '</span>' + '<span class="oc-win-pct' + pctCls + '">' + pctText + '</span>' +
'<span class="oc-win-reset countdown-timer">-</span>' + '<span class="oc-win-reset countdown-timer"' + resetAttr + '>-</span>' +
'</div>'; '</div>';
ocTargets.push({ el: null, target: target });
}); });
const chipText = keyWorst === "exceeded" ? "超限" : keyWorst === "warning" ? "紧张" : "正常"; const chipText = keyWorst === "exceeded" ? "超限" : keyWorst === "warning" ? "紧张" : "正常";
@@ -1578,16 +1613,7 @@ const QuotaPageHTML = `<!DOCTYPE html>
} }
}); });
ocContent.innerHTML = html; return { html: html, worst: worst };
// 绑定多 key x 3 窗口的倒计时元素（与 ocTargets 顺序一致）
const resetEls = ocContent.querySelectorAll(".oc-win-reset");
for (let i = 0; i < ocTargets.length; i++) {
if (resetEls[i]) ocTargets[i].el = resetEls[i];
}
updateTimers();
setProviderStatus("opencode", worst);
} }
function renderAllTab() { function renderAllTab() {
@@ -1643,32 +1669,10 @@ const QuotaPageHTML = `<!DOCTYPE html>
allBodyOpencode.innerHTML = '<div class="error-card-title">OpenCode Go 查询失败</div><div class="error-card-msg">' + esc(oc.err) + '</div>'; allBodyOpencode.innerHTML = '<div class="error-card-title">OpenCode Go 查询失败</div><div class="error-card-msg">' + esc(oc.err) + '</div>';
} else if (oc.data) { } else if (oc.data) {
const data = oc.data; const data = oc.data;
// 多 key 契约：逐 key 紧凑列表（key_id + 最差窗口 percent + miniBar） // 多 key 契约：逐 key 完整卡片，与 OpenCode tab 共用同一渲染函数
const keys = Array.isArray(data.keys) ? data.keys : []; const keys = Array.isArray(data.keys) ? data.keys : [];
let html = ""; const rendered = renderOpenCodeKeyGroups(keys);
keys.forEach(function (k) { const html = rendered.html || '<div class="all-summary-value">无 key 数据</div>';
const keyId = '<span class="all-key-id">' + esc(k.key_id || "***") + '</span>';
if (k.ok && k.windows) {
const wins = [k.windows.rolling || {}, k.windows.weekly || {}, k.windows.monthly || {}];
let worstPct = null;
let worstLevel = "online";
wins.forEach(function (w) {
const pct = clampPercent(w.percent);
const level = levelOf(pct, w.exceeded, w.status);
if (worstPct === null || (pct !== null && pct > worstPct) || level === "exceeded") {
worstPct = pct === null ? 0 : pct;
worstLevel = level;
}
});
html += summaryRow(keyId, worstPct === null ? "-" : Math.round(worstPct) + "%") + miniBar(worstPct, worstLevel);
} else {
const label = k.status_code === 401 ? "凭据无效" : "查询错误";
html += summaryRow(keyId, '<span class="error-card-msg" style="font-size:12px">' + label + '</span>');
}
});
if (!html) {
html = '<div class="all-summary-value">无 key 数据</div>';
}
allBadgeOpencode.className = "status-badge " + badgeVisualClass(oc.level); allBadgeOpencode.className = "status-badge " + badgeVisualClass(oc.level);
allBadgeTextOpencode.textContent = BADGE_TEXT[oc.level] || "-"; allBadgeTextOpencode.textContent = BADGE_TEXT[oc.level] || "-";
allBodyOpencode.innerHTML = html; allBodyOpencode.innerHTML = html;
@@ -1690,7 +1694,8 @@ const QuotaPageHTML = `<!DOCTYPE html>
document.getElementById("sectionAll").classList.toggle("active", tab === "all"); document.getElementById("sectionAll").classList.toggle("active", tab === "all");
updateGlobalBadge(); updateGlobalBadge();
if (updateHash) { if (updateHash) {
if (tab === "commandcode") { if (tab === "all") {
// All 为默认 tab：激活 All 时清掉 hash（刷新回到默认）
history.replaceState(null, "", location.pathname + location.search); history.replaceState(null, "", location.pathname + location.search);
} else { } else {
location.hash = tab; location.hash = tab;
@@ -1890,11 +1895,12 @@ const QuotaPageHTML = `<!DOCTYPE html>
} }
// Restore tab from location.hash, then initial fetch // Restore tab from location.hash, then initial fetch
// 无 hash 默认 All：All tab 才能通过刷新后的 #all hash 恢复
const initHash = location.hash.replace(/^#/, ""); const initHash = location.hash.replace(/^#/, "");
if (initHash === "opencode" || initHash === "all") { if (initHash === "opencode" || initHash === "commandcode") {
setActiveTab(initHash, false); setActiveTab(initHash, false);
} else { } else {
setActiveTab("commandcode", false); setActiveTab("all", false);
} }
// Initial fetch // Initial fetch