@dsh-plus/llm-pi 0.1.9 → 0.1.11

package/lib/index.js

@@ -276,6 +276,12 @@ function fetchJson(url, proxy, timeoutMs) {
 		}, (response) => {
 			const chunks = [];
 			let size = 0;
+			let settled = false;
+			const fail = (error) => {
+				if (settled) return;
+				settled = true;
+				reject(error);
+			};
 			response.on("data", (chunk) => {
 				size += chunk.length;
 				if (size > MAX_RESPONSE_BYTES$1) {
@@ -285,11 +291,14 @@ function fetchJson(url, proxy, timeoutMs) {
 				chunks.push(chunk);
 			});
 			response.on("end", () => {
+				if (settled) return;
+				settled = true;
 				resolve({
 					status: response.statusCode ?? 0,
 					body: Buffer.concat(chunks).toString("utf8")
 				});
 			});
+			response.on("error", fail);
 		});
 		req.on("timeout", () => req.destroy(/* @__PURE__ */ new Error(`请求超时（${timeoutMs}ms）`)));
 		req.on("error", reject);
@@ -449,20 +458,23 @@ var DeepseekRouteRegistrar = class {
 		for (const [route, built] of target) {
 			const existing = this.registrations.get(route);
 			if (existing !== void 0) {
-				this.refreshPolicy(route, built, existing);
+				this.refreshRegistration(route, built, existing);
 				continue;
 			}
 			this.register(route, built);
 		}
 	}
-	refreshPolicy(route, built, registration) {
-		const policy = built.connection.retryPolicy;
-		if (deepEqualJson(policy, registration.retryPolicy)) return;
+	/** retryPolicy 或 displayName 变化时原地 replace（两者均为注册期捕获事实）。 */
+	refreshRegistration(route, built, registration) {
+		const policyUnchanged = deepEqualJson(built.connection.retryPolicy, registration.retryPolicy);
+		const nameUnchanged = built.displayName === registration.displayName;
+		if (policyUnchanged && nameUnchanged) return;
 		try {
 			registration.handle.replace([route]);
-			registration.retryPolicy = policy;
+			registration.retryPolicy = built.connection.retryPolicy;
+			registration.displayName = built.displayName;
 		} catch (error) {
-			this.deps.logger.error(`llm-pi: deepseek route "${route}" 重试策略更新被拒，保留此前注册`);
+			this.deps.logger.error(`llm-pi: deepseek route "${route}" 注册事实更新被拒，保留此前注册`);
 			this.deps.logger.error(error);
 		}
 	}
@@ -484,11 +496,16 @@ var DeepseekRouteRegistrar = class {
 			resolveUserId: () => this.resolveUserId(),
 			resolveAttachments: () => ctx.get("attachments")
 		});
+		adapter.providerInfo = (provider) => ({
+			id: provider,
+			name: routes().get(route)?.displayName ?? built.displayName
+		});
 		try {
 			const handle = ctx.llm.registerAdapter([route], adapter);
 			this.registrations.set(route, {
 				handle,
-				retryPolicy: built.connection.retryPolicy
+				retryPolicy: built.connection.retryPolicy,
+				displayName: built.displayName
 			});
 		} catch (error) {
 			logger.error(`llm-pi: deepseek route "${route}" 注册失败（可能与其他 adapter 重名），该 route 不可用`);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dsh-plus/llm-pi",
-  "version": "0.1.9",
+  "version": "0.1.11",
   "description": "dsh-plus service+ui plugin: 基于 PiAiAdapter 的自定义 LLM 路由（全量 compat、模型继承、models.dev 目录兜底）",
   "type": "module",
   "main": "lib/index.js",

package/src/catalog/models-dev.ts

@@ -82,6 +82,12 @@ function fetchJson(url: string, proxy: string, timeoutMs: number): Promise<JsonR
       (response) => {
         const chunks: Buffer[] = []
         let size = 0
+        let settled = false
+        const fail = (error: Error): void => {
+          if (settled) return
+          settled = true
+          reject(error)
+        }
         response.on('data', (chunk: Buffer) => {
           size += chunk.length
           if (size > MAX_RESPONSE_BYTES) {
@@ -91,11 +97,16 @@ function fetchJson(url: string, proxy: string, timeoutMs: number): Promise<JsonR
           chunks.push(chunk)
         })
         response.on('end', () => {
+          if (settled) return
+          settled = true
           resolve({
             status: response.statusCode ?? 0,
             body: Buffer.concat(chunks).toString('utf8'),
           })
         })
+        // 响应流自身出错（中途截断的 aborted 等）不经请求转发：缺此监听时
+        // Promise 永不 settle（req timeout 只覆盖建连/空闲等待），refresh 永久挂起。
+        response.on('error', fail)
       },
     )
     req.on('timeout', () => req.destroy(new Error(`请求超时（${timeoutMs}ms）`)))

package/src/client/client.ts

@@ -21,7 +21,7 @@ import type { Context } from '@deepseek-ai/cordis'
 import { SETTINGS_NS } from '../ns.ts'
 import { LlmPiCard } from './card.tsx'
 import { en, NS, zh } from './i18n.ts'
-import type { Scope, SettingsApi } from './scope.ts'
+import type { Scope, ScopeSnapshot, SettingsApi } from './scope.ts'
 import { injectStyle } from './styles.ts'
 
 export const name = 'dsh-plus-llm-pi'

package/src/client/scope.ts

@@ -35,8 +35,11 @@ export interface SettingsApi {
     result: {
       ok: boolean
       value?: {
+        writable: boolean
         namespaces: Array<{
           ns: string
+          value: unknown
+          revision: number
           secrets: Array<{ path: string[]; set: boolean }>
         }>
       }

package/src/deepseek-routes.ts

@@ -25,6 +25,8 @@ interface RouteRegistration {
   handle: AdapterRegistrationHandle
   /** 注册期捕获的重试策略（变化才 replace）。 */
   retryPolicy: unknown
+  /** 注册期捕获的展示名（providerInfo 是注册期捕获事实，变化才 replace）。 */
+  displayName: string
 }
 
 export interface DeepseekRegistrarDeps {
@@ -80,25 +82,28 @@ export class DeepseekRouteRegistrar {
     for (const [route, built] of target) {
       const existing = this.registrations.get(route)
       if (existing !== undefined) {
-        this.refreshPolicy(route, built, existing)
+        this.refreshRegistration(route, built, existing)
         continue
       }
       this.register(route, built)
     }
   }
 
-  private refreshPolicy(
+  /** retryPolicy 或 displayName 变化时原地 replace（两者均为注册期捕获事实）。 */
+  private refreshRegistration(
     route: string,
     built: ResolvedDeepseekRoute,
     registration: RouteRegistration,
   ): void {
-    const policy = built.connection.retryPolicy
-    if (deepEqualJson(policy, registration.retryPolicy)) return
+    const policyUnchanged = deepEqualJson(built.connection.retryPolicy, registration.retryPolicy)
+    const nameUnchanged = built.displayName === registration.displayName
+    if (policyUnchanged && nameUnchanged) return
     try {
       registration.handle.replace([route])
-      registration.retryPolicy = policy
+      registration.retryPolicy = built.connection.retryPolicy
+      registration.displayName = built.displayName
     } catch (error) {
-      this.deps.logger.error(`llm-pi: deepseek route "${route}" 重试策略更新被拒，保留此前注册`)
+      this.deps.logger.error(`llm-pi: deepseek route "${route}" 注册事实更新被拒，保留此前注册`)
       this.deps.logger.error(error)
     }
   }
@@ -126,9 +131,20 @@ export class DeepseekRouteRegistrar {
       resolveUserId: () => this.resolveUserId() as never,
       resolveAttachments: () => ctx.get('attachments') as never,
     })
+    // 官方 providerInfo 硬编码 name: "DeepSeek"——覆盖为按路由动态读取的
+    // displayName，否则自定义 deepseek 路由在模型选择器里与 deepseek-official
+    // 撞名（两个 "DeepSeek" 分组，无法区分）。
+    adapter.providerInfo = (provider: string) => ({
+      id: provider,
+      name: routes().get(route)?.displayName ?? built.displayName,
+    })
     try {
       const handle = ctx.llm.registerAdapter([route], adapter as never)
-      this.registrations.set(route, { handle, retryPolicy: built.connection.retryPolicy })
+      this.registrations.set(route, {
+        handle,
+        retryPolicy: built.connection.retryPolicy,
+        displayName: built.displayName,
+      })
     } catch (error) {
       logger.error(
         `llm-pi: deepseek route "${route}" 注册失败（可能与其他 adapter 重名），该 route 不可用`,