CliRemote 1.4.5__py3-none-any.whl → 1.5.0__py3-none-any.whl

{cliremote-1.4.5.dist-info → cliremote-1.5.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: CliRemote
-Version: 1.4.5
+Version: 1.5.0
 Summary: Remote client framework for Telegram automation using Pyrogram
 Home-page: https://github.com/MohammadAhmadi-R/CliRemote
 Author: MrAhmadiRad

{cliremote-1.4.5.dist-info → cliremote-1.5.0.dist-info}/RECORD

@@ -1,4 +1,4 @@
-cliremote-1.4.5.dist-info/licenses/LICENSE,sha256=O-0zMbcEi6wXz1DiSdVgzMlQjJcNqNe5KDv08uYzqR0,1055
+cliremote-1.5.0.dist-info/licenses/LICENSE,sha256=O-0zMbcEi6wXz1DiSdVgzMlQjJcNqNe5KDv08uYzqR0,1055
 remote/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 remote/account_manager.py,sha256=u8yqcyq7Vl8LZ1rNlrEfwlJEbJiBzoSAlL3z2hhTzyc,9829
 remote/account_viewer.py,sha256=MQoH5lOz24651EjhlzVwi6O5hVUAT7Q5fFU6ZHjBlsM,4243
@@ -8,10 +8,10 @@ remote/batch_manager.py,sha256=jVGhYVwHMKJd7f7JxcWjKlwr03dq0RaGD1KdkyYdb00,1051
 remote/block_manager.py,sha256=R7UaQigr-hTRtjxjG3OvJdKhvp0mDpLaESp3Of1AYhs,5692
 remote/caption_manager.py,sha256=ekgcZ_D1q8C24WP18TXxlM5eWTknJmw-KNXDfqlsnEw,966
 remote/cleaner.py,sha256=gvPtkosGsf7Eb3zmYyeC44xB4HtCxlzKH3e3qLuVos4,5742
-remote/client_manager.py,sha256=7u5Izqf8wEVOZqsoK-sewWNYSjaXK2YvQgE_d42GXNY,8883
+remote/client_manager.py,sha256=RkYygo0t0jM-nFNVl4e_Hi3JY3jsSHNePG81_27_RNQ,10444
 remote/client_picker.py,sha256=3QYi1UQ8pZjqR5YU2oKgQlCYV7-1pSPWknCyRFMcFak,4428
 remote/config.py,sha256=VK0e96gEINRViKIq99CYYuYyaVZTLtlWlPKKkBd41Cg,2377
-remote/device_manager.py,sha256=ybB6vWAXe2Krzs-kOrdICqlX4c_3gxxP4c0aNlAwJhg,5811
+remote/device_manager.py,sha256=SUCONe1qa5jMHOMqqS27ATtv3CaqAT8cN9jNi7AI_Go,5813
 remote/file_sender.py,sha256=5_3ptTkoFejhJhaSyzh-8y5l_k7frxFq9LS_WL5jsGc,3657
 remote/getcode_controller.py,sha256=huHSeCLSTc8s3p2bxcEV6W0JP7kWCuV2aaD8k7A3ozA,1789
 remote/health.py,sha256=JVCxw8iB46PO4cQtoXP9CbwuSHZ3vEAVvdb_C8Uc7R4,1294
@@ -31,7 +31,7 @@ remote/speed_manager.py,sha256=fIWSQAP9qW8AHZtMZq0MrC4_nvxcTFU1SBU75kpRzB8,1115
 remote/stop_manager.py,sha256=UXzKJTblEyQqCjp7fenvQ51Q96Unx05WeOiuFMdj25M,1151
 remote/text_manager.py,sha256=C2wNSXPSCDu8NSD3RsfbKmUQMWOYd1B5N4tzy-Jsriw,2195
 remote/username_manager.py,sha256=nMNdke-2FIv86xR1Y6rR-43oUoQu_3Khw8wEo54noXI,3388
-cliremote-1.4.5.dist-info/METADATA,sha256=KBdd5hKfr0fh7rPnySbjPklm4isIJGuHztut6Rnds_U,1202
-cliremote-1.4.5.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-cliremote-1.4.5.dist-info/top_level.txt,sha256=yBZidJ6zCix_a2ubGlYaewvlzBFXWbckQt20dudxJ1E,7
-cliremote-1.4.5.dist-info/RECORD,,
+cliremote-1.5.0.dist-info/METADATA,sha256=6kXa1qqSclZOY8X8LcZRi3iqgfG0lv-r5-OoWYMiNug,1202
+cliremote-1.5.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+cliremote-1.5.0.dist-info/top_level.txt,sha256=yBZidJ6zCix_a2ubGlYaewvlzBFXWbckQt20dudxJ1E,7
+cliremote-1.5.0.dist-info/RECORD,,

remote/client_manager.py

@@ -1,3 +1,4 @@
+
 import os
 import json
 import asyncio
@@ -8,100 +9,80 @@ from typing import Optional, Dict, List, Set, Tuple
 from pyrogram import Client, errors
 
 # ============================================================
-# ⚙️ تنظیم لاگ دقیق و مجزا برای دیباگ دیتابیس‌ها
+# ⚙️ دقیق‌ترین لاگ برای دیباگ Pyrogram/SQLite
 # ============================================================
 os.makedirs("logs", exist_ok=True)
-log_file = "logs/client_debug_log.txt"
+LOG_FILE = "logs/client_debug_log.txt"
 logger = logging.getLogger(__name__)
 logger.setLevel(logging.DEBUG)
 
-if not any(isinstance(h, logging.FileHandler) and h.baseFilename.endswith(log_file) for h in logger.handlers):
-    fh = logging.FileHandler(log_file, encoding="utf-8")
+if not any(isinstance(h, logging.FileHandler) and getattr(h, "baseFilename", "").endswith(LOG_FILE) for h in logger.handlers):
+    fh = logging.FileHandler(LOG_FILE, encoding="utf-8")
     fmt = logging.Formatter("%(asctime)s - %(levelname)s - %(message)s", "%Y-%m-%d %H:%M:%S")
     fh.setFormatter(fmt)
     logger.addHandler(fh)
 
-logger.info("🧩 Client Manager started in DEBUG MODE.")
+logger.info("🧩 Client Manager (DEBUG MODE) booted.")
 
 # ============================================================
-# ⚙️ ساختارهای ذخیره‌سازی
+# 📁 مسیرها و استخرها
 # ============================================================
-client_pool: Dict[str, Client] = {}
-client_locks: Dict[str, asyncio.Lock] = {}
-
 ACCOUNTS_FOLDER = "acc"
 ACCOUNTS_DATA_FOLDER = "acc_data"
 os.makedirs(ACCOUNTS_FOLDER, exist_ok=True)
 os.makedirs(ACCOUNTS_DATA_FOLDER, exist_ok=True)
 
+client_pool: Dict[str, Client] = {}
+client_locks: Dict[str, asyncio.Lock] = {}
+
 # ============================================================
-# 🧠 ساخت یا دریافت کلاینت
+# 🔧 ابزارک‌ها
 # ============================================================
-async def get_or_start_client(phone_number: str) -> Optional[Client]:
-    """
-    ساخت یا گرفتن کلاینت از فایل سشن (با لاگ‌های بسیار دقیق برای تشخیص ارورهای SQLite)
-    """
-    cli = client_pool.get(phone_number)
+def _ensure_dir(path: str):
     try:
-        if cli is not None and getattr(cli, "is_connected", False):
-            logger.debug(f"{phone_number}: Already connected → {cli.session_name}")
-            return cli
-
-        cli = _make_client_from_json(phone_number)
-        if cli is None:
-            logger.error(f"{phone_number}: ❌ Client creation failed (make_client_from_json returned None)")
-            return None
-
-        # لاگ مسیر سشن
-        session_db_path = f"{cli.session_name}.session"
-        logger.debug(f"{phone_number}: Session file path → {session_db_path}")
-
-        # چک وجود فایل
-        if not os.path.exists(session_db_path):
-            logger.warning(f"{phone_number}: Session file missing → {session_db_path}")
-        else:
-            size = os.path.getsize(session_db_path)
-            logger.debug(f"{phone_number}: Session file exists ({size} bytes)")
-
-        # چک دسترسی
-        if not os.access(session_db_path, os.R_OK | os.W_OK):
-            logger.warning(f"{phone_number}: ⚠️ No read/write permission for {session_db_path}")
-
-        try:
-            await cli.start()
-            await asyncio.sleep(0.4)
-            logger.info(f"{phone_number}: ✅ Client started successfully")
-        except errors.SessionPasswordNeeded:
-            twofa = getattr(cli, "_twofa_password", None)
-            if twofa:
-                await cli.check_password(twofa)
-                logger.info(f"{phone_number}: ✅ 2FA password applied successfully.")
-            else:
-                logger.error(f"{phone_number}: ⚠️ 2FA required but password missing.")
-                return None
-        except Exception as e:
-            tb = traceback.format_exc(limit=3)
-            logger.error(f"{phone_number}: ❌ Pyrogram start() failed → {type(e).__name__}: {e}\nTraceback:\n{tb}")
-            return None
+        os.makedirs(path, exist_ok=True)
+    except Exception as e:
+        logger.error(f"⚠️ Cannot create directory {path}: {type(e).__name__}: {e}")
 
-        client_pool[phone_number] = cli
-        client_locks.setdefault(phone_number, asyncio.Lock())
-        return cli
+def _strip_session_ext(session_base: str) -> str:
+    # "acc/123.session" -> "acc/123"; "123.session" -> "123"
+    if session_base.endswith(".session"):
+        return session_base[:-8]
+    return session_base
 
+# ============================================================
+# 💾 JSON helpers
+# ============================================================
+def get_account_data(phone_number: str) -> Optional[Dict]:
+    file_path = os.path.join(ACCOUNTS_DATA_FOLDER, f"{phone_number}.json")
+    if not os.path.exists(file_path):
+        logger.warning(f"{phone_number}: ⚠️ Account JSON not found at {file_path}")
+        return None
+    try:
+        with open(file_path, "r", encoding="utf-8") as f:
+            return json.load(f)
     except Exception as e:
-        tb = traceback.format_exc(limit=3)
-        logger.critical(f"{phone_number}: 💥 Fatal error in get_or_start_client() → {type(e).__name__}: {e}\nTraceback:\n{tb}")
+        logger.error(f"{phone_number}: ⚠️ Error reading JSON - {type(e).__name__}: {e}")
         return None
 
+def save_account_data(phone_number: str, data: Dict) -> None:
+    _ensure_dir(ACCOUNTS_DATA_FOLDER)
+    file_path = os.path.join(ACCOUNTS_DATA_FOLDER, f"{phone_number}.json")
+    try:
+        with open(file_path, "w", encoding="utf-8") as f:
+            json.dump(data, f, ensure_ascii=False, indent=4)
+        logger.info(f"{phone_number}: 💾 Account data saved → {file_path}")
+    except Exception as e:
+        logger.error(f"{phone_number}: ⚠️ Error saving JSON - {type(e).__name__}: {e}")
 
 # ============================================================
-# 🧱 ساخت کلاینت از JSON
+# 🧱 ساخت کلاینت از JSON (بدون پسوند .session در name)
 # ============================================================
 def _make_client_from_json(phone_number: str) -> Optional[Client]:
     try:
         data_path = os.path.join(ACCOUNTS_DATA_FOLDER, f"{phone_number}.json")
         if not os.path.exists(data_path):
-            logger.error(f"{phone_number}: ⚠️ JSON file not found → {data_path}")
+            logger.error(f"{phone_number}: ⚠️ Account JSON not found → {data_path}")
             return None
 
         with open(data_path, "r", encoding="utf-8") as f:
@@ -109,106 +90,159 @@ def _make_client_from_json(phone_number: str) -> Optional[Client]:
 
         session_base = account_data.get("session")
         if not session_base:
-            logger.error(f"{phone_number}: Missing 'session' in JSON → {data_path}")
+            logger.error(f"{phone_number}: Missing 'session' key in JSON → {data_path}")
             return None
 
-        # مسیر دقیق سشن
-        session_path = os.path.join(ACCOUNTS_FOLDER, session_base)
-        if not session_path.endswith(".session"):
-            session_path += ".session"
-
-        # مسیر SQLite
-        db_dir = os.path.dirname(os.path.abspath(session_path))
-        if not os.path.exists(db_dir):
-            logger.warning(f"{phone_number}: Creating missing folder for session → {db_dir}")
-            os.makedirs(db_dir, exist_ok=True)
-
-        logger.debug(f"{phone_number}: Final session path → {session_path}")
-
-        # بررسی وجود فایل SQLite (قبل از start)
-        if os.path.exists(session_path):
-            logger.debug(f"{phone_number}: Session file already present ({os.path.getsize(session_path)} bytes)")
+        # Build session name WITHOUT .session extension
+        if os.path.isabs(session_base) or os.path.dirname(session_base):
+            session_name = _strip_session_ext(session_base)
         else:
-            logger.debug(f"{phone_number}: Session file will be created by Pyrogram")
+            session_name = os.path.join(ACCOUNTS_FOLDER, _strip_session_ext(session_base))
+
+        # Ensure parent dir exists
+        _ensure_dir(os.path.dirname(session_name) or ".")
 
         api_id = account_data.get("api_id")
         api_hash = account_data.get("api_hash")
         if not api_id or not api_hash:
-            logger.error(f"{phone_number}: Missing api_id/api_hash in JSON → {data_path}")
+            logger.error(f"{phone_number}: Missing API credentials in JSON → {data_path}")
             return None
 
+        # Separate workdir per account to avoid file collisions
+        workdir = os.path.join("acc_temp", phone_number)
+        _ensure_dir(workdir)
+
         cli = Client(
-            name=session_path,
+            name=session_name,          # <— NO .session here
             api_id=int(api_id),
             api_hash=str(api_hash),
             sleep_threshold=30,
-            workdir=os.path.join("acc_temp", phone_number),
-            no_updates=True
+            workdir=workdir,
+            no_updates=True,
         )
 
         if account_data.get("2fa_password"):
             setattr(cli, "_twofa_password", account_data["2fa_password"])
 
+        logger.debug(f"{phone_number}: Prepared Client(name={session_name})")
         return cli
 
     except Exception as e:
         tb = traceback.format_exc(limit=3)
-        logger.critical(f"{phone_number}: 💥 Error creating client instance → {type(e).__name__}: {e}\nTraceback:\n{tb}")
+        logger.critical(f"{phone_number}: 💥 Error creating client - {type(e).__name__}: {e}\n{tb}")
         return None
 
+# ============================================================
+# 🧠 دریافت/استارت کلاینت
+# ============================================================
+async def get_or_start_client(phone_number: str) -> Optional[Client]:
+    cli = client_pool.get(phone_number)
+    try:
+        if cli is not None and getattr(cli, "is_connected", False):
+            logger.debug(f"{phone_number}: Already connected → {getattr(cli, 'name', '?')}")
+            return cli
+
+        cli = _make_client_from_json(phone_number)
+        if cli is None:
+            logger.error(f"{phone_number}: ❌ Could not build client (invalid JSON/session)")
+            return None
+
+        # Compute expected session file path for logging
+        session_file = f"{cli.name}.session"
+        logger.debug(f"{phone_number}: Expected session file → {session_file}")
+        if os.path.exists(session_file):
+            try:
+                size = os.path.getsize(session_file)
+                logger.debug(f"{phone_number}: Session file exists ({size} bytes)")
+            except Exception:
+                logger.debug(f"{phone_number}: Session file exists (size unknown)")
+        else:
+            logger.debug(f"{phone_number}: Session file will be created by Pyrogram")
+
+        # Start with careful handling
+        try:
+            await cli.start()
+            await asyncio.sleep(0.4)  # brief pause helps SQLite on some FS
+            logger.info(f"{phone_number}: ✅ Client started.")
+        except errors.SessionPasswordNeeded:
+            twofa = getattr(cli, "_twofa_password", None)
+            if twofa:
+                await cli.check_password(twofa)
+                logger.info(f"{phone_number}: ✅ 2FA password applied.")
+            else:
+                logger.error(f"{phone_number}: ⚠️ 2FA required but missing.")
+                return None
+        except errors.AuthKeyDuplicated:
+            logger.error(f"{phone_number}: ❌ AuthKeyDuplicated (session invalid).")
+            return None
+        except Exception as e:
+            tb = traceback.format_exc(limit=3)
+            logger.error(f"{phone_number}: ❌ Start failed - {type(e).__name__}: {e}\n{tb}")
+            return None
+
+        client_pool[phone_number] = cli
+        client_locks.setdefault(phone_number, asyncio.Lock())
+        return cli
+
+    except Exception as e:
+        tb = traceback.format_exc(limit=3)
+        logger.critical(f"{phone_number}: 💥 Fatal error in get_or_start_client - {type(e).__name__}: {e}\n{tb}")
+        return None
 
 # ============================================================
-# 🧩 Preload Clients (دقیق)
+# 🚀 Preload با فاصله ایمن
 # ============================================================
 async def preload_clients(limit: Optional[int] = None) -> None:
     phones = list(get_active_accounts())
     if limit is not None:
         phones = phones[:max(0, int(limit))]
 
-    logger.info(f"🚀 Starting preload for {len(phones)} account(s)...")
+    if not phones:
+        logger.info("⚙️ No accounts found for preload.")
+        return
 
+    logger.info(f"🚀 Preloading {len(phones)} clients...")
     ok, bad = 0, 0
+
     for idx, phone in enumerate(phones, 1):
-        logger.info(f"🔹 [{idx}/{len(phones)}] Preloading {phone} ...")
+        logger.info(f"🔹 [{idx}/{len(phones)}] Loading client {phone}")
         try:
             cli = await get_or_start_client(phone)
             if cli and getattr(cli, "is_connected", False):
                 ok += 1
-                logger.info(f"{phone}: ✅ Connected OK.")
+                logger.info(f"{phone}: ✅ Connected.")
             else:
                 bad += 1
                 logger.warning(f"{phone}: ❌ Not connected after start().")
         except Exception as e:
             bad += 1
             tb = traceback.format_exc(limit=3)
-            logger.error(f"{phone}: ❌ Exception during preload → {type(e).__name__}: {e}\n{tb}")
+            logger.error(f"{phone}: ❌ Exception during preload - {type(e).__name__}: {e}\n{tb}")
 
-        # فاصله ایمن بین استارت‌ها برای SQLite
-        await asyncio.sleep(1.0)
+        await asyncio.sleep(0.8 + random.uniform(0.1, 0.3))
 
     logger.info(f"🎯 Preload completed: OK={ok} | FAIL={bad}")
 
-
 # ============================================================
-# 🧹 Stop all
+# 🧹 توقف تمام کلاینت‌ها
 # ============================================================
 async def stop_all_clients() -> None:
     logger.info("🧹 Stopping all clients...")
     for phone, cli in list(client_pool.items()):
         try:
             await cli.stop()
-            logger.info(f"{phone}: 📴 Stopped cleanly.")
+            logger.info(f"{phone}: 📴 Stopped successfully.")
         except Exception as e:
             tb = traceback.format_exc(limit=2)
-            logger.warning(f"{phone}: ⚠️ Error stopping client → {type(e).__name__}: {e}\n{tb}")
+            logger.warning(f"{phone}: ⚠️ Error stopping client - {type(e).__name__}: {e}\n{tb}")
         finally:
             client_pool.pop(phone, None)
-            await asyncio.sleep(0.3)
-    logger.info("✅ stop_all_clients finished.")
-
+            client_locks.pop(phone, None)
+            await asyncio.sleep(0.2)
+    logger.info("✅ All clients stopped cleanly.")
 
 # ============================================================
-# 🔍 کمکی‌ها
+# 📋 لیست اکانت‌های فعال (بر اساس فایل‌های .session)
 # ============================================================
 def accounts() -> List[str]:
     accs: Set[str] = set()

remote/device_manager.py

@@ -1,8 +1,9 @@
 # antispam_core/device_manager.py (updated safe version)
 import asyncio, logging
 from pyrogram import Client, errors, raw
-from .client_manager import get_or_start_client, get_account_data, accounts
-from . import admin_manager
+from .client_manager import get_or_start_client, accounts
+from .account_manager import get_account_data
+
 
 logger = logging.getLogger(__name__)