dsh-router-core 0.1.0 → 0.3.0

package/src/suppliers/registry.ts

@@ -17,11 +17,12 @@
  *   POST   /suppliers/:id/login                   生成登录链接
  *   POST   /suppliers/:id/login/callback          {callbackUrl}
  *   POST   /suppliers/:id/links/remove            {uid}
- *   GET    /suppliers/:id/checkin/rule            + POST {rule}
- *   POST   /suppliers/:id/checkin                 触发签到
+ *   POST   /suppliers/:id/links/refresh           刷新链接池（积分，核心调 status() 等落地）
+ *   POST   /suppliers/:id/checkin                 签到所有链接（核心遍历 + 汇总）
  */
 import type { IncomingMessage, ServerResponse } from 'node:http'
-import type { ModelWithEnabled } from '../router/types.ts'
+import type { Router } from '../router/index.ts'
+import type { ModelWithEnabled, SupplierStatus } from '../router/types.ts'
 import type { SupplierConfigStore } from '../supplier-config.ts'
 import type { LoadedSupplier } from './loader.ts'
 
@@ -63,32 +64,31 @@ function cap(set: Set<string>, key: string): boolean {
   return set.has(key)
 }
 
-/** 模型列表统一缓存（dsh-router 核心管；插件只管拉取，不缓存）。 */
-const modelsCache = new Map<string, { models: ModelWithEnabled[]; fetchedAt: number }>()
-const MODELS_TTL_MS = 60 * 1000
+/** 账号状态指纹（积分 + 健康），用于判断刷新是否落地。 */
+function fingerprint(accounts: SupplierStatus['accounts']): string {
+  return accounts.map((a) => `${a.uid}:${a.credits}:${a.cooling}:${a.disabled}`).join('|')
+}
 
