mioku-plugin-help 3.0.0 → 3.0.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mioku-plugin-help",
-  "version": "3.0.0",
+  "version": "3.0.2",
   "description": "帮助插件，使用截图服务生成美观的帮助图片，并提供 #状态 指令",
   "main": "index.ts",
   "type": "module",

package/status/data-collector.ts

@@ -2,12 +2,18 @@ import * as os from "node:os";
 import * as path from "node:path";
 import systemInfo from "systeminformation";
 import {
+  buildAdapterReport,
   connectedBots,
   getPluginMetadataList,
   getService,
   Services,
 } from "mioku";
-import type { AIService, Bot, MiokuContext } from "mioku";
+import type {
+  AdapterInstanceStatus,
+  AIService,
+  Bot,
+  MiokuContext,
+} from "mioku";
 import { getRenderVersions } from "../utils";
 import { perfMonitor } from "./performance-monitor";
 import { networkSampler } from "./network-sampler";
@@ -26,8 +32,6 @@ import type {
   MemoryStick,
   NetworkStatus,
   NodeRuntimeStatus,
-  OneBotStatusData,
-  OneBotVersionInfoData,
   ResourceStatus,
   StatusSnapshot,
   SystemInfo,
@@ -216,82 +220,55 @@ async function collectBotStatuses(
   ctx: MiokuContext,
   stdinAvatar?: string,
 ): Promise<BotAccountStatus[]> {
-  const results: BotAccountStatus[] = [];
-  for (const bot of bots) {
+  // 统一走框架的适配器上报，不再按 OneBot 的 get_version_info / get_status 猜
+  const adapters = ctx.adapters.map((adapter) => ({
+    name: adapter.name,
+    version: adapter.version,
+    impl: adapter.impl,
+  }));
+  const report = await withTimeout(buildAdapterReport({ bots, adapters })).catch(
+    () => null,
+  );
+  const instances = new Map<string, AdapterInstanceStatus>();
+  const implOf = new Map<string, { name: string; version?: string } | undefined>();
+  for (const entry of report?.adapters ?? []) {
+    implOf.set(entry.name, entry.impl);
+    for (const instance of entry.instances) {
+      instances.set(`${entry.name}:${instance.bot_id}`, instance);
+    }
+  }
+
+  return bots.map((bot) => {
     const uin = String(bot.bot_id);
     const adapter = String(bot.adapter);
     const isStdin = adapter === "stdin";
-    const nickname = String(bot.nickname || "Unknown Bot");
-    let framework = isStdin ? adapter : "unknown";
-    const avatarUrl = isStdin
-      ? toImageSrc(stdinAvatar || "")
-      : `https://q1.qlogo.cn/g?b=qq&nk=${uin}&s=160`;
-
-    let online = true;
-    let groupCount = 0;
-    let friendCount = 0;
-    let appVersion = "unknown";
-    let protocolVersion = "unknown";
-    const [statusResult, groupsResult, friendsResult, versionResult] =
-      await Promise.allSettled([
-        withTimeout(Promise.resolve().then(() => bot.sendApi<OneBotStatusData>("get_status"))).catch(
-          () => null,
-        ),
-        withTimeout(Promise.resolve().then(() => bot.getGroupList())).catch(
-          () => [],
-        ),
-        withTimeout(Promise.resolve().then(() => bot.getFriendList())).catch(
-          () => [],
-        ),
-        withTimeout(
-          Promise.resolve().then(() => bot.sendApi<OneBotVersionInfoData>("get_version_info")),
-        ).catch(() => null),
-      ]);
-    if (statusResult.status === "fulfilled" && statusResult.value) {
-      online = Boolean(statusResult.value.online);
-    }
-    if (isStdin) {
-      // 终端适配器没有 OneBot 版本信息，直接用适配器包版本
-      appVersion = String(ctx.getAdapter(adapter)?.version ?? "unknown");
-    } else if (versionResult.status === "fulfilled" && versionResult.value) {
-      const v = versionResult.value;
-      framework = String(v.app_name || "").trim() || framework;
-      if (v.app_version && v.app_version.trim()) {
-        appVersion = v.app_version.trim();
-      }
-      if (v.protocol_version && v.protocol_version.trim()) {
-        protocolVersion = v.protocol_version.trim();
-      }
-    }
-    if (
-      groupsResult.status === "fulfilled" &&
-      Array.isArray(groupsResult.value)
-    ) {
-      groupCount = groupsResult.value.length;
-    }
-    if (
-      friendsResult.status === "fulfilled" &&
-      Array.isArray(friendsResult.value)
-    ) {
-      friendCount = friendsResult.value.length;
-    }
+    const instance = instances.get(`${adapter}:${uin}`);
+    const lib = implOf.get(adapter);
+    // 实现端优先用平台自报的（NapCat / LLOneBot），否则退回适配器的底层库（ICQQ）
+    const framework = instance?.impl || lib?.name || adapter;
+    const appVersion = instance?.version || lib?.version || "";
 
-    results.push({
+    return {
       uin,
-      nickname,
-      avatarUrl,
+      nickname: String(bot.nickname || "Unknown Bot"),
+      avatarUrl: isStdin
+        ? toImageSrc(stdinAvatar || "")
+        : `https://q1.qlogo.cn/g?b=qq&nk=${uin}&s=160`,
       adapter,
-      framework,
-      appVersion,
-      protocolVersion,
-      online,
-      groupCount,
-      friendCount,
-      send: 0,
-      receive: 0,
-    });
-  }
-  return results;
+      framework: isStdin ? adapter : framework,
+      appVersion: isStdin
+        ? String(ctx.getAdapter(adapter)?.version ?? "")
+        : appVersion,
+      protocolVersion: instance?.protocol ?? "",
+      platform: instance?.platform ?? "",
+      platformVersion: instance?.platformVersion ?? "",
+      online: bot.online,
+      groupCount: instance?.stats.groups ?? 0,
+      friendCount: instance?.stats.friends ?? 0,
+      send: instance?.stats.sent ?? 0,
+      receive: instance?.stats.received ?? 0,
+    };
+  });
 }
 
 async function collectFramework(

package/status/html-generator.ts

@@ -1,10 +1,6 @@
-import {
-  escapeHtml,
-} from "../utils";
-import {
-  getHelpTheme,
-  HELP_BACKGROUND_IMAGE_URL,
-} from "../theme";
+import { escapeHtml } from "../utils";
+import { getHelpTheme, HELP_BACKGROUND_IMAGE_URL } from "../theme";
+import { displayAdapterId } from "mioku";
 import type {
   AIUsageStatsLite,
   BotAccountStatus,
@@ -76,7 +72,10 @@ function progressBar(percent: number, color: string): string {
   return `<div class="status-bar"><div class="status-bar__fill" style="width:${clamped}%;background:${color};"></div></div>`;
 }
 
-function progressColor(percent: number, theme: ReturnType<typeof getHelpTheme>): string {
+function progressColor(
+  percent: number,
+  theme: ReturnType<typeof getHelpTheme>,
+): string {
   if (percent >= 85) {
     return "linear-gradient(90deg, #ef4444, #f97316)";
   }
@@ -86,7 +85,10 @@ function progressColor(percent: number, theme: ReturnType<typeof getHelpTheme>):
   return `linear-gradient(90deg, ${theme.eyebrow}, ${theme.commandTitle})`;
 }
 
-function pieColor(percent: number, theme: ReturnType<typeof getHelpTheme>): string {
+function pieColor(
+  percent: number,
+  theme: ReturnType<typeof getHelpTheme>,
+): string {
   if (percent >= 85) {
     return "#ef4444";
   }
@@ -96,7 +98,10 @@ function pieColor(percent: number, theme: ReturnType<typeof getHelpTheme>): stri
   return theme.eyebrow;
 }
 
-function renderPieChart(percent: number, theme: ReturnType<typeof getHelpTheme>): string {
+function renderPieChart(
+  percent: number,
+  theme: ReturnType<typeof getHelpTheme>,
+): string {
   const clamped = Math.max(0, Math.min(100, percent));
   const filled = (clamped / 100) * PIE_CIRCUMFERENCE;
   const rest = PIE_CIRCUMFERENCE - filled;
@@ -128,36 +133,42 @@ function renderHero(
 ): string {
   const bots = snapshot.bots;
 
-  const accountRows = bots.length === 0
-    ? `<div class="status-hero__empty">当前没有在线账号</div>`
-    : bots
-        .map((bot) => {
-          const statusText = bot.online ? "在线" : "离线";
-          const statusColor = bot.online ? "#10b981" : "#ef4444";
-          // stdin 等本地适配器没有 OneBot 版本信息，统一显示为 `<适配器>@<包版本>`
-          const frameworkText =
-            bot.adapter === "stdin"
-              ? `${bot.adapter}@${bot.appVersion}`
-              : bot.appVersion && bot.appVersion !== "unknown"
-                ? `${bot.framework} ${bot.appVersion} · 协议 ${bot.protocolVersion}`
-                : bot.framework;
-          // Nickname is rendered as a bold large heading above the avatar
-          // row (not as a chip). Chips below only carry the metadata.
-          const tags = [
-            { text: String(bot.uin || "—"), kind: "data" },
-            { text: statusText, kind: bot.online ? "ok" : "danger" },
-            { text: `好友 ${fmtNumber(bot.friendCount)}`, kind: "data" },
-            { text: `群聊 ${fmtNumber(bot.groupCount)}`, kind: "data" },
-            { text: `收 ${fmtNumber(bot.receive)}`, kind: "data" },
-            { text: `发 ${fmtNumber(bot.send)}`, kind: "data" },
-            { text: frameworkText, kind: "data" },
-          ];
-          const tagsHtml = tags
-            .map(
-              (t) => `<span class="status-chip status-chip--${t.kind}">${escapeHtml(t.text)}</span>`,
-            )
-            .join("");
-          return `
+  const accountRows =
+    bots.length === 0
+      ? `<div class="status-hero__empty">当前没有在线账号</div>`
+      : bots
+          .map((bot) => {
+            const statusText = bot.online ? "在线" : "离线";
+            const statusColor = bot.online ? "#10b981" : "#ef4444";
+            const adapterLabel = displayAdapterId(bot.adapter);
+            const implText =
+              bot.adapter === "stdin"
+                ? `${adapterLabel}@${bot.appVersion}`
+                : bot.appVersion
+                  ? `${bot.framework} ${bot.appVersion}${bot.protocolVersion ? ` · 协议 ${bot.protocolVersion}` : ""}`
+                  : bot.framework;
+            const platformText = bot.platform
+              ? `${bot.platform}${bot.platformVersion ? ` v${bot.platformVersion}` : ""}`
+              : "";
+            // Nickname is rendered as a bold large heading above the avatar
+            // row (not as a chip). Chips below only carry the metadata.
+            const tags = [
+              { text: displayAdapterId(bot.uin) || "—", kind: "data" },
+              { text: statusText, kind: bot.online ? "ok" : "danger" },
+              { text: `好友 ${fmtNumber(bot.friendCount)}`, kind: "data" },
+              { text: `群聊 ${fmtNumber(bot.groupCount)}`, kind: "data" },
+              { text: `收 ${fmtNumber(bot.receive)}`, kind: "data" },
+              { text: `发 ${fmtNumber(bot.send)}`, kind: "data" },
+              { text: implText, kind: "data" },
+              ...(platformText ? [{ text: platformText, kind: "data" }] : []),
+            ];
+            const tagsHtml = tags
+              .map(
+                (t) =>
+                  `<span class="status-chip status-chip--${t.kind}">${escapeHtml(t.text)}</span>`,
+              )
+              .join("");
+            return `
             <div class="status-hero__account">
               <div class="status-hero__account-name">${escapeHtml(bot.nickname)}</div>
               <div class="status-hero__account-body">
@@ -169,8 +180,8 @@ function renderHero(
               </div>
             </div>
           `;
-        })
-        .join("");
+          })
+          .join("");
 
   return `
     <header class="status-hero">
@@ -190,8 +201,7 @@ function renderResourceCard(
 ): string {
   const linesHtml = lines
     .map(
-      (line) =>
-        `<div class="status-pie-card__line">${escapeHtml(line)}</div>`,
+      (line) => `<div class="status-pie-card__line">${escapeHtml(line)}</div>`,
     )
     .join("");
   return `
@@ -231,7 +241,10 @@ function renderResourcesSection(
       "SWAP",
       hasSwap ? r.swapPercent : 0,
       hasSwap
-        ? [`${r.swapUsedGB} / ${r.swapTotalGB} GB`, `可用 ${Math.max(0, r.swapTotalGB - r.swapUsedGB).toFixed(2)} GB`]
+        ? [
+            `${r.swapUsedGB} / ${r.swapTotalGB} GB`,
+            `可用 ${Math.max(0, r.swapTotalGB - r.swapUsedGB).toFixed(2)} GB`,
+          ]
         : ["未配置", ""],
       theme,
     ),
@@ -299,10 +312,10 @@ function buildSmoothPath(points: Array<{ x: number; y: number }>): string {
     const p1 = points[i];
     const p2 = points[i + 1];
     const p3 = points[Math.min(points.length - 1, i + 2)];
-    const cp1x = p1.x + (p2.x - p0.x) * tension / 3;
-    const cp1y = p1.y + (p2.y - p0.y) * tension / 3;
-    const cp2x = p2.x - (p3.x - p1.x) * tension / 3;
-    const cp2y = p2.y - (p3.y - p1.y) * tension / 3;
+    const cp1x = p1.x + ((p2.x - p0.x) * tension) / 3;
+    const cp1y = p1.y + ((p2.y - p0.y) * tension) / 3;
+    const cp2x = p2.x - ((p3.x - p1.x) * tension) / 3;
+    const cp2y = p2.y - ((p3.y - p1.y) * tension) / 3;
     d += ` C ${cp1x.toFixed(2)} ${cp1y.toFixed(2)}, ${cp2x.toFixed(2)} ${cp2y.toFixed(2)}, ${p2.x.toFixed(2)} ${p2.y.toFixed(2)}`;
   }
   return d;
@@ -322,10 +335,7 @@ function renderNetworkChart(history: NetworkSample[]): string {
     return `<svg viewBox="0 0 ${w} ${h}" class="status-chart"><text x="${w / 2}" y="${h / 2}" text-anchor="middle" fill="#94a3b8" font-size="11">数据采集中…</text></svg>`;
   }
 
-  const maxVal = Math.max(
-    1,
-    ...history.map((s) => Math.max(s.rxBps, s.txBps)),
-  );
+  const maxVal = Math.max(1, ...history.map((s) => Math.max(s.rxBps, s.txBps)));
   const yMax = maxVal * 1.2;
   const t0 = history[0].ts;
   const t1 = history[history.length - 1].ts;
@@ -487,9 +497,7 @@ function renderSystemSection(
   } else {
     s.memSticks.forEach((m, i) => {
       const size =
-        m.sizeGB >= 1
-          ? `${m.sizeGB} GB`
-          : `${(m.sizeGB * 1024).toFixed(0)} MB`;
+        m.sizeGB >= 1 ? `${m.sizeGB} GB` : `${(m.sizeGB * 1024).toFixed(0)} MB`;
       const speed = m.speedMTs > 0 ? ` · ${m.speedMTs} MT/s` : "";
       const manu =
         m.manufacturer && m.manufacturer !== "Manufacturer"
@@ -527,7 +535,10 @@ function renderSystemSection(
           : `${d.sizeGB} GB`;
       const vendor = d.vendor && d.vendor !== d.name ? `${d.vendor} ` : "";
       const name = d.name || d.type || "Unknown";
-      const iface = d.interfaceType && d.interfaceType !== "Unknown" ? ` · ${d.interfaceType}` : "";
+      const iface =
+        d.interfaceType && d.interfaceType !== "Unknown"
+          ? ` · ${d.interfaceType}`
+          : "";
       items.push({
         label: `硬盘 ${i + 1}`,
         value: `${vendor}${name} · ${sizeLabel}${iface}`.trim(),

package/status/types.ts

@@ -13,12 +13,16 @@ export interface BotAccountStatus {
   avatarUrl: string;
   /** 适配器名，如 "stdin" / "onebotv11" / "icqq"。 */
   adapter: string;
-  /** Underlying bot framework identifier, e.g. "QQBot" / "NapCat" / "LLOneBot". */
+  /** 实现端名称，如 "NapCat" / "LLOneBot" / "ICQQ"，取不到时为空串 */
   framework: string;
-  /** Adapter app version, e.g. "5.0.6" — from OneBot `get_version_info.app_version`. */
+  /** 实现端版本，如 "5.0.6"*/
   appVersion: string;
-  /** OneBot protocol version, e.g. "v11" — from OneBot `get_version_info.protocol_version`. */
+  /** 协议版本，如 OneBot 的 "v11"，没有则为空串 */
   protocolVersion: string;
+  /** 登录设备，如 icqq 的 "aPad"，没有则为空串 */
+  platform: string;
+  /** 登录设备对应的客户端版本，如 "9.3.50.40225"，没有则为空串 */
+  platformVersion: string;
   online: boolean;
   groupCount: number;
   friendCount: number;
@@ -26,27 +30,6 @@ export interface BotAccountStatus {
   receive: number;
 }
 
-/**
- * OneBot v11 `get_version_info` payload (already unwrapped from the
- * `{ status, retcode, data, ... }` envelope by the adapter's `bot.sendApi`).
- */
-export interface OneBotVersionInfoData {
-  app_name: string;
-  protocol_version: string;
-  app_version: string;
-}
-
-/**
- * OneBot v11 `get_status` payload (already unwrapped by napcat-sdk).
- * Per napcat 官方文档: `{ online, good, stat }` —— `stat` 是空对象，
- * 不包含 `start_time` 或任何统计字段。本接口只声明文档承诺的字段。
- */
-export interface OneBotStatusData {
-  online: boolean;
-  good: boolean;
-  stat: Record<string, never>;
-}
-
 /** Subset of mioku's `AIService.getUsageSummary` payload that we actually render. */
 export interface AIUsageSummary {
   totals?: {
@@ -126,13 +109,11 @@ export interface NodeRuntimeStatus {
   arrayBuffersMB: number;
   eventLoopDelayMs: { mean: number; p99: number };
   /** null when `--expose-gc` is not enabled. */
-  gc:
-    | {
-        available: boolean;
-        count: number;
-        lastDurationMs?: number;
-      }
-    | null;
+  gc: {
+    available: boolean;
+    count: number;
+    lastDurationMs?: number;
+  } | null;
 }
 
 export interface NetworkSample {