CliRemote 1.4.6__py3-none-any.whl → 1.6.0__py3-none-any.whl

{cliremote-1.4.6.dist-info → cliremote-1.6.0.dist-info}/METADATA

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

{cliremote-1.4.6.dist-info → cliremote-1.6.0.dist-info}/RECORD

@@ -1,4 +1,4 @@
-cliremote-1.4.6.dist-info/licenses/LICENSE,sha256=O-0zMbcEi6wXz1DiSdVgzMlQjJcNqNe5KDv08uYzqR0,1055
+cliremote-1.6.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,7 +8,7 @@ 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=EP2pVasUOUwjr4h-vO-LWWf9_rMCGAsFrzVvnGXJcNI,8250
 remote/client_picker.py,sha256=3QYi1UQ8pZjqR5YU2oKgQlCYV7-1pSPWknCyRFMcFak,4428
 remote/config.py,sha256=VK0e96gEINRViKIq99CYYuYyaVZTLtlWlPKKkBd41Cg,2377
 remote/device_manager.py,sha256=SUCONe1qa5jMHOMqqS27ATtv3CaqAT8cN9jNi7AI_Go,5813
@@ -31,7 +31,8 @@ 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.6.dist-info/METADATA,sha256=ax7Qizh4htZJb4FURfPTniKtE5Co--pMkhOCobQodzw,1202
-cliremote-1.4.6.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-cliremote-1.4.6.dist-info/top_level.txt,sha256=yBZidJ6zCix_a2ubGlYaewvlzBFXWbckQt20dudxJ1E,7
-cliremote-1.4.6.dist-info/RECORD,,
+remote/utils/sqlite_utils.py,sha256=5i0oUXsBgKC_8qHZPJ-Gyhp9D1TwqKHVvuZRIhKpS6w,1260
+cliremote-1.6.0.dist-info/METADATA,sha256=TVNkkckVN52498m8gUoc5SFnEYyZ1cKFE6wDUZh6GTk,1202
+cliremote-1.6.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+cliremote-1.6.0.dist-info/top_level.txt,sha256=yBZidJ6zCix_a2ubGlYaewvlzBFXWbckQt20dudxJ1E,7
+cliremote-1.6.0.dist-info/RECORD,,

remote/client_manager.py

@@ -1,223 +1,231 @@
+
 import os
 import json
 import asyncio
 import logging
 import random
 import traceback
-from typing import Optional, Dict, List, Set, Tuple
+from typing import Optional, Dict, List, Set
 from pyrogram import Client, errors
 
-# ============================================================
-# ⚙️ تنظیم لاگ دقیق و مجزا برای دیباگ دیتابیس‌ها
-# ============================================================
+from .utils.sqlite_utils import (
+    ensure_dir, chmod_rw, cleanup_sqlite_sidecars, probe_sqlite
+)
+
+# =========================
+# Logging
+# =========================
 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 loaded (v1.6.0, DEBUG).")
+
+# =========================
+# Paths
+# =========================
+BASE_DIR = os.path.abspath(os.getcwd())
+ACCOUNTS_FOLDER = os.path.join(BASE_DIR, "acc")
+ACCOUNTS_DATA_FOLDER = os.path.join(BASE_DIR, "acc_data")
+ACC_TEMP = os.path.join(BASE_DIR, "acc_temp")
+for p in (ACCOUNTS_FOLDER, ACCOUNTS_DATA_FOLDER, ACC_TEMP):
+    ensure_dir(p)
 
-logger.info("🧩 Client Manager started in DEBUG MODE.")
-
-# ============================================================
-# ⚙️ ساختارهای ذخیره‌سازی
-# ============================================================
 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)
+def _strip_session_ext(x: str) -> str:
+    return x[:-8] if x.endswith(".session") else x
+
+# =========================
+# JSON helpers
+# =========================
+def get_account_data(phone_number: str) -> Optional[Dict]:
+    fp = os.path.join(ACCOUNTS_DATA_FOLDER, f"{phone_number}.json")
+    if not os.path.exists(fp):
+        logger.warning("%s: account JSON not found: %s", phone_number, fp)
+        return None
+    try:
+        with open(fp, "r", encoding="utf-8") as f:
+            return json.load(f)
+    except Exception as e:
+        logger.error("%s: error reading JSON: %s: %s", phone_number, type(e).__name__, e)
+        return None
 
