dsh-codearts 0.5.3 → 1.0.1

package/lib/index.d.mts

@@ -443,6 +443,8 @@ interface UsageSnapshot {
   today: UsageTotals;
   /** 账本里所有保留天数的合计。 */
   allTime: UsageTotals;
+  /** 最近 30 天（含今天）的合计。 */
+  last30: UsageTotals;
   /** 今天按模型的合计，按 totalTokens 降序。 */
   byModelToday: {
     id: string;
@@ -646,22 +648,23 @@ interface CreditCacheOptions {
  * 而上游对同一账号的并发是有成本/风险的。
  */
 declare class CodeArtsCreditCache {
-  private state;
-  private inflight;
+  /** 按账号分槽：多账号下每个号有自己的余额，不能共用一个快照。 */
+  private readonly states;
+  private readonly inflights;
   private readonly ttlMs;
   private readonly failureTtlMs;
   private readonly load;
   private readonly now;
   constructor(options?: CreditCacheOptions);
-  /** 当前缓存内容（不触发请求），供只想读快照的场景使用。 */
-  peek(): CodeArtsCreditState | undefined;
-  /** 丢掉缓存，下次 get 会重新拉（重新登录/添加账号后调用）。 */
-  invalidate(): void;
+  /** 某账号的缓存内容（不触发请求），供只想读快照的场景使用。 */
+  peek(accountId: string): CodeArtsCreditState | undefined;
+  /** 丢掉缓存，下次 get 会重新拉（重新登录/添加账号后调用）。省略账号则清空全部。 */
+  invalidate(accountId?: string): void;
   /**
-   * 取一次积分。命中缓存直接返回；否则合并成一次上游请求。
+   * 取一次某账号的积分。命中缓存直接返回；否则合并成一次上游请求。
    * **不抛异常**：失败以 `phase: 'error'` 返回，调用方（状态路由）照样能渲染。
    */
-  get(credential: CodeArtsResolved, signal?: AbortSignal): Promise<CodeArtsCreditState>;
+  get(accountId: string, credential: CodeArtsResolved, signal?: AbortSignal): Promise<CodeArtsCreditState>;
   private run;
 }
 //#endregion

package/lib/index.mjs

@@ -1,4 +1,4 @@
-import { A as isBenefitModel, C as upstreamErrorMessage, D as creditRatioLabel, E as clearBenefitBlocked, F as startLogin, M as CodeArtsCredentialStore, N as codeartsAccountsPath, O as filterEnabledModels, P as codeartsAuthPath, S as signedGet, T as FALLBACK_CODEARTS_MODELS, _ as isWelfareClaimedStatus, a as SNAP_HOST, b as prepareChatBody, c as claimDailyWelfare, d as fetchModels, f as fetchWelfareCampaigns, g as isTpmLimit, h as isQueueableRate, i as refreshCatalog, j as CodeArtsAccountStore, k as isBenefitBlocked, l as degradeTokenCeiling, m as isParamInvalidFrame, n as codeartsUsagePath, o as canonicalModel, p as isConcurrencyCap, r as discoverModels, s as chatStream, t as CodeArtsUsageTracker, u as fetchCallerIdentity, v as maxTokensCeilingFor, w as CodeArtsCatalog, x as rateLimitFrame, y as pickDailyWelfareCampaign } from "./usage-Djtou78p.mjs";
+import { A as isBenefitModel, C as upstreamErrorMessage, D as creditRatioLabel, E as clearBenefitBlocked, F as startLogin, M as CodeArtsCredentialStore, N as codeartsAccountsPath, O as filterEnabledModels, P as codeartsAuthPath, S as signedGet, T as FALLBACK_CODEARTS_MODELS, _ as isWelfareClaimedStatus, a as SNAP_HOST, b as prepareChatBody, c as claimDailyWelfare, d as fetchModels, f as fetchWelfareCampaigns, g as isTpmLimit, h as isQueueableRate, i as refreshCatalog, j as CodeArtsAccountStore, k as isBenefitBlocked, l as degradeTokenCeiling, m as isParamInvalidFrame, n as codeartsUsagePath, o as canonicalModel, p as isConcurrencyCap, r as discoverModels, s as chatStream, t as CodeArtsUsageTracker, u as fetchCallerIdentity, v as maxTokensCeilingFor, w as CodeArtsCatalog, x as rateLimitFrame, y as pickDailyWelfareCampaign } from "./usage-BEoMNRwo.mjs";
 import z from "@deepseek-ai/schemastery";
 import { randomBytes, timingSafeEqual } from "node:crypto";
 import { createServer } from "node:http";
@@ -314,8 +314,9 @@ function safeJson(text) {
 * 而上游对同一账号的并发是有成本/风险的。
 */
 var CodeArtsCreditCache = class {
-	state;
-	inflight;
+	/** 按账号分槽：多账号下每个号有自己的余额，不能共用一个快照。 */
+	states = /* @__PURE__ */ new Map();
+	inflights = /* @__PURE__ */ new Map();
 	ttlMs;
 	failureTtlMs;
 	load;
@@ -326,37 +327,46 @@ var CodeArtsCreditCache = class {
 		this.load = options.load ?? fetchCredits;
 		this.now = options.now ?? (() => Date.now());
 	}
-	/** 当前缓存内容（不触发请求），供只想读快照的场景使用。 */
-	peek() {
-		return this.state;
+	/** 某账号的缓存内容（不触发请求），供只想读快照的场景使用。 */
+	peek(accountId) {
+		return this.states.get(accountId);
 	}
-	/** 丢掉缓存，下次 get 会重新拉（重新登录/添加账号后调用）。 */
-	invalidate() {
-		this.state = void 0;
-		this.inflight = void 0;
+	/** 丢掉缓存，下次 get 会重新拉（重新登录/添加账号后调用）。省略账号则清空全部。 */
+	invalidate(accountId) {
+		if (accountId === void 0) {
+			this.states.clear();
+			this.inflights.clear();
+			return;
+		}
+		this.states.delete(accountId);
+		this.inflights.delete(accountId);
 	}
 	/**
-	* 取一次积分。命中缓存直接返回；否则合并成一次上游请求。
+	* 取一次某账号的积分。命中缓存直接返回；否则合并成一次上游请求。
 	* **不抛异常**：失败以 `phase: 'error'` 返回，调用方（状态路由）照样能渲染。
 	*/
-	async get(credential, signal) {
-		const cached = this.state;
+	async get(accountId, credential, signal) {
+		const cached = this.states.get(accountId);
 		if (cached !== void 0) {
 			const ttl = cached.phase === "ok" ? this.ttlMs : this.failureTtlMs;
 			if (this.now() - cached.at < ttl) return cached;
 		}
-		return this.inflight ??= this.run(credential, signal).finally(() => {
-			this.inflight = void 0;
+		const existing = this.inflights.get(accountId);
+		if (existing !== void 0) return existing;
+		const inflight = this.run(accountId, credential, signal).finally(() => {
+			this.inflights.delete(accountId);
 		});
+		this.inflights.set(accountId, inflight);
+		return inflight;
 	}
-	async run(credential, signal) {
+	async run(accountId, credential, signal) {
 		try {
 			const state = {
 				phase: "ok",
 				value: await this.load(credential, signal),
 				at: this.now()
 			};
-			this.state = state;
+			this.states.set(accountId, state);
 			return state;
 		} catch (error) {
 			const state = {
@@ -364,7 +374,7 @@ var CodeArtsCreditCache = class {
 				message: error instanceof Error ? error.message : String(error),
 				at: this.now()
 			};
-			this.state = state;
+			this.states.set(accountId, state);
 			return state;
 		}
 	}
@@ -1094,6 +1104,23 @@ function choicesOf(deps) {
 		};
 	});
 }
+/**
+* 把逐账号的领取结果汇总成一条：HTTP 层只看 ok，卡片看 results 逐号展示。
+* 有一个号失败就算整批 ok=false，但别的号领到的结果照样在 results 里。
+*/
+function summarizeClaims(results) {
+	const failed = results.find((result) => result.state === "failed");
+	const claimed = results.filter((result) => result.claimed);
+	const messages = [...new Set(results.map((result) => result.message).filter((message) => message !== ""))];
+	return {
+		ok: results.length > 0 && failed === void 0,
+		claimed: claimed.length > 0,
+		state: claimed.length > 0 ? "claimed" : failed?.state ?? results[0]?.state ?? "failed",
+		amount: claimed.reduce((sum, result) => sum + result.amount, 0),
+		message: results.length === 1 ? results[0].message : messages.join("; ").slice(0, 300),
+		results
+	};
+}
 function json(res, status, body) {
 	const payload = JSON.stringify(body);
 	res.writeHead(status, {
@@ -1185,7 +1212,9 @@ function usageOf(deps) {
 	return {
 		today: snapshot?.today ?? noTotals,
 		allTime: snapshot?.allTime ?? noTotals,
+		last30: snapshot?.last30 ?? noTotals,
 		byModelToday: snapshot?.byModelToday ?? [],
+		byAccountToday: snapshot?.byAccountToday ?? {},
 		days: snapshot?.days ?? 0,
 		...snapshot?.lastAt === void 0 ? {} : { lastAt: snapshot.lastAt },
 		slots: slotsOf(deps)
@@ -1200,8 +1229,13 @@ function usageOf(deps) {
 async function creditsOf(deps) {
 	if (deps.credits === void 0) return {};
 	try {
-		const state = await deps.credits();
-		return state.phase === "ok" ? { credits: state.value } : { creditsError: state.message };
+		const entries = await deps.credits();
+		const primary = entries.find((entry) => entry.credits !== void 0) ?? entries[0];
+		return {
+			...primary?.credits === void 0 ? {} : { credits: primary.credits },
+			...primary?.credits === void 0 && primary?.creditsError !== void 0 ? { creditsError: primary.creditsError } : {},
+			...entries.length === 0 ? {} : { creditsByAccount: entries }
+		};
 	} catch (error) {
 		return { creditsError: safeMessage(error) };
 	}
@@ -1413,8 +1447,17 @@ function claimHandler(deps) {
 			json(res, 403, { error: "request-not-trusted" });
 			return;
 		}
+		let accountId;
+		const type = req.headers["content-type"];
+		if (typeof type === "string" && type.trim().toLowerCase().startsWith("application/json")) try {
+			const body = JSON.parse(await readBody(req));
+			if (typeof body?.id === "string" && body.id.trim() !== "") accountId = body.id.trim();
+		} catch {
+			json(res, 400, { error: "expected {\"id\"?: string}" });
+			return;
+		}
 		try {
-			const result = await deps.claim();
+			const result = await deps.claim(accountId);
 			json(res, result.ok ? 200 : 500, result);
 		} catch (error) {
 			json(res, 500, {
@@ -1701,38 +1744,50 @@ function apply(ctx, rawConfig) {
 	/** /status 是卡片与对话底部都会轮询的接口，积分慢请求不能把它拖成转圈。 */
 	const CREDIT_TIMEOUT_MS = 8e3;
 	/**
-	* 拉一次积分。
+	* 拉一次积分（每个账号各自一份）。
 	*
-	* 积分是**账号级**属性，不随请求轮转：这里挑第一个没用坏的账号，够覆盖正常用法
-	* （多账号下的积分差异不在本插件关心范围内）。
+	* 积分是**账号级**属性：多账号下每个号的余额、到期、签到状态都不同，所以逐号
+	* 并发拉、逐号缓存（缓存键就是账号 id）。一个号失败只影响它自己那一份。
 	*/
 	const loadCredits = async (signal) => {
 		const ids = await store.ids();
-		if (ids.length === 0) return {
-			phase: "error",
-			message: "not signed in",
-			at: Date.now()
-		};
+		if (ids.length === 0) return [];
 		const controller = new AbortController();
 		const timer = setTimeout(() => controller.abort(), CREDIT_TIMEOUT_MS);
 		timer.unref?.();
 		signal?.addEventListener("abort", () => controller.abort(), { once: true });
 		try {
-			let last;
-			for (const id of ids) {
+			return await Promise.all(ids.map(async (id) => {
 				const stored = await store.credential(id);
-				if (stored === void 0 || stored.stale === true) continue;
-				const resolved = await store.resolve(id);
-				if (resolved === void 0) continue;
-				const state = await credits.get(resolved, controller.signal);
-				if (state.phase === "ok") return state;
-				last = state;
-			}
-			return last ?? {
-				phase: "error",
-				message: "no usable credential",
-				at: Date.now()
-			};
+				if (stored === void 0) return {
+					id,
+					creditsError: "account no longer stored"
+				};
+				if (stored.stale === true) return {
+					id,
+					creditsError: "account needs sign-in"
+				};
+				try {
+					const resolved = await store.resolve(id);
+					if (resolved === void 0) return {
+						id,
+						creditsError: "no usable credential"
+					};
+					const state = await credits.get(id, resolved, controller.signal);
+					return state.phase === "ok" ? {
+						id,
+						credits: state.value
+					} : {
+						id,
+						creditsError: state.message
+					};
+				} catch (error) {
+					return {
+						id,
+						creditsError: error instanceof Error ? error.message : String(error)
+					};
+				}
+			}));
 		} finally {
 			clearTimeout(timer);
 		}
@@ -1755,40 +1810,62 @@ function apply(ctx, rawConfig) {
 		pool: () => pool.list(),
 		usage: () => usage.snapshot(),
 		credits: (signal) => loadCredits(signal),
-		claim: async () => {
-			try {
-				const ids = await store.ids();
-				for (const id of ids) {
-					const stored = await store.credential(id);
-					if (stored === void 0 || stored.stale === true) continue;
-					const resolved = await store.resolve(id);
-					if (resolved === void 0) continue;
-					const outcome = await claimDailyWelfare(resolved, AbortSignal.timeout(2e4));
-					if (outcome.state === "claimed") credits.invalidate();
-					return {
-						ok: outcome.state !== "failed",
-						claimed: outcome.state === "claimed",
-						state: outcome.state,
-						amount: outcome.amount,
-						message: outcome.message
-					};
+		claim: async (accountId) => {
+			const ids = accountId === void 0 ? await store.ids() : [accountId];
+			if (ids.length === 0) return {
+				ok: false,
+				claimed: false,
+				state: "failed",
+				amount: 0,
+				message: "no usable credential"
+			};
+			const results = [];
+			for (const id of ids) try {
+				const stored = await store.credential(id);
+				if (stored === void 0 || stored.stale === true) {
+					results.push({
+						id,
+						ok: false,
+						claimed: false,
+						state: "failed",
+						amount: 0,
+						message: stored === void 0 ? "account not found" : "account needs sign-in"
+					});
+					continue;
 				}
-				return {
-					ok: false,
-					claimed: false,
-					state: "failed",
-					amount: 0,
-					message: "no usable credential"
-				};
+				const resolved = await store.resolve(id);
+				if (resolved === void 0) {
+					results.push({
+						id,
+						ok: false,
+						claimed: false,
+						state: "failed",
+						amount: 0,
+						message: "no usable credential"
+					});
+					continue;
+				}
+				const outcome = await claimDailyWelfare(resolved, AbortSignal.timeout(2e4));
+				if (outcome.state === "claimed") credits.invalidate(id);
+				results.push({
+					id,
+					ok: outcome.state !== "failed",
+					claimed: outcome.state === "claimed",
+					state: outcome.state,
+					amount: outcome.amount,
+					message: outcome.message
+				});
 			} catch (error) {
-				return {
+				results.push({
+					id,
 					ok: false,
 					claimed: false,
 					state: "failed",
 					amount: 0,
 					message: error instanceof Error ? error.message : String(error)
-				};
+				});
 			}
+			return summarizeClaims(results);
 		},
 		refreshModels: async () => {
 			const outcome = await refreshCatalog(store, catalog, AbortSignal.timeout(MANUAL_REFRESH_MS));

package/lib/{usage-Djtou78p.mjs → usage-BEoMNRwo.mjs}

@@ -2528,8 +2528,13 @@ var CodeArtsUsageTracker = class {
 	snapshot(at = this.now()) {
 		const todayKey = localDateKey(at);
 		const today = this.days.get(todayKey);
+		const cutoff = localDateKey(at - 2592e6);
 		const allTime = emptyTotals();
-		for (const day of this.days.values()) for (const totals of Object.values(day.models)) mergeTotals(allTime, totals);
+		const last30 = emptyTotals();
+		for (const [date, day] of this.days) for (const totals of Object.values(day.models)) {
+			mergeTotals(allTime, totals);
+			if (date >= cutoff) mergeTotals(last30, totals);
+		}
 		const models = today?.models ?? {};
 		return {
 			today: {
@@ -2537,6 +2542,7 @@ var CodeArtsUsageTracker = class {
 				...today === void 0 ? {} : sumOf(models)
 			},
 			allTime,
+			last30,
 			byModelToday: Object.entries(models).map(([id, totals]) => ({
 				id,
 				totals: { ...totals }

package/package.json

@@ -2,7 +2,7 @@
   "name": "dsh-codearts",
   "displayName": "DSH CodeArts Connect",
   "description": "把华为云 CodeArts 接入 DeepSeek Harness —— 内置 OAuth2 登录（PKCE + DPoP），登录后即可在 DSH 对话窗口使用 CodeArts 的模型。",
-  "version": "0.5.3",
+  "version": "1.0.1",
   "packageManager": "pnpm@11.24.0",
   "author": "elegant01",
   "keywords": [
@@ -50,6 +50,7 @@
     "cordis.patch.yml",
     "README.md",
     "README.en.md",
+    "CHANGELOG.md",
     "INSTALL.md",
     "INSTALL.en.md",
     "DEV.md",