@whanext/core 0.16.0 → 0.17.1

package/CHANGELOG.md

@@ -1,5 +1,30 @@
 # Changelog
 
+## 0.17.1
+
+### Fixed
+
+- Compatibilidade com o novo formato criptografado de edições do WhatsApp (`secretEncryptedMessage`).
+- O provider interpreta `targetMessageKey.fromMe` pela perspectiva do editor, deriva a chave com `messageSecret` e descriptografa edições com AES-256-GCM.
+- Edições em conversas privadas preservam a chave local da mensagem original após a descriptografia.
+- Edições consecutivas preservam o `messageSecret` no cache para que a versão anterior continue disponível.
+- `messageEdited` continua com a mesma API pública da 0.17.0.
+
+## 0.17.0
+
+### Adicionado
+
+- Novo evento público `messageEdited` em `app.on()` e `multi.on()`.
+- Novo tipo `MessageEdited`, com versão anterior quando ainda estiver no cache, versão atual, identidade responsável e horário da edição.
+- O provider Baileys passa a interpretar atualizações `editedMessage` recebidas em `messages.update`.
+- O cache recente é atualizado após cada edição, permitindo acompanhar múltiplas alterações da mesma mensagem em sequência.
+
+### Compatibilidade
+
+- A mudança é aditiva para consumidores da API pública.
+- Providers customizados passam a incluir `messageEdited` em `ProviderEvents`.
+- Quando a versão anterior já saiu do cache, o evento continua sendo emitido sem o campo `previous`.
+
 
 ## 0.16.0
 

package/README.md

