@zhin.js/adapter-icqq 4.0.0 → 5.0.0

package/src/{bot.ts → endpoint.ts}

@@ -1,12 +1,12 @@
 /**
- * ICQQ Bot：通过 @icqqjs/cli 守护进程 IPC 通信，实现 zhin Bot 接口
+ * ICQQ Bot：通过 @icqqjs/cli 守护进程 IPC 通信，实现 zhin Endpoint 接口
  *
  * 不再直接依赖 @icqqjs/icqq 协议库。
- * 登录由 `icqq login` 完成，本 Bot 只负责连接守护进程并收发消息。
+ * 登录由 `icqq login` 完成，本 Endpoint 只负责连接守护进程并收发消息。
  */
-import { formatCompact, Bot, Message, segment, SendContent, SendOptions, type QuotedMessagePayload } from 'zhin.js';
+import { formatCompact, Endpoint, Message, segment, SendContent, SendOptions, type QuotedMessagePayload } from 'zhin.js';
 import type {
-  IcqqBotConfig,
+  IcqqEndpointConfig,
   IcqqSenderInfo,
   IpcFriendInfo,
   IpcGroupInfo,
@@ -53,9 +53,9 @@ import { enableTypingIndicator, type ICQQTypingIndicatorManager } from "./typing
 import { parseIcqqGetMsgResponse } from "./get-msg.js";
 import { enrichQuotedPayloadWithForward, isForwardPlaceholderPayload } from "./forward-msg.js";
 
-export class IcqqBot implements Bot<IcqqBotConfig, IcqqIpcMessageEvent> {
+export class IcqqEndpoint implements Endpoint<IcqqEndpointConfig, IcqqIpcMessageEvent> {
   $connected = false;
-  $config: IcqqBotConfig;
+  $config: IcqqEndpointConfig;
   ipc!: IpcClient;
 
   /** 缓存的好友列表 */
@@ -86,7 +86,7 @@ export class IcqqBot implements Bot<IcqqBotConfig, IcqqIpcMessageEvent> {
 
   constructor(
     public adapter: IcqqAdapter,
-    config: IcqqBotConfig,
+    config: IcqqEndpointConfig,
   ) {
     this.$config = config;
   }
@@ -127,7 +127,7 @@ export class IcqqBot implements Bot<IcqqBotConfig, IcqqIpcMessageEvent> {
     // 如果配置中明确设置为 false，则不启用
     if (typingConfig?.enabled === false) {
       this.logger.debug(formatCompact({
-        bot: this.$id,
+        endpoint: this.$id,
         typingIndicator: 'disabled_by_config',
       }));
       return;
@@ -137,13 +137,13 @@ export class IcqqBot implements Bot<IcqqBotConfig, IcqqIpcMessageEvent> {
     try {
       this.$typingIndicator = enableTypingIndicator(this, typingConfig);
       this.logger.debug(formatCompact({
-        bot: this.$id,
+        endpoint: this.$id,
         typingIndicator: 'enabled',
         emoji: typingConfig?.defaultEmoji || '⏳',
       }));
     } catch (error) {
       this.logger.warn(formatCompact({
-        bot: this.$id,
+        endpoint: this.$id,
         typingIndicator: 'failed',
         error: error instanceof Error ? error.message : String(error),
       }));
@@ -209,7 +209,7 @@ export class IcqqBot implements Bot<IcqqBotConfig, IcqqIpcMessageEvent> {
         this.$connected = false;
         this.logger.warn(formatCompact( {
           op: "disconnect",
-          bot: this.$id,
+          endpoint: this.$id,
           ok: false,
           delay_ms: delayMs,
           attempt: attempt + 1,
@@ -222,17 +222,17 @@ export class IcqqBot implements Bot<IcqqBotConfig, IcqqIpcMessageEvent> {
           await this.rebindIpcSession();
           this.logger.info(formatCompact( {
             op: "reconnect",
-            bot: this.$id,
+            endpoint: this.$id,
             friends: this.friends.size,
             groups: this.groups.size,
           }));
           break;
-        } catch (e: any) {
+        } catch (e: unknown) {
           this.logger.warn(formatCompact( {
             op: "reconnect",
-            bot: this.$id,
+            endpoint: this.$id,
             ok: false,
-            error: e?.message ?? String(e),
+            error: e instanceof Error ? e.message : String(e),
           }));
         }
       }
@@ -282,7 +282,7 @@ export class IcqqBot implements Bot<IcqqBotConfig, IcqqIpcMessageEvent> {
     this.inboundDeduper.clear();
     this.ipc?.close();
     this.$connected = false;
-    this.logger.info(formatCompact( { op: "disconnect", bot: this.$id }));
+    this.logger.info(formatCompact( { op: "disconnect", endpoint: this.$id }));
   }
 
   // ── 消息处理 ───────────────────────────────────────────────────────
@@ -394,7 +394,7 @@ export class IcqqBot implements Bot<IcqqBotConfig, IcqqIpcMessageEvent> {
       formatCompact({
         notice: notice.$type,
         channel: `${notice.$channel.type}(${notice.$channel.id})`,
-        bot: this.$id,
+        endpoint: this.$id,
         sub_type: notice.$subType,
       }),
     );
@@ -414,7 +414,7 @@ export class IcqqBot implements Bot<IcqqBotConfig, IcqqIpcMessageEvent> {
       formatCompact({
         request: request.$type,
         channel: `${request.$channel.type}(${request.$channel.id})`,
-        bot: this.$id,
+        endpoint: this.$id,
         from: request.$sender.id,
       }),
     );
@@ -489,16 +489,6 @@ export class IcqqBot implements Bot<IcqqBotConfig, IcqqIpcMessageEvent> {
         senderInfo.permissions = ["admin"];
       }
     }
-    if (normalized.senderRole && normalized.senderRole !== "member") {
-      senderInfo.role = normalized.senderRole;
-      if (normalized.senderRole === "owner") {
-        senderInfo.isOwner = true;
-        senderInfo.permissions = ["owner"];
-      } else if (normalized.senderRole === "admin") {
-        senderInfo.isAdmin = true;
-        senderInfo.permissions = ["admin"];
-      }
-    }
 
     const quoteId =
       Message.quoteIdFromContent(normalized.content) ??
@@ -508,7 +498,7 @@ export class IcqqBot implements Bot<IcqqBotConfig, IcqqIpcMessageEvent> {
     const result = Message.from(raw, {
       $id: normalized.messageId,
       $adapter: "icqq" as const,
-      $bot: this.$config.name,
+      $endpoint: this.$config.name,
       $sender: senderInfo,
       $channel: {
         id: normalized.channelId,
@@ -522,7 +512,7 @@ export class IcqqBot implements Bot<IcqqBotConfig, IcqqIpcMessageEvent> {
         if (normalized.idSource === "synthetic") {
           this.logger.warn(formatCompact( {
             op: "recall",
-            bot: this.$id,
+            endpoint: this.$id,
             ok: false,
             error: "no message_id in push",
           }));
@@ -544,7 +534,7 @@ export class IcqqBot implements Bot<IcqqBotConfig, IcqqIpcMessageEvent> {
         return await this.adapter.sendMessage({
           ...result.$channel,
           context: "icqq",
-          bot: this.$config.name,
+          endpoint: this.$config.name,
           content,
         });
       },
@@ -640,7 +630,7 @@ export class IcqqBot implements Bot<IcqqBotConfig, IcqqIpcMessageEvent> {
     if (!resp.ok) {
       this.logger.warn(formatCompact( {
         op: "recall",
-        bot: this.$id,
+        endpoint: this.$id,
         ok: false,
         error: resp.error,
       }));
@@ -717,7 +707,7 @@ export class IcqqBot implements Bot<IcqqBotConfig, IcqqIpcMessageEvent> {
     }
 
     // 从映射中查找
-    const id = IcqqBot.EMOJI_MAP[emoji];
+    const id = IcqqEndpoint.EMOJI_MAP[emoji];
     if (id) {
       return id;
     }
@@ -745,7 +735,7 @@ export class IcqqBot implements Bot<IcqqBotConfig, IcqqIpcMessageEvent> {
       if (!resp.ok) {
         this.logger.warn(formatCompact({
           op: "add_reaction",
-          bot: this.$id,
+          endpoint: this.$id,
           message_id: messageId,
           emoji,
           id: emojiId,
@@ -757,7 +747,7 @@ export class IcqqBot implements Bot<IcqqBotConfig, IcqqIpcMessageEvent> {
 
       this.logger.debug(formatCompact({
         op: "add_reaction",
-        bot: this.$id,
+        endpoint: this.$id,
         message_id: messageId,
         emoji,
         id: emojiId,
@@ -769,7 +759,7 @@ export class IcqqBot implements Bot<IcqqBotConfig, IcqqIpcMessageEvent> {
     } catch (error) {
       this.logger.warn(formatCompact({
         op: "add_reaction",
-        bot: this.$id,
+        endpoint: this.$id,
         message_id: messageId,
         emoji,
         ok: false,
@@ -801,7 +791,7 @@ export class IcqqBot implements Bot<IcqqBotConfig, IcqqIpcMessageEvent> {
       if (!resp.ok) {
         this.logger.warn(formatCompact({
           op: "remove_reaction",
-          bot: this.$id,
+          endpoint: this.$id,
           message_id: messageId,
           reaction_id: reactionId,
           id: emojiId,
@@ -811,7 +801,7 @@ export class IcqqBot implements Bot<IcqqBotConfig, IcqqIpcMessageEvent> {
       } else {
         this.logger.debug(formatCompact({
           op: "remove_reaction",
-          bot: this.$id,
+          endpoint: this.$id,
           message_id: messageId,
           reaction_id: reactionId,
           id: emojiId,
@@ -821,7 +811,7 @@ export class IcqqBot implements Bot<IcqqBotConfig, IcqqIpcMessageEvent> {
     } catch (error) {
       this.logger.warn(formatCompact({
         op: "remove_reaction",
-        bot: this.$id,
+        endpoint: this.$id,
         message_id: messageId,
         reaction_id: reactionId,
         ok: false,
@@ -832,7 +822,7 @@ export class IcqqBot implements Bot<IcqqBotConfig, IcqqIpcMessageEvent> {
 }
 
 /** @deprecated 使用 `./cq-message.js` 导出 */
-export namespace IcqqBot {
+export namespace IcqqEndpoint {
   export const parseCqMessage = parseCqMessageImpl;
   export const buildIcqqIpcMessage = buildIcqqIpcMessageImpl;
   export const toCqString = toCqStringImpl;

package/src/icqq-side-events.ts

@@ -116,7 +116,7 @@ function senderFromId(id: unknown, name?: string) {
 
 export function formatIcqqNotice(
   event: IcqqIpcRawEvent,
-  botName: string,
+  endpointName: string,
 ): ReturnType<typeof Notice.from<IcqqIpcRawEvent>> {
   const $type = resolveNoticeZhinType(event);
   const isGroup = event.group_id != null;
@@ -128,7 +128,7 @@ export function formatIcqqNotice(
   return Notice.from(event, {
     $id: resolveSideEventDedupeKey(event, "notice"),
     $adapter: "icqq",
-    $bot: botName,
+    $endpoint: endpointName,
     $type,
     $subType: event.sub_type,
     $channel: {
@@ -152,7 +152,7 @@ function resolveRequestZhinType(event: IcqqIpcRawEvent): RequestType {
 
 export function formatIcqqRequest(
   event: IcqqIpcRawEvent,
-  botName: string,
+  endpointName: string,
   ipc: IpcClient,
 ): ReturnType<typeof Request.from<IcqqIpcRawEvent>> {
   const $type = resolveRequestZhinType(event);
@@ -169,7 +169,7 @@ export function formatIcqqRequest(
   return Request.from(event, {
     $id: String(flag),
     $adapter: "icqq",
-    $bot: botName,
+    $endpoint: endpointName,
     $type,
     $subType: event.sub_type,
     $channel: {

package/src/index.ts

@@ -29,7 +29,7 @@ declare module "zhin.js" {
 }
 
 export * from "./types.js";
-export { IcqqBot } from "./bot.js";
+export { IcqqEndpoint } from "./endpoint.js";
 export { IcqqAdapter } from "./adapter.js";
 export {
   ICQQTypingIndicatorManager,

package/src/ipc-client.ts

@@ -162,7 +162,7 @@ export class IpcClient {
       sock.on("error", (err) =>
         reject(
           new Error(
-            `无法连接 icqq 守护进程 (${getSocketPath(uin)}): ${err.message}。请先执行: icqq login`,
+            `无法连接 icqq 守护进程 (${getSocketPath(uin)}): ${err instanceof Error ? err.message : String(err)}。请先执行: icqq login`,
           ),
         ),
       );
@@ -204,7 +204,7 @@ export class IpcClient {
       sock.on("connect", () => resolve(new IpcClient(sock, true)));
       sock.on("error", (err) =>
         reject(
-          new Error(`无法连接 icqq RPC 服务 (${host}:${port}): ${err.message}`),
+          new Error(`无法连接 icqq RPC 服务 (${host}:${port}): ${err instanceof Error ? err.message : String(err)}`),
         ),
       );
     });

package/src/outbound-media.ts

@@ -3,7 +3,7 @@ import * as os from "node:os";
 import * as path from "node:path";
 import * as crypto from "node:crypto";
 import type { MessageSegment, SendContent } from "zhin.js";
-import type { IcqqBotConfig } from "./types.js";
+import type { IcqqEndpointConfig } from "./types.js";
 
 export type IcqqOutboundMediaMode = "file" | "base64";
 
@@ -38,7 +38,7 @@ function spoolBase64ToFile(
  * base64=保留 segment.base64，CQ 编码为 [image:base64://...] 经 IPC 交给守护进程解码（异机 RPC 默认）。
  */
 export function resolveIcqqOutboundMediaMode(
-  config: Pick<IcqqBotConfig, "rpc" | "outboundMedia">,
+  config: Pick<IcqqEndpointConfig, "rpc" | "outboundMedia">,
 ): IcqqOutboundMediaMode {
   if (config.outboundMedia === "base64" || config.outboundMedia === "file") {
     return config.outboundMedia;

package/src/routes.ts

@@ -11,29 +11,29 @@ export function registerRoutes(
   icqq: IcqqAdapter,
   _root: Plugin,
 ) {
-  router.get("/api/icqq/bots", async (ctx) => {
+  router.get("/api/icqq/endpoints", async (ctx) => {
     try {
-      const bots = Array.from(icqq.bots.values());
-      if (bots.length === 0) {
-        ctx.body = { success: true, data: [], message: "暂无ICQQ机器人实例" };
+      const endpoints = Array.from(icqq.endpoints.values());
+      if (endpoints.length === 0) {
+        ctx.body = { success: true, data: [], message: "暂无ICQQEndpoint 实例" };
         return;
       }
       const result = await Promise.all(
-        bots.map(async (bot) => {
+        endpoints.map(async (endpoint) => {
           try {
             const base: Record<string, unknown> = {
-              name: bot.$config.name,
-              connected: bot.$connected || false,
-              groupCount: bot.groups.size,
-              friendCount: bot.friends.size,
-              status: bot.$connected ? "online" : "offline",
+              name: endpoint.$config.name,
+              connected: endpoint.$connected || false,
+              groupCount: endpoint.groups.size,
+              friendCount: endpoint.friends.size,
+              status: endpoint.$connected ? "online" : "offline",
               lastActivity: new Date().toISOString(),
             };
 
             // 尝试从守护进程获取详细状态
-            if (bot.$connected && bot.ipc && !bot.ipc.closed) {
+            if (endpoint.$connected && endpoint.ipc && !endpoint.ipc.closed) {
               try {
-                const statusResp = await bot.ipc.request(
+                const statusResp = await endpoint.ipc.request(
                   Actions.GET_STATUS,
                   {},
                   5000,
@@ -51,7 +51,7 @@ export function registerRoutes(
             return base;
           } catch {
             return {
-              name: bot.$config.name,
+              name: endpoint.$config.name,
               connected: false,
               groupCount: 0,
               friendCount: 0,
@@ -71,7 +71,7 @@ export function registerRoutes(
       ctx.body = {
         success: false,
         error: "ICQQ_API_ERROR",
-        message: "获取机器人数据失败",
+        message: "获取 Endpoint 数据失败",
         details:
           process.env.NODE_ENV === "development"
             ? (error as Error).message