@whanext/core 0.19.12 → 0.19.14

package/CHANGELOG.md

@@ -1,5 +1,16 @@
 # Changelog
 
+## 0.19.14
+
+- Removed the temporary end-to-end AntiEdit diagnostic instrumentation after confirming the group-author identity fix in production.
+- Normal edit handling remains quiet apart from the existing standard error and recovery logs.
+
+## 0.19.13
+
+- Group edits now preserve the original message author's participant identities instead of replacing them with identities carried by the edit-addon envelope.
+- Archived mutation recovery now prefers the original stored participant and `fromMe` values over fallback mutation metadata.
+- Fixed external edits being incorrectly classified as owner edits in multi-account/group sessions.
+
 ## 0.19.12
 
 - Added end-to-end AntiEdit diagnostics for encrypted addons, protocol events, direct edit envelopes, normalization, previous-message recovery, and final `messageEdited` emission.

package/dist/index.js

@@ -3112,13 +3112,6 @@ var ZapoProvider = class {
     client.on("message", (event) => {
       const protocol = this.#protocolMessage(event);
       if (protocol && this.#isMessageMutationProtocol(protocol.type)) {
-        if (protocol.type === proto.Message.ProtocolMessage.Type.MESSAGE_EDIT) {
-          this.#logEditDiagnostic("received_message_protocol_payload", {
-            eventMessageId: event.key.id ?? void 0,
-            targetMessageId: protocol.key?.id ?? void 0,
-            offline: event.offline === true
-          });
-        }
         this.#enqueueProtocolEvent({
           ...event,
           protocolMessage: protocol
@@ -3127,11 +3120,6 @@ var ZapoProvider = class {
       }
       const directEdit = this.#directEditedMessage(event.message);
       if (directEdit && event.key.id) {
-        this.#logEditDiagnostic("received_direct_edited_message", {
-          eventMessageId: event.key.id,
-          targetMessageId: event.key.id,
-          offline: event.offline === true
-        });
         this.#enqueueProtocolEvent({
           ...event,
           protocolMessage: {
@@ -3142,14 +3130,6 @@ var ZapoProvider = class {
         });
         return;
       }
-      const encryptedEdit = this.#encryptedEditInfo(event.message);
-      if (encryptedEdit) {
-        this.#logEditDiagnostic("received_encrypted_addon", {
-          eventMessageId: event.key.id ?? void 0,
-          targetMessageId: encryptedEdit.targetMessageId,
-          offline: event.offline === true
-        });
-      }
       this.#handleMessage(event);
     });
     client.on("message_send", (event) => {
@@ -3165,13 +3145,6 @@ var ZapoProvider = class {
       });
     });
     client.on("message_protocol", (event) => {
-      if (event.protocolMessage.type === proto.Message.ProtocolMessage.Type.MESSAGE_EDIT) {
-        this.#logEditDiagnostic("received_message_protocol_event", {
-          eventMessageId: event.key.id ?? void 0,
-          targetMessageId: event.protocolMessage.key?.id ?? void 0,
-          offline: event.offline === true
-        });
-      }
       this.#enqueueProtocolEvent(event);
     });
     client.on("message_addon", (event) => {
@@ -3229,29 +3202,10 @@ var ZapoProvider = class {
     const kind = event.kind ?? this.#stringField(decrypted, "kind") ?? this.#stringField(decrypted, "type");
     const isEdit = kind === "message_edit" || protocol?.type === proto.Message.ProtocolMessage.Type.MESSAGE_EDIT;
     if (!isEdit) return;
-    this.#logEditDiagnostic("received_decrypted_addon", {
-      eventMessageId: event.key.id ?? void 0,
-      targetMessageId: event.targetMessageId ?? this.#stringField(decrypted, "targetMessageId") ?? this.#stringField(decrypted, "targetMessageID") ?? protocol?.key?.id ?? void 0,
-      addonKind: kind ?? void 0,
-      offline: event.offline === true
-    });
     const targetMessageId = event.targetMessageId ?? this.#stringField(decrypted, "targetMessageId") ?? this.#stringField(decrypted, "targetMessageID") ?? protocol?.key?.id ?? void 0;
-    if (!targetMessageId) {
-      this.#logEditDiagnostic("dropped_addon_without_target", {
-        eventMessageId: event.key.id ?? void 0,
-        addonKind: kind ?? void 0
-      }, "warn");
-      return;
-    }
+    if (!targetMessageId) return;
     const editedMessage = protocol?.editedMessage ?? this.#addonEditedMessage(event.decrypted);
