@prototypevip/baileys 0.0.9 → 0.1.1

package/lib/Socket/index.js

@@ -1,79 +1,19 @@
 import { DEFAULT_CONNECTION_CONFIG } from "../Defaults/index.js";
 import { makeCommunitiesSocket } from "./communities.js";
 
-/**
- * Optional AntiBan — مقفول افتراضياً.
- * لتفعيله مرّر في إعدادات makeWASocket:
- *   makeWASocket({ antiBan: true })                    // moderate preset
- *   makeWASocket({ antiBan: 'conservative' })          // preset name
- *   makeWASocket({ antiBan: { maxPerMinute: 8, ... } }) // config مخصص
- *   makeWASocket({ antiBan: false })                   // صراحة مقفول (الافتراضي)
- *
- * الحالة الاختيارية:
- *   antiBanWarmUpState  — حالة الـ warmup المحفوظة
- *   antiBanWrapOptions  — خيارات إضافية لـ wrapSocket
- */
-
-let _wrapSocket = null;
-let _wrapSocketWithFingerprint = null;
-let _PRESETS = {};
-let _antiBanLoadError = null;
-
-async function loadAntiBan() {
-  if (_wrapSocket) return true;
-  if (_antiBanLoadError) return false;
-  try {
-    const mod = await import("../AntiBan/index.js");
-    _wrapSocket = mod.wrapSocket;
-    _wrapSocketWithFingerprint = mod.wrapSocketWithFingerprint;
-    _PRESETS = mod.PRESETS || {};
-    return true;
-  } catch (e) {
-    // fallback: try wrapper export path
-    try {
-      const wrap = await import("../AntiBan/wrapper.js");
-      const presets = await import("../AntiBan/presets.js").catch(() => ({}));
-      _wrapSocket = wrap.wrapSocket;
-      _wrapSocketWithFingerprint = wrap.wrapSocketWithFingerprint;
-      _PRESETS = presets.PRESETS || {};
-      return true;
-    } catch (e2) {
-      _antiBanLoadError = e2;
-      console.warn(
-        "[@prototypevip/baileys] AntiBan module failed to load — continuing without it:",
-        e2?.message || e2
-      );
-      return false;
-    }
-  }
-}
-
-// Sync load attempt for ESM top-level (best-effort)
-try {
-  const wrap = await import("../AntiBan/wrapper.js");
-  _wrapSocket = wrap.wrapSocket;
-  _wrapSocketWithFingerprint = wrap.wrapSocketWithFingerprint;
-  try {
-    const presets = await import("../AntiBan/presets.js");
-    _PRESETS = presets.PRESETS || {};
-  } catch {}
-} catch (e) {
-  _antiBanLoadError = e;
-}
-
 /**
  * Create a WhatsApp socket.
- * AntiBan مقفول افتراضياً — فعّله عبر config.antiBan
+ * Clean version — without AntiBan.
  */
 const makeWASocket = (config = {}) => {
-  const {
-    antiBan = false, // مقفول افتراضياً
-    antiBanWarmUpState,
-    antiBanWrapOptions,
-    ...restConfig
-  } = config || {};
+  const restConfig = { ...(config || {}) };
 
+  // strip any leftover antiBan keys if present
+  delete restConfig.antiBan;
+  delete restConfig.antiBanWarmUpState;
+  delete restConfig.antiBanWrapOptions;
   delete restConfig.userDevicesCache;
+
   const newConfig = { ...DEFAULT_CONNECTION_CONFIG, ...restConfig };
 
   let sock;
@@ -85,77 +25,14 @@ const makeWASocket = (config = {}) => {
   }
 
   sock = makeCommunitiesSocket(newConfig);
-
-  // ── AntiBan (اختياري) ──
-  const enabled =
-    antiBan === true ||
-    (typeof antiBan === "string" && antiBan.length > 0) ||
-    (antiBan && typeof antiBan === "object");
-
-  if (enabled) {
-    if (typeof _wrapSocket !== "function") {
-      console.warn(
-        "[@prototypevip/baileys] antiBan requested but module not available — socket without protection"
-      );
-      return sock;
-    }
-
-    const antiBanConfig =
-      antiBan === true
-        ? "moderate"
-        : antiBan; // string preset or object config
-
-    try {
-      sock = _wrapSocket(
-        sock,
-        antiBanConfig,
-        antiBanWarmUpState,
-        antiBanWrapOptions || {}
-      );
-      if (newConfig.logger?.info) {
-        newConfig.logger.info(
-          { antiBan: typeof antiBanConfig === "string" ? antiBanConfig : "custom" },
-          "AntiBan protection enabled"
-        );
-      }
-    } catch (e) {
-      console.warn(
-        "[@prototypevip/baileys] AntiBan wrap failed — continuing without it:",
-        e?.message || e
-      );
-    }
-  }
-
   return sock;
 };
 
