fb-messenger-e2ee 0.1.4 → 0.1.6

package/dist/index.d.cts

@@ -225,6 +225,13 @@ interface SendMessageInput {
     threadId: string;
     text: string;
     replyToMessageId?: string;
+    /**
+     * JID of the original message sender for E2EE reply (QuotedMessage.participant field).
+     * - For DM: the bare JID of the peer (e.g. "123456789.0@msgr"); if omitted, defaults to the peer's JID.
+     * - For group: the full member JID who sent the original message (e.g. "123456789.160@msgr"); required
+     *   for the server to correctly thread the reply in the group conversation.
+     */
+    replyToSenderJid?: string;
 }
 interface SendMediaInput {
     threadId: string;
@@ -234,6 +241,11 @@ interface SendMediaInput {
     mimeType?: string;
     caption?: string;
     replyToMessageId?: string;
+    /**
+     * JID of the original message sender for E2EE reply (QuotedMessage.participant field).
+     * See SendMessageInput.replyToSenderJid for details.
+     */
+    replyToSenderJid?: string;
     /** Optional media width in pixels for E2EE image/video/sticker payloads. */
     width?: number;
     /** Optional media height in pixels for E2EE image/video/sticker payloads. */
@@ -749,6 +761,38 @@ declare class DeviceStore implements IdentityKeyStore, SessionStore, PreKeyStore
     getPreKeyCount(): number;
 }
 
+/**
+ * Reply-to (quoted message) metadata for MessageApplication.Metadata.QuotedMessage.
+ *
+ * Proto schema (WAMsgApplication.proto):
+ *   message QuotedMessage {
+ *     optional string stanzaID   = 1;  // message ID of the quoted message
+ *     optional string remoteJID  = 2;  // chat JID (thread) that contains the quoted message
+ *     optional string participant = 3; // sender JID of the quoted message (required for groups)
+ *   }
+ */
+interface ReplyToMeta {
+    /** Message ID (stanzaID) of the quoted message. */
+    messageId: string;
+    /** Chat JID (remoteJID) — the thread where the quoted message lives. */
+    chatJid: string;
+    /**
+     * Sender JID (participant) of the quoted message.
+     * - For DM: same as chatJid (the peer's bare JID).
+     * - For group: the specific member JID who sent the original message.
+     */
+    senderJid: string;
+}
+/**
+ * Wrap a ConsumerApplication payload into a MessageApplication.
+ * Returns (messageApp bytes, frankingKey, frankingTag).
+ */
+declare function encodeMessageApplication(consumerAppBytes: Buffer, replyTo?: ReplyToMeta): {
+    messageApp: Buffer;
+    frankingKey: Buffer;
+    frankingTag: Buffer;
+};
+
 /**
  * Encode a ConsumerApplication text message.
  * Field 1 = Payload { field 1 = Content { field 1 = MessageText { field 1 = text } } }
@@ -779,19 +823,6 @@ declare function encodeEditMessage(targetMessageId: string, newText: string): Bu
 /** Encode a revoke (unsend) message. */
 declare function encodeRevokeMessage(messageId: string, keyOptsOrFromMe?: MessageKeyOptions | boolean): Buffer;
 
-/**
- * Wrap a ConsumerApplication payload into a MessageApplication.
- * Returns (messageApp bytes, frankingKey, frankingTag).
- */
-declare function encodeMessageApplication(consumerAppBytes: Buffer, replyTo?: {
-    id: string;
-    senderJid: string;
-}): {
-    messageApp: Buffer;
-    frankingKey: Buffer;
-    frankingTag: Buffer;
-};
-
 /**
  * Encode the MessageTransport protobuf that will be fed into Signal cipher.
  */

package/dist/index.d.ts

@@ -225,6 +225,13 @@ interface SendMessageInput {
     threadId: string;
     text: string;
     replyToMessageId?: string;
+    /**
+     * JID of the original message sender for E2EE reply (QuotedMessage.participant field).
+     * - For DM: the bare JID of the peer (e.g. "123456789.0@msgr"); if omitted, defaults to the peer's JID.
+     * - For group: the full member JID who sent the original message (e.g. "123456789.160@msgr"); required
+     *   for the server to correctly thread the reply in the group conversation.
+     */
+    replyToSenderJid?: string;
 }
 interface SendMediaInput {
     threadId: string;
@@ -234,6 +241,11 @@ interface SendMediaInput {
     mimeType?: string;
     caption?: string;
     replyToMessageId?: string;
+    /**
+     * JID of the original message sender for E2EE reply (QuotedMessage.participant field).
+     * See SendMessageInput.replyToSenderJid for details.
+     */
+    replyToSenderJid?: string;
     /** Optional media width in pixels for E2EE image/video/sticker payloads. */
     width?: number;
     /** Optional media height in pixels for E2EE image/video/sticker payloads. */
@@ -749,6 +761,38 @@ declare class DeviceStore implements IdentityKeyStore, SessionStore, PreKeyStore
     getPreKeyCount(): number;
 }
 
+/**
+ * Reply-to (quoted message) metadata for MessageApplication.Metadata.QuotedMessage.
+ *
+ * Proto schema (WAMsgApplication.proto):
+ *   message QuotedMessage {
+ *     optional string stanzaID   = 1;  // message ID of the quoted message
+ *     optional string remoteJID  = 2;  // chat JID (thread) that contains the quoted message
+ *     optional string participant = 3; // sender JID of the quoted message (required for groups)
+ *   }
+ */
+interface ReplyToMeta {
+    /** Message ID (stanzaID) of the quoted message. */
+    messageId: string;
+    /** Chat JID (remoteJID) — the thread where the quoted message lives. */
+    chatJid: string;
+    /**
+     * Sender JID (participant) of the quoted message.
+     * - For DM: same as chatJid (the peer's bare JID).
+     * - For group: the specific member JID who sent the original message.
+     */
+    senderJid: string;
+}
+/**
+ * Wrap a ConsumerApplication payload into a MessageApplication.
+ * Returns (messageApp bytes, frankingKey, frankingTag).
+ */
+declare function encodeMessageApplication(consumerAppBytes: Buffer, replyTo?: ReplyToMeta): {
+    messageApp: Buffer;
+    frankingKey: Buffer;
+    frankingTag: Buffer;
+};
+
 /**
  * Encode a ConsumerApplication text message.
  * Field 1 = Payload { field 1 = Content { field 1 = MessageText { field 1 = text } } }
@@ -779,19 +823,6 @@ declare function encodeEditMessage(targetMessageId: string, newText: string): Bu
 /** Encode a revoke (unsend) message. */
 declare function encodeRevokeMessage(messageId: string, keyOptsOrFromMe?: MessageKeyOptions | boolean): Buffer;
 
-/**
- * Wrap a ConsumerApplication payload into a MessageApplication.
- * Returns (messageApp bytes, frankingKey, frankingTag).
- */
-declare function encodeMessageApplication(consumerAppBytes: Buffer, replyTo?: {
-    id: string;
-    senderJid: string;
-}): {
-    messageApp: Buffer;
-    frankingKey: Buffer;
-    frankingTag: Buffer;
-};
-
 /**
  * Encode the MessageTransport protobuf that will be fed into Signal cipher.
  */

package/dist/index.js

@@ -3969,8 +3969,8 @@ init_esm_shims();
 var MessageBuilder = class {
   content;
   replyTo;
-  setReply(id, senderJid) {
-    this.replyTo = { id, senderJid };
+  setReply(replyTo) {
+    this.replyTo = replyTo;
     return this;
   }
   getReply() {
@@ -4194,7 +4194,7 @@ function encodeMessageApplication(consumerAppBytes, replyTo) {
   const appPayload = new ProtoWriter().bytes(4, payloadSubProto).build();
   let metadataWriter = new ProtoWriter().bytes(8, frankingKey).varint(9, 0);
   if (replyTo) {
-    const quoted = new ProtoWriter().string(1, replyTo.id).string(2, replyTo.senderJid).build();
+    const quoted = new ProtoWriter().string(1, replyTo.messageId).string(2, replyTo.chatJid).string(3, replyTo.senderJid).build();
     metadataWriter = metadataWriter.bytes(10, quoted);
   }
   const metadata = metadataWriter.build();
@@ -5597,7 +5597,16 @@ var E2EEClient = class {
   async buildDMTextFanoutPayloads(opts) {
     const builder = new MessageBuilder().setText(opts.text);
     if (opts.replyToId && opts.replyToSenderJid) {
-      builder.setReply(opts.replyToId, opts.replyToSenderJid);
+      const replyTo = {
+        messageId: opts.replyToId,
+        // chatJid = remoteJID: the thread/chat that holds the quoted message
+        // For DM, this is the peer's bare JID (toJid).
+        chatJid: opts.toJid,
+        // senderJid = participant: who sent the original message.
+        // Caller must supply the correct sender JID via replyToSenderJid.
+        senderJid: opts.replyToSenderJid
+      };
+      builder.setReply(replyTo);
     }
     const consumerApp = builder.build();
     const { messageApp, frankingTag } = encodeMessageApplication(consumerApp, builder.getReply());
@@ -5632,7 +5641,14 @@ var E2EEClient = class {
   async encryptGroupText(groupJid, selfJid, text, messageId, replyToId, replyToSenderJid) {
     const builder = new MessageBuilder().setText(text);
     if (replyToId && replyToSenderJid) {
-      builder.setReply(replyToId, replyToSenderJid);
+      const replyTo = {
+        messageId: replyToId,
+        // chatJid = remoteJID: for a group message, this is the group JID
+        chatJid: groupJid,
+        // participant: the specific member who sent the original message
+        senderJid: replyToSenderJid
+      };
+      builder.setReply(replyTo);
     }
     const consumerApp = builder.build();
     const { messageApp, frankingTag } = encodeMessageApplication(consumerApp, builder.getReply());
@@ -5985,6 +6001,9 @@ var EncryptedFrameSocket = class {
     const len = header.readUIntBE(0, 3);
     logger.debug("FacebookE2EESocket", `RAW frame header: ${header.toString("hex")} (len=${len})`);
     const payload = await this.ws.readRaw(len);
+    if (!payload) {
+      throw new Error("Socket closed while reading frame payload");
+    }
     try {
       const decrypted = this.decryptFrame(payload);
       logger.debug("FacebookE2EESocket", `Decrypt successful, result length: ${decrypted.length}`);
@@ -6124,11 +6143,12 @@ var FacebookE2EESocket = class extends EventEmitter2 {
   url;
   heartbeatInterval = null;
   isConnected = false;
+  cookieHeader = "";
   constructor(endpoint) {
     super();
     this.url = endpoint;
   }
-  async connect(noisePrivKey, authPayload) {
+  async connect(noisePrivKey, authPayload, cookies) {
     return new Promise((resolve, reject) => {
       try {
         let readFromBuffer2 = function(len) {
@@ -6153,19 +6173,25 @@ var FacebookE2EESocket = class extends EventEmitter2 {
           return res;
         };
         var readFromBuffer = readFromBuffer2;
+        if (cookies) this.cookieHeader = cookies;
         const wsUrl = new URL(this.url);
         wsUrl.searchParams.set("cid", "client-" + Date.now());
         const UserAgentStr = "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/138.0.0.0 Safari/537.36";
+        const wsHeaders = {
+          "Origin": "https://www.facebook.com",
+          "User-Agent": UserAgentStr
+        };
+        if (this.cookieHeader) {
+          wsHeaders["Cookie"] = this.cookieHeader;
+        }
         this.ws = new WebSocket(wsUrl.toString(), void 0, {
-          headers: {
-            "Origin": "https://www.facebook.com",
-            "User-Agent": UserAgentStr
-          }
+          headers: wsHeaders
         });
         this.ws.binaryType = "arraybuffer";
         let handshakeResolved = false;
         let streamBuffer = [];
         let streamLen = 0;
+        let waitingRejectFn = null;
         let waitingResolver = null;
         let waitingLen = 0;
         this.ws.addEventListener("message", (ev) => {
@@ -6190,8 +6216,9 @@ var FacebookE2EESocket = class extends EventEmitter2 {
             const targetLen = len || 0;
             if (targetLen === 0) {
               if (streamLen > 0) return Promise.resolve(readFromBuffer2(streamLen));
-              return new Promise((resolve2) => {
+              return new Promise((resolve2, reject2) => {
                 waitingLen = 1;
+                waitingRejectFn = reject2;
                 waitingResolver = () => resolve2(readFromBuffer2(streamLen));
               });
             }
@@ -6201,8 +6228,9 @@ var FacebookE2EESocket = class extends EventEmitter2 {
             if (this.ws?.readyState !== WebSocket.OPEN) {
               return Promise.reject(new Error("WebSocket not open"));
             }
-            return new Promise((resolve2) => {
+            return new Promise((resolve2, reject2) => {
               waitingLen = targetLen;
+              waitingRejectFn = reject2;
               waitingResolver = resolve2;
             });
           },
@@ -6211,10 +6239,11 @@ var FacebookE2EESocket = class extends EventEmitter2 {
         this.ws.addEventListener("close", () => {
           this.isConnected = false;
           this.stopHeartbeat();
-          if (waitingResolver) {
-            waitingResolver(null);
-            waitingResolver = null;
+          if (waitingRejectFn) {
+            waitingRejectFn(new Error("WebSocket closed while waiting for data"));
+            waitingRejectFn = null;
           }
+          waitingResolver = null;
           this.emit("disconnected");
         });
         this.ws.addEventListener("open", async () => {
@@ -8066,10 +8095,10 @@ var ClientController = class {
     logger.debug("ClientController", "Fetching CAT...");
     const fbCat = await this.gateway.fetchCAT(this.requireApi());
     if (!ds.jidDevice) {
-      const api = this.requireApi();
-      const appState = api.getAppState?.() || [];
-      const cookieStr = appState.map((c) => `${c.key}=${c.value}`).join("; ");
-      this.icdcService.setCookies(cookieStr);
+      const api2 = this.requireApi();
+      const appState2 = api2.getAppState?.() || [];
+      const cookieStr2 = appState2.map((c) => `${c.key}=${c.value}`).join("; ");
+      this.icdcService.setCookies(cookieStr2);
       logger.info("ClientController", "Registering new device via ICDC...");
       const waDeviceId = await this.icdcService.register(userId, fbCat, "2220391788200892", ds);
       ds.jidDevice = waDeviceId;
@@ -8118,7 +8147,12 @@ var ClientController = class {
         logger.error("E2EE", "Frame error:", err);
       }
     });
-    await noiseSocket.connect(ds.noiseKeyPriv, clientPayload);
+    const api = this.requireApi();
+    const appState = api.getAppState?.() || [];
+    const cookieStr = appState.map((c) => `${c.key}=${c.value}`).join("; ");
+    logger.info("ClientController", "FCA appState length:", appState.length);
+    logger.info("ClientController", "Cookie string snippet:", cookieStr.substring(0, 100));
+    await noiseSocket.connect(ds.noiseKeyPriv, clientPayload, cookieStr || void 0);
     this.e2eeSocket = noiseSocket;
     await new Promise((resolve, reject) => {
       const timeout = setTimeout(() => reject(new Error("Handshake timeout")), 1e4);
@@ -8241,15 +8275,25 @@ var ClientController = class {
     if (this.e2eeConnected && isE2EE) {
       let messageId;
       if (isGroup) {
-        messageId = await this.sendE2EEGroupText(input.threadId, input.text, input.replyToMessageId);
+        messageId = await this.sendE2EEGroupText(
+          input.threadId,
+          input.text,
+          input.replyToMessageId,
+          input.replyToSenderJid
+        );
       } else {
-        messageId = await this.sendE2EEText(input.threadId, input.text, input.replyToMessageId);
+        messageId = await this.sendE2EEText(
+          input.threadId,
+          input.text,
+          input.replyToMessageId,
+          input.replyToSenderJid
+        );
       }
       return { messageId, timestampMs: now() };
     }
     return this.messagingService.sendText(this.requireApi(), input);
   }
-  async sendE2EEText(threadId, text, replyToMessageId) {
+  async sendE2EEText(threadId, text, replyToMessageId, replyToSenderJid) {
     if (!this.e2eeSocket) throw new Error("E2EE not connected");
     const e2eeClient = this.e2eeService.getClient();
     const selfJid = this.getSelfE2EEJid();
@@ -8261,7 +8305,9 @@ var ClientController = class {
       text,
       isGroup: false,
       replyToId: replyToMessageId,
-      replyToSenderJid: replyToMessageId ? toJid : void 0
+      // For DM: participant = sender of original msg. If caller knows who sent it, use that;
+      // otherwise fall back to the peer's JID (correct for messages they sent to us).
+      replyToSenderJid: replyToMessageId ? replyToSenderJid ?? toJid : void 0
     });
     const participantNodes = [];
     const deviceJids = uniqueJids(await this.e2eeHandler.getDeviceList([toJid, toBareMessengerJid(selfJid)]));
@@ -8307,7 +8353,7 @@ var ClientController = class {
     logger.info("ClientController", `E2EE DM message sent to ${toJid} with ${participantNodes.length} devices`);
     return messageId;
   }
-  async sendE2EEGroupText(groupJid, text, replyToMessageId) {
+  async sendE2EEGroupText(groupJid, text, replyToMessageId, replyToSenderJid) {
     if (!this.e2eeSocket) throw new Error("E2EE not connected");
     const e2eeClient = this.e2eeService.getClient();
     const selfJid = this.getSelfE2EEJid();
@@ -8323,7 +8369,8 @@ var ClientController = class {
       text,
       messageId,
       replyToMessageId,
-      void 0
+      replyToSenderJid
+      // pass through — undefined when not replying
     );
     const participantNodes = [];
     for (const deviceJid of deviceJids) {
@@ -8663,7 +8710,11 @@ var ClientController = class {
     const consumerApp = buildMessage(media.mediaFields);
     const { messageApp, frankingTag } = e2eeClient.buildMessageApplication(
       consumerApp,
-      input.replyToMessageId ? { id: input.replyToMessageId, senderJid: toJid } : void 0
+      input.replyToMessageId ? {
+        messageId: input.replyToMessageId,
+        chatJid: toJid,
+        senderJid: input.replyToSenderJid ?? toJid
+      } : void 0
     );
     const devicePayload = e2eeClient.buildMessageTransport({ messageApp });
     const selfDevicePayload = e2eeClient.buildMessageTransport({