-/** 拉取并缓存某供应商模型（force 时强制刷新）。custom 模型并入显示。 */
-async function cachedModels(s: LoadedSupplier['supplier'], cfg: ReturnType<SupplierConfigStore['get']>, force = false): Promise<ModelWithEnabled[]> {
-  const hit = modelsCache.get(s.id)
-  if (!force && hit && Date.now() - hit.fetchedAt < MODELS_TTL_MS) return hit.models
-  const list = await Promise.resolve(s.listModels())
-  const custom = new Set(cfg.custom)
-  const disabled = new Set(cfg.disabled)
-  const models: ModelWithEnabled[] = list.map((mm) => ({
-    ...mm,
-    enabled: !disabled.has(mm.id),
-    custom: custom.has(mm.id) ? true : undefined,
-  }))
-  // 自定义模型（listModels 之外的）并入显示
-  const seen = new Set(models.map((mm) => mm.id))
-  for (const id of custom) {
-    if (!seen.has(id)) {
-      seen.add(id)
-      models.push({ id, enabled: !disabled.has(id), custom: true })
-    }
+/**
+ * 反复调插件已有的 status()，直到快照稳定再返回（是否有变化 = changed）。
+ * 插件的积分刷新是 fire-and-forget（status() 内部异步拉），核心拿不到句柄，
+ * 只能按指纹变化等它落地。天花板：缓存未过期时插件不会真拉上游，此时按钮
+ * 退化为「重读一次状态」（冷却/禁用这类健康状态仍是 status() 实时算的）。
+ * 升级路径：插件暴露可 await 的刷新能力，这里就不用轮询了。
+ */
+async function settleStatus(s: LoadedSupplier['supplier'], timeoutMs = 3000): Promise<boolean> {
+  const first = fingerprint(s.status().accounts)
+  const deadline = Date.now() + timeoutMs
+  let last = first
+  let stable = 0
+  while (Date.now() < deadline) {
+    await new Promise((resolve) => setTimeout(resolve, 200))
+    const now = fingerprint(s.status().accounts)
+    stable = now === last ? stable + 1 : 0
+    last = now
+    if (stable >= 2) break // 连续两次没变 → 认为刷新已落地
   }
-  modelsCache.set(s.id, { models, fetchedAt: Date.now() })
-  return models
+  return last !== first
 }
 
 function mod(s: LoadedSupplier): Record<string, unknown> {
@@ -96,7 +96,7 @@ function mod(s: LoadedSupplier): Record<string, unknown> {
 }
 
 /** 为一个供应商生成端点（通用 + 差异化，返回 route 列表）。 */
-export function supplierRoutes(base: string, loaded: LoadedSupplier, store: SupplierConfigStore): WebServerRoute[] {
+export function supplierRoutes(base: string, loaded: LoadedSupplier, store: SupplierConfigStore, router: Router): WebServerRoute[] {
   const s = loaded.supplier
   const m = mod(loaded)
   const c = loaded.capabilities
@@ -108,7 +108,7 @@ export function supplierRoutes(base: string, loaded: LoadedSupplier, store: Supp
     kind: 'exact',
     path: `${p}/models`,
     handler: async (_req, res) => {
-      const models = await cachedModels(s, store.get(s.id))
+      const models = await router.modelsOf(s.id)
       writeJson(res, 200, { ok: true, alias: s.getAlias(), models })
     },
   })
@@ -121,11 +121,16 @@ export function supplierRoutes(base: string, loaded: LoadedSupplier, store: Supp
       const body = JSON.parse(await readBody(req)) as { alias?: string }
       const alias = body.alias ?? ''
       const clean = alias.trim()
-      if (clean === '' || !/^[A-Za-z0-9_-]+$/.test(clean)) {
+      // 空 = 用供应商 id（默认值），合法；非空则校验字符集
+      if (clean !== '' && !/^[A-Za-z0-9_-]+$/.test(clean)) {
         writeJson(res, 400, { ok: false, error: '前缀只能包含字母、数字、- 和 _' })
         return
       }
-      store.setAlias(s.id, clean)
+      const r = store.setAlias(s.id, clean)
+      if (!r.ok) {
+        writeJson(res, 400, { ok: false, error: `前缀已被供应商 ${JSON.stringify(r.conflictWith ?? '?')} 占用` })
+        return
+      }
       writeJson(res, 200, { ok: true })
     },
   })
@@ -137,13 +142,13 @@ export function supplierRoutes(base: string, loaded: LoadedSupplier, store: Supp
     handler: async (req, res) => {
       const body = JSON.parse(await readBody(req)) as { id?: string; enabled?: boolean }
       const cfg = store.get(s.id)
-      const models = await cachedModels(s, cfg)
+      const models = await router.modelsOf(s.id)
       if (!body.id || !models.some((mm) => mm.id === body.id)) {
         writeJson(res, 400, { ok: false, error: '模型不存在' })
         return
       }
       store.setModelEnabled(s.id, body.id, !!body.enabled)
-      modelsCache.delete(s.id) // 启用状态变化后失效缓存
+      router.invalidateModels(s.id)
       writeJson(res, 200, { ok: true })
     },
   })
@@ -159,13 +164,13 @@ export function supplierRoutes(base: string, loaded: LoadedSupplier, store: Supp
         writeJson(res, 400, { ok: false, error: '模型 id 不能为空' })
         return
       }
-      const models = await cachedModels(s, store.get(s.id))
+      const models = await router.modelsOf(s.id)
       if (models.some((mm) => mm.id === id)) {
         writeJson(res, 400, { ok: false, error: `模型 ${id} 已存在` })
         return
       }
       store.addCustomModel(s.id, id)
-      modelsCache.delete(s.id)
+      router.invalidateModels(s.id)
       writeJson(res, 200, { ok: true })
     },
   })
@@ -182,7 +187,7 @@ export function supplierRoutes(base: string, loaded: LoadedSupplier, store: Supp
         return
       }
       store.removeCustomModel(s.id, body.id)
-      modelsCache.delete(s.id)
+      router.invalidateModels(s.id)
       writeJson(res, 200, { ok: true })
     },
   })
@@ -193,9 +198,9 @@ export function supplierRoutes(base: string, loaded: LoadedSupplier, store: Supp
     path: `${p}/models/bulk`,
     handler: async (req, res) => {
       const body = JSON.parse(await readBody(req)) as { enabled?: boolean }
-      const models = await cachedModels(s, store.get(s.id))
+      const models = await router.modelsOf(s.id)
       store.setAllModelsEnabled(s.id, !!body.enabled, models.map((mm) => mm.id))
-      modelsCache.delete(s.id)
+      router.invalidateModels(s.id)
       writeJson(res, 200, { ok: true })
     },
   })
