@tokenbuddy/tb-admin 1.0.32 → 1.0.34

package/tests/ui-static-row.test.ts

@@ -7,7 +7,7 @@
  * registry / 老 1.0.31 缺字段) 渲染出正确的 CSS class + 文案 + 按钮.
  *
  * 覆盖 (跟 docs/processes/seller-fleet-data-sources.md 一致):
- *   1. dataSource="both"       → "app-row" (无红/灰 class), 绿点 active, "Both" chip
+ *   1. dataSource="both"       → "app-row" (无红/灰 class), 绿点 active, "已发布" chip
  *   2. dataSource="fly"        → "app-row app-row-fly-only" (灰), "未发布" chip
  *                                + publish-hint-btn 文案
  *   3. dataSource="registry"   → "app-row app-row-registry-only" (整行红边)
@@ -98,7 +98,7 @@ function renderRow(row: Record<string, unknown>): string {
 }
 
 describe("admin web seller row 渲染 (Step 13 v1.1 双源 spec)", () => {
-  test("dataSource=both → 正常行 (无红/灰 class), 绿点, Both chip", () => {
+  test("dataSource=both → 正常行 (无红/灰 class), 绿点, 已发布 chip", () => {
     const out = renderRow({
       id: "tbs-alpha",
       name: "tbs-alpha",
@@ -118,9 +118,11 @@ describe("admin web seller row 渲染 (Step 13 v1.1 双源 spec)", () => {
     expect(out).not.toContain("app-row-fly-only");
     // 绿点 active → tone-green
     expect(out).toMatch(/app-dot tone-green/);
-    // Both chip
-    expect(out).toMatch(/datasource-chip both/);
-    expect(out).toContain("Both");
+    expect(out).toContain('title="registry: active · upstream: healthy · publish: published · detail: pending"');
+    // 已发布 chip
+    expect(out).toMatch(/datasource-chip published/);
+    expect(out).toContain("已发布");
+    expect(out).not.toContain("status-badge");
     // 无 alert-reason / remove-hint-btn / publish-hint-btn
     expect(out).not.toContain("alert-reason");
     expect(out).not.toContain("remove-hint-btn");
@@ -139,18 +141,280 @@ describe("admin web seller row 渲染 (Step 13 v1.1 双源 spec)", () => {
       upstreamStatus: "unknown",
       modelsCount: 0,
       dataSource: "fly",
+      publishStatus: "unpublished",
       publishHint: "未发布 — 可申请发布 (走 vendor-bootstrap stage)",
       flyApp: { name: "tbs-flyonly", status: "running" }
     });
     expect(out).toContain("app-row-fly-only");
     expect(out).not.toContain("app-row-registry-only");
-    expect(out).toMatch(/datasource-chip fly/);
+    expect(out).toMatch(/datasource-chip unpublished/);
     expect(out).toContain("未发布");
     // publish-hint-btn 出现 + 文案含 spec 关键词
     expect(out).toContain("publish-hint-btn");
     expect(out).toContain("未发布 — 可申请发布");
   });
 
+  test("registryStatus=offline overrides Pub chip even when Fly app still exists", () => {
+    const out = renderRow({
+      id: "tbs-offline",
+      name: "tbs-offline",
+      app: "tbs-offline",
+      url: "https://tbs-offline.fly.dev",
+      registryStatus: "offline",
+      nodeStatus: "unknown",
+      upstreamDomain: "api.example.com",
+      upstreamStatus: "unknown",
+      modelsCount: 1,
+      dataSource: "both",
+      publishStatus: "published",
+      flyApp: { name: "tbs-offline", status: "running" }
+    });
+
+    expect(out).toMatch(/datasource-chip offline/);
+    expect(out).toContain("已下线");
+    expect(out).toContain("Publish: offline · registry: offline · source: both");
+    expect(out).toContain('title="registry: offline · upstream: unknown · publish: offline · detail: pending"');
+    expect(out).not.toContain(">已发布</span>");
+    expect(out).not.toContain("registry: error");
+  });
+
+  test("registryStatus=draining overrides Pub chip even when publish relation is published", () => {
+    const out = renderRow({
+      id: "tbs-draining",
+      name: "tbs-draining",
+      app: "tbs-draining",
+      url: "https://tbs-draining.fly.dev",
+      registryStatus: "draining",
+      nodeStatus: "active",
+      upstreamDomain: "api.example.com",
+      upstreamStatus: "healthy",
+      modelsCount: 1,
+      dataSource: "both",
+      publishStatus: "published",
+      flyApp: { name: "tbs-draining", status: "running" }
+    });
+
+    expect(out).toMatch(/datasource-chip draining/);
+    expect(out).toContain("下线中");
+    expect(out).toContain("Publish: draining · registry: draining · source: both");
+  });
+
+  test("publishStatus=checking → 不把未知发布状态显示成未发布", () => {
+    const out = renderRow({
+      id: "tbs-checking",
+      name: "tbs-checking",
+      app: "tbs-checking",
+      url: "https://tbs-checking.fly.dev",
+      registryStatus: "unknown",
+      nodeStatus: "unknown",
+      upstreamDomain: "tbs-checking.fly.dev",
+      upstreamStatus: "unknown",
+      modelsCount: 0,
+      dataSource: "fly",
+      publishStatus: "checking",
+      detailStatus: "pending",
+      flyApp: { name: "tbs-checking", status: "running" }
+    });
+    expect(out).not.toContain("app-row-fly-only");
+    expect(out).toMatch(/datasource-chip checking/);
+    expect(out).toContain("发布待确认");
+    expect(out).not.toContain("publish-hint-btn");
+    expect(out).not.toContain(">未发布<");
+  });
+
+  test("列表列语义: connection 显示连接数, resources 无第二排, upstream 不显示 seller host / models", () => {
+    const out = renderRow({
+      id: "tbs-hide-host",
+      name: "tbs-hide-host",
+      app: "tbs-hide-host",
+      url: "https://tbs-hide-host.fly.dev",
+      registryStatus: "active",
+      nodeStatus: "active",
+      upstreamDomain: "tbs-hide-host.fly.dev",
+      upstreamStatus: "healthy",
+      upstreamBalanceUsdMicros: 1020000,
+      upstreamBalanceCurrency: "USD",
+      upstreamBalanceSource: "usage_generic",
+      capacityUsed: 3,
+      capacityLimit: 8,
+      resourceCpuPercent: 12.5,
+      resourceMemoryPercent: 48,
+      resourceMemoryRssMb: 246,
+      resourceMemoryLimitMb: 512,
+      discountRatio: 1,
+      modelsCount: 7,
+      specs: { cpuCores: 1, memoryMb: 512, machines: 1, runningMachines: 1, volumeGb: 1 },
+      dataSource: "both",
+      publishStatus: "published",
+      detailStatus: "fresh",
+      detailUpdatedAt: "2026-06-12T13:06:00.000Z",
+      detailNextRefreshAt: "2999-01-01T00:00:00.000Z",
+      flyApp: { name: "tbs-hide-host", status: "running" }
+    });
+
+    expect(out).toContain("op-value");
+    expect(out).toContain(">3 / 8</strong>");
+    expect(out).toContain("12.5%/48%");
+    expect(out).toContain("spec 1 vCPU / 512 MB");
+    expect(out).toContain("balance-line tone-red");
+    expect(out).toContain("op-chip tone-red");
+    expect(out).not.toMatch(/Resources<\/span><strong[^>]*>1 vCPU \/ 512 MB<\/strong><span class="metric-sub"/);
+    expect(out).not.toContain("cap 3 / 8");
+    expect(out).not.toContain("<strong>tbs-hide-host.fly.dev</strong>");
+    expect(out).not.toContain("7 models · disc");
+    expect(out).not.toContain("usage_generic");
+    expect(out).not.toContain("balance-badge tone-green");
+    expect(out).toContain("op-chip tone-green");
+    expect(out).toContain(">healthy</span>");
+  });
+
+  test("CPU/RAM 列只显示占比, 无运行数据时显示 -/-", () => {
+    const out = renderRow({
+      id: "tbs-no-runtime",
+      name: "tbs-no-runtime",
+      app: "tbs-no-runtime",
+      url: "https://tbs-no-runtime.fly.dev",
+      registryStatus: "active",
+      nodeStatus: "active",
+      upstreamDomain: "api.example.com",
+      upstreamStatus: "healthy",
+      capacityUsed: 0,
+      capacityLimit: 8,
+      dataSource: "both",
+      publishStatus: "published",
+      flyApp: { name: "tbs-no-runtime", status: "running" }
+    });
+
+    expect(out).toContain("-/-");
+    expect(out).not.toContain("CPU — / MEM —");
+  });
+
+  test("上游 status 从 seller /operator/status 单列显示, unhealthy 显示红色告警", () => {
+    const out = renderRow({
+      id: "tbs-upstream-down",
+      name: "tbs-upstream-down",
+      app: "tbs-upstream-down",
+      url: "https://tbs-upstream-down.fly.dev",
+      registryStatus: "active",
+      nodeStatus: "active",
+      upstreamDomain: "api.downstream.example",
+      upstreamStatus: "unhealthy",
+      capacityUsed: 0,
+      capacityLimit: 8,
+      dataSource: "both",
+      publishStatus: "published",
+      flyApp: { name: "tbs-upstream-down", status: "running" }
+    });
+
+    expect(out).toContain(">Status</span>");
+    expect(out).toContain("Upstream status from seller /operator/status");
+    expect(out).toContain("op-chip tone-red");
+    expect(out).toContain(">unhealthy</span>");
+    expect(out).toContain("row-alert");
+  });
+
+  test("上游 status 未知时显示中性 -, 不显示 unknown 文案", () => {
+    const out = renderRow({
+      id: "tbs-upstream-unknown",
+      name: "tbs-upstream-unknown",
+      app: "tbs-upstream-unknown",
+      url: "https://tbs-upstream-unknown.fly.dev",
+      registryStatus: "active",
+      nodeStatus: "active",
+      upstreamDomain: "api.example.com",
+      upstreamStatus: "unknown",
+      capacityUsed: 0,
+      capacityLimit: 8,
+      dataSource: "both",
+      publishStatus: "published",
+      flyApp: { name: "tbs-upstream-unknown", status: "running" }
+    });
+
+    expect(out).toContain(">Status</span>");
+    expect(out).toContain("op-chip tone-gray");
+    expect(out).toContain(">-\u003c/span>");
+    expect(out).not.toContain(">unknown</span>");
+    expect(out).not.toContain(">unkown</span>");
+  });
+
+  test("余额探测失败只显示 -, 不显示额外状态文案", () => {
+    const out = renderRow({
+      id: "tbs-balance-blocked",
+      name: "tbs-balance-blocked",
+      app: "tbs-balance-blocked",
+      url: "https://tbs-balance-blocked.fly.dev",
+      registryStatus: "active",
+      nodeStatus: "active",
+      upstreamDomain: "api.example.com",
+      upstreamStatus: "healthy",
+      upstreamBalanceError: "unauthorized: check upstreamApiKey",
+      capacityUsed: 0,
+      capacityLimit: 8,
+      dataSource: "both",
+      publishStatus: "published",
+      flyApp: { name: "tbs-balance-blocked", status: "running" }
+    });
+
+    expect(out).toContain('title="unauthorized: check upstreamApiKey">-</span>');
+    expect(out).not.toContain("probe blocked");
+    expect(out).not.toContain("balance-badge tone-gray");
+    expect(out).not.toContain("balance-badge tone-red");
+    expect(out).not.toContain("balance-line tone-red");
+  });
+
+  test("详情刷新 queued/loading 时 Next 列显示 spinner, 不显示状态文本", () => {
+    const out = renderRow({
+      id: "tbs-refreshing",
+      name: "tbs-refreshing",
+      app: "tbs-refreshing",
+      url: "https://tbs-refreshing.fly.dev",
+      registryStatus: "active",
+      nodeStatus: "active",
+      upstreamDomain: "api.example.com",
+      upstreamStatus: "healthy",
+      capacityUsed: 0,
+      capacityLimit: 8,
+      detailStatus: "loading",
+      dataSource: "both",
+      publishStatus: "published",
+      flyApp: { name: "tbs-refreshing", status: "running" }
+    });
+
+    expect(out).toContain("inline-spinner");
+    expect(out).toContain("aria-label=\"detail loading\"");
+    expect(out).not.toContain(">loading</strong>");
+    expect(out).not.toContain(">queued</strong>");
+  });
+
+  test("运维关键指标按风险突出: 满连接/高资源/慢 TTFT 显示红黄 chip", () => {
+    const out = renderRow({
+      id: "tbs-hot",
+      name: "tbs-hot",
+      app: "tbs-hot",
+      url: "https://tbs-hot.fly.dev",
+      registryStatus: "active",
+      nodeStatus: "active",
+      upstreamDomain: "openrouter.ai",
+      upstreamStatus: "healthy",
+      capacityUsed: 8,
+      capacityLimit: 8,
+      resourceCpuPercent: 81,
+      resourceMemoryPercent: 93,
+      ttftMs: 6500,
+      upstreamBalanceUsdMicros: 50000000,
+      upstreamBalanceCurrency: "USD",
+      dataSource: "both",
+      publishStatus: "published",
+      flyApp: { name: "tbs-hot", status: "running" }
+    });
+
+    expect(out).toContain("row-alert");
+    expect(out).toContain("op-chip tone-red");
+    expect(out).toContain(">8 / 8</span>");
+    expect(out).toContain("81%/93%");
+    expect(out).toContain(">6.50s</span>");
+  });
+
   test("dataSource=registry → 整行红边 + 严重事故 + alert-reason + 立即下线 (registry-only) 按钮", () => {
     const out = renderRow({
       id: "tbs-ghost",
@@ -163,6 +427,7 @@ describe("admin web seller row 渲染 (Step 13 v1.1 双源 spec)", () => {
       upstreamStatus: "unknown",
       modelsCount: 1,
       dataSource: "registry",
+      publishStatus: "registry_only",
       registryAlert: true,
       alertReason: "registry 收录了但 fly app 失踪 — 严重事故, 立即下线",
       removeHint: "立即下线 (registry-only)"
@@ -196,7 +461,7 @@ describe("admin web seller row 渲染 (Step 13 v1.1 双源 spec)", () => {
     expect(out).toContain('class="app-row"');
     expect(out).not.toContain("app-row-registry-only");
     expect(out).not.toContain("app-row-fly-only");
-    // 兜底 chip = both
-    expect(out).toMatch(/datasource-chip both/);
+    // 兜底 chip = published
+    expect(out).toMatch(/datasource-chip published/);
   });
 });

package/tests/vendor-cli.test.ts

@@ -7,7 +7,9 @@ import { execSync } from "child_process";
 
 // Use the workspace-linked package. ts-jest will resolve the
 // `.js` to the compiled `.ts` via the root moduleNameMapper.
-import { buildApp, BootstrapConfig } from "@tokenbuddy/wallet-bootstrap";
+import { buildApp } from "@tokenbuddy/wallet-bootstrap";
+import type { BootstrapConfig } from "@tokenbuddy/wallet-bootstrap";
+import { RegistryAdminClient } from "../src/client.js";
 
 const WALLET_TEST_DIR = path.resolve(__dirname, "../../data-vendor-cli-test");
 const TEMP_REGISTRY_PATH = path.join(WALLET_TEST_DIR, "sellers.json");
@@ -194,4 +196,46 @@ describe("Vendor CLI integration (Step 5)", () => {
     expect(list.body.releaseRequests).toHaveLength(1);
     expect(list.body.releaseRequests[0].id).toBe(submit.body.releaseRequest.id);
   });
+
+  test("RegistryAdminClient uses canonical admin API routes", async () => {
+    const app = buildServer();
+    const server = app.listen(0);
+    const address = server.address();
+    if (!address || typeof address !== "object") {
+      throw new Error("test server did not bind a TCP port");
+    }
+    const client = new RegistryAdminClient(`http://127.0.0.1:${address.port}`, SUPER_ADMIN_KEY);
+    try {
+      const vendor = await client.createVendor("AdminClientVendor");
+      expect(vendor.token).toBeTruthy();
+
+      const vendors = await client.listVendors();
+      expect(vendors.vendors.length).toBeGreaterThan(0);
+
+      const versions = await client.listVersions();
+      expect(versions.versions.length).toBeGreaterThan(0);
+
+      const token = vendor.token;
+      await request(app)
+        .post("/platform/sellers/stage")
+        .set("Authorization", `Bearer ${token}`)
+        .send({ seller: {
+          id: "admin-client-force-1",
+          name: "Admin Client Force",
+          url: "https://admin-client-force.example.com",
+          status: "active",
+          models: ["m1"],
+          supportedProtocols: ["chat_completions"],
+          paymentMethods: ["clawtip"]
+        } });
+      const submit = await request(app)
+        .post("/platform/release-requests")
+        .set("Authorization", `Bearer ${token}`)
+        .send({ stagedSellerIds: ["admin-client-force-1"] });
+      const forced = await client.forcePublish(submit.body.releaseRequest.id);
+      expect(forced.releaseRequest).toMatchObject({ status: "published" });
+    } finally {
+      await new Promise<void>((resolve) => server.close(() => resolve()));
+    }
+  });
 });