hridoy-ultimate 9.0.0 → 9.0.2

package/src/api/socket/core/connectMqtt.js

@@ -5,14 +5,9 @@
  */
 const { formatID } = require("../../../utils/format");
 const { getDefaultUserAgent } = require("../../../utils/fingerprint");
-const lifecycle = require("./lifecycle");
 
-// Was 5000 in the supplied sources; the 3.1.0 changelog entry of the upstream
-// lineage reports 5000ms causing needless reconnect cycles on slow links.
-// Configurable through listenMqtt({ tmsWaitTimeoutMs, connectTimeoutMs }).
-const T_MS_WAIT_TIMEOUT_MS = 8000;
-const CONNECT_TIMEOUT_MS = 12000;
-const SUBACK_TIMEOUT_MS = 5000;
+const DEFAULT_RECONNECT_DELAY_MS = 2000;
+const T_MS_WAIT_TIMEOUT_MS = 5000;
 
 module.exports = function createListenMqtt(deps) {
   const { WebSocket, mqtt, HttpsProxyAgent, buildStream, buildProxy,
@@ -21,33 +16,29 @@ module.exports = function createListenMqtt(deps) {
 
   return function listenMqtt(defaultFuncs, api, ctx, globalCallback) {
 
-    // Tear down a previous client if listenMqtt() is entered twice (duplicate
-    // listener / reconnect race) so we never keep two live sockets.
-    if (ctx.mqttClient) {
-      const stale = ctx.mqttClient;
-      ctx.mqttClient = undefined;
-      if (ctx._rTimeout) { clearTimeout(ctx._rTimeout); ctx._rTimeout = null; }
-      lifecycle.detachClient(stale);
-      try { stale.end(true); } catch (_) { /* already closed */ }
-      logger("mqtt: replaced a still-registered client before reconnecting", "warn");
-    }
-    ctx._stopped = false;
-
-    function giveUp(reason) {
-      const msg = `mqtt reconnect attempts exhausted (${reason}); call listen again to restart`;
-      logger(msg, "error");
-      ctx._stopped = true;
-      lifecycle.clearListenerTimers(ctx, false);
-      globalCallback({ type: "stop_listen", error: msg }, null);
+    function scheduleReconnect(delayMs) {
+      const d = (ctx._mqttOpt && ctx._mqttOpt.reconnectDelayMs) || DEFAULT_RECONNECT_DELAY_MS;
+      const ms = typeof delayMs === "number" ? delayMs : d;
+      if (ctx._reconnectTimer) {
+        logger("mqtt reconnect already scheduled", "warn");
+        return; // debounce
+      }
+      if (ctx._ending) {
+        logger("mqtt reconnect skipped - ending", "warn");
+        return;
+      }
+      logger(`mqtt will reconnect in ${ms}ms`, "warn");
+      ctx._reconnectTimer = setTimeout(() => {
+        ctx._reconnectTimer = null;
+        if (!ctx._ending) {
+          listenMqtt(defaultFuncs, api, ctx, globalCallback);
+        }
+      }, ms);
     }
-    function scheduleReconnect(reason) {
-      const res = lifecycle.scheduleReconnect(ctx, logger, function () {
-        listenMqtt(defaultFuncs, api, ctx, globalCallback);
-      }, reason);
-      if (res === "exhausted") giveUp(reason);
-      else if (res === "stopped") logger("mqtt reconnect skipped - stopped", "info");
-      return res;
+    function isEndingLikeError(msg) {
+      return /No subscription existed|client disconnecting|socket hang up|ECONNRESET/i.test(msg || "");
     }
+
     // Default to online unless explicitly disabled — GoatBot's optionsFca
     // has no `online` key, which used to make this undefined (falsy), so the
     // account sat permanently "inactive" while actively sending messages.
@@ -87,7 +78,7 @@ module.exports = function createListenMqtt(deps) {
           // Must match the HTTP layer's Accept-Language (src/utils/headers.js)
           // — a hardcoded different value here made the WS handshake and the
           // HTTP requests disagree about the same "browser".
-          "Accept-Language": ctx.globalOptions.acceptLanguage || "en-US,en;q=0.9,vi;q=0.8",
+          "Accept-Language": ctx.globalOptions.acceptLanguage || "en-US,en;q=0.9",
           "Sec-WebSocket-Extensions": "permessage-deflate; client_max_window_bits"
         },
         origin: "https://www.facebook.com",
@@ -97,7 +88,7 @@ module.exports = function createListenMqtt(deps) {
       keepalive: 30,
       reschedulePings: true,
       reconnectPeriod: 0,
-      connectTimeout: (ctx._mqttOpt && ctx._mqttOpt.connectTimeoutMs) || CONNECT_TIMEOUT_MS
+      connectTimeout: 5000
     };
     if (ctx.globalOptions.proxy !== undefined) {
       const agent = new HttpsProxyAgent(ctx.globalOptions.proxy);
@@ -109,11 +100,8 @@ module.exports = function createListenMqtt(deps) {
       options
     );
     const mqttClient = ctx.mqttClient;
-    // A late event from a replaced/stopped client must never touch current state.
-    const isActive = function () { return ctx.mqttClient === mqttClient; };
 
     mqttClient.on("error", function (err) {
-      if (!isActive()) return;
       const msg = String(err && err.message ? err.message : err || "");
       if ((ctx._ending || ctx._cycling) && /No subscription existed|client disconnecting/i.test(msg)) {
         logger(`mqtt expected during shutdown: ${msg}`, "info");
@@ -145,80 +133,67 @@ module.exports = function createListenMqtt(deps) {
       if (ctx._ending || ctx._cycling) return;
 
       if (ctx.globalOptions.autoReconnect && !ctx._ending) {
-        scheduleReconnect("error: " + msg);
+        const d = (ctx._mqttOpt && ctx._mqttOpt.reconnectDelayMs) || DEFAULT_RECONNECT_DELAY_MS;
+        logger(`mqtt autoReconnect listenMqtt() in ${d}ms`, "warn");
+        scheduleReconnect(d);
       } else {
         globalCallback({ type: "stop_listen", error: msg || "Connection refused" }, null);
       }
     });
 
     mqttClient.on("connect", function () {
-      if (!isActive()) return;
+      if (process.env.OnStatus === undefined) {
+        logger("fca-unofficial", "info");
+        process.env.OnStatus = true;
+      }
       ctx._cycling = false;
 
-      // Subscribe first and publish only after every SUBACK (or a bounded
-      // timeout). Publishing before the subscriptions exist can make the
-      // server close the socket with "No subscription existed". This ordering
-      // is protocol-level behaviour of mqtt.js; NOT verified against live
-      // Facebook servers (see README "Known limitations").
-      let started = false;
-      const startSync = function () {
-        if (started || !isActive()) return;
-        started = true;
-        clearTimeout(subTimer);
-        const queue = {
-          sync_api_version: 11, max_deltas_able_to_process: 100, delta_batch_size: 500,
-          encoding: "JSON", entity_fbid: ctx.userID, initial_titan_sequence_id: ctx.lastSeqId, device_params: null
-        };
-        const topic = ctx.syncToken ? "/messenger_sync_get_diffs" : "/messenger_sync_create_queue";
-        if (ctx.syncToken) { queue.last_seq_id = ctx.lastSeqId; queue.sync_token = ctx.syncToken; }
-        mqttClient.publish(topic, JSON.stringify(queue), { qos: 1, retain: false });
-        mqttClient.publish("/foreground_state", JSON.stringify({ foreground: chatOn }), { qos: 1 });
-        mqttClient.publish("/set_client_settings", JSON.stringify({ make_user_available_when_in_foreground: true }), { qos: 1 });
+      topics.forEach(t => mqttClient.subscribe(t));
 
-        const waitMs = (ctx._mqttOpt && ctx._mqttOpt.tmsWaitTimeoutMs) || T_MS_WAIT_TIMEOUT_MS;
-        let rTimeout = setTimeout(function () {
-          rTimeout = null;
-          if (!isActive() || ctx._ending) {
-            logger("mqtt t_ms timeout skipped - ending/replaced", "warn");
-            return;
-          }
-          logger("mqtt t_ms timeout, cycling", "warn");
-          try { mqttClient.end(true); } catch (_) { /* already closed */ }
-          scheduleReconnect("t_ms timeout");
-        }, waitMs);
-        ctx._rTimeout = rTimeout;
 
-        ctx.tmsWait = function () {
-          if (rTimeout) { clearTimeout(rTimeout); rTimeout = null; }
-          if (ctx._rTimeout) ctx._rTimeout = null;
-          // First real sync response: the connection is healthy, reset backoff.
-          ctx._reconnectAttempt = 0;
-          if (ctx.globalOptions.emitReady) globalCallback({ type: "ready", error: null });
-          delete ctx.tmsWait;
-        };
+      const queue = {
+        sync_api_version: 11, max_deltas_able_to_process: 100, delta_batch_size: 500,
+        encoding: "JSON", entity_fbid: ctx.userID, initial_titan_sequence_id: ctx.lastSeqId, device_params: null
       };
-
-      let pending = topics.length;
-      const subTimer = setTimeout(function () {
-        logger("mqtt SUBACK wait timed out, continuing", "warn");
-        startSync();
-      }, SUBACK_TIMEOUT_MS);
-      if (!pending) return startSync();
-      topics.forEach(function (t) {
+      const topic = ctx.syncToken ? "/messenger_sync_get_diffs" : "/messenger_sync_create_queue";
+      if (ctx.syncToken) { queue.last_seq_id = ctx.lastSeqId; queue.sync_token = ctx.syncToken; }
+      mqttClient.publish(topic, JSON.stringify(queue), { qos: 1, retain: false });
+      mqttClient.publish("/foreground_state", JSON.stringify({ foreground: chatOn }), { qos: 1 });
+      mqttClient.publish("/set_client_settings", JSON.stringify({ make_user_available_when_in_foreground: true }), { qos: 1 });
+      const d = (ctx._mqttOpt && ctx._mqttOpt.reconnectDelayMs) || DEFAULT_RECONNECT_DELAY_MS;
+      let rTimeout = setTimeout(function () {
+        rTimeout = null;
+        if (ctx._ending) {
+          logger("mqtt t_ms timeout skipped - ending", "warn");
+          return;
+        }
+        logger(`mqtt t_ms timeout, cycling in ${d}ms`, "warn");
         try {
-          mqttClient.subscribe(t, function (subErr) {
-            if (subErr) logger(`mqtt subscribe ${t} failed: ${subErr && subErr.message ? subErr.message : String(subErr)}`, "warn");
-            if (--pending === 0) startSync();
-          });
-        } catch (e) {
-          logger(`mqtt subscribe ${t} threw: ${e && e.message ? e.message : String(e)}`, "warn");
-          if (--pending === 0) startSync();
+          if (mqttClient && mqttClient.connected) {
+            mqttClient.end(true);
+          }
+        } catch (_) { }
+        scheduleReconnect(d);
+      }, T_MS_WAIT_TIMEOUT_MS);
+
+      // Store timeout reference for cleanup
+      ctx._rTimeout = rTimeout;
+
+      ctx.tmsWait = function () {
+        if (rTimeout) {
+          clearTimeout(rTimeout);
+          rTimeout = null;
         }
-      });
+        if (ctx._rTimeout) {
+          delete ctx._rTimeout;
+        }
+        if (ctx.globalOptions.emitReady) globalCallback({ type: "ready", error: null });
+        delete ctx.tmsWait;
+      };
     });
 
     mqttClient.on("message", function (topic, message) {
-      if (!isActive() || ctx._ending) return; // stale client or shutting down
+      if (ctx._ending) return; // Ignore messages if ending
       ctx.lastMqttActivity = Date.now(); // packet-level liveness for the heartbeat
       try {
         let jsonMessage = Buffer.isBuffer(message) ? Buffer.from(message).toString() : message;
@@ -278,26 +253,24 @@ module.exports = function createListenMqtt(deps) {
     });
 
     mqttClient.on("close", function () {
-      if (!isActive()) return;
       if (ctx._ending || ctx._cycling) {
         logger("mqtt close expected", "info");
         return;
       }
       logger("mqtt connection closed", "warn");
       if (ctx.globalOptions.autoReconnect && !ctx._ending) {
-        scheduleReconnect("socket closed");
+        scheduleReconnect();
       }
     });
 
     mqttClient.on("disconnect", () => {
-      if (!isActive()) return;
       if (ctx._ending || ctx._cycling) {
         logger("mqtt disconnect expected", "info");
         return;
       }
       logger("mqtt disconnected", "warn");
       if (ctx.globalOptions.autoReconnect && !ctx._ending) {
-        scheduleReconnect("server disconnect");
+        scheduleReconnect();
       }
     });
   };

package/src/api/socket/core/emitAuth.js

@@ -3,14 +3,21 @@
  * Emits account_inactive to the global callback and cleans up MQTT/timers/scheduler.
  * Used when login is invalid, blocked, or session is lost.
  */
-const lifecycle = require("./lifecycle");
-
 module.exports = function createEmitAuth({ logger }) {
   return function emitAuth(ctx, api, globalCallback, reason, detail) {
-    // Clean up all timers (listener + per-login dtsg refresh) and mark stopped
-    // so no pending reconnect can revive a dead session.
-    ctx._stopped = true;
-    lifecycle.clearListenerTimers(ctx, true);
+    // Clean up all timers
+    try {
+      if (ctx._autoCycleTimer) {
+        clearInterval(ctx._autoCycleTimer);
+        ctx._autoCycleTimer = null;
+      }
+    } catch (_) { }
+    try {
+      if (ctx._reconnectTimer) {
+        clearTimeout(ctx._reconnectTimer);
+        ctx._reconnectTimer = null;
+      }
+    } catch (_) { }
 
     try {
       ctx._ending = true;
@@ -20,9 +27,10 @@ module.exports = function createEmitAuth({ logger }) {
     // Clean up MQTT client
     try {
       if (ctx.mqttClient) {
-        const c = ctx.mqttClient;
-        lifecycle.detachClient(c);
-        c.end(true);
+        ctx.mqttClient.removeAllListeners();
+        if (ctx.mqttClient.connected) {
+          ctx.mqttClient.end(true);
+        }
       }
     } catch (_) { }
 

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

@@ -5,7 +5,7 @@
  *
  * Wraps the `fb-messenger-e2ee` npm package (real dependency, not a bundled
  * vendor copy) and exposes it through NEXCA's own api.e2ee / connectE2EE /
- * listenE2EE surface, so the rest of fca-eryxenx and GoatBot never need to
+ * listenE2EE surface, so the rest of hridoy-ultimate and GoatBot never need to
  * know which E2EE engine is underneath.
  *
 
@@ -17,36 +17,18 @@
  */
 
 const path = require("path");
-const fs = require("fs");
 const logger = require("../../../utils/nexca-logger");
 const nativeMediaBridge = require("./native/nativeMediaBridge");
 const { decodeIncomingMedia } = require("./mediaDecode");
 const localMediaServer = require("./localMediaServer");
 
-// Native media engine (image/video/audio send, group receive/send, reactions,
-// unsend, markRead) is OPT-IN in hridoy-ultimate. It needs a prebuilt
-// "messagix" shared library (mautrix, MPL-2.0) that this package does NOT
-// bundle because its provenance could not be verified from the supplied
-// archives. hridoy-ultimate 9.0.0 now ships the user-supplied messagix.so /
-// messagix.dll under native/build/ (SHA-256 pinned in THIRD_PARTY_NOTICES.md),
-// but the engine stays OPT-IN: set FCA_E2EE_NATIVE=1 (FCA_E2EE_NATIVE_LIB can
-// still override the bundled path). Upstream 1.0.8 flipped this to default-on;
-// that is rejected here because the native and vendored engines share one E2EE
-// device and kick each other (see the note in connect()).
-function _bundledNativeLib() {
-    const base = path.join(__dirname, "native", "build");
-    if (process.platform === "win32") return path.join(base, "messagix.dll");
-    if (process.platform === "darwin") return path.join(base, "messagix.dylib");
-    return path.join(base, "messagix.so");
-}
-function _nativeLibAvailable() {
-    try {
-        if (process.env.FCA_E2EE_NATIVE_LIB) return fs.existsSync(process.env.FCA_E2EE_NATIVE_LIB);
-        return fs.existsSync(_bundledNativeLib());
-    } catch (_) { return false; }
-}
+// 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 === "1" && _nativeLibAvailable();
+    return process.env.FCA_E2EE_NATIVE !== "0";
 }
 
 // Simple FIFO-bounded Map.set — evicts the oldest entry once maxSize is
@@ -70,7 +52,7 @@ function loadFBClient() {
         //   1. fb-messenger-e2ee is NOT published on the npm registry — only
         //      available as TypeScript source on GitHub.
         //   2. Depending on it as a git/file dependency nested inside
-        //      fca-eryxenx (itself installed via `github:` in GoatBot-Pro)
+        //      hridoy-ultimate (itself installed via `github:` in GoatBot-Pro)
         //      is unreliable — npm does not consistently build nested
         //      non-registry dependencies during a git-dependency install.
         // Shipping plain compiled JS here means zero build step is needed
@@ -404,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
-        // native engine not enabled (set FCA_E2EE_NATIVE=1; bundled messagix binary is used unless FCA_E2EE_NATIVE_LIB overrides it) (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 = _nativeMediaEnabled();
         if (!_nativeEnabled) {
-            logger.info("E2EE", "[native-group] native engine disabled (native engine not enabled (set FCA_E2EE_NATIVE=1; bundled messagix binary is used unless FCA_E2EE_NATIVE_LIB overrides it)) — 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 };
@@ -542,7 +524,7 @@ class E2EEBridge {
                 // 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, which is disabled (native engine not enabled (set FCA_E2EE_NATIVE=1; bundled messagix binary is used unless FCA_E2EE_NATIVE_LIB overrides it)) 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.
@@ -621,7 +603,7 @@ class E2EEBridge {
             let result;
             try {
                 if (!_nativeMediaEnabled()) {
-                    throw new Error("native engine disabled (native engine not enabled (set FCA_E2EE_NATIVE=1; bundled messagix binary is used unless FCA_E2EE_NATIVE_LIB overrides it)) — see native-group note");
+                    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,
@@ -739,7 +721,7 @@ class E2EEBridge {
         const isGroup = this._knownE2EEGroups.has(String(threadId));
         try {
             if (!_nativeMediaEnabled())
-                throw new Error("native engine disabled (native engine not enabled (set FCA_E2EE_NATIVE=1; bundled messagix binary is used unless FCA_E2EE_NATIVE_LIB overrides it))");
+                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) {
@@ -762,7 +744,7 @@ class E2EEBridge {
         const isGroup = this._knownE2EEGroups.has(String(threadId));
         try {
             if (!_nativeMediaEnabled())
-                throw new Error("native engine disabled (native engine not enabled (set FCA_E2EE_NATIVE=1; bundled messagix binary is used unless FCA_E2EE_NATIVE_LIB overrides it))");
+                throw new Error("native engine disabled (FCA_E2EE_NATIVE=0)");
             return await nativeMediaBridge.unsendMessage(this.api.getAppState(), threadId, messageId, isGroup);
         } catch (err) {
             if (isGroup) {
@@ -780,7 +762,7 @@ class E2EEBridge {
         const isGroup = this._knownE2EEGroups.has(String(threadId));
         if (isGroup) {
             if (!_nativeMediaEnabled())
-                throw new Error("E2EE group edit requires the native engine, which is disabled (native engine not enabled (set FCA_E2EE_NATIVE=1; bundled messagix binary is used unless FCA_E2EE_NATIVE_LIB overrides it)).");
+                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).

package/src/api/socket/e2ee/native/NOTICE.md

@@ -16,12 +16,12 @@ https://www.mozilla.org/en-US/MPL/2.0/
 into the compiled binary, adapted from the same upstream project's Node
 bindings.
 
-fca-eryxenx uses this native engine only for sending E2EE media attachments
+hridoy-ultimate uses this native engine only for sending E2EE media attachments
 (images/video/audio/documents) in end-to-end encrypted Messenger threads,
 because the project's own hand-written Signal Protocol media encoder
 (`../vendor/fme`) produces payloads that Facebook's servers accept but that
 Messenger clients fail to render. Text messages and all non-media E2EE
-functionality continue to use fca-eryxenx's original implementation.
+functionality continue to use hridoy-ultimate's original implementation.
 
 In accordance with MPL-2.0 §3.3, this NOTICE file must be preserved and
 distributed alongside these files, and any modifications to the covered

package/src/api/socket/e2ee/native/lib/index.mjs

@@ -19,7 +19,6 @@ function resolveDirname() {
 }
 __name(resolveDirname, "resolveDirname");
 function libPath() {
-  if (process.env.FCA_E2EE_NATIVE_LIB) return process.env.FCA_E2EE_NATIVE_LIB;
   const base = path.join(resolveDirname(), "..", "build");
   if (process.platform === "win32") return path.join(base, "messagix.dll");
   if (process.platform === "darwin") return path.join(base, "messagix.dylib");
@@ -28,7 +27,7 @@ function libPath() {
 __name(libPath, "libPath");
 var LIB_FILE = libPath();
 if (!fs.existsSync(LIB_FILE)) {
-  throw new Error(`Native library not found at ${LIB_FILE}. No bundled build exists for this platform/arch (only x86-64 .so/.dll ship). Set FCA_E2EE_NATIVE_LIB to a trusted messagix build.`);
+  throw new Error(`Native library not found at ${LIB_FILE}. Run: npm run build:go`);
 }
 var lib = koffi.load(LIB_FILE);
 var mk = /* @__PURE__ */ __name((ret, name, args) => lib.func(name, ret, args), "mk");

package/src/api/socket/e2ee/native/nativeMediaBridge.js

@@ -6,7 +6,7 @@
  * Upstream: https://github.com/mautrix/go, https://github.com/mautrix/meta
  * License:  https://www.mozilla.org/en-US/MPL/2.0/
  *
- * fca-eryxenx's own hand-written Signal/Noise media encoder (vendor/fme)
+ * hridoy-ultimate's own hand-written Signal/Noise media encoder (vendor/fme)
  * sends E2EE image/video/audio/document messages that Facebook's server
  * accepts (valid messageId + CDN path returned) but that the real Messenger
  * client silently fails to render — the reverse-engineered .proto schema
@@ -16,7 +16,7 @@
  * mautrix-go/mautrix-meta (a maintained, protocol-accurate Go implementation
  * of the same E2EE stack) via the `koffi` FFI, exactly like the reference
  * "stfca" package does. Only MEDIA sending is routed through here — text
- * messages keep using fca-eryxenx's existing, already-working E2EE path.
+ * messages keep using hridoy-ultimate's existing, already-working E2EE path.
  */
 
 const path = require("path");
@@ -101,7 +101,7 @@ let _connected = false;
  * on every reconnect was never releasing the old handle fast enough and
  * leaked native memory over a multi-hour uptime — reusing the instance and
  * just re-calling .connect() avoids that entirely.
- * @param {Array} appState fca-eryxenx's appState (from api.getAppState())
+ * @param {Array} appState hridoy-ultimate's appState (from api.getAppState())
  */
 async function getClient(appState) {
     if (_connected && _clientInstance) return _clientInstance;
@@ -184,7 +184,7 @@ async function sendMedia(appState, chatJid, mediaType, data, mimeType, opts) {
     const client = await getClient(appState);
     opts = opts || {};
 
-    // Native client needs a full JID (id@server). fca-eryxenx normalizes
+    // Native client needs a full JID (id@server). hridoy-ultimate normalizes
     // E2EE thread ids down to bare numeric strings for GoatBot's benefit,
     // so re-attach the domain here if it's missing — groups use "@g.us",
     // DMs use "@msgr". Using the wrong domain makes native try to look up

package/src/api/socket/listenE2EE.js

@@ -27,9 +27,7 @@ module.exports = function (defaultFuncs, api, ctx) {
                     cb([]);
                 }
                 if (ctx.e2ee && ctx.e2ee.connected) {
-                    ctx.e2ee.disconnect().catch((e) => {
-                        require("../../../func/logger")("E2EE disconnect failed: " + (e && e.message ? e.message : String(e)), "warn");
-                    });
+                    ctx.e2ee.disconnect().catch(() => {});
                 }
             }
             stopListeningAsync() {