fb-messenger-e2ee 0.1.4 → 0.1.6

package/DOCS.md

@@ -18,8 +18,8 @@ new FBClient(options: ClientOptions)
 
 | Option | Type | Description |
 |---|---|---|
-| `appStatePath` | `string` | Path to Facebook appState/cookies JSON. |
-| `appState` | `any[] \| string` | Optional in-memory appState alternative. |
+| `appStatePath` | `string` | Path to Facebook appState JSON (contains the active login cookies/session data). |
+| `appState` | `any[] \| string` | Optional in-memory appState/cookies alternative (cookies string or array). |
 | `sessionStorePath` | `string` | Optional path for login/session metadata used by E2EE bootstrap. |
 | `platform` | `"facebook" \| "messenger"` | Login platform hint. Defaults to `"facebook"`. |
 

package/README.md

@@ -28,7 +28,7 @@
 - **Language**: [TypeScript](https://www.typescriptlang.org/)
 - **Encryption**: [@signalapp/libsignal-client](https://github.com/signalapp/libsignal-client)
 - **Protocol**: ProtobufJS + manual WA-binary/protobuf encoders
-- **Auth bootstrap bridge**: [fca-unofficial](https://github.com/VangBanLaNhat/fca-unofficial) is used internally only for appState login/CAT bootstrap
+- **Auth bootstrap bridge**: [fca-unofficial](https://github.com/VangBanLaNhat/fca-unofficial) is used internally only for appState login/CAT bootstrap (where appState represents the active Facebook login cookies)
 
 ---
 
@@ -60,7 +60,7 @@ const { FBClient } = require("fb-messenger-e2ee");
 import { FBClient } from "fb-messenger-e2ee";
 
 const client = new FBClient({
-  appStatePath: "./appstate.json",
+  appStatePath: "./appstate.json", // Path to Facebook appState JSON (contains active login cookies/session data)
   sessionStorePath: "./session.json",
   platform: "facebook",
 });

package/dist/index.cjs

@@ -3976,8 +3976,8 @@ init_cjs_shims();
 var MessageBuilder = class {
   content;
   replyTo;
-  setReply(id, senderJid) {
-    this.replyTo = { id, senderJid };
+  setReply(replyTo) {
+    this.replyTo = replyTo;
     return this;
   }
   getReply() {
@@ -4201,7 +4201,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();
@@ -5573,7 +5573,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());
@@ -5608,7 +5617,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());
@@ -5952,6 +5968,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}`);
@@ -6091,11 +6110,12 @@ var FacebookE2EESocket = class extends import_node_events2.EventEmitter {
   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) {
@@ -6120,19 +6140,25 @@ var FacebookE2EESocket = class extends import_node_events2.EventEmitter {
           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) => {
@@ -6157,8 +6183,9 @@ var FacebookE2EESocket = class extends import_node_events2.EventEmitter {
             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));
               });
             }
@@ -6168,8 +6195,9 @@ var FacebookE2EESocket = class extends import_node_events2.EventEmitter {
             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;
             });
           },
@@ -6178,10 +6206,11 @@ var FacebookE2EESocket = class extends import_node_events2.EventEmitter {
         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 () => {
@@ -8033,10 +8062,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;
@@ -8085,7 +8114,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);
@@ -8208,15 +8242,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();
@@ -8228,7 +8272,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)]));
@@ -8274,7 +8320,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();
@@ -8290,7 +8336,8 @@ var ClientController = class {
       text,
       messageId,
       replyToMessageId,
-      void 0
+      replyToSenderJid
+      // pass through — undefined when not replying
     );
     const participantNodes = [];
     for (const deviceJid of deviceJids) {
@@ -8630,7 +8677,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({