@oxidezap/baileyrs 0.2.3 → 0.2.4

package/lib/Compatibility/message-relay.d.ts

@@ -1,9 +1,16 @@
 import type { MessageRetransmissionInput } from '@oxidezap/whatsapp-rust-bridge';
 import type { BinaryNode, MessageRelayOptions } from '../Types/index.js';
-type OwnRelayIdentity = {
+export declare const EMPTY_RELAY_NODES: BinaryNode[];
+export type OwnRelayIdentity = {
     id?: string;
     lid?: string;
 } | undefined;
+/**
+ * The one place that decides between the caller's id and a generated one.
+ * Every send path resolves through here, so `messageId` means the same thing
+ * on `sendMessage` and on `relayMessage`.
+ */
+export declare const resolveMessageId: (own: OwnRelayIdentity, messageId?: string) => string;
 export type MessageRelayPlan = {
     kind: 'message';
     messageId: string;
@@ -22,5 +29,4 @@ export type MessageRelayPlan = {
     input: MessageRetransmissionInput;
 };
 export declare const planMessageRelay: (jid: string, options: MessageRelayOptions, own: OwnRelayIdentity) => MessageRelayPlan;
-export {};
 //# sourceMappingURL=message-relay.d.ts.map

package/lib/Compatibility/message-relay.js

@@ -1,7 +1,13 @@
 import { Boom } from '../Utils/boom.js';
 import { generateMessageIDV2 } from '../Utils/generics.js';
 import { areJidsSameUser, isJidBroadcast, isJidGroup, isJidNewsletter } from '../WABinary/index.js';
-const EMPTY_RELAY_NODES = [];
+export const EMPTY_RELAY_NODES = [];
+/**
+ * The one place that decides between the caller's id and a generated one.
+ * Every send path resolves through here, so `messageId` means the same thing
+ * on `sendMessage` and on `relayMessage`.
+ */
+export const resolveMessageId = (own, messageId) => messageId || generateMessageIDV2(own?.id);
 const assertSupportedAttributes = (attributes) => {
     if (!attributes)
         return;
@@ -24,7 +30,7 @@ export const planMessageRelay = (jid, options, own) => {
             statusCode: 400
         });
     }
-    const id = messageId || generateMessageIDV2(own?.id);
+    const id = resolveMessageId(own, messageId);
     const refreshGroupMetadata = useCachedGroupMetadata === false;
     if (participant) {
         const requesterIsOwnDevice = isDirectConversation(jid) && isOwnDevice(participant.jid, own);

package/lib/Socket/messages.js

@@ -1,7 +1,7 @@
 import { sendReportingUpstreamFailure } from '../Compatibility/all-encryptions-failed.js';
 import { sendDroppingDerivedNodes } from '../Compatibility/derived-stanza-nodes.js';
 import { encodeProtoCompat } from '../Compatibility/encode-proto.js';
-import { planMessageRelay } from '../Compatibility/message-relay.js';
+import { EMPTY_RELAY_NODES, planMessageRelay, resolveMessageId } from '../Compatibility/message-relay.js';
 import { receiptMessageKeys } from '../Compatibility/message-keys.js';
 import { MESSAGE_RECEIPT_TYPES, WAProto } from '../Types/index.js';
 import { assertArgumentDomain } from '../Utils/argument-domain.js';
@@ -52,6 +52,12 @@ export const makeMessageMethods = (ctx) => ({
         if (contentType === 'protocolMessage') {
             const protoMsg = msg.protocolMessage;
             if (protoMsg?.type === WAProto.Message.ProtocolMessage.Type.REVOKE && protoMsg?.key?.id) {
+                if (options?.messageId) {
+                    // The core has no revoke variant that takes a stanza id, so
+                    // the option cannot be honoured here. Saying so beats the
+                    // silent drop this option used to get on every path.
+                    ctx.logger.warn({ jid, messageId: options.messageId }, 'messageId option cannot be honoured for a revoke: the core assigns the stanza id itself');
+                }
                 // Group revokes need the original sender's participant JID —
                 // without it the server rejects the revoke. The bridge
                 // signature is `revokeMessage(jid, message_id, participant?)`.
@@ -65,15 +71,26 @@ export const makeMessageMethods = (ctx) => ({
                 protoMsg?.key?.id &&
                 protoMsg?.editedMessage) {
                 const editBytes = WAProto.Message.encode(protoMsg.editedMessage).finish();
-                const newMsgId = await client.editMessageBytes(jid, protoMsg.key.id, editBytes);
+                // Edit-path counterpart of `options.messageId` on a plain send, and
+                // deliberately not `resolveMessageId`: the engine treats any supplied
+                // stanza id as borrowed and binds no id-keyed state to it, so an edit
+                // nobody asked to pin would silently lose its retry-cache entry and
+                // outbound secret. Absent stays absent. `||` and not `??` because an
+                // empty id means unspecified everywhere else in this API.
+                const editStanzaId = options?.messageId || undefined;
+                const newMsgId = await client.editMessageBytes(jid, protoMsg.key.id, editBytes, editStanzaId);
                 fullMsg.key.id = newMsgId || fullMsg.key.id;
                 return fullMsg;
             }
         }
         const msgBytes = encodeProtoCompat('Message', msg);
+        // The with-options sends are the same core send as the plain ones, with
+        // the stanza id supplied by the caller instead of drawn by the engine.
+        // The id resolves through the same place `relayMessage` resolves it.
+        const messageId = resolveMessageId(ctx.getUser(), options?.messageId);
         const msgId = await sendReportingUpstreamFailure(() => jid === 'status@broadcast' && options?.statusJidList?.length
-            ? client.sendStatusMessageBytes(msgBytes, options.statusJidList)
-            : client.sendMessageBytes(jid, msgBytes));
+            ? client.sendStatusMessageBytesWithOptions(msgBytes, options.statusJidList, messageId, EMPTY_RELAY_NODES, false)
+            : client.relayMessageBytesWithOptions(jid, msgBytes, messageId, EMPTY_RELAY_NODES, false, false));
         fullMsg.key.id = msgId || fullMsg.key.id;
         // Local echo of the message we just sent. Suppressed when
         // `emitOwnEvents=false` so callers that explicitly opted out of seeing

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@oxidezap/baileyrs",
   "type": "module",
-  "version": "0.2.3",
+  "version": "0.2.4",
   "description": "A Rust-powered WhatsApp Web library for JavaScript, with a Baileys-compatible API",
   "keywords": [
     "whatsapp",
@@ -82,7 +82,7 @@
   },
   "dependencies": {
     "@hapi/boom": "^9.1.4",
-    "@oxidezap/whatsapp-rust-bridge": "0.14.0",
+    "@oxidezap/whatsapp-rust-bridge": "0.15.0",
     "long": "^5.3.2",
     "pino": "^10.3.1",
     "protobufjs": "^7.6.5"