dsh-xdpool 2.4.5 → 2.4.6

package/CHANGELOG.md

@@ -1,6 +1,31 @@
 # Changelog
 本项目的所有重要变更都会记录在此文件。
 版本号遵循 [语义化版本](https://semver.org/lang/zh-CN/)。
+## 2.4.6 — 扫码账号每次打开都空白：一份数据卡在两个细节里
+
+> 2.4.4/2.4.5 之后侧栏能进、能滚了，但扫码过的渠道在账号池里经常整片空白，重开也一样。磁盘上账号是齐的（`state.json` 里 15 条），所以问题全在读取链。
+
+### 16 秒的事实抓取把首屏挡掉了
+
+`load()` 里先 `await fetchChannelModels(...)` 再 `setEntries(...)`。那次采样式采到了 **16.5 秒**——它要把每个模型逐个交给宿主适配器解析上下文窗口，冷启动时很慢。卡片区在这十几秒里是空的，看起来就像「没有账号」。
+
+改成两阶段：`provider.status` 与 `account.list` 先回来（几十毫秒），**卡片立刻渲染**；事实（窗口/识图）随后用 `setEntries(previous => ...)` 合并进去。
+
+### 失败被渲染成了「空」
+
+`provider.status` 是「哪些渠道有账号」的唯一判据。它一旦整段返回 401，`scanProviders` 就是空的，`entries` 也是空的，组件走到 `if (entries.length === 0 && error === undefined) return <></>`——**静默渲染空白，一个字都不说**。读者无法区分「还没扫码」和「读取失败」。
+
+现在把原始信封留下来判 `ok`：真的读失败就把错误显示出来。
+
+### RPC 桥只捕获一次
+
+`callPack` 必须走 `ctx.connection.rpc`（裸 `fetch('/api/channel-pack')` 被宿主 401，因为 `/api/*` 只允许经 admission 的客户端）。但 `installPackRpc(ctx)` 在 `apply()` 里只跑一次，而提供 `connection` 的是另一个 fiber——那一刻没就绪，桥就永久为空，此后所有 `callPack` 都回落裸 fetch 吃 401，正好触发上一条的静默空白。
+
+改为保存 ctx、每次调用前惰性解析，就绪后自动恢复。每一步仍各自 try：宿主给客户端 ctx 套的 Proxy 对未声明服务的属性访问会**抛异常**（并上报运行失败），`?.` 挡不住抛异常的 getter，只有 `ctx.get()` 豁免。
+
+### 其他
+- 全套 79 文件 1023 用例。
+- `tests/aggregate-probe-regression.test.ts` 全量并行时会因争抢跑到 60 秒超时，单独跑 26 秒通过——既有测试，与本次改动无关。
 ## 2.4.5 — 侧栏面板能滚动了
 
 > 2.4.4 把账号池搬到侧栏那行之后，页面在折叠处被切掉、怎么都翻不到下半页。这不是新功能缺失，是我把设置页里的组件原样塞进了另一个容器，而**那个容器不滚动**。

package/lib/client.js

@@ -8947,6 +8947,25 @@ window.__ModuleLoader__.load({
 		let packRpcBridge;
 		/** Capture the client ctx's connection service for {@link callPack}. */
 		function installPackRpc(ctx) {
+			packRpcContext = ctx;
+			packRpcBridge = resolvePackRpcBridge();
+		}
+		/** The client ctx captured by {@link installPackRpc}, for late resolution. */
+		let packRpcContext;
+		/**
+		* Read `connection.rpc.call` off the captured ctx, or `undefined` if the
+		* service is still absent.
+		*
+		* Each step gets its own try. The host hands the client ctx a Proxy that
+		* THROWS on direct property access to an undeclared service
+		* (cordis-client-runner's dynamic ctx), and that throw also reports the run as
+		* failed — so one shared try/catch would let a rejected `ctx.connection` skip
+		* the exempt `ctx.get()` below and silently leave the bridge unset. `?.` does
+		* not help: it guards null/undefined, not a throwing getter.
+		*/
+		function resolvePackRpcBridge() {
+			const ctx = packRpcContext;
+			if (ctx === void 0 || ctx === null) return void 0;
 			let connection;
 			try {
 				connection = ctx.connection;
@@ -8960,8 +8979,8 @@ window.__ModuleLoader__.load({
 			}
 			try {
 				const call = connection?.rpc?.call;
-				if (typeof call !== "function") return;
-				packRpcBridge = { call: async (method, payload) => {
+				if (typeof call !== "function") return void 0;
+				return { call: async (method, payload) => {
 					const bound = call.bind(connection);
 					const controller = new AbortController();
 					const timer = setTimeout(() => controller.abort(), 9e4);
@@ -8975,7 +8994,7 @@ window.__ModuleLoader__.load({
 					}
 				} };
 			} catch {
-				packRpcBridge = void 0;
+				return;
 			}
 		}
 		/**
@@ -11669,7 +11688,8 @@ window.__ModuleLoader__.load({
 			const load = async () => {
 				try {
 					const channels = (await fetchChannels()).filter((channel) => !REGION_OWNED_CHANNELS.has(channel.id));
-					const statuses = providerStatusesFrom(await callPack("provider.status", { providers: channels.map((channel) => channel.id) }));
+					const statusAnswer = await callPack("provider.status", { providers: channels.map((channel) => channel.id) });
+					const statuses = providerStatusesFrom(statusAnswer);
 					const scanProviders = channels.map((channel) => channel.id).filter((id) => (statuses.get(id)?.accountsTotal ?? 0) > 0);
 					const perProvider = await Promise.all(scanProviders.map(async (provider) => {
 						const wantBalances = channels.find((channel) => channel.id === provider)?.credits !== void 0;
@@ -11698,18 +11718,28 @@ window.__ModuleLoader__.load({
 						}];
 					}));
 					const byProvider = new Map(perProvider);
-					const idsByProvider = {};
-					for (const [provider, entry] of perProvider) if (entry.models.length > 0) idsByProvider[provider] = entry.models.map((model) => model.id);
-					const facts = await fetchChannelModels(scanProviders, idsByProvider).catch(() => /* @__PURE__ */ new Map());
 					const next = channels.filter((channel) => byProvider.has(channel.id)).map((channel) => ({
 						channel,
 						...byProvider.get(channel.id),
-						facts: new Map((facts.get(channel.id) ?? []).map((model) => [model.id, model])),
+						facts: /* @__PURE__ */ new Map(),
 						status: statuses.get(channel.id)
 					}));
 					if (!mountedRef.current) return;
 					setEntries(next);
 					setError(void 0);
+					if (next.length === 0) {
+						if (!statusAnswer.ok) setError(statusAnswer.error?.message ?? "provider.status refused");
+						return;
+					}
+					const idsByProvider = {};
+					for (const [provider, entry] of perProvider) if (entry.models.length > 0) idsByProvider[provider] = entry.models.map((model) => model.id);
+					const facts = await fetchChannelModels(next.map((entry) => entry.channel.id), idsByProvider).catch(() => /* @__PURE__ */ new Map());
+					if (!mountedRef.current) return;
+					if (facts.size === 0) return;
+					setEntries((previous) => previous.map((entry) => ({
+						...entry,
+						facts: new Map((facts.get(entry.channel.id) ?? []).map((model) => [model.id, model]))
+					})));
 				} catch (cause) {
 					if (!mountedRef.current) return;
 					setError(cause instanceof Error ? cause.message : String(cause));
@@ -12338,7 +12368,7 @@ window.__ModuleLoader__.load({
 		*
 		* @module dsh-xdpool/version
 		*/
-		const POOL_VERSION = "2.4.5";
+		const POOL_VERSION = "2.4.6";
 		//#endregion
 		//#region src/client/PoolCard.tsx
 		/**

package/package.json

@@ -2,7 +2,7 @@
   "name": "dsh-xdpool",
   "displayName": "DSH XD Pool",
   "description": "One DSH model pool for every free quota you have: merge all locally signed-in WorkBuddy accounts with auto-failover, sign in to 13 vendors by QR/web, aggregate 76 vendors' free tiers, plus a usage dashboard, model routing, a local OpenAI-compatible gateway and a points-automation suite.",
-  "version": "2.4.5",
+  "version": "2.4.6",
   "license": "MIT",
   "author": "XDTrees",
   "homepage": "https://github.com/XDTrees/dsh-xdpool#readme",