@whanext/core 0.18.0 → 0.19.0

package/dist/index.js

@@ -420,7 +420,7 @@ var CommandContextImplementation = class {
     this.chat = { id: options.message.chatId, isGroup: options.message.isGroup };
     this.command = options.command;
     this.commands = options.commands;
-    this.prefix = options.commands.prefix;
+    this.prefix = options.prefix ?? options.commands.prefix;
     this.options = options.options;
     this.args = options.args;
     this.locale = options.locale;
@@ -742,8 +742,11 @@ var UserService = class {
 // src/commands/router.ts
 var CommandRouter = class {
   #roots = /* @__PURE__ */ new Map();
+  #prefixlessRoots = /* @__PURE__ */ new Map();
   #definitions = /* @__PURE__ */ new Set();
-  #prefix;
+  #prefix = "!";
+  #prefixes = ["!"];
+  #matchingPrefixes = ["!"];
   #services;
   #legacyOnError;
   #globalMiddleware = [];
@@ -755,22 +758,25 @@ var CommandRouter = class {
   #cooldownOperations = 0;
   constructor(servicesOrGroup, options = {}) {
     this.#services = isRuntimeServices(servicesOrGroup) ? servicesOrGroup : createLegacyServices(servicesOrGroup);
-    this.#prefix = options.prefix ?? "!";
+    this.setPrefixes(options.prefix ?? "!");
     this.#legacyOnError = options.onError;
     this.#beforeExecute = options.beforeExecute;
     this.#afterExecute = options.afterExecute;
     if (options.onCommandError) this.#errorHandlers.push(options.onCommandError);
-    if (this.#prefix.length === 0 || /\s/.test(this.#prefix)) {
-      throw new WhaNextError(
-        "ARGUMENT_INVALID",
-        "The command prefix cannot be empty or contain whitespace.",
-        { context: { prefix: this.#prefix } }
-      );
-    }
   }
   get prefix() {
     return this.#prefix;
   }
+  get prefixes() {
+    return this.#prefixes;
+  }
+  setPrefixes(prefixes) {
+    const normalized = normalizePrefixes(prefixes);
+    this.#prefixes = normalized;
+    this.#matchingPrefixes = [...normalized].sort((left, right) => right.length - left.length);
+    this.#prefix = normalized[0];
+    return this;
+  }
   get size() {
     return this.catalog({ includeHidden: true }).length;
   }
@@ -789,6 +795,19 @@ var CommandRouter = class {
         ...name.locale ? { locale: name.locale } : {}
       });
     }
+    for (const name of prefixlessCommandNames(definition)) {
+      const normalized = name.value.toLowerCase();
+      if (this.#prefixlessRoots.has(normalized)) {
+        throw new WhaNextError(
+          "ARGUMENT_INVALID",
+          `The prefixless command trigger "${normalized}" is already registered.`
+        );
+      }
+      this.#prefixlessRoots.set(normalized, {
+        definition,
+        ...name.locale ? { locale: name.locale } : {}
+      });
+    }
     this.#definitions.add(definition);
     return this;
   }
@@ -840,13 +859,15 @@ _Nenhum comando dispon\xEDvel._`;
     return context.reply(text);
   }
   async dispatch(message) {
-    const text = message.text?.trim();
-    if (!text?.startsWith(this.#prefix)) return false;
-    const tokens = tokenize(text.slice(this.#prefix.length));
+    const text = (message.interactive?.id ?? message.text)?.trim();
+    if (!text) return false;
+    const matchedPrefix = this.#matchPrefix(text);
+    const tokens = tokenize(matchedPrefix === void 0 ? text : text.slice(matchedPrefix.length));
     const rootName = tokens.shift()?.toLowerCase();
     if (!rootName) return false;
-    const root = this.#roots.get(rootName);
+    const root = matchedPrefix === void 0 ? this.#prefixlessRoots.get(rootName) : this.#roots.get(rootName);
     if (!root) return false;
+    const invocationPrefix = matchedPrefix ?? "";
     let resolved;
     try {
       resolved = this.#resolve(root, tokens);
@@ -869,6 +890,7 @@ _Nenhum comando dispon\xEDvel._`;
         args: new ArgsParser(tokens),
         services: this.#services,
         commands: this,
+        prefix: invocationPrefix,
         signal: new AbortController().signal,
         ...root.locale ? { locale: root.locale } : {}
       });