-    if (!editedMessage) {
-      this.#logEditDiagnostic("dropped_addon_without_edited_content", {
-        eventMessageId: event.key.id ?? void 0,
-        targetMessageId,
-        addonKind: kind ?? void 0
-      }, "warn");
-      return;
-    }
+    if (!editedMessage) return;
     const protocolKey = protocol?.key;
     const target = {
       ...protocolKey ?? {},
@@ -3334,24 +3288,6 @@ var ZapoProvider = class {
     const nested = message.ephemeralMessage?.message ?? message.deviceSentMessage?.message;
     return nested ? this.#directEditedMessage(nested) : void 0;
   }
-  #encryptedEditInfo(message) {
-    const content = unwrapZapoMessageContent(message);
-    const encrypted = content?.secretEncryptedMessage;
-    if (!encrypted) return void 0;
-    if (encrypted.secretEncType !== proto.Message.SecretEncryptedMessage.SecretEncType.MESSAGE_EDIT) {
-      return void 0;
-    }
-    return {
-      ...encrypted.targetMessageKey?.id ? { targetMessageId: encrypted.targetMessageKey.id } : {}
-    };
-  }
-  #logEditDiagnostic(stage, context, level = "info") {
-    this.#logger[level]("AntiEdit diagnostic", {
-      diagnostic: "antiedit",
-      stage,
-      ...context
-    });
-  }
   #protocolMessage(event) {
     if (event.protocolMessage) return event.protocolMessage;
     const content = unwrapZapoMessageContent(event.message);
@@ -3389,38 +3325,25 @@ var ZapoProvider = class {
     if (!protocol || !this.#isMessageMutationProtocol(protocol.type)) return;
     const protocolKey = protocol.key;
     if (!protocolKey?.id) {
-      const context = {
+      this.#logger.debug("Ignored Zapo protocol mutation without a target message id.", {
         messageId: event.key.id ?? void 0,
         protocolType: protocol.type ?? void 0
-      };
-      if (protocol.type === proto.Message.ProtocolMessage.Type.MESSAGE_EDIT) {
-        this.#logEditDiagnostic("dropped_protocol_without_target", context, "warn");
-      } else {
-        this.#logger.debug("Ignored Zapo protocol mutation without a target message id.", context);
-      }
+      });
       return;
     }
     const remoteJid = protocolKey.remoteJid ?? event.key.remoteJid;
     const participant = protocolKey.participant ?? event.key.participant;
     const participantAlt = protocolKey.participantAlt ?? event.key.participantAlt;
-    const target = {
+    let target = {
       ...protocolKey,
       ...remoteJid !== void 0 ? { remoteJid } : {},
       ...participant !== void 0 ? { participant } : {},
       ...participantAlt !== void 0 ? { participantAlt } : {}
     };
     const stored = await this.#findStoredMessage(target);
+    if (stored) target = this.#targetKeyFromStoredMessage(target, stored.key);
     if (!target.remoteJid && stored?.key.remoteJid) target.remoteJid = stored.key.remoteJid;
-    if (!target.remoteJid) {
-      if (protocol.type === proto.Message.ProtocolMessage.Type.MESSAGE_EDIT) {
-        this.#logEditDiagnostic("dropped_edit_without_chat", {
-          eventMessageId: event.key.id ?? void 0,
-          targetMessageId: target.id ?? void 0,
-          previousRecovered: stored !== void 0
-        }, "warn");
-      }
-      return;
-    }
+    if (!target.remoteJid) return;
     const type = protocol.type;
     const mutationKey = this.#protocolDeliveryKey(event, target, type);
     if (mutationKey && this.#handledProtocolStore.has(mutationKey)) {
@@ -3451,13 +3374,7 @@ var ZapoProvider = class {
       return;
     }
     const editedContent = protocol.editedMessage ? this.#unwrapEditedContent(protocol.editedMessage) : void 0;
-    if (!editedContent) {
-      this.#logEditDiagnostic("dropped_edit_without_content", {
-        eventMessageId: event.key.id ?? void 0,
-        targetMessageId: target.id ?? void 0
-      }, "warn");
-      return;
-    }
+    if (!editedContent) return;
     const pushName = event.pushName ?? stored?.pushName;
     const edited = {
       ...stored ?? {},
@@ -3470,31 +3387,18 @@ var ZapoProvider = class {
       ...pushName !== void 0 ? { pushName } : {}
     };
     const message = normalizeZapoMessage(edited);
-    if (!message) {
-      this.#logEditDiagnostic("dropped_edit_normalization_failed", {
-        eventMessageId: event.key.id ?? void 0,
-        targetMessageId: target.id ?? void 0,
-        previousRecovered: stored !== void 0
-      }, "warn");
-      return;
-    }
+    if (!message) return;
     const previous = stored ? normalizeZapoMessage(stored) : void 0;
     if (mutationKey) this.#rememberHandledProtocol(mutationKey);
     this.#remember(edited);
     const editedByMe = event.key.fromMe === true;
     const editedById = event.key.participant ?? event.key.participantAlt ?? (editedByMe ? this.getCurrentUserIds()[0] : event.key.remoteJid ?? void 0);
     if (!previous) {
-      this.#logEditDiagnostic("emitting_without_previous_message", {
+      this.#logger.debug("Zapo edit target was not present in the recent message cache.", {
         targetMessageId: target.id ?? void 0,
         chatId: target.remoteJid ?? void 0
-      }, "warn");
+      });
     }
