@koishijs/plugin-adapter-discord 2.0.0 → 2.0.1

package/lib/bot.d.ts

@@ -2,10 +2,15 @@
 /// <reference types="node" />
 import { Adapter, Bot, Schema, Quester } from 'koishi';
 import { AdapterConfig } from './utils';
-import { Sender } from './sender';
-import * as Discord from './types';
-export interface BotConfig extends Bot.BaseConfig, Sender.Config {
+import { Internal } from './types';
+interface PrivilegedIntents {
+    members?: boolean;
+    presence?: boolean;
+}
+export interface BotConfig extends Bot.BaseConfig, Quester.Config {
     token: string;
+    gateway?: string;
+    intents?: PrivilegedIntents;
 }
 export declare const BotConfig: Schema<unknown, any>;
 export declare class DiscordBot extends Bot<BotConfig> {
@@ -14,8 +19,9 @@ export declare class DiscordBot extends Bot<BotConfig> {
     _ping: NodeJS.Timeout;
     _sessionId: string;
     http: Quester;
-    internal: Discord.Internal;
+    internal: Internal;
     constructor(adapter: Adapter, config: BotConfig);
+    getIntents(): number;
     getSelf(): Promise<Bot.User>;
     private parseQuote;
     sendMessage(channelId: string, content: string, guildId?: string): Promise<string[]>;
@@ -38,3 +44,4 @@ export declare class DiscordBot extends Bot<BotConfig> {
     getGuildList(): Promise<Bot.Guild[]>;
     getChannelList(guildId: string): Promise<Bot.Channel[]>;
 }
+export {};

package/lib/index.d.ts

@@ -8,9 +8,6 @@ export * from './sender';
 export * from './utils';
 export * from './ws';
 declare module 'koishi' {
-    interface Modules {
-        'adapter-discord': typeof import('.');
-    }
     interface Session {
         discord?: Discord.GatewayPayload & Discord.Internal;
     }

package/lib/index.js

@@ -61,15 +61,155 @@ var import_koishi6 = __toModule(require("koishi"));
 var import_koishi4 = __toModule(require("koishi"));
 
 // plugins/adapter/discord/src/utils.ts
+var import_koishi2 = __toModule(require("koishi"));
+
+// plugins/adapter/discord/src/sender.ts
+var import_fs = __toModule(require("fs"));
+var import_path = __toModule(require("path"));
+var import_file_type = __toModule(require("file-type"));
+var import_form_data = __toModule(require("form-data"));
+var import_es_aggregate_error = __toModule(require("es-aggregate-error"));
 var import_koishi = __toModule(require("koishi"));
-var AdapterConfig = import_koishi.Schema.intersect([
-  import_koishi.Schema.object({
-    intents: import_koishi.Schema.object({
-      members: import_koishi.Schema.boolean()
-    })
-  }),
-  import_koishi.App.Config.Request,
-  import_koishi.Adapter.WebSocketClient.Config
+var _Sender = class {
+  constructor(bot, url) {
+    this.bot = bot;
+    this.url = url;
+    this.results = [];
+    this.errors = [];
+  }
+  static from(bot, url) {
+    const sender = new _Sender(bot, url);
+    return sender.sendMessage.bind(sender);
+  }
+  async post(data, headers) {
+    try {
+      const result = await this.bot.http.post(this.url, data, { headers });
+      this.results.push(result.id);
+    } catch (e) {
+      this.errors.push(e);
+    }
+  }
+  async sendEmbed(fileBuffer, payload_json = {}, filename) {
+    const fd = new import_form_data.default();
+    const type = await (0, import_file_type.fromBuffer)(fileBuffer);
+    filename || (filename = "file." + type.ext);
+    fd.append("file", fileBuffer, filename);
+    fd.append("payload_json", JSON.stringify(payload_json));
+    return this.post(fd, fd.getHeaders());
+  }
+  async sendContent(content, addition) {
+    return this.post(__spreadProps(__spreadValues({}, addition), { content }));
+  }
+  async sendAsset(type, data, addition) {
+    const { handleMixedContent, handleExternalAsset } = this.bot.adapter.config;
+    if (handleMixedContent === "separate" && addition.content) {
+      await this.post(addition);
+      addition.content = "";
+    }
+    if (data.url.startsWith("file://")) {
+      const filename = (0, import_path.basename)(data.url.slice(7));
+      return await this.sendEmbed((0, import_fs.readFileSync)(data.url.slice(7)), addition, data.file || filename);
+    } else if (data.url.startsWith("base64://")) {
+      const a = Buffer.from(data.url.slice(9), "base64");
+      return await this.sendEmbed(a, addition, data.file);
+    }
+    const sendDirect = /* @__PURE__ */ __name(async () => {
+      if (addition.content) {
+        await this.post(addition);
+      }
+      return this.post(__spreadProps(__spreadValues({}, addition), { content: data.url }));
+    }, "sendDirect");
+    const sendDownload = /* @__PURE__ */ __name(async () => {
+      const filename = (0, import_path.basename)(data.url);
+      const buffer = await this.bot.app.http.get(data.url, {
+        headers: { accept: type + "/*" },
+        responseType: "arraybuffer"
+      });
+      return this.sendEmbed(buffer, addition, data.file || filename);
+    }, "sendDownload");
+    const mode = data.mode || handleExternalAsset;
+    if (mode === "download" || handleMixedContent === "attach" && addition.content || type === "file") {
+      return sendDownload();
+    } else if (mode === "direct") {
+      return sendDirect();
+    }
+    return await this.bot.app.http.head(data.url, {
+      headers: { accept: type + "/*" }
+    }).then((headers) => {
+      if (headers["content-type"].startsWith(type)) {
+        return sendDirect();
+      } else {
+        return sendDownload();
+      }
+    }, sendDownload);
+  }
+  async sendMessage(content, addition = {}) {
+    const chain = import_koishi.segment.parse(content);
+    let textBuffer = "";
+    delete addition.content;
+    const sendBuffer = /* @__PURE__ */ __name(async () => {
+      const content2 = textBuffer.trim();
+      if (!content2)
+        return;
+      await this.post(__spreadProps(__spreadValues({}, addition), { content: content2 }));
+      textBuffer = "";
+    }, "sendBuffer");
+    for (const code of chain) {
+      const { type, data } = code;
+      if (type === "text") {
+        textBuffer += data.content.trim();
+      } else if (type === "at" && data.id) {
+        textBuffer += `<@${data.id}>`;
+      } else if (type === "at" && data.type === "all") {
+        textBuffer += `@everyone`;
+      } else if (type === "at" && data.type === "here") {
+        textBuffer += `@here`;
+      } else if (type === "sharp" && data.id) {
+        textBuffer += `<#${data.id}>`;
+      } else if (type === "face" && data.name && data.id) {
+        textBuffer += `<:${data.name}:${data.id}>`;
+      } else if ((type === "image" || type === "video") && data.url) {
+        await this.sendAsset(type, data, __spreadProps(__spreadValues({}, addition), {
+          content: textBuffer.trim()
+        }));
+        textBuffer = "";
+      } else if (type === "share") {
+        await sendBuffer();
+        await this.post(__spreadProps(__spreadValues({}, addition), {
+          embeds: [__spreadValues({}, data)]
+        }));
+      } else if (type === "record") {
+        await this.sendAsset("file", data, __spreadProps(__spreadValues({}, addition), {
+          content: textBuffer.trim()
+        }));
+        textBuffer = "";
+      }
+    }
+    await sendBuffer();
+    if (!this.errors.length)
+      return this.results;
+    throw new import_es_aggregate_error.default(this.errors);
+  }
+};
+var Sender = _Sender;
+__name(Sender, "Sender");
+Sender.Config = import_koishi.Schema.object({
+  handleExternalAsset: import_koishi.Schema.union([
+    import_koishi.Schema.const("download").description("先下载后发送"),
+    import_koishi.Schema.const("direct").description("直接发送链接"),
+    import_koishi.Schema.const("auto").description("发送一个 HEAD 请求，根据返回的 Content-Type 决定发送方式")
+  ]).description("发送外链资源时采用的方式。").default("auto"),
+  handleMixedContent: import_koishi.Schema.union([
+    import_koishi.Schema.const("separate").description("将每个不同形式的内容分开发送"),
+    import_koishi.Schema.const("attach").description("图片前如果有文本内容，则将文本作为图片的附带信息进行发送"),
+    import_koishi.Schema.const("auto").description("如果图片本身采用直接发送则与前面的文本分开，否则将文本作为图片的附带信息发送")
+  ]).description("发送图文等混合内容时采用的方式。").default("auto")
+}).description("发送设置");
+
+// plugins/adapter/discord/src/utils.ts
+var AdapterConfig = import_koishi2.Schema.intersect([
+  Sender.Config,
+  import_koishi2.Adapter.WebSocketClient.Config
 ]);
 var adaptUser = /* @__PURE__ */ __name((user) => ({
   userId: user.id,
@@ -109,40 +249,40 @@ function adaptMessage(bot, meta, session = {}) {
     session.content = meta.content.replace(/<@[!&](.+?)>/, (_, id) => {
       var _a2;
       if (meta.mention_roles.includes(id)) {
-        return (0, import_koishi.segment)("at", { role: id });
+        return (0, import_koishi2.segment)("at", { role: id });
       } else {
         const user = (_a2 = meta.mentions) == null ? void 0 : _a2.find((u) => u.id === id);
-        return import_koishi.segment.at(id, { name: user == null ? void 0 : user.username });
+        return import_koishi2.segment.at(id, { name: user == null ? void 0 : user.username });
       }
-    }).replace(/<:(.*):(.+?)>/, (_, name, id) => (0, import_koishi.segment)("face", { id, name })).replace(/<a:(.*):(.+?)>/, (_, name, id) => (0, import_koishi.segment)("face", { id, name, animated: true })).replace(/@everyone/, () => (0, import_koishi.segment)("at", { type: "all" })).replace(/@here/, () => (0, import_koishi.segment)("at", { type: "here" })).replace(/<#(.+?)>/, (_, id) => {
+    }).replace(/<:(.*):(.+?)>/, (_, name, id) => (0, import_koishi2.segment)("face", { id, name })).replace(/<a:(.*):(.+?)>/, (_, name, id) => (0, import_koishi2.segment)("face", { id, name, animated: true })).replace(/@everyone/, () => (0, import_koishi2.segment)("at", { type: "all" })).replace(/@here/, () => (0, import_koishi2.segment)("at", { type: "here" })).replace(/<#(.+?)>/, (_, id) => {
       var _a2;
       const channel = (_a2 = meta.mention_channels) == null ? void 0 : _a2.find((c) => c.id === id);
-      return import_koishi.segment.sharp(id, { name: channel == null ? void 0 : channel.name });
+      return import_koishi2.segment.sharp(id, { name: channel == null ? void 0 : channel.name });
     });
   }
   if ((_c = meta.attachments) == null ? void 0 : _c.length) {
     session.content += meta.attachments.map((v) => {
       var _a2, _b2, _c2;
       if (v.height && v.width && ((_a2 = v.content_type) == null ? void 0 : _a2.startsWith("image/"))) {
-        return (0, import_koishi.segment)("image", {
+        return (0, import_koishi2.segment)("image", {
           url: v.url,
           proxy_url: v.proxy_url,
           file: v.filename
         });
       } else if (v.height && v.width && ((_b2 = v.content_type) == null ? void 0 : _b2.startsWith("video/"))) {
-        return (0, import_koishi.segment)("video", {
+        return (0, import_koishi2.segment)("video", {
           url: v.url,
           proxy_url: v.proxy_url,
           file: v.filename
         });
       } else if ((_c2 = v.content_type) == null ? void 0 : _c2.startsWith("audio/")) {
-        return (0, import_koishi.segment)("record", {
+        return (0, import_koishi2.segment)("record", {
           url: v.url,
           proxy_url: v.proxy_url,
           file: v.filename
         });
       } else {
-        return (0, import_koishi.segment)("file", {
+        return (0, import_koishi2.segment)("file", {
           url: v.url,
           proxy_url: v.proxy_url,
           file: v.filename
@@ -152,13 +292,13 @@ function adaptMessage(bot, meta, session = {}) {
   }
   for (const embed of meta.embeds) {
     if (embed.image) {
-      session.content += (0, import_koishi.segment)("image", { url: embed.image.url, proxy_url: embed.image.proxy_url });
+      session.content += (0, import_koishi2.segment)("image", { url: embed.image.url, proxy_url: embed.image.proxy_url });
     }
     if (embed.thumbnail) {
-      session.content += (0, import_koishi.segment)("image", { url: embed.thumbnail.url, proxy_url: embed.thumbnail.proxy_url });
+      session.content += (0, import_koishi2.segment)("image", { url: embed.thumbnail.url, proxy_url: embed.thumbnail.proxy_url });
     }
     if (embed.video) {
-      session.content += (0, import_koishi.segment)("video", { url: embed.video.url, proxy_url: embed.video.proxy_url });
+      session.content += (0, import_koishi2.segment)("video", { url: embed.video.url, proxy_url: embed.video.proxy_url });
     }
   }
   return session;
@@ -170,7 +310,7 @@ function adaptMessageSession(bot, meta, session = {}) {
   session.timestamp = new Date(meta.timestamp).valueOf() || Date.now();
   if (meta.message_reference) {
     const { message_id, channel_id } = meta.message_reference;
-    session.content = (0, import_koishi.segment)("quote", { id: message_id, channelId: channel_id }) + session.content;
+    session.content = (0, import_koishi2.segment)("quote", { id: message_id, channelId: channel_id }) + session.content;
   }
   return session;
 }
@@ -232,140 +372,10 @@ async function adaptSession(bot, input) {
   } else {
     return;
   }
-  return new import_koishi.Session(bot, session);
+  return new import_koishi2.Session(bot, session);
 }
 __name(adaptSession, "adaptSession");
 
-// plugins/adapter/discord/src/sender.ts
-var import_fs = __toModule(require("fs"));
-var import_path = __toModule(require("path"));
-var import_file_type = __toModule(require("file-type"));
-var import_form_data = __toModule(require("form-data"));
-var import_es_aggregate_error = __toModule(require("es-aggregate-error"));
-var import_koishi2 = __toModule(require("koishi"));
-var Sender = class {
-  constructor(bot, url) {
-    this.bot = bot;
-    this.url = url;
-    this.results = [];
-    this.errors = [];
-  }
-  static from(bot, url) {
-    const sender = new Sender(bot, url);
-    return sender.sendMessage.bind(sender);
-  }
-  async post(data, headers) {
-    try {
-      const result = await this.bot.http.post(this.url, data, { headers });
-      this.results.push(result.id);
-    } catch (e) {
-      this.errors.push(e);
-    }
-  }
-  async sendEmbed(fileBuffer, payload_json = {}, filename) {
-    const fd = new import_form_data.default();
-    const type = await (0, import_file_type.fromBuffer)(fileBuffer);
-    filename || (filename = "file." + type.ext);
-    fd.append("file", fileBuffer, filename);
-    fd.append("payload_json", JSON.stringify(payload_json));
-    return this.post(fd, fd.getHeaders());
-  }
-  async sendContent(content, addition) {
-    return this.post(__spreadProps(__spreadValues({}, addition), { content }));
-  }
-  async sendAsset(type, data, addition) {
-    const { handleMixedContent, handleExternalAsset } = this.bot.config;
-    if (handleMixedContent === "separate" && addition.content) {
-      await this.post(addition);
-      addition.content = "";
-    }
-    if (data.url.startsWith("file://")) {
-      const filename = (0, import_path.basename)(data.url.slice(7));
-      return await this.sendEmbed((0, import_fs.readFileSync)(data.url.slice(7)), addition, data.file || filename);
-    } else if (data.url.startsWith("base64://")) {
-      const a = Buffer.from(data.url.slice(9), "base64");
-      return await this.sendEmbed(a, addition, data.file);
-    }
-    const sendDirect = /* @__PURE__ */ __name(async () => {
-      if (addition.content) {
-        await this.post(addition);
-      }
-      return this.post(__spreadProps(__spreadValues({}, addition), { content: data.url }));
-    }, "sendDirect");
-    const sendDownload = /* @__PURE__ */ __name(async () => {
-      const filename = (0, import_path.basename)(data.url);
-      const buffer = await this.bot.app.http.get(data.url, {
-        headers: { accept: type + "/*" },
-        responseType: "arraybuffer"
-      });
-      return this.sendEmbed(buffer, addition, data.file || filename);
-    }, "sendDownload");
-    const mode = data.mode || handleExternalAsset;
-    if (mode === "download" || handleMixedContent === "attach" && addition.content || type === "file") {
-      return sendDownload();
-    } else if (mode === "direct") {
-      return sendDirect();
-    }
-    return await this.bot.app.http.head(data.url, {
-      headers: { accept: type + "/*" }
-    }).then((headers) => {
-      if (headers["content-type"].startsWith(type)) {
-        return sendDirect();
-      } else {
-        return sendDownload();
-      }
-    }, sendDownload);
-  }
-  async sendMessage(content, addition = {}) {
-    const chain = import_koishi2.segment.parse(content);
-    let textBuffer = "";
-    delete addition.content;
-    const sendBuffer = /* @__PURE__ */ __name(async () => {
-      const content2 = textBuffer.trim();
-      if (!content2)
-        return;
-      await this.post(__spreadProps(__spreadValues({}, addition), { content: content2 }));
-      textBuffer = "";
-    }, "sendBuffer");
-    for (const code of chain) {
-      const { type, data } = code;
-      if (type === "text") {
-        textBuffer += data.content.trim();
-      } else if (type === "at" && data.id) {
-        textBuffer += `<@${data.id}>`;
-      } else if (type === "at" && data.type === "all") {
-        textBuffer += `@everyone`;
-      } else if (type === "at" && data.type === "here") {
-        textBuffer += `@here`;
-      } else if (type === "sharp" && data.id) {
-        textBuffer += `<#${data.id}>`;
-      } else if (type === "face" && data.name && data.id) {
-        textBuffer += `<:${data.name}:${data.id}>`;
-      } else if ((type === "image" || type === "video") && data.url) {
-        await this.sendAsset(type, data, __spreadProps(__spreadValues({}, addition), {
-          content: textBuffer.trim()
-        }));
-        textBuffer = "";
-      } else if (type === "share") {
-        await sendBuffer();
-        await this.post(__spreadProps(__spreadValues({}, addition), {
-          embeds: [__spreadValues({}, data)]
-        }));
-      } else if (type === "record") {
-        await this.sendAsset("file", data, __spreadProps(__spreadValues({}, addition), {
-          content: textBuffer.trim()
-        }));
-        textBuffer = "";
-      }
-    }
-    await sendBuffer();
-    if (!this.errors.length)
-      return this.results;
-    throw new import_es_aggregate_error.default(this.errors);
-  }
-};
-__name(Sender, "Sender");
-
 // plugins/adapter/discord/src/types/index.ts
 var types_exports = {};
 __export(types_exports, {
@@ -1317,30 +1327,41 @@ Internal.define({
 // plugins/adapter/discord/src/bot.ts
 var BotConfig = import_koishi4.Schema.intersect([
   import_koishi4.Schema.object({
-    token: import_koishi4.Schema.string().description("机器人的用户令牌。").required(),
-    handleExternalAsset: import_koishi4.Schema.union([
-      import_koishi4.Schema.const("download").description("先下载后发送"),
-      import_koishi4.Schema.const("direct").description("直接发送链接"),
-      import_koishi4.Schema.const("auto").description("发送一个 HEAD 请求，如果返回的 Content-Type 正确，则直接发送链接，否则先下载后发送")
-    ]).description("发送外链资源时采用的方式。").default("auto"),
-    handleMixedContent: import_koishi4.Schema.union([
-      import_koishi4.Schema.const("separate").description("将每个不同形式的内容分开发送"),
-      import_koishi4.Schema.const("attach").description("图片前如果有文本内容，则将文本作为图片的附带信息进行发送"),
-      import_koishi4.Schema.const("auto").description("如果图片本身采用直接发送则与前面的文本分开，否则将文本作为图片的附带信息发送")
-    ]).description("发送图文等混合内容时采用的方式。").default("auto")
+    token: import_koishi4.Schema.string().description("机器人的用户令牌。").role("secret").required()
   }),
-  import_koishi4.App.Config.Request
+  import_koishi4.Schema.object({
+    gateway: import_koishi4.Schema.string().role("url").default("wss://gateway.discord.gg/?v=8&encoding=json").description("要连接的 WebSocket 网关。"),
+    intents: import_koishi4.Schema.object({
+      members: import_koishi4.Schema.boolean().description("启用 GUILD_MEMBERS 推送。").default(true),
+      presence: import_koishi4.Schema.boolean().description("启用 GUILD_PRESENCES 推送。").default(false)
+    })
+  }).description("推送设置"),
+  import_koishi4.Quester.createSchema({
+    endpoint: "https://discord.com/api/v8"
+  })
 ]);
 var DiscordBot = class extends import_koishi4.Bot {
   constructor(adapter, config) {
     super(adapter, config);
     this._d = 0;
     this._sessionId = "";
-    this.http = adapter.http.extend({
-      headers: { Authorization: `Bot ${config.token}` }
-    });
+    this.http = adapter.ctx.http.extend(__spreadProps(__spreadValues({}, config), {
+      headers: __spreadValues({
+        Authorization: `Bot ${config.token}`
+      }, config.headers)
+    }));
     this.internal = new Internal(this.http);
   }
+  getIntents() {
+    let intents = 0 | GatewayIntent.GUILD_MESSAGES | GatewayIntent.GUILD_MESSAGE_REACTIONS | GatewayIntent.DIRECT_MESSAGES | GatewayIntent.DIRECT_MESSAGE_REACTIONS;
+    if (this.config.intents.members) {
+      intents |= GatewayIntent.GUILD_MEMBERS;
+    }
+    if (this.config.intents.presence) {
+      intents |= GatewayIntent.GUILD_PRESENCES;
+    }
+    return intents;
+  }
   async getSelf() {
     const data = await this.internal.getCurrentUser();
     return adaptUser(data);
@@ -1444,14 +1465,8 @@ var import_koishi5 = __toModule(require("koishi"));
 var import_ws = __toModule(require("ws"));
 var logger = new import_koishi5.Logger("discord");
 var WebSocketClient = class extends import_koishi5.Adapter.WebSocketClient {
-  constructor(ctx, config) {
-    super(ctx, config);
-    this.http = ctx.http.extend(__spreadValues({
-      endpoint: "https://discord.com/api/v8"
-    }, config.request));
-  }
-  prepare() {
-    return new import_ws.default("wss://gateway.discord.gg/?v=8&encoding=json");
+  prepare(bot) {
+    return new import_ws.default(bot.config.gateway);
   }
   heartbeat(bot) {
     logger.debug(`heartbeat d ${bot._d}`);
@@ -1460,13 +1475,6 @@ var WebSocketClient = class extends import_koishi5.Adapter.WebSocketClient {
       d: bot._d
     }));
   }
-  getIntents() {
-    let intents = 0 | GatewayIntent.GUILD_MESSAGES | GatewayIntent.GUILD_MESSAGE_REACTIONS | GatewayIntent.DIRECT_MESSAGES | GatewayIntent.DIRECT_MESSAGE_REACTIONS;
-    if (this.config.intents.members !== false) {
-      intents |= GatewayIntent.GUILD_MEMBERS;
-    }
-    return intents;
-  }
   accept(bot) {
     if (bot._sessionId) {
       logger.debug("resuming");
@@ -1480,10 +1488,9 @@ var WebSocketClient = class extends import_koishi5.Adapter.WebSocketClient {
       }));
     }
     bot.socket.on("message", async (data) => {
-      data = data.toString();
       let parsed;
       try {
-        parsed = JSON.parse(data);
+        parsed = JSON.parse(data.toString());
       } catch (error) {
         return logger.warn("cannot parse message", data);
       }
@@ -1501,7 +1508,7 @@ var WebSocketClient = class extends import_koishi5.Adapter.WebSocketClient {
             token: bot.config.token,
             properties: {},
             compress: false,
-            intents: this.getIntents()
+            intents: bot.getIntents()
           }
         }));
       }