-/** Pass-through stubs when antiban is not loaded; real functions when loaded */
-const wrapSocket = (sock, ...args) =>
-  typeof _wrapSocket === "function" ? _wrapSocket(sock, ...args) : sock;
-
-const wrapSocketWithFingerprint = (makeSock, opts, wrapOpts) => {
-  if (typeof _wrapSocketWithFingerprint === "function") {
-    return _wrapSocketWithFingerprint(makeSock, opts, wrapOpts);
-  }
-  return typeof makeSock === "function" ? makeSock(opts || {}) : makeSock;
-};
-
-const PRESETS = new Proxy(
-  {},
-  {
-    get(_, prop) {
-      return _PRESETS[prop];
-    },
-    ownKeys() {
-      return Reflect.ownKeys(_PRESETS);
-    },
-    getOwnPropertyDescriptor(_, prop) {
-      if (prop in _PRESETS) {
-        return { enumerable: true, configurable: true, value: _PRESETS[prop] };
-      }
-    },
-  }
-);
+/** Stubs kept for API compatibility (no-op without AntiBan) */
+const wrapSocket = (sock) => sock;
+const wrapSocketWithFingerprint = (makeSock, opts) =>
+  typeof makeSock === "function" ? makeSock(opts || {}) : makeSock;
+const PRESETS = {};
 
 export default makeWASocket;
 export { makeWASocket, wrapSocket, wrapSocketWithFingerprint, PRESETS };

package/lib/Socket/messages-send.js

@@ -845,31 +845,10 @@ export const makeMessagesSocket = (config) => {
             return {};
           })(),
         ]);
