@whanext/core 0.5.0 → 0.7.0

package/dist/index.js

@@ -1,6 +1,10 @@
 // src/cache/memory-cache.ts
 var MemoryCache = class {
   #entries = /* @__PURE__ */ new Map();
+  #maxEntries;
+  constructor(options = {}) {
+    this.#maxEntries = Math.max(1, options.maxEntries ?? 1e3);
+  }
   async get(key) {
     const entry = this.#entries.get(key);
     if (!entry) {
@@ -10,6 +14,8 @@ var MemoryCache = class {
       this.#entries.delete(key);
       return void 0;
     }
+    this.#entries.delete(key);
+    this.#entries.set(key, entry);
     return entry.value;
   }
   async set(key, value, ttlMs) {
@@ -18,6 +24,11 @@ var MemoryCache = class {
       entry.expiresAt = Date.now() + ttlMs;
     }
     this.#entries.set(key, entry);
+    while (this.#entries.size > this.#maxEntries) {
+      const oldest = this.#entries.keys().next().value;
+      if (oldest === void 0) return;
+      this.#entries.delete(oldest);
+    }
   }
   async delete(key) {
     this.#entries.delete(key);
@@ -932,6 +943,7 @@ var GroupService = class {
   #provider;
   #cache;
   #ttlMs;
+  #requests = /* @__PURE__ */ new Map();
   constructor(provider, cache, ttlMs = 3e5) {
     this.#provider = provider;
     this.#cache = cache;
@@ -979,9 +991,17 @@ var GroupService = class {
         return cached;
       }
     }
-    const group = await this.#provider.getGroup(groupId);
-    await this.#cache.set(key, group, this.#ttlMs);
-    return group;
+    const pending = this.#requests.get(key);
+    if (pending) {
+      return pending;
+    }
+    const request = this.#loadMetadata(key, groupId);
+    this.#requests.set(key, request);
+    try {
+      return await request;
+    } finally {
+      this.#requests.delete(key);
+    }
   }
   async isAdmin(groupId, memberIds) {
     if (!groupId.endsWith("@g.us")) {
@@ -1030,6 +1050,11 @@ var GroupService = class {
   #key(groupId) {
     return `group:${groupId}`;
   }
+  async #loadMetadata(key, groupId) {
+    const group = await this.#provider.getGroup(groupId);
+    await this.#cache.set(key, group, this.#ttlMs);
+    return group;
+  }
   #matchesParticipant(participant, identities) {
     const participantIds = [participant.id, participant.lid, participant.phoneNumber].filter((identity) => identity !== void 0);
     return identities.some((identity) => participantIds.some((participantId) => identitiesMatch(identity, participantId)));
@@ -1051,6 +1076,10 @@ var MediaService = class {
   audio(chatId, content) {
     return this.#provider.sendMessage(chatId, content);
   }
+  download(message) {
+    const key = "keys" in message ? message.keys : message;
+    return this.#provider.downloadMedia(key);
+  }
 };
 
 // src/services/member-service.ts
@@ -1141,6 +1170,14 @@ var MessageService = class {
     const key = "keys" in message ? message.keys : message;
     return this.#provider.deleteMessage(key);
   }
+  react(message, emoji) {
+    const key = "keys" in message ? message.keys : message;
+    return this.#provider.reactToMessage(key, emoji);
+  }
+  unreact(message) {
+    const key = "keys" in message ? message.keys : message;
+    return this.#provider.reactToMessage(key);
+  }
   text(chatId, text, mentions) {
     const content = { text };
     if (mentions !== void 0) {
@@ -1199,7 +1236,9 @@ var WhaNextApp = class {
     this.#provider = provider;
     this.#phone = options.phone;
     this.logger = logger;
-    const cache = options.cache?.store ?? new MemoryCache();
+    const cache = options.cache?.store ?? new MemoryCache(
+      options.cache?.memoryMaxEntries === void 0 ? void 0 : { maxEntries: options.cache.memoryMaxEntries }
+    );
     this.group = new GroupService(provider, cache, options.cache?.groupTtlMs);
     this.member = new MemberService(provider, this.group);
     this.message = new MessageService(provider);
@@ -1307,6 +1346,10 @@ var WhaNextApp = class {
       await this.#events.emit("connection", update);
     });
     this.#provider.on("groupChanged", ({ groupId }) => this.group.invalidate(groupId));
+    this.#provider.on("groupParticipantsChanged", async (change) => {
+      await this.group.invalidate(change.groupId);
+      await this.#events.emit("groupParticipantsChanged", change);
+    });
     this.#provider.on("call", async (call) => {
       this.logger.debug("Call received", {
         callId: call.id,
@@ -1401,6 +1444,7 @@ var Browser = /* @__PURE__ */ ((Browser2) => {
 import {
   Browsers,
   DisconnectReason,
+  downloadMediaMessage,
   makeWASocket,
   proto,
   useMultiFileAuthState
@@ -1611,6 +1655,7 @@ var BaileysProvider = class {
   #events = new TypedEventEmitter();
   #logger;
   #messageStore = /* @__PURE__ */ new Map();
+  #messageCacheSize;
   #socket;
   #saveCredentials;
   #saveQueue = Promise.resolve();
@@ -1621,6 +1666,7 @@ var BaileysProvider = class {
   constructor(options) {
     this.#options = options;
     this.#logger = options.logger ?? new Logger("silent");
+    this.#messageCacheSize = Math.max(1, options.messageCacheSize ?? 1e3);
   }
   on(event, listener) {
     return this.#events.on(event, listener);
@@ -1645,7 +1691,7 @@ var BaileysProvider = class {
         markOnlineOnConnect: false,
         enableAutoSessionRecreation: true,
         enableRecentMessageCache: true,
-        getMessage: async (key) => key.id ? this.#messageStore.get(key.id) : void 0
+        getMessage: async (key) => this.#messageStore.get(this.#messageStoreKey(key))?.message ?? void 0
       });
       this.#socket = socket;
       this.#bind(socket);
@@ -1724,6 +1770,39 @@ var BaileysProvider = class {
     const result = await socket.sendMessage(chatId, this.#toContent(content), options);
     return this.#sent(result);
   }
+  async reactToMessage(key, emoji) {
+    const result = await this.#requireSocket().sendMessage(key.chatId, {
+      react: {
+        text: emoji ?? "",
+        key: this.#toWaKey(key)
+      }
+    });
+    return this.#sent(result);
+  }
+  async downloadMedia(key) {
+    const message = this.#messageStore.get(this.#messageStoreKey(key));
+    if (!message?.message) {
+      throw new WhaNextError(
+        "MEDIA_NOT_AVAILABLE",
+        "The media is unavailable. Download it from the received message event while it is cached.",
+        { recoverable: true }
+      );
+    }
+    const data = await downloadMediaMessage(message, "buffer", {}, {
+      reuploadRequest: (current) => this.#requireSocket().updateMediaMessage(current),
+      logger: createBaileysLogger(this.#logger.child("media"))
+    });
+    const media = normalizeBaileysMessage(message)?.media;
+    if (!media) {
+      throw new WhaNextError("MEDIA_NOT_AVAILABLE", "The selected message does not contain media.");
+    }
+    return {
+      data,
+      kind: media.kind,
+      ...media.mimetype ? { mimetype: media.mimetype } : {},
+      ...media.fileName ? { fileName: media.fileName } : {}
+    };
+  }
   async editMessage(key, content) {
     const result = await this.#requireSocket().sendMessage(key.chatId, {
       text: content,
@@ -1792,7 +1871,6 @@ var BaileysProvider = class {
   }
   async setPresence(chatId, state) {
     const socket = this.#requireSocket();
-    await socket.presenceSubscribe(chatId);
     const presence = state === "typing" ? "composing" : state === "recording" ? "recording" : "paused";
     await socket.sendPresenceUpdate(presence, chatId);
   }
@@ -1809,7 +1887,7 @@ var BaileysProvider = class {
     socket.ev.on("messages.upsert", ({ messages, type }) => {
       if (type !== "notify") return;
       for (const raw of messages) {
-        if (raw.key.id && raw.message) this.#remember(raw.key.id, raw.message);
+        if (raw.key.id && raw.message) this.#remember(raw);
         const message = normalizeBaileysMessage(raw);
         if (message) void this.#events.emit("message", message);
       }
@@ -1819,7 +1897,10 @@ var BaileysProvider = class {
         if (group.id) void this.#events.emit("groupChanged", { groupId: group.id });
       }
     });
-    socket.ev.on("group-participants.update", ({ id }) => {
+    socket.ev.on("group-participants.update", (update) => {
+      const change = this.#groupParticipantsChanged(update);
+      void this.#events.emit("groupParticipantsChanged", change);
+      const { id } = update;
       void this.#events.emit("groupChanged", { groupId: id });
     });
     socket.ev.on("call", (calls) => {
@@ -1949,7 +2030,7 @@ var BaileysProvider = class {
     if (!message?.key.id || !message.key.remoteJid) {
       throw new WhaNextError("PROVIDER_ERROR", "WhatsApp did not confirm the sent message.");
     }
-    if (message.message) this.#remember(message.key.id, message.message);
+    if (message.message) this.#remember(message);
     return {
       id: message.key.id,
       chatId: message.key.remoteJid,
@@ -1968,6 +2049,15 @@ var BaileysProvider = class {
       date: call.date ?? /* @__PURE__ */ new Date()
     };
   }
+  #groupParticipantsChanged(change) {
+    const participantIds = change.participants.map((participant) => participant.id).filter((id) => Boolean(id));
+    return {
+      groupId: change.id,
+      action: change.action,
+      participantIds,
+      ...change.author ? { authorId: change.author } : {}
+    };
+  }
   #callStatus(status) {
     const known = [
       "offer",
@@ -1979,13 +2069,19 @@ var BaileysProvider = class {
     ];
     return known.find((value) => value === status) ?? "timeout";
   }
-  #remember(id, message) {
-    this.#messageStore.set(id, message);
-    if (this.#messageStore.size > 500) {
+  #remember(message) {
+    const key = this.#messageStoreKey(message.key);
+    this.#messageStore.delete(key);
+    this.#messageStore.set(key, message);
+    while (this.#messageStore.size > this.#messageCacheSize) {
       const oldest = this.#messageStore.keys().next().value;
       if (oldest) this.#messageStore.delete(oldest);
     }
   }
+  #messageStoreKey(key) {
+    const chatId = "chatId" in key ? key.chatId : key.remoteJid;
+    return `${chatId ?? ""}:${key.id ?? ""}`;
+  }
 };
 
 // src/app/create.ts
@@ -1995,6 +2091,7 @@ async function create(options = {}) {
     auth: options.auth ?? "./session",
     browser: options.browser ?? "windows" /* Windows */,
     logger: logger.child("provider"),
+    ...options.messageCacheSize !== void 0 ? { messageCacheSize: options.messageCacheSize } : {},
     ...options.reconnect ? { reconnect: options.reconnect } : {}
   });
   return new WhaNextApp(provider, {
@@ -2011,6 +2108,9 @@ async function create(options = {}) {
 function defineCommand(command) {
   return command;
 }
+function defineCommands(...commands) {
+  return commands;
+}
 
 // src/commands/load-commands.ts
 import { readdir } from "fs/promises";
@@ -2023,16 +2123,20 @@ async function loadCommands(registrar, dirPath, options = {}) {
   const entries = await readEntries(dirPath, recursive);
   const loaded = [];
   const skipped = [];
+  const commands = [];
   for (const filePath of entries) {
     if (!extensions.includes(path.extname(filePath))) {
       skipped.push(filePath);
       continue;
     }
-    const definition = await importCommand(filePath);
-    registrar.command(definition);
+    const definitions = await importCommands(filePath);
+    for (const definition of definitions) {
+      registrar.command(definition);
+      commands.push({ name: definition.name, filePath });
+    }
     loaded.push(filePath);
   }
-  return { loaded, skipped };
+  return { loaded, skipped, commands };
 }
 async function readEntries(dirPath, recursive) {
   let dirents;
@@ -2044,9 +2148,9 @@ async function readEntries(dirPath, recursive) {
       context: { dirPath }
     });
   }
-  return dirents.filter((dirent) => dirent.isFile()).map((dirent) => path.join(dirent.parentPath, dirent.name));
+  return dirents.filter((dirent) => dirent.isFile()).map((dirent) => path.join(dirent.parentPath, dirent.name)).sort((left, right) => left.localeCompare(right));
 }
-async function importCommand(filePath) {
+async function importCommands(filePath) {
   let module;
   try {
     module = await import(pathToFileURL(filePath).href);
@@ -2056,13 +2160,27 @@ async function importCommand(filePath) {
       context: { filePath }
     });
   }
-  const candidate = module.default ?? Object.values(module)[0];
-  if (!isCommandDefinition(candidate)) {
-    throw new WhaNextError("COMMAND_LOAD_FAILED", `The file "${filePath}" does not export a valid command.`, {
+  const definitions = [];
+  const seen = /* @__PURE__ */ new Set();
+  const exports = [
+    module.default,
+    ...Object.entries(module).filter(([name]) => name !== "default").map(([, value]) => value)
+  ];
+  for (const value of exports) {
+    const candidates = Array.isArray(value) ? value : [value];
+    for (const candidate of candidates) {
+      if (isCommandDefinition(candidate) && !seen.has(candidate)) {
+        seen.add(candidate);
+        definitions.push(candidate);
+      }
+    }
+  }
+  if (definitions.length === 0) {
+    throw new WhaNextError("COMMAND_LOAD_FAILED", `The file "${filePath}" does not export any valid commands.`, {
       context: { filePath }
     });
   }
-  return candidate;
+  return definitions;
 }
 function isCommandDefinition(value) {
   return typeof value === "object" && value !== null && typeof value.name === "string" && typeof value.execute === "function";
@@ -2080,6 +2198,7 @@ export {
   WhaNextError,
   create,
   defineCommand,
+  defineCommands,
   loadCommands,
   toWhaNextError
 };