@zhin.js/adapter-discord 2.0.12 → 3.0.1

package/src/adapter.ts

@@ -3,91 +3,93 @@
  */
 import { Adapter, Plugin } from "zhin.js";
 import type { Router } from "@zhin.js/host-router";
-import { DiscordBot } from "./bot.js";
-import { DiscordInteractionsBot } from "./bot-interactions.js";
+import { DiscordEndpoint } from "./endpoint.js";
+import { DiscordInteractionsEndpoint } from "./endpoint-interactions.js";
 import type {
-  DiscordBotConfig,
+  DiscordEndpointConfig,
   DiscordGatewayConfig,
   DiscordInteractionsConfig,
 } from "./types.js";
 
-export type DiscordBotLike = DiscordBot | DiscordInteractionsBot;
+export type DiscordEndpointLike = DiscordEndpoint | DiscordInteractionsEndpoint;
 
-function isGatewayBot(bot: DiscordBotLike): bot is DiscordBot {
-  return (bot.$config as { connection?: string }).connection === "gateway";
+function isGatewayBot(endpoint: DiscordEndpointLike): endpoint is DiscordEndpoint {
+  return (endpoint.$config as { connection?: string }).connection === "gateway";
 }
 
-export class DiscordAdapter extends Adapter<DiscordBotLike> {
+export class DiscordAdapter extends Adapter<DiscordEndpointLike> {
+  static override readonly capabilities = ['inbound', 'outbound'] as const;
+
   #router?: Router;
 
   constructor(plugin: Plugin) {
     super(plugin, "discord", []);
   }
 
-  createBot(config: DiscordBotConfig): DiscordBotLike {
+  createEndpoint(config: DiscordEndpointConfig): DiscordEndpointLike {
     const connection = config.connection ?? "gateway";
     switch (connection) {
       case "gateway":
-        return new DiscordBot(this, config as DiscordGatewayConfig);
+        return new DiscordEndpoint(this, config as DiscordGatewayConfig);
       case "interactions":
         if (!this.#router) {
           throw new Error(
             "Discord connection: interactions 需要 router，请安装并在配置中启用 @zhin.js/host-router"
           );
         }
-        return new DiscordInteractionsBot(this, this.#router, config as DiscordInteractionsConfig);
+        return new DiscordInteractionsEndpoint(this, this.#router, config as DiscordInteractionsConfig);
       default:
-        throw new Error(`Unknown Discord connection: ${(config as DiscordBotConfig).connection}`);
+        throw new Error(`Unknown Discord connection: ${(config as DiscordEndpointConfig).connection}`);
     }
   }
 
-  async kickMember(botId: string, sceneId: string, userId: string) {
-    const bot = this.bots.get(botId);
-    if (!bot) throw new Error(`Bot ${botId} 不存在`);
-    if (!isGatewayBot(bot)) throw new Error("群管仅支持 connection: gateway");
-    return bot.kickMember(sceneId, userId);
+  async kickMember(endpointId: string, sceneId: string, userId: string) {
+    const endpoint = this.endpoints.get(endpointId);
+    if (!endpoint) throw new Error(`Endpoint ${endpointId} 不存在`);
+    if (!isGatewayBot(endpoint)) throw new Error("群管仅支持 connection: gateway");
+    return endpoint.kickMember(sceneId, userId);
   }
 
-  async banMember(botId: string, sceneId: string, userId: string, reason?: string) {
-    const bot = this.bots.get(botId);
-    if (!bot) throw new Error(`Bot ${botId} 不存在`);
-    if (!isGatewayBot(bot)) throw new Error("群管仅支持 connection: gateway");
-    return bot.banMember(sceneId, userId, reason);
+  async banMember(endpointId: string, sceneId: string, userId: string, reason?: string) {
+    const endpoint = this.endpoints.get(endpointId);
+    if (!endpoint) throw new Error(`Endpoint ${endpointId} 不存在`);
+    if (!isGatewayBot(endpoint)) throw new Error("群管仅支持 connection: gateway");
+    return endpoint.banMember(sceneId, userId, reason);
   }
 
-  async unbanMember(botId: string, sceneId: string, userId: string) {
-    const bot = this.bots.get(botId);
-    if (!bot) throw new Error(`Bot ${botId} 不存在`);
-    if (!isGatewayBot(bot)) throw new Error("群管仅支持 connection: gateway");
-    return bot.unbanMember(sceneId, userId);
+  async unbanMember(endpointId: string, sceneId: string, userId: string) {
+    const endpoint = this.endpoints.get(endpointId);
+    if (!endpoint) throw new Error(`Endpoint ${endpointId} 不存在`);
+    if (!isGatewayBot(endpoint)) throw new Error("群管仅支持 connection: gateway");
+    return endpoint.unbanMember(sceneId, userId);
   }
 
-  async muteMember(botId: string, sceneId: string, userId: string, duration = 600) {
-    const bot = this.bots.get(botId);
-    if (!bot) throw new Error(`Bot ${botId} 不存在`);
-    if (!isGatewayBot(bot)) throw new Error("群管仅支持 connection: gateway");
-    return bot.timeoutMember(sceneId, userId, duration);
+  async muteMember(endpointId: string, sceneId: string, userId: string, duration = 600) {
+    const endpoint = this.endpoints.get(endpointId);
+    if (!endpoint) throw new Error(`Endpoint ${endpointId} 不存在`);
+    if (!isGatewayBot(endpoint)) throw new Error("群管仅支持 connection: gateway");
+    return endpoint.timeoutMember(sceneId, userId, duration);
   }
 
-  async setMemberNickname(botId: string, sceneId: string, userId: string, nickname: string) {
-    const bot = this.bots.get(botId);
-    if (!bot) throw new Error(`Bot ${botId} 不存在`);
-    if (!isGatewayBot(bot)) throw new Error("群管仅支持 connection: gateway");
-    return bot.setNickname(sceneId, userId, nickname);
+  async setMemberNickname(endpointId: string, sceneId: string, userId: string, nickname: string) {
+    const endpoint = this.endpoints.get(endpointId);
+    if (!endpoint) throw new Error(`Endpoint ${endpointId} 不存在`);
+    if (!isGatewayBot(endpoint)) throw new Error("群管仅支持 connection: gateway");
+    return endpoint.setNickname(sceneId, userId, nickname);
   }
 
-  async listMembers(botId: string, sceneId: string) {
-    const bot = this.bots.get(botId);
-    if (!bot) throw new Error(`Bot ${botId} 不存在`);
-    if (!isGatewayBot(bot)) throw new Error("群管仅支持 connection: gateway");
-    return bot.getMembers(sceneId);
+  async listMembers(endpointId: string, sceneId: string) {
+    const endpoint = this.endpoints.get(endpointId);
+    if (!endpoint) throw new Error(`Endpoint ${endpointId} 不存在`);
+    if (!isGatewayBot(endpoint)) throw new Error("群管仅支持 connection: gateway");
+    return endpoint.getMembers(sceneId);
   }
 
-  async getGroupInfo(botId: string, sceneId: string) {
-    const bot = this.bots.get(botId);
-    if (!bot) throw new Error(`Bot ${botId} 不存在`);
-    if (!isGatewayBot(bot)) throw new Error("群管仅支持 connection: gateway");
-    return bot.getGuildInfo(sceneId);
+  async getGroupInfo(endpointId: string, sceneId: string) {
+    const endpoint = this.endpoints.get(endpointId);
+    if (!endpoint) throw new Error(`Endpoint ${endpointId} 不存在`);
+    if (!isGatewayBot(endpoint)) throw new Error("群管仅支持 connection: gateway");
+    return endpoint.getGuildInfo(sceneId);
   }
 
   async start(): Promise<void> {

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

@@ -1,5 +1,5 @@
 /**
- * Discord Interactions Bot 实现
+ * Discord Interactions Endpoint 实现
  */
 import {
   Client,
@@ -21,14 +21,14 @@ import {
   InteractionResponseType,
 } from "discord.js";
 import nacl from "tweetnacl";
-import { Bot, Message, SendOptions, SendContent, MessageSegment, segment } from "zhin.js";
+import { Endpoint, Message, SendOptions, SendContent, MessageSegment, segment } from "zhin.js";
 import { registerFetchRoute, type Router, type RouterContext } from "@zhin.js/host-router/router";
 import type { DiscordInteractionsConfig } from "./types.js";
 import type { DiscordAdapter } from "./adapter.js";
 
-export class DiscordInteractionsBot
+export class DiscordInteractionsEndpoint
   extends Client
-  implements Bot<DiscordInteractionsConfig, any> {
+  implements Endpoint<DiscordInteractionsConfig, any> {
   $connected: boolean;
   private router: Router;
   private slashCommandHandlers: Map<
@@ -171,7 +171,7 @@ export class DiscordInteractionsBot
     return Message.from(interaction, {
       $id: interaction.id,
       $adapter: "discord",
-      $bot: this.$config.name,
+      $endpoint: this.$config.name,
       $sender: {
         id: interaction.user?.id || interaction.member?.user?.id,
         name: interaction.user?.username || interaction.member?.user?.username,

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

@@ -1,5 +1,5 @@
 /**
- * Discord Bot 实现 (Gateway)
+ * Discord Endpoint 实现 (Gateway)
  */
 import {
   Client,
@@ -21,9 +21,10 @@ import {
   InteractionResponseType,
   GuildMember,
   PermissionsBitField,
+  PermissionFlagsBits,
 } from "discord.js";
 import {
-  Bot,
+  Endpoint,
   Message,
   SendOptions,
   SendContent,
@@ -36,9 +37,9 @@ import { createReadStream } from "fs";
 import { promises as fs } from "fs";
 import path from "path";
 
-export class DiscordBot
+export class DiscordEndpoint
   extends Client
-  implements Bot<DiscordGatewayConfig, DiscordChannelMessage> {
+  implements Endpoint<DiscordGatewayConfig, DiscordChannelMessage> {
   private slashCommandHandlers: Map<
     string,
     (interaction: ChatInputCommandInteraction) => Promise<void>
@@ -140,7 +141,7 @@ export class DiscordBot
       this.once("clientReady", async () => {
         this.$connected = true;
         this.pluginLogger.info(
-          `Discord bot ${this.$config.name} connected successfully as ${this.user?.tag}`
+          `Discord endpoint ${this.$config.name} connected successfully as ${this.user?.tag}`
         );
 
         // 设置活动状态
@@ -179,7 +180,7 @@ export class DiscordBot
     try {
       await this.destroy();
       this.$connected = false;
-      this.pluginLogger.info(`Discord bot ${this.$config.name} disconnected`);
+      this.pluginLogger.info(`Discord endpoint ${this.$config.name} disconnected`);
     } catch (error) {
       this.pluginLogger.error("Error disconnecting Discord bot:", error);
       throw error;
@@ -205,14 +206,43 @@ export class DiscordBot
     // 转换消息内容为 segment 格式
     const content = this.parseMessageContent(msg);
 
+    const sender = (() => {
+      const base = {
+        id: msg.author.id,
+        name: msg.member?.displayName || msg.author.displayName,
+      } as { id: string; name: string; role?: string; permissions?: string[] };
+      const member = msg.member;
+      const guild = msg.guild;
+      if (member && guild) {
+        const tokens: string[] = [];
+        const permChecks: Array<[bigint, string]> = [
+          [PermissionFlagsBits.Administrator, "ADMINISTRATOR"],
+          [PermissionFlagsBits.ManageRoles, "MANAGE_ROLES"],
+          [PermissionFlagsBits.ModerateMembers, "MODERATE_MEMBERS"],
+          [PermissionFlagsBits.ManageChannels, "MANAGE_CHANNELS"],
+          [PermissionFlagsBits.ManageGuild, "MANAGE_GUILD"],
+        ];
+        for (const [bit, name] of permChecks) {
+          if (member.permissions.has(bit)) tokens.push(name);
+        }
+        if (guild.ownerId === msg.author.id) {
+          base.role = "owner";
+          tokens.push("guild_owner", "ADMINISTRATOR");
+        } else if (tokens.includes("ADMINISTRATOR") || tokens.includes("MODERATE_MEMBERS")) {
+          base.role = "admin";
+        } else {
+          base.role = "member";
+        }
+        base.permissions = tokens;
+      }
+      return base;
+    })();
+
     const result = Message.from(msg, {
       $id: msg.id,
       $adapter: "discord",
-      $bot: this.$config.name,
-      $sender: {
-        id: msg.author.id,
-        name: msg.member?.displayName || msg.author.displayName,
-      },
+      $endpoint: this.$config.name,
+      $sender: sender,
       $channel: {
         id: channelId,
         type: channelType,
@@ -246,7 +276,7 @@ export class DiscordBot
 
         const res = await this.adapter.sendMessage({
           context: "discord",
-          bot: this.$config.name,
+          endpoint: this.$config.name,
           id: msg.channel.id,
           type: msg.channel.type as any,
           content: content,
@@ -627,10 +657,10 @@ export class DiscordBot
       const guild = await this.guilds.fetch(guildId);
       const member = await guild.members.fetch(userId);
       await member.kick(reason);
-      this.pluginLogger.info(`Discord Bot ${this.$id} 踢出成员 ${userId}（服务器 ${guildId}）`);
+      this.pluginLogger.info(`Discord Endpoint ${this.$id} 踢出成员 ${userId}（服务器 ${guildId}）`);
       return true;
     } catch (error) {
-      this.pluginLogger.error(`Discord Bot ${this.$id} 踢出成员失败:`, error);
+      this.pluginLogger.error(`Discord Endpoint ${this.$id} 踢出成员失败:`, error);
       throw error;
     }
   }
@@ -646,10 +676,10 @@ export class DiscordBot
     try {
       const guild = await this.guilds.fetch(guildId);
       await guild.members.ban(userId, { reason, deleteMessageSeconds: deleteMessageDays ? deleteMessageDays * 86400 : undefined });
-      this.pluginLogger.info(`Discord Bot ${this.$id} 封禁成员 ${userId}（服务器 ${guildId}）`);
+      this.pluginLogger.info(`Discord Endpoint ${this.$id} 封禁成员 ${userId}（服务器 ${guildId}）`);
       return true;
     } catch (error) {
-      this.pluginLogger.error(`Discord Bot ${this.$id} 封禁成员失败:`, error);
+      this.pluginLogger.error(`Discord Endpoint ${this.$id} 封禁成员失败:`, error);
       throw error;
     }
   }
@@ -664,10 +694,10 @@ export class DiscordBot
     try {
       const guild = await this.guilds.fetch(guildId);
       await guild.members.unban(userId, reason);
-      this.pluginLogger.info(`Discord Bot ${this.$id} 解除封禁 ${userId}（服务器 ${guildId}）`);
+      this.pluginLogger.info(`Discord Endpoint ${this.$id} 解除封禁 ${userId}（服务器 ${guildId}）`);
       return true;
     } catch (error) {
-      this.pluginLogger.error(`Discord Bot ${this.$id} 解除封禁失败:`, error);
+      this.pluginLogger.error(`Discord Endpoint ${this.$id} 解除封禁失败:`, error);
       throw error;
     }
   }
@@ -685,14 +715,14 @@ export class DiscordBot
       const member = await guild.members.fetch(userId);
       if (duration === 0) {
         await member.timeout(null, reason);
-        this.pluginLogger.info(`Discord Bot ${this.$id} 取消成员 ${userId} 超时（服务器 ${guildId}）`);
+        this.pluginLogger.info(`Discord Endpoint ${this.$id} 取消成员 ${userId} 超时（服务器 ${guildId}）`);
       } else {
         await member.timeout(duration * 1000, reason);
-        this.pluginLogger.info(`Discord Bot ${this.$id} 超时成员 ${userId} ${duration}秒（服务器 ${guildId}）`);
+        this.pluginLogger.info(`Discord Endpoint ${this.$id} 超时成员 ${userId} ${duration}秒（服务器 ${guildId}）`);
       }
       return true;
     } catch (error) {
-      this.pluginLogger.error(`Discord Bot ${this.$id} 超时操作失败:`, error);
+      this.pluginLogger.error(`Discord Endpoint ${this.$id} 超时操作失败:`, error);
       throw error;
     }
   }
@@ -708,10 +738,10 @@ export class DiscordBot
       const guild = await this.guilds.fetch(guildId);
       const member = await guild.members.fetch(userId);
       await member.setNickname(nickname);
-      this.pluginLogger.info(`Discord Bot ${this.$id} 设置成员 ${userId} 昵称为 "${nickname}"（服务器 ${guildId}）`);
+      this.pluginLogger.info(`Discord Endpoint ${this.$id} 设置成员 ${userId} 昵称为 "${nickname}"（服务器 ${guildId}）`);
       return true;
     } catch (error) {
-      this.pluginLogger.error(`Discord Bot ${this.$id} 设置昵称失败:`, error);
+      this.pluginLogger.error(`Discord Endpoint ${this.$id} 设置昵称失败:`, error);
       throw error;
     }
   }
@@ -727,10 +757,10 @@ export class DiscordBot
       const guild = await this.guilds.fetch(guildId);
       const member = await guild.members.fetch(userId);
       await member.roles.add(roleId);
-      this.pluginLogger.info(`Discord Bot ${this.$id} 给成员 ${userId} 添加角色 ${roleId}（服务器 ${guildId}）`);
+      this.pluginLogger.info(`Discord Endpoint ${this.$id} 给成员 ${userId} 添加角色 ${roleId}（服务器 ${guildId}）`);
       return true;
     } catch (error) {
-      this.pluginLogger.error(`Discord Bot ${this.$id} 添加角色失败:`, error);
+      this.pluginLogger.error(`Discord Endpoint ${this.$id} 添加角色失败:`, error);
       throw error;
     }
   }
@@ -746,10 +776,10 @@ export class DiscordBot
       const guild = await this.guilds.fetch(guildId);
       const member = await guild.members.fetch(userId);
       await member.roles.remove(roleId);
-      this.pluginLogger.info(`Discord Bot ${this.$id} 移除成员 ${userId} 的角色 ${roleId}（服务器 ${guildId}）`);
+      this.pluginLogger.info(`Discord Endpoint ${this.$id} 移除成员 ${userId} 的角色 ${roleId}（服务器 ${guildId}）`);
       return true;
     } catch (error) {
-      this.pluginLogger.error(`Discord Bot ${this.$id} 移除角色失败:`, error);
+      this.pluginLogger.error(`Discord Endpoint ${this.$id} 移除角色失败:`, error);
       throw error;
     }
   }
@@ -770,7 +800,7 @@ export class DiscordBot
         permissions: role.permissions.bitfield.toString(),
       }));
     } catch (error) {
-      this.pluginLogger.error(`Discord Bot ${this.$id} 获取角色列表失败:`, error);
+      this.pluginLogger.error(`Discord Endpoint ${this.$id} 获取角色列表失败:`, error);
       throw error;
     }
   }
@@ -792,7 +822,7 @@ export class DiscordBot
         joined_at: member.joinedAt?.toISOString(),
       }));
     } catch (error) {
-      this.pluginLogger.error(`Discord Bot ${this.$id} 获取成员列表失败:`, error);
+      this.pluginLogger.error(`Discord Endpoint ${this.$id} 获取成员列表失败:`, error);
       throw error;
     }
   }
@@ -813,7 +843,7 @@ export class DiscordBot
         created_at: guild.createdAt?.toISOString(),
       };
     } catch (error) {
-      this.pluginLogger.error(`Discord Bot ${this.$id} 获取服务器信息失败:`, error);
+      this.pluginLogger.error(`Discord Endpoint ${this.$id} 获取服务器信息失败:`, error);
       throw error;
     }
   }
@@ -825,10 +855,10 @@ export class DiscordBot
       const options: any = { name, autoArchiveDuration: autoArchiveDuration || 1440 };
       if (messageId) options.startMessage = messageId;
       const thread = await (channel as TextChannel).threads.create(options);
-      this.pluginLogger.info(`Discord Bot ${this.$id} 创建帖子 "${name}" (channel ${channelId})`);
+      this.pluginLogger.info(`Discord Endpoint ${this.$id} 创建帖子 "${name}" (channel ${channelId})`);
       return thread;
     } catch (error) {
-      this.pluginLogger.error(`Discord Bot ${this.$id} 创建帖子失败:`, error);
+      this.pluginLogger.error(`Discord Endpoint ${this.$id} 创建帖子失败:`, error);
       throw error;
     }
   }
@@ -839,9 +869,9 @@ export class DiscordBot
       if (!channel || !channel.isTextBased()) throw new Error(`Channel ${channelId} 不是文本频道`);
       const message = await (channel as TextChannel).messages.fetch(messageId);
       await message.react(emoji);
-      this.pluginLogger.info(`Discord Bot ${this.$id} 添加反应 ${emoji} (message ${messageId})`);
+      this.pluginLogger.info(`Discord Endpoint ${this.$id} 添加反应 ${emoji} (message ${messageId})`);
     } catch (error) {
-      this.pluginLogger.error(`Discord Bot ${this.$id} 添加反应失败:`, error);
+      this.pluginLogger.error(`Discord Endpoint ${this.$id} 添加反应失败:`, error);
       throw error;
     }
   }
@@ -863,7 +893,7 @@ export class DiscordBot
   async $addReaction(messageId: string, emoji: string): Promise<string | null> {
     const ref = this.resolveDiscordMessageRef(messageId);
     if (!ref) {
-      this.pluginLogger.warn(`Discord Bot ${this.$id} 无法根据 message_id=${messageId} 定位 channel_id，跳过 addReaction`);
+      this.pluginLogger.warn(`Discord Endpoint ${this.$id} 无法根据 message_id=${messageId} 定位 channel_id，跳过 addReaction`);
       return null;
     }
 
@@ -871,7 +901,7 @@ export class DiscordBot
       await this.addReaction(ref.channelId, ref.msgId, emoji);
       return emoji;
     } catch (error) {
-      this.pluginLogger.error(`Discord Bot ${this.$id} 添加 reaction 失败:`, error);
+      this.pluginLogger.error(`Discord Endpoint ${this.$id} 添加 reaction 失败:`, error);
       return null;
     }
   }
@@ -879,7 +909,7 @@ export class DiscordBot
   async $removeReaction(messageId: string, reactionId: string): Promise<void> {
     const ref = this.resolveDiscordMessageRef(messageId);
     if (!ref) {
-      this.pluginLogger.warn(`Discord Bot ${this.$id} 无法根据 message_id=${messageId} 定位 channel_id，跳过 removeReaction`);
+      this.pluginLogger.warn(`Discord Endpoint ${this.$id} 无法根据 message_id=${messageId} 定位 channel_id，跳过 removeReaction`);
       return;
     }
 
@@ -899,7 +929,7 @@ export class DiscordBot
         await targetReaction.users.remove(this.user.id);
       }
     } catch (error) {
-      this.pluginLogger.error(`Discord Bot ${this.$id} 移除 reaction 失败:`, error);
+      this.pluginLogger.error(`Discord Endpoint ${this.$id} 移除 reaction 失败:`, error);
     }
   }
 