-        // نبني قائمة المشاركين + بدائل LID/PN عشان حسابات اليوزرنيم
-        // (اللي أحياناً USync بيرجع فاضي لو استعلمنا بصيغة واحدة بس)
-        const participantsList = [];
-        const seenParticipantUsers = new Set();
-        const addParticipantJid = (jid) => {
-          if (!jid || typeof jid !== "string") return;
-          const normalized = jidNormalizedUser(jid);
-          const user = jidDecode(normalized)?.user;
-          if (!user || seenParticipantUsers.has(user + ":" + (normalized.split("@")[1] || ""))) {
-            // نسمح بنفس الـ user بصيغتين مختلفتين (pn + lid) بس نمنع التكرار الحرفي
-          }
-          if (participantsList.includes(normalized) || participantsList.includes(jid)) return;
-          participantsList.push(normalized);
-          if (user) seenParticipantUsers.add(user);
-        };
-        if (groupData?.participants) {
-          for (const p of groupData.participants) {
-            addParticipantJid(p.id);
-            // بديل LID لو الـ id رقم (PN) — مهم لحسابات اليوزرنيم
-            if (p.lid) addParticipantJid(p.lid);
-            // بديل الرقم لو الـ id LID
-            if (p.phoneNumber) addParticipantJid(p.phoneNumber);
-            if (p.jid && p.jid !== p.id) addParticipantJid(p.jid);
-          }
-        }
+        // قائمة المشاركين الأساسية (زي الرسمي) — p.id بس عشان ميأثرش على الناس العادية
+        const participantsList = groupData?.participants
+          ? groupData.participants.map((p) => p.id)
+          : [];
         if (groupData?.ephemeralDuration && groupData.ephemeralDuration > 0) {
           additionalAttributes = {
             ...additionalAttributes,
@@ -877,42 +856,46 @@ export const makeMessagesSocket = (config) => {
           };
         }
         if (isStatus && statusJidList) {
-          for (const s of statusJidList) addParticipantJid(s);
+          participantsList.push(...statusJidList);
         }
         let additionalDevices = await getUSyncDevices(
           participantsList,
           !!useUserDevicesCache,
           false,
         );
-        // لو في مشاركين معرفين في الميتاداتا ومفيش أي device ليهم في النتيجة
-        // (شائع مع username/LID)، نعيد الاستعلام من غير كاش وبمهلة أطول
-        // على الـ JIDs الناقصة فقط — من غير ما نأثر على باقي الجروب
+        // Fallback لأصحاب اليوزرنيم/LID اللي p.id بتاعهم مرجعش أجهزة:
+        // نجرب الصيغة البديلة (lid أو phoneNumber) بس للناقصين — من غير ما نلوّث القائمة الأساسية
         if (groupData?.participants?.length) {
           const coveredUsers = new Set(
             additionalDevices
               .map((d) => d.user || jidDecode(d.jid)?.user)
               .filter(Boolean),
           );
-          const missingJids = [];
+          const missingAlts = [];
+          const seenAlt = new Set();
           for (const p of groupData.participants) {
-            const candidates = [p.id, p.lid, p.phoneNumber, p.jid].filter(Boolean);
-            const userIds = candidates
-              .map((j) => jidDecode(jidNormalizedUser(j))?.user)
-              .filter(Boolean);
-            if (userIds.some((u) => coveredUsers.has(u))) continue;
-            // جرب LID أولاً لو موجود (أحسن لليوزرنيم)، وإلا id الأصلي
-            if (p.lid) missingJids.push(jidNormalizedUser(p.lid));
-            else if (p.id) missingJids.push(jidNormalizedUser(p.id));
-            else if (p.phoneNumber) missingJids.push(jidNormalizedUser(p.phoneNumber));
+            const idNorm = p.id ? jidNormalizedUser(p.id) : null;
+            const idUser = idNorm ? jidDecode(idNorm)?.user : null;
+            if (idUser && coveredUsers.has(idUser)) continue;
+            // جرب البدائل المختلفة عن p.id فقط
+            const alts = [p.lid, p.phoneNumber, p.jid].filter(Boolean);
+            for (const alt of alts) {
+              const altNorm = jidNormalizedUser(alt);
+              if (!altNorm || altNorm === idNorm || seenAlt.has(altNorm)) continue;
+              const altUser = jidDecode(altNorm)?.user;
+              if (altUser && coveredUsers.has(altUser)) continue;
+              seenAlt.add(altNorm);
+              missingAlts.push(altNorm);
+            }
           }
-          if (missingJids.length > 0) {
+          if (missingAlts.length > 0) {
             logger.debug(
-              { missing: missingJids.length, jids: missingJids.slice(0, 5) },
-              "retrying USync for participants with no devices (likely username/LID)",
+              { missing: missingAlts.length, jids: missingAlts.slice(0, 5) },
+              "retrying USync for missing participants (username/LID fallback)",
             );
             try {
               const retryDevices = await getUSyncDevices(
-                missingJids,
+                missingAlts,
                 false, // no cache
                 false,
                 8000, // longer timeout
@@ -921,7 +904,7 @@ export const makeMessagesSocket = (config) => {
                 additionalDevices = [...additionalDevices, ...retryDevices];
               }
             } catch (e) {
-              logger.warn({ e }, "USync retry for missing participants failed");
+              logger.warn({ e }, "USync retry for missing username/LID participants failed");
             }
           }
         }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@prototypevip/baileys",
-  "version": "0.0.9",
-  "description": "Baileys fork (@prototypevip/baileys) — clean, without anti-ban",
+  "version": "0.1.1",
+  "description": "Baileys fork (@prototypevip/baileys) — clean, without anti-ban, group encryption disabled (like 0.0.8)",
   "main": "lib/index.js",
   "type": "module",
   "scripts": {