-# ============================================================
-# 🧠 ساخت یا دریافت کلاینت
-# ============================================================
+def save_account_data(phone_number: str, data: Dict) -> None:
+    fp = os.path.join(ACCOUNTS_DATA_FOLDER, f"{phone_number}.json")
+    ensure_dir(ACCOUNTS_DATA_FOLDER)
+    try:
+        with open(fp, "w", encoding="utf-8") as f:
+            json.dump(data, f, ensure_ascii=False, indent=4)
+        logger.info("%s: JSON saved: %s", phone_number, fp)
+    except Exception as e:
+        logger.error("%s: error saving JSON: %s: %s", phone_number, type(e).__name__, e)
+
+# =========================
+# Client builder
+# =========================
+def _make_client_from_json(phone_number: str) -> Optional[Client]:
+    try:
+        data = get_account_data(phone_number)
+        if not data:
+            return None
+        session_base = data.get("session")
+        if not session_base:
+            logger.error("%s: JSON missing 'session'", phone_number)
+            return None
+
+        # absolute name WITHOUT .session
+        if os.path.isabs(session_base) or os.path.dirname(session_base):
+            session_name = _strip_session_ext(session_base)
+        else:
+            session_name = os.path.join(ACCOUNTS_FOLDER, _strip_session_ext(session_base))
+
+        ensure_dir(os.path.dirname(session_name) or BASE_DIR)
+
+        api_id = data.get("api_id")
+        api_hash = data.get("api_hash")
+        if not api_id or not api_hash:
+            logger.error("%s: JSON missing api_id/api_hash", phone_number)
+            return None
+
+        workdir = os.path.join(ACC_TEMP, phone_number)
+        ensure_dir(workdir)
+
+        cli = Client(
+            name=session_name,      # NO .session here
+            api_id=int(api_id),
+            api_hash=str(api_hash),
+            sleep_threshold=30,
+            workdir=workdir,
+            no_updates=True,
+        )
+        if data.get("2fa_password"):
+            setattr(cli, "_twofa_password", data["2fa_password"])
+        logger.debug("%s: Prepared Client(name=%s)", phone_number, session_name)
+        return cli
+    except Exception as e:
+        tb = traceback.format_exc(limit=3)
+        logger.critical("%s: client build failed: %s: %s\n%s", phone_number, type(e).__name__, e, tb)
+        return None
+
+# =========================
+# Start client (safe)
+# =========================
 async def get_or_start_client(phone_number: str) -> Optional[Client]:
-    """
-    ساخت یا گرفتن کلاینت از فایل سشن (با لاگ‌های بسیار دقیق برای تشخیص ارورهای SQLite)
-    """
     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 → {cli.session_name}")
+            logger.debug("%s: already connected (%s)", phone_number, getattr(cli, "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}")
+        session_file = f"{cli.name}.session"
+        parent = os.path.dirname(session_file) or BASE_DIR
+        ensure_dir(parent)
 
-        # چک وجود فایل
-        if not os.path.exists(session_db_path):
-            logger.warning(f"{phone_number}: Session file missing → {session_db_path}")
+        # sanitize permissions + sidecars
+        if os.path.exists(session_file):
+            chmod_rw(session_file)
+            cleanup_sqlite_sidecars(cli.name)
         else:
-            size = os.path.getsize(session_db_path)
-            logger.debug(f"{phone_number}: Session file exists ({size} bytes)")
+            try:
+                os.chmod(parent, 0o777)
+            except Exception:
+                pass
 
-        # چک دسترسی
-        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}")
+        if os.path.exists(session_file) and not probe_sqlite(session_file):
+            logger.warning("%s: sqlite probe failed; retrying after cleanup", phone_number)
+            chmod_rw(session_file)
+            cleanup_sqlite_sidecars(cli.name)
 
         try:
             await cli.start()
             await asyncio.sleep(0.4)
-            logger.info(f"{phone_number}: ✅ Client started successfully")
+            logger.info("%s: client started", phone_number)
         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.")
+                logger.info("%s: 2FA applied", phone_number)
             else:
-                logger.error(f"{phone_number}: ⚠️ 2FA required but password missing.")
+                logger.error("%s: 2FA required but missing", phone_number)
                 return None