@@ -242,18 +247,18 @@ export function supplierRoutes(base: string, loaded: LoadedSupplier, store: Supp
     kind: 'exact',
     path: `${p}/models/fetch`,
     handler: async (_req, res) => {
-      const models = await cachedModels(s, store.get(s.id), true)
+      const models = await router.modelsOf(s.id, true)
       writeJson(res, 200, { ok: true, models })
     },
   })
 
-  // ---- 必要差异化: testModel（所有供应商必须实现） ----
+  // ---- 通用: 测试模型（核心统一走 chatOnce 路径，账号池回退/冷却自动生效） ----
   routes.push({
     kind: 'exact',
     path: `${p}/models/test`,
     handler: async (req, res) => {
       const body = JSON.parse(await readBody(req)) as { id?: string }
-      const result = await s.testModel(body.id ?? '')
+      const result = await router.testModel(s.id, body.id ?? '')
       writeJson(res, result.ok ? 200 : 400, result)
     },
   })
@@ -327,22 +332,19 @@ export function supplierRoutes(base: string, loaded: LoadedSupplier, store: Supp
     },
   })
 
-  // ---- 通用: 签到规则（dsh-router 策略,存 SupplierConfigStore） ----
+  // ---- 通用: 刷新链接池（积分 + 健康） ----
+  // 刷新是核心的活，但只调插件已有的 status()——插件在 status() 里自带积分
+  // 异步刷新（缓存过期才真拉上游），冷却/禁用（健康）也是 status() 实时算的。
   routes.push({
     kind: 'exact',
-    path: `${p}/checkin/rule`,
-    handler: async (req, res) => {
-      if (req.method === 'GET') {
-        writeJson(res, 200, { ok: true, rule: store.get(s.id).checkinRule })
-        return
-      }
-      const body = JSON.parse(await readBody(req)) as { rule?: string }
-      if (body.rule !== 'all' && body.rule !== 'first') {
-        writeJson(res, 400, { ok: false, error: 'rule 必须是 all 或 first' })
-        return
+    path: `${p}/links/refresh`,
+    handler: async (_req, res) => {
+      try {
+        const changed = await settleStatus(s)
+        writeJson(res, 200, { ok: true, changed, accounts: s.status().accounts })
+      } catch (err) {
+        writeJson(res, 500, { ok: false, error: (err as Error).message })
       }
-      store.setCheckinRule(s.id, body.rule)
-      writeJson(res, 200, { ok: true })
     },
   })
 
@@ -351,12 +353,30 @@ export function supplierRoutes(base: string, loaded: LoadedSupplier, store: Supp
       kind: 'exact',
       path: `${p}/checkin`,
       handler: async (_req, res) => {
-        try {
-          const result = await (m.checkinNow as () => Promise<{ ok: boolean; error?: string }>).call(loaded.supplier)
-          writeJson(res, result.ok === false ? 400 : 200, result)
-        } catch (err) {
-          writeJson(res, 500, { ok: false, error: (err as Error).message })
+        // 签到 = 所有链接逐个签一次：checkinNow 是单账号能力，
+        // 遍历与汇总是核心的活（插件不负责连接池顺序/范围）。
+        // 禁用与否由插件自己判定（如 traework 返回 status:'disabled'），核心不替它筛。
+        const checkinOne = m.checkinNow as
+          ((uid: string) => Promise<{ ok: boolean; status: string; message?: string }>) | undefined
+        if (!checkinOne) {
+          writeJson(res, 400, { ok: false, error: '该供应商不支持签到' })
+          return
+        }
+        type CheckinResult = { uid: string; ok: boolean; status: string; message?: string }
+        const uids = s.status().accounts.map((a) => a.uid)
+        const results: CheckinResult[] = []
+        // 单个链接抛错不能带垮整批：记成 error 继续下一个
+        for (const uid of uids) {
+          try {
+            results.push({ uid, ...(await checkinOne.call(loaded.supplier, uid)) })
+          } catch (err) {
+            results.push({ uid, ok: false, status: 'error', message: (err as Error).message })
+          }
         }
+        const succeeded = results.filter((r) => r.status === 'ok').length
+        const already = results.filter((r) => r.status === 'already').length
+        const payload = { ok: succeeded + already > 0, total: uids.length, succeeded, already, results }
+        writeJson(res, payload.ok ? 200 : 400, payload)
       },
     })
   }