@elizaos/plugin-discord 1.0.0-alpha.20 → 1.0.0-alpha.21

package/dist/index.js

@@ -1,6 +1,7 @@
 // src/index.ts
 import {
   ChannelType as ChannelType10,
+  EventTypes as EventTypes2,
   Role,
   Service,
   createUniqueUuid as createUniqueUuid6,
@@ -16,11 +17,11 @@ import {
 } from "discord.js";
 
 // src/actions/chatWithAttachments.ts
-import * as fs from "node:fs";
+import fs from "node:fs";
 import {
   ChannelType,
   ModelTypes,
-  composePrompt,
+  composePromptFromState,
   parseJSONObjectFromText,
   trimTokens
 } from "@elizaos/core";
@@ -49,7 +50,7 @@ Your response must be formatted as a JSON block with this structure:
 \`\`\`
 `;
 var getAttachmentIds = async (runtime, _message, state) => {
-  const prompt = composePrompt({
+  const prompt = composePromptFromState({
     state,
     template: attachmentIdsTemplate
   });
@@ -86,7 +87,7 @@ var summarizeAction = {
   ],
   description: "Answer a user request informed by specific attachments based on their IDs. If a user asks to chat with a PDF, or wants more specific information about a link or video or anything else they've attached, this is the action to use.",
   validate: async (_runtime, message, _state) => {
-    const room = await _runtime.getDatabaseAdapter().getRoom(message.roomId);
+    const room = await _runtime.getRoom(message.roomId);
     if (room?.type !== ChannelType.GROUP) {
       return false;
     }
@@ -166,7 +167,7 @@ ${attachment.text}`).join("\n\n");
       chunkSize,
       runtime
     );
-    const prompt = composePrompt({
+    const prompt = composePromptFromState({
       state,
       // make sure it fits, we can pad the tokens a bit
       // Get the model's tokenizer based on the current model being used
@@ -213,7 +214,7 @@ ${currentSummary.trim()}
         });
         await fs.promises.writeFile(summaryFilename, currentSummary, "utf8");
         console.log("File written successfully");
-        await runtime.getDatabaseAdapter().setCache(summaryFilename, currentSummary);
+        await runtime.setCache(summaryFilename, currentSummary);
         console.log("Cache set operation completed");
         await callback(
           {
@@ -303,7 +304,7 @@ var chatWithAttachments_default = summarizeAction;
 import {
   ModelTypes as ModelTypes2,
   ServiceTypes,
-  composePrompt as composePrompt2,
+  composePromptFromState as composePromptFromState2,
   parseJSONObjectFromText as parseJSONObjectFromText2
 } from "@elizaos/core";
 var mediaUrlTemplate = `# Messages we are searching for a media URL
@@ -320,7 +321,7 @@ Your response must be formatted as a JSON block with this structure:
 \`\`\`
 `;
 var getMediaUrl = async (runtime, _message, state) => {
-  const prompt = composePrompt2({
+  const prompt = composePromptFromState2({
     state,
     template: mediaUrlTemplate
   });
@@ -453,10 +454,10 @@ var downloadMedia_default = {
 };
 
 // src/actions/summarizeConversation.ts
-import * as fs2 from "node:fs";
+import fs2 from "node:fs";
 import {
   ModelTypes as ModelTypes3,
-  composePrompt as composePrompt3,
+  composePromptFromState as composePromptFromState3,
   getEntityDetails,
   parseJSONObjectFromText as parseJSONObjectFromText3,
   splitChunks,
@@ -490,7 +491,7 @@ Your response must be formatted as a JSON block with this structure:
 \`\`\`
 `;
 var getDateRange = async (runtime, _message, state) => {
-  const prompt = composePrompt3({
+  const prompt = composePromptFromState3({
     state,
     template: dateRangeTemplate
   });
@@ -656,7 +657,7 @@ ${attachments}`;
         chunkSize + 500,
         runtime
       );
-      const prompt = composePrompt3({
+      const prompt = composePromptFromState3({
         state,
         // make sure it fits, we can pad the tokens a bit
         template
@@ -695,7 +696,7 @@ ${currentSummary.trim()}
     } else if (currentSummary.trim()) {
       const summaryDir = "cache";
       const summaryFilename = `${summaryDir}/conversation_summary_${Date.now()}`;
-      await runtime.getDatabaseAdapter().setCache(summaryFilename, currentSummary);
+      await runtime.setCache(summaryFilename, currentSummary);
       await fs2.promises.mkdir(summaryDir, { recursive: true });
       await fs2.promises.writeFile(summaryFilename, currentSummary, "utf8");
       await callback(
@@ -786,7 +787,7 @@ var summarizeConversation_default = summarizeAction2;
 // src/actions/transcribeMedia.ts
 import {
   ModelTypes as ModelTypes4,
-  composePrompt as composePrompt4,
+  composePromptFromState as composePromptFromState4,
   parseJSONObjectFromText as parseJSONObjectFromText4
 } from "@elizaos/core";
 var mediaAttachmentIdTemplate = `# Messages we are transcribing
@@ -803,7 +804,7 @@ Your response must be formatted as a JSON block with this structure:
 \`\`\`
 `;
 var getMediaAttachmentId = async (runtime, _message, state) => {
-  const prompt = composePrompt4({
+  const prompt = composePromptFromState4({
     state,
     template: mediaAttachmentIdTemplate
   });
@@ -913,7 +914,7 @@ ${mediaTranscript.trim()}
       await callback(callbackData);
     } else if (callbackData.text) {
       const transcriptFilename = `content/transcript_${Date.now()}`;
-      await runtime.getDatabaseAdapter().setCache(transcriptFilename, callbackData.text);
+      await runtime.setCache(transcriptFilename, callbackData.text);
       await callback(
         {
           ...callbackData,
@@ -965,7 +966,7 @@ var transcribeMedia_default = transcribeMediaAction;
 import {
   ChannelType as ChannelType2,
   ModelTypes as ModelTypes5,
-  composePrompt as composePrompt5,
+  composePromptFromState as composePromptFromState5,
   createUniqueUuid as createUniqueUuid2,
   logger
 } from "@elizaos/core";
@@ -993,7 +994,7 @@ var voiceJoin_default = {
     if (message.content.source !== "discord") {
       return false;
     }
-    const room = state.data.room ?? await runtime.getDatabaseAdapter().getRoom(message.roomId);
+    const room = state.data.room ?? await runtime.getRoom(message.roomId);
     if (room?.type !== ChannelType2.GROUP) {
       return false;
     }
@@ -1006,7 +1007,7 @@ var voiceJoin_default = {
   },
   description: "Join a voice channel to participate in voice chat.",
   handler: async (runtime, message, state, _options, callback) => {
-    const room = state.data.room ?? await runtime.getDatabaseAdapter().getRoom(message.roomId);
+    const room = state.data.room ?? await runtime.getRoom(message.roomId);
     if (!room) {
       throw new Error("No room found");
     }
@@ -1090,7 +1091,7 @@ You should only respond with the name of the voice channel or none, no commentar
       userMessage: message.content.text,
       voiceChannels: voiceChannels.map((channel) => channel.name).join("\n")
     };
-    const prompt = composePrompt5({
+    const prompt = composePromptFromState5({
       template: messageTemplate,
       state: guessState
     });
@@ -1291,7 +1292,7 @@ var voiceLeave_default = {
       logger2.error("Discord client not found");
       return false;
     }
-    const room = state.data.room ?? await runtime.getDatabaseAdapter().getRoom(message.roomId);
+    const room = state.data.room ?? await runtime.getRoom(message.roomId);
     if (room?.type !== ChannelType3.GROUP) {
       return false;
     }
@@ -1300,7 +1301,7 @@ var voiceLeave_default = {
   },
   description: "Leave the current voice channel.",
   handler: async (runtime, message, _state, _options) => {
-    const room = await runtime.getDatabaseAdapter().getRoom(message.roomId);
+    const room = await runtime.getRoom(message.roomId);
     if (!room) {
       throw new Error("No room found");
     }
@@ -1536,6 +1537,7 @@ var DISCORD_SERVICE_NAME = "discord";
 // src/messages.ts
 import {
   ChannelType as ChannelType5,
+  EventTypes,
   ServiceTypes as ServiceTypes4,
   createUniqueUuid as createUniqueUuid4,
   logger as logger4
@@ -2142,7 +2144,7 @@ var MessageManager = class {
           return [];
         }
       };
-      this.runtime.emitEvent(["DISCORD_MESSAGE_RECEIVED", "MESSAGE_RECEIVED"], {
+      this.runtime.emitEvent(["DISCORD_MESSAGE_RECEIVED" /* MESSAGE_RECEIVED */, EventTypes.MESSAGE_RECEIVED], {
         runtime: this.runtime,
         message: newMessage,
         callback
@@ -2268,7 +2270,7 @@ import { ChannelType as ChannelType6 } from "@elizaos/core";
 var channelStateProvider = {
   name: "channelState",
   get: async (runtime, message, state) => {
-    const room = state.data?.room ?? await runtime.getDatabaseAdapter().getRoom(message.roomId);
+    const room = state.data?.room ?? await runtime.getRoom(message.roomId);
     if (!room) {
       throw new Error("No room found");
     }
@@ -2354,7 +2356,7 @@ import { ChannelType as ChannelType7 } from "@elizaos/core";
 var voiceStateProvider = {
   name: "voiceState",
   get: async (runtime, message, state) => {
-    const room = await runtime.getDatabaseAdapter().getRoom(message.roomId);
+    const room = await runtime.getRoom(message.roomId);
     if (!room) {
       throw new Error("No room found");
     }
@@ -2392,7 +2394,7 @@ var voiceStateProvider = {
       };
     }
     const worldId = room.worldId;
-    const world = await runtime.getDatabaseAdapter().getWorld(worldId);
+    const world = await runtime.getWorld(worldId);
     if (!world) {
       throw new Error("No world found");
     }
@@ -2966,7 +2968,7 @@ var VoiceManager = class extends EventEmitter {
   setReady(status) {
     this.ready = status;
     this.emit("ready");
-    logger6.success(`VoiceManager is now ready: ${this.ready}`);
+    logger6.debug(`VoiceManager is now ready: ${this.ready}`);
   }
   /**
    * Check if the object is ready.
@@ -3641,7 +3643,6 @@ var DiscordService = class _DiscordService extends Service {
    */
   constructor(runtime) {
     super(runtime);
-    logger7.log("Discord client constructor was engaged");
     const token = runtime.getSetting("DISCORD_API_TOKEN");
     if (!token || token.trim() === "") {
       logger7.warn(
@@ -3699,11 +3700,25 @@ var DiscordService = class _DiscordService extends Service {
    * @returns {Promise<void>} - A Promise that resolves once all channels are ensured.
    */
   async ensureAllChannelsExist(runtime, guild) {
-    const guildObj = await guild.fetch();
-    const guildChannels = await guild.fetch();
+    let guildObj;
+    let guildChannels;
+    let retries = 3;
+    while (retries > 0) {
+      try {
+        guildObj = await guild.fetch();
+        guildChannels = await guild.fetch();
+        break;
+      } catch (error) {
+        retries--;
+        if (retries === 0) {
+          throw error;
+        }
+        await new Promise((resolve) => setTimeout(resolve, 1e3));
+      }
+    }
     for (const [, channel] of guildChannels.channels.cache) {
       const roomId = createUniqueUuid6(this.runtime, channel.id);
-      const room = await runtime.getDatabaseAdapter().getRoom(roomId);
+      const room = await runtime.getRoom(roomId);
       if (room) {
         continue;
       }
@@ -3801,21 +3816,20 @@ var DiscordService = class _DiscordService extends Service {
     logger7.log(`New member joined: ${member.user.username}`);
     const guild = member.guild;
     const tag = member.user.bot ? `${member.user.username}#${member.user.discriminator}` : member.user.username;
-    this.runtime.emitEvent("USER_JOINED", {
+    this.runtime.emitEvent([EventTypes2.ENTITY_JOINED], {
       runtime: this.runtime,
       entityId: createUniqueUuid6(this.runtime, member.id),
-      user: {
-        id: member.id,
+      worldId: createUniqueUuid6(this.runtime, guild.id),
+      source: "discord",
+      metadata: {
+        originalId: member.id,
         username: tag,
-        displayName: member.displayName || member.user.username
-      },
-      serverId: guild.id,
-      channelId: null,
-      // No specific channel for server joins
-      channelType: ChannelType10.WORLD,
-      source: "discord"
+        displayName: member.displayName || member.user.username,
+        roles: member.roles.cache.map((r) => r.name),
+        joinedAt: member.joinedAt?.getTime()
+      }
     });
-    this.runtime.emitEvent("DISCORD_USER_JOINED", {
+    this.runtime.emitEvent(["DISCORD_USER_JOINED" /* ENTITY_JOINED */], {
       runtime: this.runtime,
       entityId: createUniqueUuid6(this.runtime, member.id),
       member,
@@ -3830,8 +3844,41 @@ var DiscordService = class _DiscordService extends Service {
    *
    */
   static async start(runtime) {
-    const client = new _DiscordService(runtime);
-    return client;
+    const token = runtime.getSetting("DISCORD_API_TOKEN");
+    if (!token || token.trim() === "") {
+      throw new Error("Discord API Token not provided");
+    }
+    const maxRetries = 5;
+    let retryCount = 0;
+    let lastError = null;
+    while (retryCount < maxRetries) {
+      try {
+        const service = new _DiscordService(runtime);
+        if (!service.client) {
+          throw new Error("Failed to initialize Discord client");
+        }
+        await new Promise((resolve, reject) => {
+          const timeout = setTimeout(() => {
+            reject(new Error("Discord client ready timeout"));
+          }, 3e4);
+          service.client?.once("ready", () => {
+            clearTimeout(timeout);
+            resolve();
+          });
+        });
+        return service;
+      } catch (error) {
+        lastError = error instanceof Error ? error : new Error(String(error));
+        logger7.error(`Discord initialization attempt ${retryCount + 1} failed: ${lastError.message}`);
+        retryCount++;
+        if (retryCount < maxRetries) {
+          const delay = 2 ** retryCount * 1e3;
+          logger7.info(`Retrying Discord initialization in ${delay / 1e3} seconds...`);
+          await new Promise((resolve) => setTimeout(resolve, delay));
+        }
+      }
+    }
+    throw new Error(`Discord initialization failed after ${maxRetries} attempts. Last error: ${lastError?.message}`);
   }
   /**
    * Stops the Discord client associated with the given runtime.
@@ -3867,7 +3914,7 @@ var DiscordService = class _DiscordService extends Service {
    * @returns {Promise<void>}
    */
   async onClientReady(readyClient) {
-    logger7.success(`Logged in as ${readyClient.user?.tag}`);
+    logger7.success(`DISCORD: Logged in as ${readyClient.user?.tag}`);
     const commands = [
       {
         name: "joinchannel",
@@ -3891,7 +3938,7 @@ var DiscordService = class _DiscordService extends Service {
     ];
     try {
       await this.client?.application?.commands.set(commands);
-      logger7.success("Slash commands registered");
+      logger7.success("DISCORD: Slash commands registered");
     } catch (error) {
       console.error("Error registering slash commands:", error);
     }
@@ -3941,8 +3988,8 @@ var DiscordService = class _DiscordService extends Service {
   /**
    * Handles the addition of a reaction on a message.
    *
-   * @param {MessageReaction} reaction The reaction that was added.
-   * @param {User} user The user who added the reaction.
+   * @param {MessageReaction | PartialMessageReaction} reaction The reaction that was added.
+   * @param {User | PartialUser} user The user who added the reaction.
    * @returns {void}
    */
   async handleReactionAdd(reaction, user) {
@@ -4037,8 +4084,8 @@ var DiscordService = class _DiscordService extends Service {
   /**
    * Handles the removal of a reaction on a message.
    *
-   * @param {MessageReaction} reaction - The reaction that was removed.
-   * @param {User} user - The user who removed the reaction.
+   * @param {MessageReaction | PartialMessageReaction} reaction - The reaction that was removed.
+   * @param {User | PartialUser} user - The user who removed the reaction.
    * @returns {Promise<void>} - A Promise that resolves after handling the reaction removal.
    */
   async handleReactionRemove(reaction, user) {
@@ -4109,7 +4156,7 @@ var DiscordService = class _DiscordService extends Service {
         await reaction.message.channel.send(content.text);
         return [];
       };
-      this.runtime.emitEvent(["DISCORD_REACTION_EVENT", "REACTION_RECEIVED"], {
+      this.runtime.emitEvent(["DISCORD_REACTION_RECEIVED" /* REACTION_RECEIVED */], {
         runtime: this.runtime,
         message: memory,
         callback
@@ -4147,12 +4194,12 @@ var DiscordService = class _DiscordService extends Service {
       },
       source: "discord"
     };
-    this.runtime.emitEvent(["DISCORD_SERVER_JOINED"], {
+    this.runtime.emitEvent(["DISCORD_WORLD_JOINED" /* WORLD_JOINED */], {
       runtime: this.runtime,
       server: fullGuild,
       source: "discord"
     });
-    this.runtime.emitEvent(["SERVER_JOINED"], standardizedData);
+    this.runtime.emitEvent([EventTypes2.WORLD_JOINED], standardizedData);
   }
   /**
    * Handles interactions created by the user, specifically commands.
@@ -4358,7 +4405,7 @@ var DiscordService = class _DiscordService extends Service {
       setTimeout(async () => {
         const fullGuild2 = await guild.fetch();
         logger7.log("DISCORD SERVER CONNECTED", fullGuild2.name);
-        this.runtime.emitEvent(["DISCORD_SERVER_CONNECTED"], {
+        this.runtime.emitEvent(["DISCORD_SERVER_CONNECTED" /* WORLD_CONNECTED */], {
           runtime: this.runtime,
           server: fullGuild2,
           source: "discord"
@@ -4369,7 +4416,7 @@ var DiscordService = class _DiscordService extends Service {
           name: fullGuild2.name,
           runtime: this.runtime,
           rooms: await this.buildStandardizedRooms(fullGuild2, worldId),
-          users: await this.buildStandardizedUsers(fullGuild2),
+          entities: await this.buildStandardizedUsers(fullGuild2),
           world: {
             id: worldId,
             name: fullGuild2.name,
@@ -4384,7 +4431,7 @@ var DiscordService = class _DiscordService extends Service {
           },
           source: "discord"
         };
-        this.runtime.emitEvent(["SERVER_CONNECTED"], standardizedData);
+        this.runtime.emitEvent([EventTypes2.WORLD_CONNECTED], standardizedData);
       }, 1e3);
     }
     this.client?.emit("voiceManagerReady");