@eryxenx/fca 1.0.7 → 1.0.9

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@eryxenx/fca",
-  "version": "1.0.7",
+  "version": "1.0.9",
   "description": "Facebook Chat API by EryXenX | Stable • Auto Re-login • Full E2EE Support — send messages, media, reactions & more in encrypted chats, hassle-free",
   "main": "index.js",
   "types": "index.d.ts",

package/src/api/socket/e2ee/index.js

@@ -22,6 +22,15 @@ const nativeMediaBridge = require("./native/nativeMediaBridge");
 const { decodeIncomingMedia } = require("./mediaDecode");
 const localMediaServer = require("./localMediaServer");
 
+// Native media engine (image/video/audio send, reactions, unsend, markRead,
+// group receive) is ON by default — matches pre-1.0.7 behavior. Set
+// FCA_E2EE_NATIVE=0 to force it off (falls back to the legacy vendor engine)
+// if the native/vendored device-kick conflict described below becomes an
+// issue for your deployment.
+function _nativeMediaEnabled() {
+    return process.env.FCA_E2EE_NATIVE !== "0";
+}
+
 // Simple FIFO-bounded Map.set — evicts the oldest entry once maxSize is
 // exceeded, so long-lived per-message caches (media buffers, thread/sender
 // lookups) can't grow unbounded over a multi-hour/overnight process