@@ -912,6 +934,7 @@ _Nenhum comando dispon\xEDvel._`;
             args: legacyArgs,
             services: this.#services,
             commands: this,
+            prefix: invocationPrefix,
             signal,
             ...resolved.locale ? { locale: resolved.locale } : {}
           });
@@ -933,6 +956,7 @@ _Nenhum comando dispon\xEDvel._`;
         args: legacyArgs,
         services: this.#services,
         commands: this,
+        prefix: invocationPrefix,
         signal: new AbortController().signal,
         ...resolved.locale ? { locale: resolved.locale } : {}
       });
@@ -940,6 +964,9 @@ _Nenhum comando dispon\xEDvel._`;
       throw normalized;
     }
   }
+  #matchPrefix(text) {
+    return this.#matchingPrefixes.find((prefix) => text.startsWith(prefix));
+  }
   #resolve(root, inputTokens) {
     const tokens = [...inputTokens];
     const layers = [root.definition];
@@ -1076,6 +1103,26 @@ _Nenhum comando dispon\xEDvel._`;
         );
       }
     }
+    if (definition.prefixless && parents.length > 0) {
+      throw new WhaNextError(
+        "ARGUMENT_INVALID",
+        "Prefixless triggers are only supported on root commands and command groups.",
+        { context: { command: definition.name } }
+      );
+    }
+    if (Array.isArray(definition.prefixless)) {
+      const available = new Set(commandNames(definition).map((name) => name.value.toLowerCase()));
+      for (const trigger of definition.prefixless) {
+        const normalized = trigger.trim().toLowerCase();
+        if (!normalized || /\s/.test(trigger) || !available.has(normalized)) {
+          throw new WhaNextError(
+            "ARGUMENT_INVALID",
+            "Every prefixless trigger must match the command name or one of its aliases.",
+            { context: { command: definition.name, trigger } }
+          );
+        }
+      }
+    }
     if (!isCommandGroup(definition)) return;
     if (definition.subcommands.length === 0) {
       throw new WhaNextError("ARGUMENT_INVALID", `The command group "${definition.name}" is empty.`);
@@ -1116,6 +1163,30 @@ async function composeMiddleware(middleware, context, execute) {
   };
   await dispatch(0);
 }
