dsh-router-core 0.1.0 → 0.3.0

package/src/suppliers/openrouter/plugin.ts

@@ -9,8 +9,8 @@
  * 一个供应商可有多个命名 key，按池顺序/策略尝试。凭证存通用 CredentialStore
  * （SQLite：auths/credentials.sqlite，{ name, apiKey }）。
  */
-import type { ServerResponse } from 'node:http'
-import type { ChatRequest, ModelInfo, SupplierStatus } from '../../router/types.ts'
+import type { ChatRequest, ModelInfo } from '../../router/types.ts'
+import type { AccountState, ChatOnceResult, SupplierStatusNow } from '../contract.ts'
 import type { SupplierEnv, SupplierModule } from '../contract.ts'
 
 export const id = 'openrouter'
@@ -22,7 +22,7 @@ export const icon = 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAIAAAACACAYAA
 const BASE = 'https://openrouter.ai/api/v1'
 const MODELS_URL = `${BASE}/models`
 const CHAT_URL = `${BASE}/chat/completions`
-const COOL_DOWN_MS = 60 * 1000 // 失败冷却 60s
+/** 默认前缀（用户可在面板改；loader 包装会优先用 store 里的值）。 */
 
 /** 免费模型过滤（同 9Router openrouter-free）：pricing 全 0 且 context ≥ 200k。 */
 function isFreeModelMeta(m: { pricing?: { prompt?: string; completion?: string }; context_length?: number }): boolean {
@@ -33,10 +33,11 @@ function isFreeModelMeta(m: { pricing?: { prompt?: string; completion?: string }
   )
 }
 
+
 /** 剥 alias 前缀（or/xxx → xxx）。 */
-function stripAlias(model: string): string {
-  const slash = model.lastIndexOf('/')
-  return slash >= 0 ? model.slice(slash + 1) : model
+/** 剥本供应商 alias 前缀（只剥自己的，模型 id 自带的斜杠保留）。 */
+function stripAlias(model: string, alias: string): string {
+  return alias !== '' && model.startsWith(`${alias}/`) ? model.slice(alias.length + 1) : model
 }
 
 interface ApiKeyAccount {
@@ -48,9 +49,8 @@ export default function factory(env: SupplierEnv): SupplierModule {
   // 模型缓存由 dsh-router 核心统一管；插件每次拉取，失败回退上次成功结果
   let modelsCache: ModelInfo[] | undefined
   let freeIds = new Set<string>()
-  /** 失败冷却：uid → until(ms)。 */
-  const cooling = new Map<string, number>()
-
+  /** 上次 chatOnce 失败原因（供核心测试模型汇总诊断）。 */
+  let lastErr: string | undefined
   function listKeys(): string[] {
     return env.credentials.list(id)
   }
@@ -67,8 +67,9 @@ export default function factory(env: SupplierEnv): SupplierModule {
     return uids.map((uid) => ({ uid, acct: getKey(uid)! })).filter((x) => x.acct !== undefined)
   }
 
-  function isCooling(uid: string, now = Date.now()): boolean {
-    return (cooling.get(uid) ?? 0) > now
+  /** 当前前缀（与 loader 包装一致：store 覆盖默认值）。 */
+  function currentAlias(): string {
+    return env.store.get(id).alias || id
   }
 
   async function refreshModels(): Promise<ModelInfo[]> {
@@ -109,20 +110,18 @@ export default function factory(env: SupplierEnv): SupplierModule {
     name,
     priority,
     icon,
-    status: (): SupplierStatus => {
-      const now = Date.now()
+    status: (): SupplierStatusNow => {
+      // 只报「现在状态」：凭证是否存在。冷却/禁用/错误累计由核心叠加。
       const accounts = orderedKeys().map(({ uid, acct }) => ({
         uid,
         nickname: acct.name || 'API Key',
         credits: 0,
-        cooling: isCooling(uid, now),
-        disabled: false,
-        err_count: 0,
+        state: 'ok' as AccountState,
       }))
       return { id, name, accounts }
     },
     listModels: (force?: boolean): Promise<ModelInfo[]> => allModels(!!force),
-    getAlias: (): string => 'or',
+    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 不能为空' }
@@ -150,43 +149,21 @@ export default function factory(env: SupplierEnv): SupplierModule {
     async removeLink(uid: string): Promise<boolean> {
       if (getKey(uid) === undefined) return false
       env.credentials.remove(id, uid)
-      cooling.delete(uid)
       return true
     },
-    async testModel(mid: string): Promise<{ ok: boolean; error?: string }> {
-      const base = stripAlias(mid)
-      const keys = orderedKeys()
-      if (keys.length === 0) return { ok: false, error: '未添加 API key（点「添加链接」配置）' }
+    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)) {
-        return { ok: false, error: `unknown free model ${JSON.stringify(mid)}` }
+        lastErr = `unknown free model ${JSON.stringify(req.model)}`
+        return { ok: false, state: 'no_such_model', message: lastErr }
       }
-      for (const { acct } of keys) {
-        try {
-          const resp = await fetch(CHAT_URL, {
-            method: 'POST',
-            headers: {
-              'Content-Type': 'application/json',
-              Authorization: `Bearer ${acct.apiKey}`,
-              'HTTP-Referer': 'https://endpoint-proxy.local',
-              'X-Title': 'dsh-router',
-            },
-            body: JSON.stringify({ model: base, messages: [{ role: 'user', content: 'ping' }], stream: false, max_tokens: 1 }),
-            signal: AbortSignal.timeout(30000),
-          })
-          if (resp.ok) return { ok: true }
-          const body = await resp.text().catch(() => '')
-          return { ok: false, error: `upstream ${resp.status}: ${body.slice(0, 200)}` }
-        } catch (err) {
-          return { ok: false, error: (err as Error).message }
-        }
+      const acct = getKey(uid)
+      if (acct === undefined) {
+        lastErr = `unknown account ${JSON.stringify(uid)}`
+        return { ok: false, state: 'no_such_model', message: lastErr }
       }
-      return { ok: false, error: 'no api key' }
-    },
-    async chatCompletions(req: ChatRequest, res: ServerResponse): Promise<boolean> {
-      const base = stripAlias(req.model)
-      if (!freeIds.has(base) && !(await allModels(false)).some((m) => m.id === base)) return false
-      const keys = orderedKeys().filter(({ uid }) => !isCooling(uid))
-      if (keys.length === 0) return false // 无健康 key → 路由器 fallback
 
       let body = req.rawBody
       try {
@@ -197,74 +174,50 @@ export default function factory(env: SupplierEnv): SupplierModule {
         // 保持原样
       }
 
-      let lastErr = ''
-      for (const { uid, acct } of keys) {
-        let upstream: Response
-        try {
-          upstream = await fetch(CHAT_URL, {
-            method: 'POST',
-            headers: {
-              'Content-Type': 'application/json',
-              Authorization: `Bearer ${acct.apiKey}`,
-              'HTTP-Referer': 'https://endpoint-proxy.local',
-              'X-Title': 'dsh-router',
-            },
-            body,
-            signal: AbortSignal.timeout(120000),
-          })
-        } catch (err) {
-          cooling.set(uid, Date.now() + COOL_DOWN_MS)
-          lastErr = (err as Error).message
-          continue
-        }
-        // 非 2xx：冷却该 key，试下一个
-        if (upstream.status < 200 || upstream.status >= 300) {
-          cooling.set(uid, Date.now() + COOL_DOWN_MS)
-          const text = await upstream.text().catch(() => '')
-          lastErr = `upstream ${upstream.status}: ${text.slice(0, 120)}`
-          continue
-        }
-        // 成功：透传（流式 SSE 或 JSON）
-        if (req.stream) {
-          res.writeHead(upstream.status, {
-            'Content-Type': 'text/event-stream',
-            'Cache-Control': 'no-cache',
-            Connection: 'keep-alive',
-            'X-Accel-Buffering': 'no',
-          })
-          if (!upstream.body) {
-            res.end()
-            return true
-          }
-          const reader = upstream.body.getReader()
-          try {
-            for (;;) {
-              const { done, value } = await reader.read()
-              if (done) break
-              res.write(Buffer.from(value))
-              if (typeof (res as { flushHeaders?: () => void }).flushHeaders === 'function') {
-                ;(res as { flushHeaders: () => void }).flushHeaders()
-              }
-            }
-          } finally {
-            reader.releaseLock()
-          }
-          res.end()
-          return true
-        }
+      let upstream: Response
+      try {
+        upstream = await fetch(CHAT_URL, {
+          method: 'POST',
+          headers: {
+            'Content-Type': 'application/json',
+            Authorization: `Bearer ${acct.apiKey}`,
+            'HTTP-Referer': 'https://endpoint-proxy.local',
+            'X-Title': 'dsh-router',
+          },
+          body,
+          signal: AbortSignal.timeout(120000),
+        })
+      } catch (err) {
+        lastErr = (err as Error).message
+        return { ok: false, state: 'transport', message: lastErr }
+      }
+
+      if (upstream.status < 200 || upstream.status >= 300) {
         const text = await upstream.text().catch(() => '')
-        let status = upstream.status
-        if (status === 200 && text === '') status = 502
-        try {
-          writeJson(res, status, JSON.parse(text))
-        } catch {
-          writeJson(res, status, { error: { message: text.slice(0, 500), type: 'api_error', code: 'upstream_error' } })
+        lastErr = `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 }
+      }
+
+      // 流式：上游已是 OpenAI SSE，原样交回核心写
+      if (req.stream) {
+        if (!upstream.body) {
+          lastErr = 'openrouter upstream: empty stream body'
+          return { ok: false, state: 'transport', message: lastErr }
         }
-        return true
+        return { ok: true, stream: upstream.body }
       }
-      // 所有 key 都失败：记录日志，返回 false 让路由器 fallback
-      env.log(`openrouter chat failed: ${lastErr}`)
-      return false
+      const text = await upstream.text().catch(() => '')
+      if (text === '') {
+        lastErr = 'openrouter upstream: empty body'
+        return { ok: false, state: 'transport', message: lastErr }
+      }
+      return { ok: true, status: upstream.status, body: text }
     },
     dispose: (): void => {
       modelsCache = undefined
@@ -272,11 +225,3 @@ export default function factory(env: SupplierEnv): SupplierModule {
   }
 }
 
-function writeJson(res: ServerResponse, status: number, body: unknown): void {
-  const payload = typeof body === 'string' ? body : JSON.stringify(body)
-  res.writeHead(status, {
-    'Content-Type': 'application/json; charset=utf-8',
-    'Cache-Control': 'no-store',
-  })
-  res.end(payload)
-}

package/src/suppliers/registry.test.ts

@@ -0,0 +1,194 @@
+/**
+ * 签到汇聚（POST /suppliers/:id/checkin）契约测试 —— node --test 直接跑（Node 24 原生剥 TS 类型）。
+ *
+ * 锁定的契约：checkinNow 是**单账号**能力，遍历所有链接 + 汇总是核心的活：
+ *   - 禁用链接不签（不动它）
+ *   - 某个链接抛错 → 记成 error，不带垮其它链接
+ *   - succeeded / already 按 status 统计，ok = 有任一成功或今日已签
+ */
+import test from 'node:test'
+import assert from 'node:assert/strict'
+import { supplierRoutes } from './registry.ts'
+import type { SupplierConfigStore } from '../supplier-config.ts'
+
+type CheckinResult = { uid: string; ok: boolean; status: string; message?: string }
+
+/** 最小假 res：只接住 writeJson 写出的状态码与 JSON body。 */
+function fakeRes(): { status: number; body: unknown; res: never } {
+  const out = { status: 0, body: undefined as unknown }
+  const res = {
+    writeHead(status: number): void {
+      out.status = status
+    },
+    end(payload: string): void {
+      out.body = JSON.parse(payload)
+    },
+  }
+  return { get status() { return out.status }, get body() { return out.body }, res: res as never }
+}
+
+type FakeAccount = { uid: string; disabled?: boolean; credits?: number }
+
+/** 造一个只带 checkinNow 的假供应商：status() 返回账号列表，checkinNow 按 uid 应答。
+ *  accounts 可传函数（每次 status() 重新求值，用来模拟插件后台异步刷积分）。 */
+function fixture(
+  accounts: FakeAccount[] | (() => FakeAccount[]),
+  checkinNow: (uid: string) => Promise<{ ok: boolean; status: string; message?: string }>,
+): never {
+  const list = (): FakeAccount[] => (typeof accounts === 'function' ? accounts() : accounts)
+  const supplier = {
+    id: 'fake',
+    name: 'fake',
+    status: () => ({
+      id: 'fake',
+      name: 'fake',
+      accounts: list().map((a) => ({
+        uid: a.uid,
+        nickname: a.uid,
+        credits: a.credits ?? 0,
+        cooling: false,
+        disabled: a.disabled ?? false,
+        err_count: 0,
+      })),
+    }),
+    __module: { checkinNow },
+  }
+  return { supplier, capabilities: new Set(['checkinNow']), source: 'builtin' } as never
+}
+
+/** 打到某条路由上，返回 { status, body }。B 是期望的响应体形状（让 tsc 真检查）。 */
+async function post<B>(loaded: never, path: string): Promise<{ status: number; body: B }> {
+  const routes = supplierRoutes('/router/api', loaded, {} as SupplierConfigStore, {} as never)
+  const route = routes.find((r) => r.path === `/router/api/suppliers/fake/${path}`)
+  assert.ok(route, `${path} 路由应注册`)
+  const sink = fakeRes() // getter 延迟读，不能解构
+  await route!.handler({} as never, sink.res)
+  return { status: sink.status, body: sink.body as B }
+}
+
+/** 跑到 /checkin 路由上，返回 { status, body }。 */
+async function postCheckin(loaded: never): Promise<{ status: number; body: CheckinPayload }> {
+  return await post<CheckinPayload>(loaded, 'checkin')
+}
+
+/** POST /links/refresh 的响应体。 */
+interface RefreshPayload {
+  ok: boolean
+  changed: boolean
+  accounts: Array<{ uid: string; credits: number }>
+  error?: string
+}
+
+interface CheckinPayload {
+  ok: boolean
+  total: number
+  succeeded: number
+  already: number
+  results?: CheckinResult[]
+  error?: string
+}
+
+test('签到：遍历所有链接，逐个调 checkinNow(uid)', async () => {
+  const seen: string[] = []
+  const { status, body } = await postCheckin(
+    fixture([{ uid: 'a' }, { uid: 'b' }], async (uid) => {
+      seen.push(uid)
+      return { ok: true, status: 'ok', message: '+100 积分' }
+    }),
+  )
+  assert.deepEqual(seen, ['a', 'b'])
+  assert.equal(status, 200)
+  assert.deepEqual(
+    { ok: body.ok, total: body.total, succeeded: body.succeeded, already: body.already },
+    { ok: true, total: 2, succeeded: 2, already: 0 },
+  )
+  assert.deepEqual(body.results?.map((r) => r.uid), ['a', 'b'])
+})
+
+test('签到：禁用链接照样签（禁用由插件自己判定，核心不筛）', async () => {
+  const seen: string[] = []
+  const { body } = await postCheckin(
+    fixture([{ uid: 'a', disabled: true }, { uid: 'b' }], async (uid) => {
+      seen.push(uid)
+      // 插件（如 traework）自己会对禁用链接返回 status:'disabled'
+      return uid === 'a' ? { ok: false, status: 'disabled', message: '链接已禁用' } : { ok: true, status: 'ok' }
+    }),
+  )
+  assert.deepEqual(seen, ['a', 'b'])
+  assert.equal(body.total, 2)
+  assert.equal(body.succeeded, 1)
+  assert.equal(body.results?.[0]?.status, 'disabled')
+})
+
+test('签到：单链接抛错记成 error，其余照签', async () => {
+  const { status, body } = await postCheckin(
+    fixture([{ uid: 'a' }, { uid: 'b' }], async (uid) => {
+      if (uid === 'a') throw new Error('boom')
+      return { ok: true, status: 'ok' }
+    }),
+  )
+  assert.equal(status, 200)
+  assert.equal(body.succeeded, 1)
+  assert.equal(body.results?.[0]?.status, 'error')
+  assert.equal(body.results?.[0]?.message, 'boom')
+  assert.equal(body.results?.[1]?.status, 'ok')
+})
+
+test('签到：今日已签（already）算成功，不计入 succeeded', async () => {
+  const { status, body } = await postCheckin(
+    fixture([{ uid: 'a' }], async () => ({ ok: true, status: 'already', message: '今日已签到' })),
+  )
+  assert.equal(status, 200)
+  assert.deepEqual({ ok: body.ok, succeeded: body.succeeded, already: body.already }, { ok: true, succeeded: 0, already: 1 })
+})
+
+test('签到：全失败 → 400；无链接 → total 0 且 ok false', async () => {
+  const fail = await postCheckin(fixture([{ uid: 'a' }], async () => ({ ok: false, status: 'error', message: '凭证失效 401' })))
+  assert.equal(fail.status, 400)
+  assert.equal(fail.body.ok, false)
+  const empty = await postCheckin(fixture([], async () => ({ ok: true, status: 'ok' })))
+  assert.equal(empty.status, 400)
+  assert.equal(empty.body.total, 0)
+})
+
+test('刷新：等后台积分落地后返回最新快照（changed=true）', async () => {
+  // 模拟插件 fire-and-forget 刷积分：第 2 次 status() 起才带上新值
+  let ticks = 0
+  const { status, body } = await post<RefreshPayload>(
+    fixture(() => [{ uid: 'a', credits: ticks++ >= 2 ? 120 : 0 }], async () => ({ ok: true, status: 'ok' })),
+    'links/refresh',
+  )
+  assert.equal(status, 200)
+  assert.equal(body.ok, true)
+  assert.equal(body.changed, true)
+  assert.equal(body.accounts[0]?.credits, 120)
+})
+
+test('刷新：快照稳定就早退，不死等超时', async () => {
+  const started = Date.now()
+  const { status, body } = await post<RefreshPayload>(
+    fixture([{ uid: 'a', credits: 7 }], async () => ({ ok: true, status: 'ok' })),
+    'links/refresh',
+  )
+  assert.equal(status, 200)
+  assert.equal(body.changed, false)
+  assert.equal(body.accounts[0]?.credits, 7)
+  // settleStatus 稳定 2 次即 break（~600ms），远小于 3s 超时
+  assert.ok(Date.now() - started < 2000, `刷新不该等满超时，实际 ${Date.now() - started}ms`)
+})
+
+test('刷新：status() 抛错 → 500 带错误信息', async () => {
+  const supplier = {
+    id: 'fake',
+    name: 'fake',
+    status: (): never => { throw new Error('status boom') },
+    __module: { checkinNow: async () => ({ ok: true, status: 'ok' }) },
+  }
+  const { status, body } = await post<RefreshPayload>(
+    { supplier, capabilities: new Set(['checkinNow']), source: 'builtin' } as never,
+    'links/refresh',
+  )
+  assert.equal(status, 500)
+  assert.equal(body.ok, false)
+  assert.match(body.error ?? '', /status boom/)
+})