@elizaos/plugin-discord 1.3.1 → 1.3.3

package/dist/index.js

@@ -4047,11 +4047,10 @@ var voiceStateProvider = {
 // src/service.ts
 import {
   ChannelType as ChannelType7,
-  EventType as EventType2,
+  EventType,
   Role,
   Service,
-  createUniqueUuid as createUniqueUuid5,
-  logger as logger13
+  createUniqueUuid as createUniqueUuid5
 } from "@elizaos/core";
 import {
   ChannelType as DiscordChannelType5,
@@ -4140,7 +4139,6 @@ function getDiscordSettings(runtime) {
 // src/messages.ts
 import {
   ChannelType as ChannelType5,
-  EventType,
   ServiceType as ServiceType4,
   MemoryType,
   createUniqueUuid as createUniqueUuid3,
@@ -4714,14 +4712,10 @@ var MessageManager = class {
     if (this.discordSettings.shouldRespondOnlyToMentions) {
       const shouldProcess = isDM || isBotMentioned || isReplyToBot;
       if (!shouldProcess) {
-        logger11.debug(
-          "[Discord] Strict mode: ignoring message (no @mention or reply)"
-        );
+        logger11.debug("[Discord] Strict mode: ignoring message (no @mention or reply)");
         return;
       }
-      logger11.debug(
-        "[Discord] Strict mode: processing message (has @mention or reply)"
-      );
+      logger11.debug("[Discord] Strict mode: processing message (has @mention or reply)");
     }
     const entityId = createUniqueUuid3(this.runtime, message.author.id);
     const userName = message.author.bot ? `${message.author.username}#${message.author.discriminator}` : message.author.username;
@@ -4756,7 +4750,10 @@ var MessageManager = class {
     try {
       const canSendResult = canSendMessage(message.channel);
       if (!canSendResult.canSend) {
-        return logger11.warn(`Cannot send message to channel ${message.channel}`, canSendResult.reason || void 0);
+        return logger11.warn(
+          `Cannot send message to channel ${message.channel}`,
+          canSendResult.reason || void 0
+        );
       }
       const { processedContent, attachments } = await this.processMessage(message);
       const audioAttachments = message.attachments.filter(
@@ -4815,7 +4812,7 @@ var MessageManager = class {
         },
         createdAt: message.createdTimestamp
       };
-      const callback = async (content, files) => {
+      const callback = async (content) => {
         try {
           if (content.target && typeof content.target === "string" && content.target.toLowerCase() !== "discord") {
             return [];
@@ -4848,7 +4845,12 @@ var MessageManager = class {
             await u.send(content.text || "");
             messages = [content];
           } else {
-            messages = await sendMessageInChunks(channel, content.text ?? "", message.id, files || []);
+            messages = await sendMessageInChunks(
+              channel,
+              content.text ?? "",
+              message.id,
+              []
+            );
           }
           const memories = [];
           for (const m of messages) {
@@ -4886,11 +4888,19 @@ var MessageManager = class {
           return [];
         }
       };
-      this.runtime.emitEvent(["DISCORD_MESSAGE_RECEIVED" /* MESSAGE_RECEIVED */, EventType.MESSAGE_RECEIVED], {
-        runtime: this.runtime,
-        message: newMessage,
-        callback
-      });
+      if (this.runtime.hasElizaOS()) {
+        logger11.debug("[Discord] Using unified messaging API");
+        await this.runtime.elizaOS.sendMessage(
+          this.runtime.agentId,
+          newMessage,
+          {
+            onResponse: callback
+          }
+        );
+      } else {
+        logger11.debug("[Discord] Using direct message service");
+        await this.runtime.messageService.handleMessage(this.runtime, newMessage, callback);
+      }
       setTimeout(() => {
         if (typingData.started && typingData.interval && !typingData.cleared) {
           clearInterval(typingData.interval);
@@ -4920,7 +4930,7 @@ var MessageManager = class {
         processedContent += "  Description:" + (embed.description ?? "(none)") + "\n";
       }
     }
-    if (message.reference) {
+    if (message.reference && message.reference.messageId) {
       const messageId = createUniqueUuid3(this.runtime, message.reference.messageId);
       processedContent += "\nReferencing MessageID " + messageId + " (discord: " + message.reference.messageId + ")";
       if (message.reference.channelId !== message.channel.id) {
@@ -5056,7 +5066,10 @@ function createOpusDecoder(options) {
       const report = generateDependencyReport();
       logger12.debug("Voice dependency report:", report);
     } catch (reportError) {
-      logger12.warn("Could not generate dependency report:", reportError);
+      logger12.warn(
+        "Could not generate dependency report:",
+        reportError instanceof Error ? reportError.message : String(reportError)
+      );
     }
     throw error;
   }
@@ -5320,7 +5333,10 @@ var VoiceManager = class extends EventEmitter {
         }
       });
       connection.on("error", (error) => {
-        logger12.log("Voice connection error:", error);
+        logger12.log(
+          "Voice connection error:",
+          error instanceof Error ? error.message : String(error)
+        );
         logger12.log("Connection error - will attempt to recover...");
       });
       this.connections.set(channel.id, connection);
@@ -5330,7 +5346,10 @@ var VoiceManager = class extends EventEmitter {
           await me.voice.setDeaf(false);
           await me.voice.setMute(false);
         } catch (error) {
-          logger12.log("Failed to modify voice state:", error);
+          logger12.log(
+            "Failed to modify voice state:",
+            error instanceof Error ? error.message : String(error)
+          );
         }
       }
       connection.receiver.speaking.on("start", async (entityId) => {
@@ -5354,7 +5373,10 @@ var VoiceManager = class extends EventEmitter {
         }
       });
     } catch (error) {
-      logger12.log("Failed to establish voice connection:", error);
+      logger12.log(
+        "Failed to establish voice connection:",
+        error instanceof Error ? error.message : String(error)
+      );
       connection.destroy();
       this.connections.delete(channel.id);
       throw error;
@@ -5696,11 +5718,7 @@ var VoiceManager = class extends EventEmitter {
           return [];
         }
       };
-      this.runtime.emitEvent(["DISCORD_VOICE_MESSAGE_RECEIVED", "VOICE_MESSAGE_RECEIVED"], {
-        runtime: this.runtime,
-        message: memory,
-        callback
-      });
+      await this.runtime.messageService.handleMessage(this.runtime, memory, callback);
     } catch (error) {
       console.error("Error processing voice message:", error);
     }
@@ -5873,7 +5891,6 @@ var DiscordService = class _DiscordService extends Service {
   discordSettings;
   userSelections = /* @__PURE__ */ new Map();
   timeouts = [];
-  clientReadyPromise;
   /**
    * List of allowed channel IDs (parsed from CHANNEL_IDS env var).
    * If undefined, all channels are allowed.
@@ -5898,7 +5915,7 @@ var DiscordService = class _DiscordService extends Service {
     const channelIdsRaw = runtime.getSetting("CHANNEL_IDS");
     if (channelIdsRaw?.trim && channelIdsRaw.trim()) {
       this.allowedChannelIds = channelIdsRaw.split(",").map((s) => s.trim()).filter((s) => s.length > 0);
-      this.runtime.logger.debug("Locking down discord to", this.allowedChannelIds);
+      this.runtime.logger.debug("Locking down discord to", this.allowedChannelIds.join(", "));
     }
     const token = runtime.getSetting("DISCORD_API_TOKEN");
     if (!token || token?.trim && token.trim() === "") {
@@ -5925,17 +5942,18 @@ var DiscordService = class _DiscordService extends Service {
       this.runtime = runtime;
       this.voiceManager = new VoiceManager(this, runtime);
       this.messageManager = new MessageManager(this);
-      this.clientReadyPromise = new Promise((resolver) => {
-        this.client.once(Events.ClientReady, (readyClient) => {
-          resolver();
-          this.onReady(readyClient);
-        });
-        this.client.login(token).catch((error) => {
-          this.runtime.logger.error(
-            `Failed to login to Discord: ${error instanceof Error ? error.message : String(error)}`
-          );
-          this.client = null;
-        });
+      this.client.once(Events.ClientReady, (readyClient) => {
+        this.onReady(readyClient);
+      });
+      this.client.login(token).catch((error) => {
+        this.runtime.logger.error(
+          `Failed to login to Discord: ${error instanceof Error ? error.message : String(error)}`
+        );
+        if (this.client) {
+          this.client.destroy().catch(() => {
+          });
+        }
+        this.client = null;
       });
       this.setupEventListeners();
       this.registerSendHandler();
@@ -6062,8 +6080,6 @@ var DiscordService = class _DiscordService extends Service {
     }
     const listenCidsRaw = this.runtime.getSetting("DISCORD_LISTEN_CHANNEL_IDS");
     const listenCids = Array.isArray(listenCidsRaw) ? listenCidsRaw : listenCidsRaw && typeof listenCidsRaw === "string" && listenCidsRaw.trim() ? listenCidsRaw.trim().split(",").map((s) => s.trim()).filter((s) => s.length > 0) : [];
-    const talkCids = this.allowedChannelIds ?? [];
-    const allowedCids = [...listenCids, ...talkCids];
     this.client.on("messageCreate", async (message) => {
       if (message.author.id === this.client?.user?.id || message.author.bot && this.discordSettings.shouldIgnoreBotMessages) {
         this.runtime.logger.info(
@@ -6073,26 +6089,25 @@ var DiscordService = class _DiscordService extends Service {
       }
       if (listenCids.includes(message.channel.id)) {
         const entityId = createUniqueUuid5(this.runtime, message.author.id);
-        const userName = message.author.bot ? `${message.author.username}#${message.author.discriminator}` : message.author.username;
-        const name = message.author.displayName;
-        const channelId = message.channel.id;
-        const roomId = createUniqueUuid5(this.runtime, channelId);
+        const roomId = createUniqueUuid5(this.runtime, message.channel.id);
         let type;
-        let serverId;
+        let _serverId;
         if (message.guild) {
           const guild = await message.guild.fetch();
           type = await this.getChannelType(message.channel);
           if (type === null) {
-            this.runtime.logger.warn("null channel type, discord message", message);
+            this.runtime.logger.warn("null channel type, discord message", message.id);
           }
-          serverId = guild.id;
+          _serverId = guild.id;
         } else {
           type = ChannelType7.DM;
-          serverId = message.channel.id;
+          _serverId = message.channel.id;
         }
         const { processedContent, attachments } = await this.messageManager.processMessage(message);
         const messageId = createUniqueUuid5(this.runtime, message.id);
         const sourceId = entityId;
+        const userName = message.author.bot ? `${message.author.username}#${message.author.discriminator}` : message.author.username;
+        const name = message.member?.displayName ?? message.author.displayName ?? message.author.globalName ?? userName;
         const newMessage = {
           id: messageId,
           entityId,
@@ -6235,7 +6250,7 @@ var DiscordService = class _DiscordService extends Service {
     const tag = member.user.bot ? `${member.user.username}#${member.user.discriminator}` : member.user.username;
     const worldId = createUniqueUuid5(this.runtime, guild.id);
     const entityId = createUniqueUuid5(this.runtime, member.id);
-    this.runtime.emitEvent([EventType2.ENTITY_JOINED], {
+    this.runtime.emitEvent([EventType.ENTITY_JOINED], {
       runtime: this.runtime,
       entityId,
       worldId,
@@ -6290,7 +6305,7 @@ var DiscordService = class _DiscordService extends Service {
       server: fullGuild,
       source: "discord"
     });
-    this.runtime.emitEvent([EventType2.WORLD_JOINED], standardizedData);
+    this.runtime.emitEvent([EventType.WORLD_JOINED], standardizedData);
   }
   /**
    * Handles interactions created by the user, specifically commands and message components.
@@ -6666,7 +6681,7 @@ var DiscordService = class _DiscordService extends Service {
             },
             source: "discord"
           };
-          this.runtime.emitEvent([EventType2.WORLD_CONNECTED], standardizedData);
+          this.runtime.emitEvent([EventType.WORLD_CONNECTED], standardizedData);
         } catch (error) {
           this.runtime.logger.error(`Error during Discord world connection: ${error instanceof Error ? error.message : String(error)}`);
         }
@@ -6732,7 +6747,7 @@ var DiscordService = class _DiscordService extends Service {
           } else {
             this.runtime.logger.info(`Fetching members for guild ${guild.name}`);
             members = await guild.members.fetch();
-            logger13.info(`Fetched ${members.size} members`);
+            this.runtime.logger.info(`Fetched ${members.size} members`);
           }
         } catch (error) {
           this.runtime.logger.error(`Error fetching members: ${error}`);