@@ -377,11 +386,11 @@ class E2EEBridge {
         // loop (a fresh Noise handshake every few seconds). Until the two
         // engines can use distinct device ids, the native engine must stay
         // OFF for the vendored socket to stay alive. Opt back in with
-        // FCA_E2EE_NATIVE=1 (group E2EE receive + native media sends) if you
+        // FCA_E2EE_NATIVE=0 (group E2EE receive + native media sends) if you
         // accept the resulting socket churn.
-        const _nativeEnabled = process.env.FCA_E2EE_NATIVE === "1";
+        const _nativeEnabled = _nativeMediaEnabled();
         if (!_nativeEnabled) {
-            logger.info("E2EE", "[native-group] native engine disabled (FCA_E2EE_NATIVE!=1) — vendored socket kept exclusive to avoid server-side device kicks");
+            logger.info("E2EE", "[native-group] native engine disabled (FCA_E2EE_NATIVE=0) — vendored socket kept exclusive to avoid server-side device kicks");
         }
         try {
             if (!_nativeEnabled) throw { _skipNative: true };
@@ -511,11 +520,11 @@ class E2EEBridge {
         const isGroup = this._knownE2EEGroups.has(String(threadId));
 
         if (!attachment && isGroup) {
-            if (process.env.FCA_E2EE_NATIVE !== "1") {
+            if (!_nativeMediaEnabled()) {
                 // Native engine disabled (default) — it shares the same E2EE
                 // device id as the vendored socket and triggers server-side
                 // device kicks. Group E2EE text send unavailable in this mode.
-                throw new Error("E2EE group text send requires the native engine (FCA_E2EE_NATIVE=1), which is disabled to protect the vendored socket from server-side device kicks.");
+                throw new Error("E2EE group text send requires the native engine, which is disabled (FCA_E2EE_NATIVE=0) to protect the vendored socket from server-side device kicks.");
             }
             // Vendor's own group Sender-Key encryption is broken (see native-group
             // listener above) — group text sends go through native instead.
@@ -593,8 +602,8 @@ class E2EEBridge {
             const appState = this.api.getAppState();
             let result;
             try {
-                if (process.env.FCA_E2EE_NATIVE !== "1") {
-                    throw new Error("native engine disabled (FCA_E2EE_NATIVE!=1) — see native-group note");
+                if (!_nativeMediaEnabled()) {
+                    throw new Error("native engine disabled (FCA_E2EE_NATIVE=0) — see native-group note");
                 }
                 result = await nativeMediaBridge.sendMedia(appState, threadId, mediaType, data, mimeType, {
                     caption: text || undefined,
@@ -690,7 +699,7 @@ class E2EEBridge {
 
     async markRead(threadId, watermarkTs) {
         this.ensureConnected();
-        if (process.env.FCA_E2EE_NATIVE === "1")
+        if (_nativeMediaEnabled())
             return nativeMediaBridge.markRead(this.api.getAppState(), threadId, watermarkTs);
         // Native disabled: read receipts aren't available through the vendored
         // engine — treat as a no-op rather than waking the native engine.
@@ -711,8 +720,8 @@ class E2EEBridge {
         this._knownE2EEGroups = this._knownE2EEGroups || new Set();
         const isGroup = this._knownE2EEGroups.has(String(threadId));
         try {
-            if (process.env.FCA_E2EE_NATIVE !== "1")
-                throw new Error("native engine disabled (FCA_E2EE_NATIVE!=1)");
+            if (!_nativeMediaEnabled())
+                throw new Error("native engine disabled (FCA_E2EE_NATIVE=0)");
             return await nativeMediaBridge.sendReaction(this.api.getAppState(), threadId, messageId, senderJid, reaction, isGroup);
         } catch (err) {
             if (isGroup) {
@@ -734,8 +743,8 @@ class E2EEBridge {
         this._knownE2EEGroups = this._knownE2EEGroups || new Set();
         const isGroup = this._knownE2EEGroups.has(String(threadId));
         try {
-            if (process.env.FCA_E2EE_NATIVE !== "1")
-                throw new Error("native engine disabled (FCA_E2EE_NATIVE!=1)");
+            if (!_nativeMediaEnabled())
+                throw new Error("native engine disabled (FCA_E2EE_NATIVE=0)");
             return await nativeMediaBridge.unsendMessage(this.api.getAppState(), threadId, messageId, isGroup);
         } catch (err) {
             if (isGroup) {
@@ -752,8 +761,8 @@ class E2EEBridge {
         this._knownE2EEGroups = this._knownE2EEGroups || new Set();
         const isGroup = this._knownE2EEGroups.has(String(threadId));
         if (isGroup) {
-            if (process.env.FCA_E2EE_NATIVE !== "1")
-                throw new Error("E2EE group edit requires the native engine (FCA_E2EE_NATIVE=1), which is disabled.");
+            if (!_nativeMediaEnabled())
+                throw new Error("E2EE group edit requires the native engine, which is disabled (FCA_E2EE_NATIVE=0).");
             // Vendor's group Sender-Key encryption is broken, so route
             // group edits through native (it doesn't need a chatJid — the
             // messageId alone identifies which chat/message to edit).
@@ -947,4 +956,4 @@ function _getImageDimensions(buf, mimeType) {
         }
     } catch (_) {}
     return null;
-}
+}

package/src/utils/format/delta.js

@@ -25,6 +25,7 @@ function getAdminTextMessageType(m) {
       return "log:thread-approval-mode";
     case "messenger_call_log":
     case "participant_joined_group_call":
+    case "rtc_call_log":
       return "log:thread-call";
     case "pin_messages_v2":
       return "log:thread-pinned";
@@ -41,7 +42,7 @@ function formatDeltaEvent(m) {
   switch (m.class) {
     case "AdminTextMessage":
       logMessageType = getAdminTextMessageType(m);
-      logMessageData = m.untypedData;
+      logMessageData = Object.assign({}, m.untypedData, { rawType: m.type });
       break;
     case "ThreadName":
       logMessageType = "log:thread-name";

package/src/utils/nexca-utils.js

@@ -569,7 +569,8 @@ function _getAdminTextMessageType(delta) {
         case "group_poll":                      return "log:thread-poll";
         case "change_thread_approval_mode":     return "log:thread-approval-mode";
         case "messenger_call_log":
-        case "participant_joined_group_call":   return "log:thread-call";
+        case "participant_joined_group_call":
+        case "rtc_call_log":                    return "log:thread-call";
         case "pin_messages_v2":
         case "unpin_messages_v2":               return "log:thread-pinned";
         case "confirm_friend_request":          return "log:confirmed-friend-request";
@@ -593,7 +594,7 @@ function formatDeltaEvent(delta) {
                 messageID: md.messageId,
                 author: (md.actorFbId || "").toString(),
                 logMessageType: _getAdminTextMessageType(delta),
-                logMessageData: delta.untypedData || {},
+                logMessageData: Object.assign({}, delta.untypedData || {}, { rawType: delta.type }),
                 logMessageBody: md.adminText || "",
                 participantIDs: participantIDs,
                 timestamp: parseInt(md.timestamp)