dsh-router-core 0.1.0 → 0.3.0

package/lib/types/suppliers/registry.d.ts

@@ -17,10 +17,11 @@
  *   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 { Router } from '../router/index.ts';
 import type { SupplierConfigStore } from '../supplier-config.ts';
 import type { LoadedSupplier } from './loader.ts';
 /** webServer 路由形状（与 index.ts 的 WebServerRoute 一致）。 */
@@ -30,4 +31,4 @@ export interface WebServerRoute {
     handler: (req: IncomingMessage, res: ServerResponse) => void | Promise<void>;
 }
 /** 为一个供应商生成端点（通用 + 差异化，返回 route 列表）。 */
-export declare function supplierRoutes(base: string, loaded: LoadedSupplier, store: SupplierConfigStore): WebServerRoute[];
+export declare function supplierRoutes(base: string, loaded: LoadedSupplier, store: SupplierConfigStore, router: Router): WebServerRoute[];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-router-core",
-  "version": "0.1.0",
+  "version": "0.3.0",
   "description": "DSH plugin: a simplified 9router (AI routing gateway). Adds a 路由系统 (Routing System) sidebar entry beside 记忆系统; the panel shows suppliers, account pool, combos, and endpoint/API keys.",
   "type": "module",
   "repository": {
@@ -52,6 +52,7 @@
     "build": "rm -rf lib && tsc -p tsconfig.build.json && tsdown && npm run build:client",
     "build:client": "DSH_CLIENT_ID=dsh-router DSH_CLIENT_FILE=client.js vite build -c client/vite.config.ts && DSH_CLIENT_ID=dsh-external/dsh-router DSH_CLIENT_FILE=client-registry.js vite build -c client/vite.config.ts",
     "typecheck": "tsc --noEmit",
+    "test": "node --test \"src/**/*.test.ts\"",
     "bundle": "tsdown",
     "watch": "tsdown --watch"
   },

package/src/client/CombosTab.tsx

