fb-messenger-e2ee 0.1.5 → 0.1.6

package/dist/index.js

@@ -6001,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}`);
@@ -6140,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) {
@@ -6169,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) => {
@@ -6206,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));
               });
             }
@@ -6217,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;
             });
           },
@@ -6227,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 () => {
@@ -8082,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;
@@ -8134,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);