+        except errors.AuthKeyDuplicated:
+            logger.error("%s: AuthKeyDuplicated (invalid session)", phone_number)
+            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}")
+            logger.error("%s: start failed: %s: %s\n%s", phone_number, type(e).__name__, e, 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}\nTraceback:\n{tb}")
-        return None
-
-
-# ============================================================
-# 🧱 ساخت کلاینت از JSON
-# ============================================================
-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}")
-            return None
-
-        with open(data_path, "r", encoding="utf-8") as f:
-            account_data = json.load(f)
-
-        session_base = account_data.get("session")
-        if not session_base:
-            logger.error(f"{phone_number}: Missing 'session' 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)")
-        else:
-            logger.debug(f"{phone_number}: Session file will be created by Pyrogram")
-
-        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}")
-            return None
-
-        cli = Client(
-            name=session_path,
-            api_id=int(api_id),
-            api_hash=str(api_hash),
-            sleep_threshold=30,
-            workdir=os.path.join("acc_temp", phone_number),
-            no_updates=True
-        )
-
-        if account_data.get("2fa_password"):
-            setattr(cli, "_twofa_password", account_data["2fa_password"])
-
-        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("%s: fatal in get_or_start_client: %s: %s\n%s", phone_number, type(e).__name__, e, 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))]
+    if not phones:
+        logger.info("no accounts to preload")
+        return
 
-    logger.info(f"🚀 Starting preload for {len(phones)} account(s)...")
-
-    ok, bad = 0, 0
+    logger.info("preloading %d client(s)...", len(phones))
+    ok = bad = 0
     for idx, phone in enumerate(phones, 1):
-        logger.info(f"🔹 [{idx}/{len(phones)}] Preloading {phone} ...")
+        logger.info("[%d/%d] preload %s", idx, len(phones), 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.")
             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("%s: exception during preload: %s: %s", phone, type(e).__name__, e)
+        await asyncio.sleep(0.8 + random.uniform(0.1, 0.3))
+    logger.info("preload done: ok=%d fail=%d", ok, bad)
 
-        # فاصله ایمن بین استارت‌ها برای SQLite
-        await asyncio.sleep(1.0)
-
-    logger.info(f"🎯 Preload completed: OK={ok} | FAIL={bad}")
-
-
-# ============================================================
-# 🧹 Stop all
-# ============================================================
+# =========================
+# Stop all
+# =========================
 async def stop_all_clients() -> None:
-    logger.info("🧹 Stopping all clients...")
+    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("%s: stopped", phone)
         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("%s: stop error: %s: %s", phone, type(e).__name__, e)
         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")
 
-# ============================================================
-# 🔍 کمکی‌ها
-# ============================================================
+# =========================
+# Enumerate accounts
+# =========================
 def accounts() -> List[str]:
-    accs: Set[str] = set()
     if not os.path.isdir(ACCOUNTS_FOLDER):
         return []
-    for acc in os.listdir(ACCOUNTS_FOLDER):
-        if acc.endswith(".session"):
-            accs.add(acc.split(".")[0])
-    return list(accs)
+    return [f[:-8] for f in os.listdir(ACCOUNTS_FOLDER) if f.endswith(".session")]
 
 def get_active_accounts() -> Set[str]:
     return set(accounts())

remote/utils/sqlite_utils.py

@@ -0,0 +1,45 @@
+
+import os
+import sqlite3
+import logging
+
+logger = logging.getLogger(__name__)
+
+SIDE_SUFFIXES = (".session-wal", ".session-shm", ".session-journal")
+
+def ensure_dir(path: str):
+    try:
+        os.makedirs(path, exist_ok=True)
+        try:
+            os.chmod(path, 0o777)
+        except Exception:
+            pass
+    except Exception as e:
+        logger.error("Cannot create directory %s: %s: %s", path, type(e).__name__, e)
+
+def chmod_rw(path: str):
+    try:
+        os.chmod(path, 0o666)
+    except Exception:
+        pass
+
+def cleanup_sqlite_sidecars(db_without_ext: str):
+    base = f"{db_without_ext}.session"
+    for suf in ("-wal", "-shm", "-journal"):
+        f = f"{base}{suf}"
+        if os.path.exists(f):
+            try:
+                os.remove(f)
+                logger.debug("Removed sqlite sidecar: %s", f)
+            except Exception as e:
+                logger.debug("Cannot remove sidecar %s: %s", f, e)
+
+def probe_sqlite(db_file: str) -> bool:
+    try:
+        conn = sqlite3.connect(db_file, timeout=1)
+        conn.execute("PRAGMA journal_mode=WAL;")
+        conn.close()
+        return True
+    except Exception as e:
+        logger.debug("SQLite probe failed for %s: %s: %s", db_file, type(e).__name__, e)
+        return False