@@ -49,15 +49,25 @@ interface ComboForm {
 }
 
 export function CombosTab({ combos, aliases, onRefresh }: CombosTabProps): JSX.Element {
-  /** 当前供应商前缀（单供应商取第一个）。 */
-  const primaryAlias = aliases[0]?.alias ?? ''
-
-  /** 模型 → 所属供应商前缀（按 groups 分组匹配；找不到兜底 primaryAlias）。 */
-  const aliasOf = (model: string): string => {
-    for (const g of groups) {
-      if (g.models.some(m => m.id === model)) return g.supplier.alias
+  /**
+   * 存储值 → 展示全名 alias/model。
+   * 存储格式 = `supplierId,modelId`：精准，同名模型不会串台。
+   * 兼容旧数据的裸 modelId：查不到归属就显示裸名——不能兜底套第一个供应商的
+   * 前缀，那样前缀是假的。
+   */
+  const displayName = (stored: string): string => {
+    const comma = stored.indexOf(',')
+    if (comma > 0) {
+      const sid = stored.slice(0, comma)
+      const mid = stored.slice(comma + 1)
+      const g = groups.find(x => x.supplier.id === sid)
+      const alias = g?.supplier.alias ?? aliases.find(a => a.id === sid)?.alias ?? ''
+      return alias === '' ? mid : `${alias}/${mid}`
     }
-    return primaryAlias
+    // 旧数据裸 id：按分组找归属（优先已启用的），找不到显示裸名
+    const hit = groups.find(g => g.models.some(m => m.id === stored && m.enabled))
+      ?? groups.find(g => g.models.some(m => m.id === stored))
+    return hit === undefined ? stored : `${hit.supplier.alias}/${stored}`
   }
   const [showForm, setShowForm] = useState(false)
   const [editing, setEditing] = useState<RouterCombo | null>(null)
@@ -132,11 +142,13 @@ export function CombosTab({ combos, aliases, onRefresh }: CombosTabProps): JSX.E
     setForm(prev => ({ ...prev, ...patch }))
   }
 
-  const toggleModel = (id: string): void => {
+  /** 勾选：存 `supplierId,modelId`（精准归属，展示时才拼 alias）。 */
+  const toggleModel = (supplierId: string, id: string): void => {
+    const stored = `${supplierId},${id}`
     patchForm({
-      models: form.models.includes(id)
-        ? form.models.filter(m => m !== id)
-        : [...form.models, id],
+      models: form.models.includes(stored)
+        ? form.models.filter(m => m !== stored)
+        : [...form.models, stored],
     })
   }
 
@@ -311,7 +323,7 @@ export function CombosTab({ combos, aliases, onRefresh }: CombosTabProps): JSX.E
                         {combo.models.slice(0, 4).map((model, i) => (
                           <span key={`${model}-${i}`} className="dshr-comboChip">
                             <span className="dshr-comboChipNum">{i + 1}</span>
-                            <span className="dshr-comboChipSupplier">{aliasOf(model) ? `${aliasOf(model)}/${model}` : model}</span>
+                            <span className="dshr-comboChipSupplier">{displayName(model)}</span>
                           </span>
                         ))}
                         {combo.models.length > 4 && (
@@ -382,7 +394,7 @@ export function CombosTab({ combos, aliases, onRefresh }: CombosTabProps): JSX.E
                         >
                           <span className="dshr-comboGrip" title="拖拽排序"><Icon d={I.grip} size={14} /></span>
                           <span className="dshr-comboStepNum">{index + 1}</span>
-                          <code className="dshr-comboSelectedModel">{aliasOf(model) ? `${aliasOf(model)}/${model}` : model}</code>
+                          <code className="dshr-comboSelectedModel">{displayName(model)}</code>
                           <button type="button" className="dshr-iconBtn dshr-iconBtn-sm dshr-comboStepRemove" title="移除" onClick={() => removeModel(index)}>
                             <Icon d={I.delete} size={14} />
                           </button>
@@ -411,14 +423,14 @@ export function CombosTab({ combos, aliases, onRefresh }: CombosTabProps): JSX.E
                       ? <p className="dshr-muted dshr-comboPickEmpty">没有可添加的模型</p>
                       : groups.map(g => {
                         const items = g.models.filter(m =>
-                          !form.models.includes(m.id) &&
+                          !form.models.includes(`${g.supplier.id},${m.id}`) &&
                           (modelQuery === '' || m.id.toLowerCase().includes(modelQuery.toLowerCase())))
                         if (items.length === 0) return null
                         return (
                           <div key={g.supplier.id} className="dshr-comboPickGroup">
                             <p className="dshr-comboPickGroupTitle">{g.supplier.name} · {g.supplier.alias}</p>
                             {items.map(m => (
-                              <button key={m.id} type="button" className="dshr-comboPickItem" onClick={() => toggleModel(m.id)}>
+                              <button key={m.id} type="button" className="dshr-comboPickItem" onClick={() => toggleModel(g.supplier.id, m.id)}>
                                 <span className="dshr-comboPickName">{m.id}</span>
                               </button>
                             ))}

package/src/client/RouterView.tsx

@@ -19,8 +19,9 @@ import {
 import { SupplierDetail } from './SupplierDetail.tsx'
 import { EndpointTab } from './EndpointTab.tsx'
 import { CombosTab } from './CombosTab.tsx'
+import { StatsTab } from './StatsTab.tsx'
 
-type TabId = 'suppliers' | 'combos' | 'endpoint'
+type TabId = 'overview' | 'suppliers' | 'combos' | 'endpoint'
 
 interface Snapshot {
   health: RouterHealthResponse | null
@@ -42,7 +43,7 @@ interface RouterViewProps {
 }
 
 export function RouterView({ onBack }: RouterViewProps): JSX.Element {
-  const [tab, setTab] = useState<TabId>('suppliers')
+  const [tab, setTab] = useState<TabId>('overview')
   const [detailSupplier, setDetailSupplier] = useState<{ id: string; name: string; icon?: string } | null>(null)
   const [snapshot, setSnapshot] = useState<Snapshot>({ health: null, status: null, combos: null })
   const [refreshing, setRefreshing] = useState(false)
@@ -125,6 +126,9 @@ export function RouterView({ onBack }: RouterViewProps): JSX.Element {
       </header>
 
       <nav className="dshr-nav">
+        <button type="button" aria-current={tab === 'overview' ? 'page' : undefined} onClick={() => setTab('overview')}>
+          概览
+        </button>
         <button type="button" aria-current={tab === 'suppliers' ? 'page' : undefined} onClick={() => setTab('suppliers')}>
           供应商 <span className="dshr-navCount">{suppliers.length}</span>
         </button>
@@ -137,6 +141,15 @@ export function RouterView({ onBack }: RouterViewProps): JSX.Element {
       </nav>
 
       <div className="dshr-content">
+        {/* ---------------- 概览（用量看板） ---------------- */}
+        {tab === 'overview' && (
+          <StatsTab
+            active
+            refreshing={refreshing}
+            onRefresh={() => void refresh()}
+          />
+        )}
+
         {/* ---------------- 供应商 ---------------- */}
         {tab === 'suppliers' && (
           detailSupplier !== null