@@ -909,10 +939,10 @@ export class DiscordBot
       if (!channel || !channel.isTextBased()) throw new Error(`Channel ${channelId} 不是文本频道`);
       const embed = this.createEmbedFromData(embedData);
       const msg = await (channel as TextChannel).send({ embeds: [embed] });
-      this.pluginLogger.info(`Discord Bot ${this.$id} 发送 Embed 到 ${channelId}`);
+      this.pluginLogger.info(`Discord Endpoint ${this.$id} 发送 Embed 到 ${channelId}`);
       return msg;
     } catch (error) {
-      this.pluginLogger.error(`Discord Bot ${this.$id} 发送 Embed 失败:`, error);
+      this.pluginLogger.error(`Discord Endpoint ${this.$id} 发送 Embed 失败:`, error);
       throw error;
     }
   }
@@ -933,10 +963,10 @@ export class DiscordBot
         if (tagIds.length) options.appliedTags = tagIds;
       }
       const thread = await forumChannel.threads.create(options);
-      this.pluginLogger.info(`Discord Bot ${this.$id} 创建论坛帖 "${name}" (channel ${channelId})`);
+      this.pluginLogger.info(`Discord Endpoint ${this.$id} 创建论坛帖 "${name}" (channel ${channelId})`);
       return thread;
     } catch (error) {
-      this.pluginLogger.error(`Discord Bot ${this.$id} 创建论坛帖失败:`, error);
+      this.pluginLogger.error(`Discord Endpoint ${this.$id} 创建论坛帖失败:`, error);
       throw error;
     }
   }
@@ -1092,7 +1122,7 @@ export class DiscordBot
 }
 
 // ================================================================================================
-// DiscordInteractionsBot 类（Interactions 端点模式）
+// DiscordInteractionsEndpoint 类（Interactions 端点模式）
 // ================================================================================================
 
 import * as nacl from "tweetnacl";