feat(usage): CodingPlan.site 自动识别 NewAPI + 账单查询体验修复

- detect_provider 新增 codingplan.site → balance:newapi(该站为
  NewAPI 实例,实测确认),保存补齐 TS 侧缺失的 balance:newapi 断言
- 凭据缺失等确定性错误改走 Ok(failure)(原 Err 被前端一律显示为
  「网络异常」),错误消息按 kind 前缀包裹后仍可本地化映射
- formatAmount 收口到 usage-display 统一复用:¤ 占位符号不再渲染、
  金额统一两位小数(配置弹窗此前直接拼原始数值)
This commit is contained in:
KimiSwitch Dev committed 2026-09-05 16:04:38 +08:00
1 parent 81699e757d
commit 1a11cfbaaf
6 files changed
+198 -31

No files matched your search

+2 -2
View File
@@ -4,7 +4,7 @@ import { invoke } from "@tauri-apps/api/core";
import { ArrowLeft, Eye, EyeOff, Loader2, Play } from "lucide-react";
import { useTranslation } from "../i18n";
import type { TranslationKey } from "../i18n/zh";
import { localizeUsageError, planLabel } from "../lib/usage-display";
import { formatAmount, localizeUsageError, planLabel } from "../lib/usage-display";
import type { Agent, Provider, UsageConfig } from "../types";
interface UsageResult {
@@ -134,7 +134,7 @@ export function UsageConfigModal({ open, agent, provider, onClose, onSave }: Usa
.map((d) => {
const parts: string[] = [];
if (d.planName) parts.push(planLabel(d.planName, t));
if (d.remaining != null) parts.push(`${t("usageRemaining")} ${d.remaining}${d.unit ?? ""}`);
if (d.remaining != null) parts.push(`${t("usageRemaining")} ${formatAmount(d.remaining, d.unit)}`);
if (d.used != null && d.total != null && d.total > 0)
parts.push(`${Math.round((d.used / d.total) * 100)}%`);
return parts.join(" ");
+1 -12
View File
@@ -1,7 +1,7 @@
import { useEffect, useState } from "react";
import { Loader2, RefreshCw } from "lucide-react";
import { useTranslation } from "../i18n";
import { localizeUsageError, planLabel } from "../lib/usage-display";
import { formatAmount, localizeUsageError, planLabel } from "../lib/usage-display";
import type { UsageData, UsageQueryState } from "../hooks/useUsageQuery";
interface UsageFooterProps {
@@ -36,17 +36,6 @@ export function UsageFooter({ usage, variant = "detail" }: UsageFooterProps) {
return null;
};
const formatAmount = (
value: number | null | undefined,
unit?: string | null
): string => {
if (value == null) return "—";
const symbol =
unit === "CNY" ? "¥" : unit === "USD" ? "$" : unit ? `${unit} ` : "";
const num = Number.isInteger(value) ? String(value) : value.toFixed(2);
return `${symbol}${num}`;
};
const formatReset = (resetsAt?: string | null): string | null => {
if (!resetsAt) return null;
const ms = new Date(resetsAt).getTime() - now;
+2
View File
@@ -14,6 +14,7 @@ export type UsageKind =
| "balance:stepfun"
| "balance:novita"
| "balance:kimi"
| "balance:newapi"
| "plan:kimi_coding"
| "plan:zhipu"
| "plan:minimax"
@@ -30,6 +31,7 @@ export const SUPPORTED_USAGE_KINDS: ReadonlySet<string> = new Set<UsageKind>([
"balance:stepfun",
"balance:novita",
"balance:kimi",
"balance:newapi",
"plan:kimi_coding",
"plan:zhipu",
"plan:minimax",
+93
View File
@@ -0,0 +1,93 @@
import { describe, expect, it } from "vitest";
import { formatAmount, localizeUsageError, planLabel } from "./usage-display";
// Minimal TranslateFn: return the key itself so assertions read the key.
const t = (key: string) => key;
describe("localizeUsageError", () => {
it("maps known Rust error prefixes to their localization keys", () => {
expect(
localizeUsageError("unsupported provider: no usage query available", t)
).toBe("usageUnsupportedProvider");
expect(localizeUsageError("no API key configured", t)).toBe("usageErrNoKey");
expect(localizeUsageError("usage query disabled in config panel", t)).toBe(
"usageErrDisabled"
);
expect(
localizeUsageError("no Kimi Code OAuth credentials found; run `kimi login` first", t)
).toBe("usageErrNoOauth");
expect(
localizeUsageError("newapi template requires accessToken and userId", t)
).toBe("usageErrNewapiCreds");
expect(localizeUsageError("Authentication failed: 401 Unauthorized", t)).toBe(
"usageInvalidKey"
);
});
it("login expired / refresh failed match case-insensitively anywhere", () => {
expect(localizeUsageError("LOGIN expired at 12:00", t)).toBe("usageErrLoginExpired");
expect(localizeUsageError("oauth refresh failed: 500", t)).toBe("usageErrLoginExpired");
});
it("strips the kinds-loop `{kind}: ` wrapper before matching", () => {
// commands.rs 的 kinds 循环把错误包成 "balance:newapi: ..." —— 必须仍命中。
expect(
localizeUsageError(
"balance:newapi: newapi template requires accessToken and userId",
t
)
).toBe("usageErrNewapiCreds");
expect(localizeUsageError("plan:zhipu: Authentication failed: 401", t)).toBe(
"usageInvalidKey"
);
expect(localizeUsageError("balance:deepseek: no API key configured", t)).toBe(
"usageErrNoKey"
);
});
it("passes unknown errors through unchanged (kind prefix retained)", () => {
const raw = "balance:openrouter: HTTP 429 too many requests";
expect(localizeUsageError(raw, t)).toBe(raw);
expect(localizeUsageError("HTTP 500 Something broke", t)).toBe(
"HTTP 500 Something broke"
);
});
});
describe("planLabel", () => {
it("maps known tier ids and passes unknown names through", () => {
expect(planLabel("five_hour", t)).toBe("usageTier5h");
expect(planLabel("weekly_limit", t)).toBe("usageTierWeekly");
expect(planLabel("monthly_limit", t)).toBe("usageTierMonthly");
expect(planLabel("NewAPI", t)).toBe("NewAPI");
expect(planLabel("¥", t)).toBe("¥");
});
});
describe("formatAmount", () => {
it("maps CNY and USD to ¥/$ with two decimals", () => {
expect(formatAmount(1.5, "CNY")).toBe("¥1.50");
expect(formatAmount(1.5, "USD")).toBe("$1.50");
});
it("treats ¤ (U+00A4) as no configured currency symbol", () => {
expect(formatAmount(136907472.01013, "¤")).toBe("136907472.01");
expect(formatAmount(136907472.01013, "\u{00A4}")).toBe("136907472.01");
});
it("prefixes arbitrary units without a symbol", () => {
// Non-integer so the two-decimal rule applies; rounds to 3.00.
expect(formatAmount(3.004, "credit")).toBe("credit 3.00");
});
it("renders null/undefined values as —", () => {
expect(formatAmount(null, "¤")).toBe("—");
expect(formatAmount(undefined, "CNY")).toBe("—");
});
it("keeps integers without decimals", () => {
expect(formatAmount(42, "CNY")).toBe("¥42");
expect(formatAmount(100, "USD")).toBe("$100");
expect(formatAmount(7, "")).toBe("7");
});
});
+27 -7
View File
@@ -35,12 +35,32 @@ export function planLabel(name: string, t: TranslateFn): string {
* src-tauri/src/commands.rs and src-tauri/src/services/*.
*/
export function localizeUsageError(error: string, t: TranslateFn): string {
if (error.startsWith("unsupported provider")) return t("usageUnsupportedProvider");
if (error.startsWith("no API key configured")) return t("usageErrNoKey");
if (error.startsWith("usage query disabled")) return t("usageErrDisabled");
if (/login expired|refresh failed/i.test(error)) return t("usageErrLoginExpired");
if (error.startsWith("no Kimi Code OAuth credentials")) return t("usageErrNoOauth");
if (error.startsWith("newapi template requires")) return t("usageErrNewapiCreds");
if (error.startsWith("Authentication failed")) return t("usageInvalidKey");
// commands.rs 的 kinds 循环把单条错误包成 `{kind}: {msg}`(kind 含数字,
// 如 plan:zhipu),先剥离再按前缀匹配;未知错误仍回退按原文展示(保留 kind
// 前缀,属诊断细节)。
const stripped = error.replace(/^(balance|plan):[a-z0-9_]+:\s*/, "");
if (stripped.startsWith("unsupported provider")) return t("usageUnsupportedProvider");
if (stripped.startsWith("no API key configured")) return t("usageErrNoKey");
if (stripped.startsWith("usage query disabled")) return t("usageErrDisabled");
if (/login expired|refresh failed/i.test(stripped)) return t("usageErrLoginExpired");
if (stripped.startsWith("no Kimi Code OAuth credentials")) return t("usageErrNoOauth");
if (stripped.startsWith("newapi template requires")) return t("usageErrNewapiCreds");
if (stripped.startsWith("Authentication failed")) return t("usageInvalidKey");
return error;
}
/**
* Format a usage amount with its unit. `¤` (U+00A4) is NewAPI's placeholder
* when the site has no custom currency symbol configured — treat it as "no
* symbol" and render only the number.
*/
export function formatAmount(
value: number | null | undefined,
unit?: string | null
): string {
if (value == null) return "—";
const symbol =
unit === "CNY" ? "¥" : unit === "USD" ? "$" : unit && unit.trim() !== "¤" ? `${unit} ` : "";
const num = Number.isInteger(value) ? String(value) : value.toFixed(2);
return `${symbol}${num}`;
}