dsh-router-core 0.3.3 → 0.3.5

package/src/suppliers/opencode/plugin.ts

@@ -30,7 +30,6 @@ export default function factory(env: SupplierEnv): SupplierModule {
   // 模型缓存由 dsh-router 核心统一管；插件每次拉取，失败回退上次成功结果
   let modelsCache: ModelInfo[] | undefined
   /** 上次 chatOnce 失败原因（供核心测试模型汇总诊断）。 */
-  let lastErr: string | undefined
 
   async function refreshModels(): Promise<ModelInfo[]> {
     try {
@@ -81,15 +80,13 @@ export default function factory(env: SupplierEnv): SupplierModule {
     icon,
     status: (): SupplierStatusNow => ({ id, name, accounts: [] }),
     listModels: (force?: boolean): Promise<ModelInfo[]> => allModels(!!force),
-    getAlias: (): string => id,
     // testModel 由 dsh-router 核心统一走 chatOnce 路径（无账号，无需回退）
-    lastError: (): string | undefined => lastErr,
     /** 无账号供应商：uid 恒为空，只认 free 模型。 */
     async chatOnce(_uid: string, req: ChatRequest): Promise<ChatOnceResult> {
       // 只认 free 模型，其他模型交给别的供应商
       if (!isFreeModel(req.model)) {
-        lastErr = `unknown free model ${JSON.stringify(req.model)}`
-        return { ok: false, state: 'no_such_model', message: lastErr }
+        const msg = `unknown free model ${JSON.stringify(req.model)}`
+        return { ok: false, state: 'no_such_model', message: msg }
       }
       // 模型名规范化：剥 alias 前缀，body.model 用裸 id
       let body = req.rawBody
@@ -115,24 +112,24 @@ export default function factory(env: SupplierEnv): SupplierModule {
           signal: AbortSignal.timeout(120000),
         })
       } catch (err) {
-        lastErr = `opencode upstream: ${(err as Error).message}`
-        return { ok: false, state: 'transport', message: lastErr }
+        const msg = `opencode upstream: ${(err as Error).message}`
+        return { ok: false, state: 'transport', message: msg }
       }
 
       // 非 2xx：按状态归类，核心据此冷却/换号（本供应商无号可换，直接放弃）
       if (upstream.status < 200 || upstream.status >= 300) {
         const text = await upstream.text().catch(() => '')
-        lastErr = `upstream ${upstream.status}: ${text.slice(0, 200)}`
+        const msg = `upstream ${upstream.status}: ${text.slice(0, 200)}`
         const state: AccountState =
           upstream.status === 429 ? 'rate_limit' : upstream.status === 404 ? 'unavailable' : 'unknown'
-        return { ok: false, state, message: lastErr }
+        return { ok: false, state, message: msg }
       }
 
       // 流式：上游已是 OpenAI SSE，原样交回核心（核心负责写响应）
       if (req.stream) {
         if (!upstream.body) {
-          lastErr = 'opencode upstream: empty stream body'
-          return { ok: false, state: 'transport', message: lastErr }
+          const msg = 'opencode upstream: empty stream body'
+          return { ok: false, state: 'transport', message: msg }
         }
         return { ok: true, stream: upstream.body }
       }
@@ -140,8 +137,8 @@ export default function factory(env: SupplierEnv): SupplierModule {
       // 非流式：透传 JSON（空 body 视为上游异常）
       const text = await upstream.text().catch(() => '')
       if (text === '') {
-        lastErr = 'opencode upstream: empty body'
-        return { ok: false, state: 'transport', message: lastErr }
+        const msg = 'opencode upstream: empty body'
+        return { ok: false, state: 'transport', message: msg }
       }
       return { ok: true, status: upstream.status, body: text }
     },

package/src/suppliers/openrouter/plugin.ts

@@ -50,7 +50,6 @@ export default function factory(env: SupplierEnv): SupplierModule {
   let modelsCache: ModelInfo[] | undefined
   let freeIds = new Set<string>()
   /** 上次 chatOnce 失败原因（供核心测试模型汇总诊断）。 */
-  let lastErr: string | undefined
   function listKeys(): string[] {
     return env.credentials.list(id)
   }
@@ -121,7 +120,6 @@ export default function factory(env: SupplierEnv): SupplierModule {
       return { id, name, accounts }
     },
     listModels: (force?: boolean): Promise<ModelInfo[]> => allModels(!!force),
-    getAlias: (): string => id,
     async addApiKey(input: { name: string; apiKey: string }): Promise<{ ok: boolean; error?: string; account?: { uid: string; nickname: string } }> {
       const key = input.apiKey.trim()
       if (key === '') return { ok: false, error: 'API key 不能为空' }
@@ -151,18 +149,17 @@ export default function factory(env: SupplierEnv): SupplierModule {
       env.credentials.remove(id, uid)
       return true
     },
-    lastError: (): string | undefined => lastErr,
     /** 对单个 key 调一次上游。选号/冷却/换号是核心的活，这里只报结果。 */
     async chatOnce(uid: string, req: ChatRequest): Promise<ChatOnceResult> {
       const base = stripAlias(req.model, currentAlias())
       if (!freeIds.has(base) && !(await allModels(false)).some((m) => m.id === base)) {
-        lastErr = `unknown free model ${JSON.stringify(req.model)}`
-        return { ok: false, state: 'no_such_model', message: lastErr }
+        const msg = `unknown free model ${JSON.stringify(req.model)}`
+        return { ok: false, state: 'no_such_model', message: msg }
       }
       const acct = getKey(uid)
       if (acct === undefined) {
-        lastErr = `unknown account ${JSON.stringify(uid)}`
-        return { ok: false, state: 'no_such_model', message: lastErr }
+        const msg = `unknown account ${JSON.stringify(uid)}`
+        return { ok: false, state: 'no_such_model', message: msg }
       }
 
       let body = req.rawBody
@@ -188,34 +185,34 @@ export default function factory(env: SupplierEnv): SupplierModule {
           signal: AbortSignal.timeout(120000),
         })
       } catch (err) {
-        lastErr = (err as Error).message
-        return { ok: false, state: 'transport', message: lastErr }
+        const msg = (err as Error).message
+        return { ok: false, state: 'transport', message: msg }
       }
 
       if (upstream.status < 200 || upstream.status >= 300) {
         const text = await upstream.text().catch(() => '')
-        lastErr = `upstream ${upstream.status}: ${text.slice(0, 120)}`
+        const msg = `upstream ${upstream.status}: ${text.slice(0, 120)}`
         // 401/403 = 这个 key 本身不可用；429 = 限流；其余归为说不清
         const state: AccountState =
           upstream.status === 429 ? 'rate_limit'
             : upstream.status === 401 || upstream.status === 403 ? 'session_dead'
               : upstream.status === 404 ? 'unavailable'
                 : 'unknown'
-        return { ok: false, state, message: lastErr }
+        return { ok: false, state, message: msg }
       }
 
       // 流式：上游已是 OpenAI SSE，原样交回核心写
       if (req.stream) {
         if (!upstream.body) {
-          lastErr = 'openrouter upstream: empty stream body'
-          return { ok: false, state: 'transport', message: lastErr }
+          const msg = 'openrouter upstream: empty stream body'
+          return { ok: false, state: 'transport', message: msg }
         }
         return { ok: true, stream: upstream.body }
       }
       const text = await upstream.text().catch(() => '')
       if (text === '') {
-        lastErr = 'openrouter upstream: empty body'
-        return { ok: false, state: 'transport', message: lastErr }
+        const msg = 'openrouter upstream: empty body'
+        return { ok: false, state: 'transport', message: msg }
       }
       return { ok: true, status: upstream.status, body: text }
     },

package/src/suppliers/registry.ts

@@ -327,7 +327,10 @@ export function supplierRoutes(base: string, loaded: LoadedSupplier, store: Supp
         return
       }
       const body = JSON.parse(await readBody(req)) as { uid?: string }
-      const ok = await s.removeLink(body.uid ?? '')
+      const uid = body.uid ?? ''
+      const ok = await s.removeLink(uid)
+      // 链接没了，它的积分缓存也得跟着走（不然删号再重登会顶着一个旧数字）
+      if (ok) store.clearCredits(s.id, uid)
       writeJson(res, ok ? 200 : 404, ok ? { ok: true } : { ok: false, error: 'link not found' })
     },
   })