-    this.#logEditDiagnostic("emitting_message_edited", {
-      eventMessageId: event.key.id ?? void 0,
-      targetMessageId: target.id ?? void 0,
-      previousRecovered: previous !== void 0,
-      editedByMe
-    });
     void this.#events.emit("messageEdited", {
       key: message.keys,
       ...previous ? { previous } : {},
@@ -3508,6 +3412,20 @@ var ZapoProvider = class {
     const wrapper = message.editedMessage;
     return wrapper?.message ?? message;
   }
+  #targetKeyFromStoredMessage(fallback, stored) {
+    const id = stored.id ?? fallback.id;
+    const remoteJid = stored.remoteJid ?? fallback.remoteJid;
+    const fromMe = stored.fromMe ?? fallback.fromMe;
+    return {
+      ...id !== void 0 ? { id } : {},
+      ...remoteJid !== void 0 ? { remoteJid } : {},
+      ...stored.remoteJidAlt !== void 0 ? { remoteJidAlt: stored.remoteJidAlt } : {},
+      ...fromMe !== void 0 ? { fromMe } : {},
+      ...stored.participant !== void 0 ? { participant: stored.participant } : {},
+      ...stored.participantAlt !== void 0 ? { participantAlt: stored.participantAlt } : {},
+      ...stored.senderUsername !== void 0 ? { senderUsername: stored.senderUsername } : {}
+    };
+  }
   #handleGroupEvent(event) {
     const groupId = event.groupJid;
     if (!groupId) return;
@@ -4056,10 +3974,10 @@ var ZapoProvider = class {
       const archivedChatId = stringValue(archived.chat_id);
       const remoteJid = key.remoteJid ?? archivedChatId;
       if (!remoteJid) return void 0;
-      const participant = key.participant ?? key.participantAlt ?? stringValue(archived.participant_id);
+      const participant = stringValue(archived.participant_id) ?? key.participant ?? key.participantAlt;
       const archivedFromMe = booleanValue(archived.from_me);
       const timestampSeconds = numberValue(archived.timestamp_seconds);
-      const fromMe = key.fromMe ?? archivedFromMe;
+      const fromMe = archivedFromMe ?? key.fromMe;
       const restored = {
         key: {
           ...key,
@@ -4576,14 +4494,6 @@ var WhaNextZapoLogger = class _WhaNextZapoLogger {
     this.#logger.info(message, this.#merge(context));
   }
   warn(message, context) {
-    if (message.startsWith("addon parent message secret not found") && context?.kind === "message_edit") {
-      this.#logger.warn("AntiEdit diagnostic", {
-        diagnostic: "antiedit",
-        stage: "decrypt_failed_missing_parent_secret",
-        ...this.#merge(context)
-      });
-      return;
-    }
     this.#logger.warn(message, this.#merge(context));
   }
   error(message, context) {