@kenz1117/dsh-ui-usage-billing 1.4.9 → 1.4.10

package/README.md

@@ -278,6 +278,8 @@ npm publish --access public
 - [@ciphoo](https://github.com/ciphoo) — MiniMax 国内域 Token Plan 订阅额度支持（PR #5）、`minimax-cn` 订阅凭据接线（PR #12）、Windows 下账本并发写入 `MoveFileExW EPERM` 修复（PR #11）
 - [@fabulousyuann-tech](https://github.com/fabulousyuann-tech) — 会话删除后用量保留的持久 ledger 功能（PR #8）
 - [@hi-fangj](https://github.com/hi-fangj) — Token 每日图悬停精确明细（PR #21）、平价消耗胶囊开关（PR #22）、Token 每日图按模型视角与图例聚焦（PR #23）、性能面板按模型对比曲线（PR #24）
+- [@aizhimoran](https://github.com/aizhimoran) — 峰谷分档支持中国法定节假日与调休：DeepSeek 按量分时把法定节假日全天按空闲时段计费（官方 2026-09-19 口径），含 10 天倒计时扫描窗（issue #73、PR #74）
+- [@gitfangj](https://github.com/gitfangj) — `sync.sh` 在 macOS 缺省 bash 3.2 下的花括号变量兼容修复
 
 ## 📄 许可证
 

package/lib/index.js

@@ -5185,6 +5185,21 @@ async function requestJson(url, init, timeoutMs) {
 		maxDelayMs: 2e3
 	});
 }
+/**
+* 订阅端点挂在服务 origin 下（/coding、/zen、/api、/alpha 前缀），而用户在
+* chat 路由上配置的 baseUrl 通常带路径前缀（如 CommandCode 网关的
+* `https://api.commandcode.ai/provider/v1`，issue #75）——整段拼接会把 chat
+* 前缀带进订阅端点导致 404。只取 origin；未配置回退官方默认，非法值同样
+* 回退（订阅查询走「未读出」兜底而非抛错）。
+*/
+function subscriptionOrigin(configBaseUrl, fallback) {
+	if (configBaseUrl === void 0 || configBaseUrl.trim() === "") return fallback;
+	try {
+		return new URL(configBaseUrl).origin;
+	} catch {
+		return fallback;
+	}
+}
 /** Parse one Kimi limit window entry. */
 function kimiWindow(value, kind) {
 	if (value === null || typeof value !== "object") return null;
@@ -5222,7 +5237,7 @@ function parseKimi(body) {
 /** Collect the Kimi For Coding quota. */
 async function collectKimi(keys, config, timeoutMs) {
 	const apiKey = keys.kimiApiKey.trim();
-	const base = config.baseUrl ?? "https://api.kimi.com";
+	const base = subscriptionOrigin(config.baseUrl, "https://api.kimi.com");
 	if (apiKey === "") return {
 		provider: config.provider,
 		displayName: "Kimi For Coding",
@@ -5407,7 +5422,7 @@ function parseOpenCodeGoApi(body) {
 /** Collect the OpenCode Go quota. */
 async function collectOpenCodeGo(keys, config, timeoutMs) {
 	const apiKey = keys.opencodeApiKey.trim();
-	const base = config.baseUrl ?? "https://opencode.ai";
+	const base = subscriptionOrigin(config.baseUrl, "https://opencode.ai");
 	if (apiKey === "") return {
 		provider: config.provider,
 		displayName: "OpenCode Go",
@@ -5480,12 +5495,14 @@ function parseMiniMaxRemains(body) {
 * Resolve the MiniMax API host based on the configured provider id.
 *
 * 国内开发者走 MiniMax（`api.minimaxi.com`），海外走 MiniMax（`minimaxi.com`）。
-* User-explicit `config.baseUrl` wins when set, so deployments in either
-* region can still override the auto-pick (e.g. proxies / staging).
+* User-explicit `config.baseUrl` wins by origin when set, so deployments in
+* either region can still override the auto-pick (e.g. proxies / staging);
+* chat path prefixes (e.g. `/v1`) are dropped — `miniMaxEndpoint` re-adds the
+* version segment itself.
 */
 function resolveMiniMaxBaseUrl(config) {
-	if (typeof config.baseUrl === "string" && config.baseUrl.trim() !== "") return config.baseUrl;
-	return config.provider === "minimax-cn" || config.provider === "minimax-token-plan-cn" ? "https://api.minimaxi.com" : "https://www.minimaxi.com";
+	const fallback = config.provider === "minimax-cn" || config.provider === "minimax-token-plan-cn" ? "https://api.minimaxi.com" : "https://www.minimaxi.com";
+	return subscriptionOrigin(config.baseUrl, fallback);
 }
 /** Display name for a MiniMax quota row, aligned with the display-name map. */
 function minmaxDisplayName(provider) {
@@ -5567,7 +5584,7 @@ function parseOpenRouterCredits(body) {
 /** Collect the OpenRouter prepaid credits usage. */
 async function collectOpenRouter(keys, config, timeoutMs) {
 	const apiKey = keys.openrouterApiKey.trim();
-	const base = config.baseUrl ?? "https://openrouter.ai";
+	const base = subscriptionOrigin(config.baseUrl, "https://openrouter.ai");
 	if (apiKey === "") return {
 		provider: config.provider,
 		displayName: "OpenRouter",
@@ -5629,7 +5646,7 @@ function parseAnthropicUsage(body) {
 /** Collect the Claude Pro/Max subscription usage via the OAuth usage endpoint. */
 async function collectAnthropic(keys, config, timeoutMs) {
 	const token = keys.anthropicApiKey.trim();
-	const base = config.baseUrl ?? "https://api.anthropic.com";
+	const base = subscriptionOrigin(config.baseUrl, "https://api.anthropic.com");
 	const displayName = "Claude (Anthropic)";
 	if (token === "") return {
 		provider: config.provider,
@@ -5693,7 +5710,7 @@ function parseCommandCodeCredits(body) {
 /** Collect the CommandCode quota (5h/weekly windows + monthly credits). */
 async function collectCommandCode(keys, config, timeoutMs) {
 	const apiKey = keys.commandcodeApiKey.trim();
-	const base = config.baseUrl ?? "https://api.commandcode.ai";
+	const base = subscriptionOrigin(config.baseUrl, "https://api.commandcode.ai");
 	const displayName = SUBSCRIPTION_DISPLAY_NAMES["commandcode"] ?? "CommandCode";
 	if (apiKey === "") return {
 		provider: config.provider,

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@kenz1117/dsh-ui-usage-billing",
   "description": "Usage billing dashboard for DeepSeek Harness: sidebar cost metrics plus a full dashboard modal, priced from a current multi-provider catalog with real usage aggregated from session logs.",
-  "version": "1.4.9",
+  "version": "1.4.10",
   "keywords": [
     "deepseek-harness",
     "deepseek",