+function normalizePrefixes(input) {
+  const values = typeof input === "string" ? [input] : [...input];
+  const prefixes = [...new Set(values)];
+  if (prefixes.length === 0) {
+    throw new WhaNextError("ARGUMENT_INVALID", "At least one command prefix is required.");
+  }
+  for (const prefix of prefixes) {
+    if (prefix.length === 0 || /\s/.test(prefix)) {
+      throw new WhaNextError(
+        "ARGUMENT_INVALID",
+        "Command prefixes cannot be empty or contain whitespace.",
+        { context: { prefix } }
+      );
+    }
+  }
+  return prefixes;
+}
+function prefixlessCommandNames(definition) {
+  if (!definition.prefixless) return [];
+  const names = commandNames(definition);
+  if (definition.prefixless === true) return names;
+  const enabled = new Set(definition.prefixless.map((name) => name.toLowerCase()));
+  return names.filter((name) => enabled.has(name.value.toLowerCase()));
+}
 function commandNames(definition) {
   const names = [
     definition.name,
@@ -2039,6 +2110,12 @@ var MessageService = class {
   buttons(chatId, content) {
     return this.send(chatId, content);
   }
+  list(chatId, content) {
+    return this.send(chatId, content);
+  }
+  poll(chatId, content) {
+    return this.send(chatId, content);
+  }
 };
 
 // src/app/whanext-app.ts
@@ -2311,12 +2388,16 @@ import {
 // src/provider/zapo/normalize-message.ts
 function unwrapZapoMessageContent(input) {
   if (!input) return void 0;
-  const nested = input.ephemeralMessage?.message ?? input.viewOnceMessage?.message ?? input.viewOnceMessageV2?.message ?? input.deviceSentMessage?.message ?? input.documentWithCaptionMessage?.message;
+  const nested = input.ephemeralMessage?.message ?? input.viewOnceMessage?.message ?? input.viewOnceMessageV2?.message ?? viewOnceV2ExtensionMessage(input) ?? input.deviceSentMessage?.message ?? input.documentWithCaptionMessage?.message;
   return nested ? unwrapZapoMessageContent(nested) : input;
 }
+function viewOnceV2ExtensionMessage(input) {
+  const extension = input.viewOnceMessageV2Extension;
+  return extension?.message ?? void 0;
+}
 function isZapoViewOnceContent(input) {
   if (!input) return false;
-  if (input.viewOnceMessage?.message || input.viewOnceMessageV2?.message) {
+  if (input.viewOnceMessage?.message || input.viewOnceMessageV2?.message || viewOnceV2ExtensionMessage(input)) {
     return true;
   }
   return isZapoViewOnceContent(input.ephemeralMessage?.message);
@@ -2326,7 +2407,7 @@ function extractQuotedZapoMessage(input) {
   const chatId = event.key.remoteJid;
   const content = unwrapZapoMessageContent(event.message);
   if (!chatId || !content) return void 0;
-  const node = contentNode(content);
+  const { node } = contentNode(content);
   const context = getContextInfo(node);
   if (!context?.stanzaId || !context.quotedMessage) return void 0;
   return {
@@ -2376,6 +2457,7 @@ function normalizeZapoMessage(input) {
   const text = getText(content);
   const caption = getCaption(content);
   const quoted = getQuoted(context, chatId);
+  const interactive = getInteractiveResponse(content);
   const message = {
     id,
     jid: chatId,
@@ -2402,6 +2484,7 @@ function normalizeZapoMessage(input) {
   if (caption !== void 0) message.caption = caption;
   if (media !== void 0) message.media = media;
   if (quoted !== void 0) message.quoted = quoted;
+  if (interactive !== void 0) message.interactive = interactive;
   return message;
 }
 function normalizeZapoKey(key) {
@@ -2481,7 +2564,67 @@ function getContentKind(type) {
   }
 }
 function getText(content) {
-  return content.conversation ?? content.extendedTextMessage?.text ?? content.buttonsResponseMessage?.selectedDisplayText ?? content.listResponseMessage?.title ?? content.templateButtonReplyMessage?.selectedDisplayText ?? void 0;
+  return content.conversation ?? content.extendedTextMessage?.text ?? content.buttonsResponseMessage?.selectedDisplayText ?? content.listResponseMessage?.title ?? content.templateButtonReplyMessage?.selectedDisplayText ?? content.pollCreationMessage?.name ?? content.pollCreationMessageV2?.name ?? content.pollCreationMessageV3?.name ?? content.pollCreationMessageV5?.name ?? getNativeFlowDisplayText(content) ?? void 0;
+}
+function getInteractiveResponse(content) {
+  const buttons = content.buttonsResponseMessage;
+  if (buttons?.selectedButtonId) {
+    return {
+      kind: "button",
+      id: buttons.selectedButtonId,
+      ...buttons.selectedDisplayText ? { title: buttons.selectedDisplayText } : {}
+    };
+  }
+  const template = content.templateButtonReplyMessage;
+  if (template?.selectedId) {
+    return {
+      kind: "button",
+      id: template.selectedId,
+      ...template.selectedDisplayText ? { title: template.selectedDisplayText } : {}
+    };
+  }
+  const list = content.listResponseMessage;
+  const rowId = list?.singleSelectReply?.selectedRowId;
+  if (rowId) {
+    return {
+      kind: "list",
+      id: rowId,
+      ...list?.title ? { title: list.title } : {}
+    };
+  }
+  const native = nativeFlowParams(content);
+  const nativeId = stringField(native, ["id", "selected_id", "row_id", "button_id"]);
+  if (nativeId) {
+    const title = stringField(native, ["display_text", "title"]);
+    return {
+      kind: native && ("row_id" in native || "selected_id" in native) ? "list" : "button",
+      id: nativeId,
+      ...title ? { title } : {}
+    };
+  }
+  return void 0;
+}
+function getNativeFlowDisplayText(content) {
+  return stringField(nativeFlowParams(content), ["display_text", "title"]);
+}
+function nativeFlowParams(content) {
+  const response = content.interactiveResponseMessage;
+  const json = response?.nativeFlowResponseMessage?.paramsJson;
+  if (!json) return void 0;
+  try {
+    const parsed = JSON.parse(json);
+    return typeof parsed === "object" && parsed !== null ? parsed : void 0;
+  } catch {
+    return void 0;
+  }
+}
+function stringField(value, keys) {
+  if (!value) return void 0;
+  for (const key of keys) {
+    const field = value[key];
+    if (typeof field === "string" && field.length > 0) return field;
+  }
+  return void 0;
 }
 function getCaption(content) {
   return content.imageMessage?.caption ?? content.videoMessage?.caption ?? content.documentMessage?.caption ?? void 0;
@@ -2559,6 +2702,7 @@ var ZapoProvider = class {
   #events = new TypedEventEmitter();
   #logger;
   #messageStore = /* @__PURE__ */ new Map();
+  #messageKeyStore = /* @__PURE__ */ new WeakMap();
   #messageCacheSize;
   #client;
   #voip;
@@ -2651,6 +2795,9 @@ var ZapoProvider = class {
     if ("buttons" in content) {
       return this.#sendButtons(chatId, content, replyTo);
     }
+    if ("list" in content) {
+      return this.#sendList(chatId, content, replyTo);
+    }
     const client = this.#requireClient();
     const { value, mentions, viewOnce } = await this.#toContent(content);
     const result = await client.message.send(chatId, value, {
@@ -2691,7 +2838,7 @@ var ZapoProvider = class {
     return this.#sent(result, key.chatId);
   }
   async downloadMedia(key) {
-    const message = this.#findStoredMessage(this.#toZapoKey(key));
+    const message = this.#messageKeyStore.get(key) ?? this.#findStoredMessage(this.#toZapoKey(key));
     if (!message?.message) {
       throw new WhaNextError(
         "MEDIA_NOT_AVAILABLE",
@@ -2881,9 +3028,10 @@ var ZapoProvider = class {
   }
   #bind(client) {
     client.on("auth_pairing_required", () => {
-      this.#pairingRequired = true;
-      this.#resolvePairingReady?.();
-      this.#resolvePairingReady = void 0;
+      this.#markPairingReady();
+    });
+    client.on("auth_qr", () => {
+      this.#markPairingReady();
     });
     client.on("auth_paired", () => {
       this.#pairingRequired = false;
@@ -2944,12 +3092,19 @@ var ZapoProvider = class {
     }
     if (stored.key?.id && stored.message) this.#remember(stored);
     const quoted = extractQuotedZapoMessage(event);
-    if (quoted) {
-      const quotedStored = quoted;
-      if (quotedStored.key?.id && quotedStored.message) this.#remember(quotedStored);
+    if (quoted?.key.id && quoted.message) {
+      this.#remember(quoted);
     }
     const message = normalizeZapoMessage(event);
-    if (message) void this.#events.emit("message", message);
+    if (!message) return;
+    this.#messageKeyStore.set(message.keys, stored);
+    if (message.quoted && quoted?.message) {
+      this.#messageKeyStore.set(
+        message.quoted.key,
+        quoted
+      );
+    }
+    void this.#events.emit("message", message);
   }
   #handleProtocolEvent(event) {
     const protocol = event.protocolMessage ?? event.message?.protocolMessage;
@@ -3087,6 +3242,7 @@ var ZapoProvider = class {
     }, delay + Math.floor(Math.random() * 250));
   }
   async #sendButtons(chatId, content, replyTo) {
+    this.#validateButtons(content);
     const mentions = content.mentions ? this.#mentions(content.mentions) : [];
     const raw = {
       interactiveMessage: {
@@ -3100,19 +3256,33 @@ var ZapoProvider = class {
         ...content.footer !== void 0 ? { footer: { text: content.footer } } : {},
         ...mentions.length > 0 ? { contextInfo: { mentionedJid: mentions } } : {},
         nativeFlowMessage: {
-          buttons: content.buttons.map((button) => button.type === "copy" ? {
-            name: "cta_copy",
-            buttonParamsJson: JSON.stringify({
-              display_text: button.label,
-              copy_code: button.code
-            })
-          } : {
-            name: "cta_url",
-            buttonParamsJson: JSON.stringify({
-              display_text: button.label,
-              url: button.url,
-              merchant_url: button.url
-            })
+          buttons: content.buttons.map((button) => {
+            if (button.type === "copy") {
+              return {
+                name: "cta_copy",
+                buttonParamsJson: JSON.stringify({
+                  display_text: button.label,
+                  copy_code: button.code
+                })
+              };
+            }
+            if (button.type === "reply") {
+              return {
+                name: "quick_reply",
+                buttonParamsJson: JSON.stringify({
+                  display_text: button.label,
+                  id: button.id
+                })
+              };
+            }
+            return {
+              name: "cta_url",
+              buttonParamsJson: JSON.stringify({
+                display_text: button.label,
+                url: button.url,
+                merchant_url: button.url
+              })
+            };
           }),
           messageParamsJson: "{}",
           messageVersion: 1
@@ -3125,6 +3295,33 @@ var ZapoProvider = class {
     });
     return this.#sent(result, chatId);
   }
+  async #sendList(chatId, content, replyTo) {
+    this.#validateList(content);
+    const mentions = content.mentions ? this.#mentions(content.mentions) : [];
+    const raw = {
+      listMessage: {
+        ...content.title !== void 0 ? { title: content.title } : {},
+        description: content.text,
+        buttonText: content.buttonText,
+        ...content.footer !== void 0 ? { footerText: content.footer } : {},
+        listType: proto.Message.ListMessage.ListType.SINGLE_SELECT,
+        sections: content.list.map((section) => ({
+          ...section.title !== void 0 ? { title: section.title } : {},
+          rows: section.rows.map((row) => ({
+            rowId: row.id,
+            title: row.title,
+            ...row.description !== void 0 ? { description: row.description } : {}
+          }))
+        })),
+        ...mentions.length > 0 ? { contextInfo: { mentionedJid: mentions } } : {}
+      }
+    };
+    const result = await this.#requireClient().message.send(chatId, raw, {
+      ...replyTo ? { quote: this.#toZapoKey(replyTo) } : {},
+      ...mentions.length > 0 ? { mentions } : {}
+    });
+    return this.#sent(result, chatId);
+  }
   async #toContent(content) {
     if ("text" in content) {
       return {
@@ -3132,6 +3329,12 @@ var ZapoProvider = class {
         mentions: content.mentions ? this.#mentions(content.mentions) : []
       };
     }
+    if ("poll" in content) {
+      return {
+        value: this.#pollContent(content),
+        mentions: []
+      };
+    }
     if ("image" in content) {
       return {
         value: {
@@ -3175,6 +3378,85 @@ var ZapoProvider = class {
       mentions: []
     };
   }
+  #validateButtons(content) {
+    if (!content.text.trim() || content.buttons.length === 0) {
+      throw new WhaNextError(
+        "ARGUMENT_INVALID",
+        "Interactive buttons require body text and at least one button."
+      );
+    }
+    for (const button of content.buttons) {
+      if (!button.label.trim()) {
+        throw new WhaNextError("ARGUMENT_INVALID", "Interactive button labels cannot be empty.");
+      }
+      if (button.type === "reply" && !button.id.trim()) {
+        throw new WhaNextError("ARGUMENT_INVALID", "Reply button IDs cannot be empty.");
+      }
+      if (button.type === "copy" && !button.code) {
+        throw new WhaNextError("ARGUMENT_INVALID", "Copy buttons require a non-empty code.");
+      }
+      if (button.type === "link" && !button.url.trim()) {
+        throw new WhaNextError("ARGUMENT_INVALID", "Link buttons require a non-empty URL.");
+      }
+    }
+  }
+  #validateList(content) {
+    if (!content.text.trim() || !content.buttonText.trim() || content.list.length === 0) {
+      throw new WhaNextError(
+        "ARGUMENT_INVALID",
+        "List menus require body text, button text and at least one section."
+      );
+    }
+    let rowCount = 0;
+    const ids = /* @__PURE__ */ new Set();
+    for (const section of content.list) {
+      for (const row of section.rows) {
+        rowCount += 1;
+        const id = row.id.trim();
+        if (!id || !row.title.trim()) {
+          throw new WhaNextError(
+            "ARGUMENT_INVALID",
+            "Every list row requires a non-empty id and title."
+          );
+        }
+        if (ids.has(id)) {
+          throw new WhaNextError(
+            "ARGUMENT_INVALID",
+            `Duplicate list row id "${id}".`
+          );
+        }
+        ids.add(id);
+      }
+    }
+    if (rowCount === 0) {
+      throw new WhaNextError("ARGUMENT_INVALID", "List menus require at least one row.");
+    }
+  }
+  #pollContent(content) {
+    const name = content.poll.trim();
+    const options = content.options.map((option2) => option2.trim()).filter(Boolean);
+    const selectableCount = content.selectableCount ?? 1;
+    if (!name || options.length < 2) {
+      throw new WhaNextError(
+        "ARGUMENT_INVALID",
+        "Polls require a question and at least two non-empty options."
+      );
+    }
+    if (!Number.isInteger(selectableCount) || selectableCount < 1 || selectableCount > options.length) {
+      throw new WhaNextError(
+        "ARGUMENT_INVALID",
+        "selectableCount must be an integer between 1 and the number of poll options.",
+        { context: { selectableCount, options: options.length } }
+      );
+    }
+    return {
+      type: "poll",
+      name,
+      options,
+      selectableCount,
+      ...content.allowAddOption !== void 0 ? { allowAddOption: content.allowAddOption } : {}
+    };
+  }
   async #media(source) {
     if (source instanceof Uint8Array) return source;
     if ("path" in source) return source.path;
@@ -3280,11 +3562,21 @@ var ZapoProvider = class {
     if (direct) return direct;
     if (!key.id) return void 0;
     for (const message of this.#messageStore.values()) {
-      if (message.key.id === key.id) return message;
+      if (message.key.id === key.id && message.message) return message;
+    }
+    for (const message of this.#messageStore.values()) {
+      const embeddedQuoted = extractQuotedZapoMessage(message);
+      if (!embeddedQuoted?.key.id || embeddedQuoted.key.id !== key.id || !embeddedQuoted.message) {
+        continue;
+      }
+      const storedQuoted = embeddedQuoted;
+      this.#remember(storedQuoted);
+      return storedQuoted;
     }
     return void 0;
   }
   #remember(message) {
+    if (!message.key.id || !message.message) return;
     const key = this.#messageStoreKey(message.key);
     this.#messageStore.delete(key);
     this.#messageStore.set(key, message);
@@ -3304,6 +3596,11 @@ var ZapoProvider = class {
     if (timestamp === void 0) return false;
     return timestamp < this.#connectedAtSeconds - 3;
   }
+  #markPairingReady() {
+    this.#pairingRequired = true;
+    this.#resolvePairingReady?.();
+    this.#resolvePairingReady = void 0;
+  }
   #preparePairingGate() {
     this.#pairingRequired = false;
     this.#pairingReady = new Promise((resolve3) => {