@@ -173,6 +173,20 @@ app.on('messageDeleted', async ({ message, deletedByMe }) => {
 
 O evento também informa `deletedById` quando o WhatsApp fornece a identidade responsável pela revogação.
 
+## Mensagens editadas
+
+Edições recebidas pelo WhatsApp são expostas pelo evento `messageEdited`. A partir da 0.17.1, o provider inclui suporte ao envelope criptografado `secretEncryptedMessage` usado atualmente pelo WhatsApp para edições. Quando a versão anterior ainda estiver no cache recente, o payload inclui `previous`; `message` contém a versão atual.
+
+```ts
+app.on('messageEdited', async ({ previous, message, editedByMe }) => {
+  if (!previous || editedByMe) return;
+
+  console.log(previous.text, message.text);
+});
+```
+
+Após cada edição, a nova versão substitui a anterior no cache recente. Assim, edições consecutivas da mesma mensagem sempre comparam a versão atual com a imediatamente anterior.
+
 ## Logging
 
 O nível padrão é `info`. Estão disponíveis `debug`, `info`, `warn`, `error` e `silent`.

package/dist/index.d.ts

@@ -97,6 +97,14 @@ interface MessageDeleted {
     deletedById?: string;
     deletedAt: Date;
 }
+interface MessageEdited {
+    key: MessageKey;
+    previous?: Message;
+    message: Message;
+    editedByMe: boolean;
+    editedById?: string;
+    editedAt: Date;
+}
 interface Message {
     id: string;
     jid: string;
@@ -255,6 +263,7 @@ interface ConnectionUpdate {
 interface ProviderEvents {
     message: Message;
     messageDeleted: MessageDeleted;
+    messageEdited: MessageEdited;
     connection: ConnectionUpdate;
     groupChanged: {
         groupId: string;
@@ -755,6 +764,7 @@ declare class AccountService {
 interface AppEvents {
     message: Message;
     messageDeleted: MessageDeleted;
+    messageEdited: MessageEdited;
     connection: ConnectionUpdate;
     error: WhaNextError;
     mute: MuteEnforcement;
@@ -914,4 +924,4 @@ declare class SqliteMuteStore implements MuteStore {
     close(): void;
 }
 
-export { AccountService, type AddMuteOptions, type AddMuteResult, type AppEvents, type AppHealth, type AppHealthStatus, ArgsParser, type AudioContent, type BooleanOption, Browser, type ButtonsContent, type CacheOptions, type CacheStore, type CallEvent, type CallStatus, type ChangeResult, type CommandAccountContext, type CommandCatalogOptions, type CommandCatalogView, type CommandChatContext, type CommandConcurrency, type CommandContext, type CommandCooldown, type CommandDefinition, type CommandErrorHandler, type CommandGroupContext, type CommandGroupDefinition, type CommandGuard, type CommandHelpOptions, type CommandHooks, type CommandLocalization, type CommandMetadata, type CommandMiddleware, type CommandOptionDefinition, type CommandOptionSchema, type CommandOptionValue, type CommandOptionValues, type CommandRegistrar, CommandRouter, type CommandRuntimeServices, type CommandScope, type ConcurrencyStrategy, type ConnectionState, type ConnectionUpdate, type CopyCodeButton, type CreateMultiOptions, type CreateOptions, DeferredReply, type DownloadedMedia, type DurationOption, type EnumOption, type ExecutableCommandDefinition, type GroupAccess, type GroupAddressingMode, type GroupParticipant, type GroupParticipantAction, type GroupParticipantsChanged, type GroupRole, type GroupSnapshot, type GuardResult, type ImageContent, type InviteResult, type LinkButton, type LoadCommandsOptions, type LoadCommandsResult, type LoadedCommand, type LogContext, type LogEntry, type LogFormat, type LogLevel, type LogWriter, Logger, type LoggerConfig, type LoggerOptions, type LoginOptions, type MediaKind, type MediaSource, type MemberActionState, MemoryCache, type MemoryCacheStats, type MentionTarget, type Message, type MessageButton, type MessageContent, type MessageContentKind, type MessageDeleted, type MessageKey, type MessageMedia, type MultiAccountOptions, type MultiAppEvent, type MultiAppHealth, MultiCommandRouter, type MultiLoadCommandsResult, type MultiLoginOptions, type MuteChangeResult, type MuteEnforcement, type MuteOptions, type MuteRecord, MuteService, type MuteStore, type NumberOption, ParsedCommandOptions, type ParticipantUpdateResult, type PresenceState, type QuotedMessage, type ReconnectOptions, type RegisteredCommand, type RemoveMuteResult, type ReplyOptions, type RepostMessageOptions, type RouterOptions, type SentMessage, SqliteMuteStore, type StickerContent, type StoredMute, type StringOption, type TextContent, User, type UserData, type UserOption, type VideoContent, WhaNextApp, WhaNextError, type WhaNextErrorCode, WhaNextMultiApp, type WhatsAppProvider, create, createMulti, defineCommand, defineCommandGroup, defineCommands, defineSubcommand, guards, isCommandGroup, loadCommands, option, toWhaNextError };
+export { AccountService, type AddMuteOptions, type AddMuteResult, type AppEvents, type AppHealth, type AppHealthStatus, ArgsParser, type AudioContent, type BooleanOption, Browser, type ButtonsContent, type CacheOptions, type CacheStore, type CallEvent, type CallStatus, type ChangeResult, type CommandAccountContext, type CommandCatalogOptions, type CommandCatalogView, type CommandChatContext, type CommandConcurrency, type CommandContext, type CommandCooldown, type CommandDefinition, type CommandErrorHandler, type CommandGroupContext, type CommandGroupDefinition, type CommandGuard, type CommandHelpOptions, type CommandHooks, type CommandLocalization, type CommandMetadata, type CommandMiddleware, type CommandOptionDefinition, type CommandOptionSchema, type CommandOptionValue, type CommandOptionValues, type CommandRegistrar, CommandRouter, type CommandRuntimeServices, type CommandScope, type ConcurrencyStrategy, type ConnectionState, type ConnectionUpdate, type CopyCodeButton, type CreateMultiOptions, type CreateOptions, DeferredReply, type DownloadedMedia, type DurationOption, type EnumOption, type ExecutableCommandDefinition, type GroupAccess, type GroupAddressingMode, type GroupParticipant, type GroupParticipantAction, type GroupParticipantsChanged, type GroupRole, type GroupSnapshot, type GuardResult, type ImageContent, type InviteResult, type LinkButton, type LoadCommandsOptions, type LoadCommandsResult, type LoadedCommand, type LogContext, type LogEntry, type LogFormat, type LogLevel, type LogWriter, Logger, type LoggerConfig, type LoggerOptions, type LoginOptions, type MediaKind, type MediaSource, type MemberActionState, MemoryCache, type MemoryCacheStats, type MentionTarget, type Message, type MessageButton, type MessageContent, type MessageContentKind, type MessageDeleted, type MessageEdited, type MessageKey, type MessageMedia, type MultiAccountOptions, type MultiAppEvent, type MultiAppHealth, MultiCommandRouter, type MultiLoadCommandsResult, type MultiLoginOptions, type MuteChangeResult, type MuteEnforcement, type MuteOptions, type MuteRecord, MuteService, type MuteStore, type NumberOption, ParsedCommandOptions, type ParticipantUpdateResult, type PresenceState, type QuotedMessage, type ReconnectOptions, type RegisteredCommand, type RemoveMuteResult, type ReplyOptions, type RepostMessageOptions, type RouterOptions, type SentMessage, SqliteMuteStore, type StickerContent, type StoredMute, type StringOption, type TextContent, User, type UserData, type UserOption, type VideoContent, WhaNextApp, WhaNextError, type WhaNextErrorCode, WhaNextMultiApp, type WhatsAppProvider, create, createMulti, defineCommand, defineCommandGroup, defineCommands, defineSubcommand, guards, isCommandGroup, loadCommands, option, toWhaNextError };

package/dist/index.js

@@ -2206,6 +2206,15 @@ var WhaNextApp = class {
       });
       await this.#events.emit("messageDeleted", deletion);
     });
+    this.#provider.on("messageEdited", async (edit) => {
+      this.logger.debug("Message edited", {
+        chatId: edit.key.chatId,
+        messageId: edit.key.id,
+        editedByMe: edit.editedByMe,
+        cached: edit.previous !== void 0
+      });
+      await this.#events.emit("messageEdited", edit);
+    });
     this.#provider.on("message", async (message) => {
       try {
         const enforcement = await this.mute.enforce(message);
@@ -2296,7 +2305,7 @@ import {
   generateWAMessageFromContent,
   isJidGroup,
   makeWASocket,
-  proto,
+  proto as proto2,
   useMultiFileAuthState
 } from "@whiskeysockets/baileys";
 
@@ -2578,6 +2587,179 @@ function toDate(value) {
   return new Date(seconds * 1e3);
 }
 
+// src/provider/baileys/secret-edit.ts
+import { createDecipheriv, hkdfSync } from "crypto";
+import {
+  jidNormalizedUser,
+  normalizeMessageContent as normalizeMessageContent2,
+  proto
+} from "@whiskeysockets/baileys";
+function isSecretEncryptedEdit(message) {
+  const content = normalizeMessageContent2(message.message);
+  return content?.secretEncryptedMessage?.secretEncType === proto.Message.SecretEncryptedMessage.SecretEncType.MESSAGE_EDIT;
+}
+function secretEditTargetKey(message) {
+  const content = normalizeMessageContent2(message.message);
+  const secret = content?.secretEncryptedMessage;
+  if (secret?.secretEncType !== proto.Message.SecretEncryptedMessage.SecretEncType.MESSAGE_EDIT || !secret.targetMessageKey?.id) {
+    return void 0;
+  }
+  return secret.targetMessageKey;
+}
+function decryptSecretEncryptedEdit(envelope, original, meId, meLid) {
+  const content = normalizeMessageContent2(envelope.message);
+  const secret = content?.secretEncryptedMessage;
+  const targetKey = secret?.targetMessageKey;
+  if (secret?.secretEncType !== proto.Message.SecretEncryptedMessage.SecretEncType.MESSAGE_EDIT || !targetKey?.id || !secret.encPayload?.length || secret.encIv?.length !== 12) {
+    return void 0;
+  }
+  const messageSecret = findMessageSecret(original.message);
+  if (messageSecret?.length !== 32) {
+    return void 0;
+  }
+  const editorCandidates = envelope.key.fromMe ? uniqueUserJids([meId, meLid]) : uniqueUserJids([
+    envelope.key.participant,
+    envelope.key.participantAlt,
+    envelope.key.remoteJid,
+    envelope.key.remoteJidAlt
+  ]);
+  const originalSenderCandidates = targetKey.fromMe ? editorCandidates : isUserJid(envelope.key.remoteJid) ? uniqueUserJids([
+    targetKey.remoteJid,
+    targetKey.remoteJidAlt,
+    original.key.remoteJid,
+    original.key.remoteJidAlt
+  ]) : uniqueUserJids([
+    targetKey.participant,
+    targetKey.participantAlt,
+    original.key.participant,
+    original.key.participantAlt
+  ]);
+  const fallbackOriginalCandidates = original.key.fromMe ? uniqueUserJids([meId, meLid]) : uniqueUserJids([
+    original.key.participant,
+    original.key.participantAlt,
+    original.key.remoteJid,
+    original.key.remoteJidAlt
+  ]);
+  const senders = uniqueUserJids([
+    ...originalSenderCandidates,
+    ...fallbackOriginalCandidates
+  ]);
+  if (!editorCandidates.length || !senders.length) {
+    return void 0;
+  }
+  let decoded;
+  for (const originalSender of senders) {
+    for (const editor of editorCandidates) {
+      try {
+        decoded = decryptPayload(
+          targetKey.id,
+          originalSender,
+          editor,
+          messageSecret,
+          secret.encIv,
+          secret.encPayload
+        );
+        break;
+      } catch {
+        continue;
+      }
+    }
+    if (decoded) {
+      break;
+    }
+  }
+  const protocol = decoded?.protocolMessage;
+  if (protocol?.type !== proto.Message.ProtocolMessage.Type.MESSAGE_EDIT || !protocol.editedMessage || protocol.key?.id && protocol.key.id !== targetKey.id) {
+    return void 0;
+  }
+  const edited = protocol.editedMessage;
+  if (!edited.messageContextInfo?.messageSecret?.length) {
+    edited.messageContextInfo = {
+      ...edited.messageContextInfo,
+      messageSecret
+    };
+  }
+  return {
+    message: edited,
+    ...protocol.timestampMs ? { timestamp: Math.floor(numberValue(protocol.timestampMs) / 1e3) } : {}
+  };
+}
+function decryptPayload(messageId, originalSender, editor, messageSecret, iv, payload) {
+  const info = Buffer.concat([
+    Buffer.from(messageId, "utf8"),
+    Buffer.from(originalSender, "utf8"),
+    Buffer.from(editor, "utf8"),
+    Buffer.from("Message Edit", "utf8")
+  ]);
+  const key = Buffer.from(hkdfSync(
+    "sha256",
+    Buffer.from(messageSecret),
+    Buffer.alloc(32),
+    info,
+    32
+  ));
+  const encrypted = Buffer.from(payload);
+  if (encrypted.length <= 16) {
+    throw new Error("INVALID_EDIT_PAYLOAD");
+  }
+  const decipher = createDecipheriv("aes-256-gcm", key, Buffer.from(iv));
+  decipher.setAAD(Buffer.alloc(0));
+  decipher.setAuthTag(encrypted.subarray(encrypted.length - 16));
+  return proto.Message.decode(Buffer.concat([
+    decipher.update(encrypted.subarray(0, encrypted.length - 16)),
+    decipher.final()
+  ]));
+}
+function findMessageSecret(message) {
+  if (!message) {
+    return void 0;
+  }
+  const direct = message.messageContextInfo?.messageSecret;
+  if (direct?.length) {
+    return direct;
+  }
+  const normalized = normalizeMessageContent2(message);
+  const normalizedSecret = normalized?.messageContextInfo?.messageSecret;
+  if (normalizedSecret?.length) {
+    return normalizedSecret;
+  }
+  const deviceSecret = message.deviceSentMessage?.message?.messageContextInfo?.messageSecret;
+  if (deviceSecret?.length) {
+    return deviceSecret;
+  }
+  return void 0;
+}
+function uniqueUserJids(values) {
+  return [...new Set(
+    values.map(normalizeUserJid).filter((value) => value !== void 0)
+  )];
+}
+function normalizeUserJid(value) {
+  if (!isUserJid(value)) {
+    return void 0;
+  }
+  return jidNormalizedUser(value);
+}
+function isUserJid(value) {
+  if (!value) {
+    return false;
+  }
+  const normalized = jidNormalizedUser(value);
+  return normalized.endsWith("@s.whatsapp.net") || normalized.endsWith("@lid") || normalized.endsWith("@hosted") || normalized.endsWith("@hosted.lid");
+}
+function numberValue(value) {
+  if (typeof value === "number") {
+    return value;
+  }
+  if (typeof value === "bigint") {
+    return Number(value);
+  }
+  if (value && typeof value === "object" && "toString" in value) {
+    return Number(String(value));
+  }
+  return Number(value);
+}
+
 // src/provider/baileys/baileys-provider.ts
 var BaileysProvider = class {
   #options;
@@ -2818,7 +3000,7 @@ var BaileysProvider = class {
   async setMessagePin(groupId, key, pinned) {
     await this.#requireSocket().sendMessage(groupId, {
       pin: this.#toWaKey(key),
-      type: pinned ? proto.PinInChat.Type.PIN_FOR_ALL : proto.PinInChat.Type.UNPIN_FOR_ALL,
+      type: pinned ? proto2.PinInChat.Type.PIN_FOR_ALL : proto2.PinInChat.Type.UNPIN_FOR_ALL,
       ...pinned ? { time: 604800 } : {}
     });
   }
@@ -2850,6 +3032,7 @@ var BaileysProvider = class {
     socket.ev.on("messages.upsert", ({ messages, type }) => {
       if (type !== "notify") return;
       for (const raw of messages) {
+        if (this.#handleSecretEncryptedEdit(raw)) continue;
         if (raw.key.id && raw.message) this.#remember(raw);
         const quoted = extractQuotedBaileysMessage(raw);
         if (quoted?.key.id && quoted.message) this.#remember(quoted);
@@ -2859,19 +3042,33 @@ var BaileysProvider = class {
     });
     socket.ev.on("messages.update", (updates) => {
       for (const { key, update } of updates) {
-        if (update.message !== null || !key.id || !key.remoteJid) continue;
+        if (!key.id || !key.remoteJid) continue;
         const stored = this.#messageStore.get(this.#messageStoreKey(key));
-        const message = stored ? normalizeBaileysMessage(stored) : void 0;
-        const deletionKey = update.key;
-        const deletedByMe = deletionKey?.fromMe === true;
-        const deletedById = deletionKey?.participant ?? deletionKey?.participantAlt ?? (deletedByMe ? this.#socket?.user?.id : deletionKey?.remoteJid ?? void 0);
-        void this.#events.emit("messageDeleted", {
-          key: message?.keys ?? normalizeKey(key),
-          ...message ? { message } : {},
-          deletedByMe,
-          ...deletedById ? { deletedById } : {},
-          deletedAt: /* @__PURE__ */ new Date()
-        });
+        if (update.message === null) {
+          const message = stored ? normalizeBaileysMessage(stored) : void 0;
+          const deletionKey = update.key;
+          const deletedByMe = deletionKey?.fromMe === true;
+          const deletedById = deletionKey?.participant ?? deletionKey?.participantAlt ?? (deletedByMe ? this.#socket?.user?.id : deletionKey?.remoteJid ?? void 0);
+          void this.#events.emit("messageDeleted", {
+            key: message?.keys ?? normalizeKey(key),
+            ...message ? { message } : {},
+            deletedByMe,
+            ...deletedById ? { deletedById } : {},
+            deletedAt: /* @__PURE__ */ new Date()
+          });
+          continue;
+        }
+        if (!update.message?.editedMessage?.message) continue;
+        const editedRaw = {
+          ...stored ?? {},
+          key: {
+            ...stored?.key ?? {},
+            ...key
+          },
+          message: update.message,
+          messageTimestamp: update.messageTimestamp ?? stored?.messageTimestamp ?? Math.floor(Date.now() / 1e3)
+        };
+        this.#emitMessageEdited(key, editedRaw, stored);
       }
     });
     socket.ev.on("groups.update", (groups) => {
@@ -2971,7 +3168,7 @@ var BaileysProvider = class {
         "WhatsApp did not expose the current account identity for the interactive message."
       );
     }
-    const interactiveMessage = proto.Message.InteractiveMessage.create({
+    const interactiveMessage = proto2.Message.InteractiveMessage.create({
       ...content.title !== void 0 ? {
         header: {
           title: content.title,
@@ -3163,6 +3360,68 @@ var BaileysProvider = class {
     ];
     return known.find((value) => value === status) ?? "timeout";
   }
+  #handleSecretEncryptedEdit(raw) {
+    if (!isSecretEncryptedEdit(raw)) return false;
+    const targetKey = secretEditTargetKey(raw);
+    if (!targetKey?.id) return true;
+    const stored = this.#findStoredMessage(targetKey);
+    if (!stored) return true;
+    try {
+      const decrypted = decryptSecretEncryptedEdit(
+        raw,
+        stored,
+        this.#socket?.user?.id,
+        this.#socket?.user?.lid
+      );
+      if (!decrypted) return true;
+      const key = {
+        ...stored.key,
+        id: targetKey.id
+      };
+      const editedRaw = {
+        ...stored,
+        key,
+        message: {
+          editedMessage: {
+            message: decrypted.message
+          }
+        },
+        messageTimestamp: decrypted.timestamp ?? raw.messageTimestamp ?? stored.messageTimestamp ?? Math.floor(Date.now() / 1e3)
+      };
+      this.#emitMessageEdited(key, editedRaw, stored);
+    } catch (error) {
+      this.#logger.warn("Could not decrypt the encrypted message edit.", {
+        messageId: targetKey.id,
+        error: error instanceof Error ? error.message : String(error)
+      });
+    }
+    return true;
+  }
+  #emitMessageEdited(key, editedRaw, stored) {
+    const previous = stored ? normalizeBaileysMessage(stored) : void 0;
+    const message = normalizeBaileysMessage(editedRaw);
+    if (!message) return;
+    this.#remember(editedRaw);
+    const editedByMe = key.fromMe === true;
+    const editedById = key.participant ?? key.participantAlt ?? (editedByMe ? this.#socket?.user?.id : key.remoteJid ?? void 0);
+    void this.#events.emit("messageEdited", {
+      key: message.keys,
+      ...previous ? { previous } : {},
+      message,
+      editedByMe,
+      ...editedById ? { editedById } : {},
+      editedAt: message.timestamp
+    });
+  }
+  #findStoredMessage(key) {
+    const direct = this.#messageStore.get(this.#messageStoreKey(key));
+    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;
+    }
+    return void 0;
+  }
   #remember(message) {
     const key = this.#messageStoreKey(message.key);
     this.#messageStore.delete(key);