CliRemote 1.5.0__tar.gz → 1.6.0__tar.gz

{cliremote-1.5.0 → cliremote-1.6.0}/CliRemote.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: CliRemote
-Version: 1.5.0
+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.5.0 → cliremote-1.6.0}/CliRemote.egg-info/SOURCES.txt

@@ -36,6 +36,7 @@ setup.py
 ./remote/stop_manager.py
 ./remote/text_manager.py
 ./remote/username_manager.py
+./remote/utils/sqlite_utils.py
 CliRemote.egg-info/PKG-INFO
 CliRemote.egg-info/SOURCES.txt
 CliRemote.egg-info/dependency_links.txt
@@ -72,4 +73,5 @@ remote/spammer.py
 remote/speed_manager.py
 remote/stop_manager.py
 remote/text_manager.py
-remote/username_manager.py
+remote/username_manager.py
+remote/utils/sqlite_utils.py

{cliremote-1.5.0 → cliremote-1.6.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: CliRemote
-Version: 1.5.0
+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.5.0 → cliremote-1.6.0}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "CliRemote"
-version = "1.5.0" 
+version = "1.6.0" 
 description = "Remote client framework for Telegram automation using Pyrogram"
 readme = "README.md"
 license = {text = "MIT"}

cliremote-1.6.0/remote/client_manager.py

@@ -0,0 +1,231 @@
+
+import os
+import json
+import asyncio
+import logging
+import random
+import traceback
+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"
+logger = logging.getLogger(__name__)
+logger.setLevel(logging.DEBUG)
+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)
+
+client_pool: Dict[str, Client] = {}
+client_locks: Dict[str, asyncio.Lock] = {}
+
+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]:
+    cli = client_pool.get(phone_number)
+    try:
+        if cli is not None and getattr(cli, "is_connected", False):
+            logger.debug("%s: already connected (%s)", phone_number, getattr(cli, "name", "?"))
+            return cli
+
+        cli = _make_client_from_json(phone_number)
+        if cli is None:
+            return None
+
+        session_file = f"{cli.name}.session"
+        parent = os.path.dirname(session_file) or BASE_DIR
+        ensure_dir(parent)
+
+        # sanitize permissions + sidecars
+        if os.path.exists(session_file):
+            chmod_rw(session_file)
+            cleanup_sqlite_sidecars(cli.name)
+        else:
+            try:
+                os.chmod(parent, 0o777)
+            except Exception:
+                pass
+
+        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("%s: client started", phone_number)
+        except errors.SessionPasswordNeeded:
+            twofa = getattr(cli, "_twofa_password", None)
+            if twofa:
+                await cli.check_password(twofa)
+                logger.info("%s: 2FA applied", phone_number)
+            else:
+                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("%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("%s: fatal in get_or_start_client: %s: %s\n%s", phone_number, type(e).__name__, e, tb)
+        return None
+
+# =========================
+# 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("preloading %d client(s)...", len(phones))
+    ok = bad = 0
+    for idx, phone in enumerate(phones, 1):
+        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
+            else:
+                bad += 1
+        except Exception as e:
+            bad += 1
+            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)
+
+# =========================
+# 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("%s: stopped", phone)
+        except Exception as e:
+            logger.warning("%s: stop error: %s: %s", phone, type(e).__name__, e)
+        finally:
+            client_pool.pop(phone, None)
+            client_locks.pop(phone, None)
+            await asyncio.sleep(0.2)
+    logger.info("all clients stopped")
+
+# =========================
+# Enumerate accounts
+# =========================
+def accounts() -> List[str]:
+    if not os.path.isdir(ACCOUNTS_FOLDER):
+        return []
+    return [f[:-8] for f in os.listdir(ACCOUNTS_FOLDER) if f.endswith(".session")]
+
+def get_active_accounts() -> Set[str]:
+    return set(accounts())

cliremote-1.6.0/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

{cliremote-1.5.0 → cliremote-1.6.0}/setup.py

@@ -5,7 +5,7 @@ with open("README.md", encoding="utf-8") as f:
 
 setup(
     name="CliRemote",
-    version="1.5.0", 
+    version="1.6.0", 
     author="MrAhmadiRad",
     author_email="mohammadahmadirad69@gmail.com",
     description="A precise, async-safe, Telegram automation core (Python 3.8+)",

cliremote-1.5.0/remote/client_manager.py

@@ -1,257 +0,0 @@
-
-import os
-import json
-import asyncio
-import logging
-import random
-import traceback
-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"
-logger = logging.getLogger(__name__)
-logger.setLevel(logging.DEBUG)
-
-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 (DEBUG MODE) booted.")
-
-# ============================================================
-# 📁 مسیرها و استخرها
-# ============================================================
-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] = {}
-
-# ============================================================
-# 🔧 ابزارک‌ها
-# ============================================================
-def _ensure_dir(path: str):
-    try:
-        os.makedirs(path, exist_ok=True)
-    except Exception as e:
-        logger.error(f"⚠️ Cannot create directory {path}: {type(e).__name__}: {e}")
-
-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:
-        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 (بدون پسوند .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}: ⚠️ Account JSON 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' key in JSON → {data_path}")
-            return None
-
-        # 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:
-            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 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_name,          # <— NO .session here
-            api_id=int(api_id),
-            api_hash=str(api_hash),
-            sleep_threshold=30,
-            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 - {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 با فاصله ایمن
-# ============================================================
-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 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)}] 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.")
-            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}")
-
-        await asyncio.sleep(0.8 + random.uniform(0.1, 0.3))
-
-    logger.info(f"🎯 Preload completed: OK={ok} | FAIL={bad}")
-
-# ============================================================
-# 🧹 توقف تمام کلاینت‌ها
-# ============================================================
-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 successfully.")
-        except Exception as e:
-            tb = traceback.format_exc(limit=2)
-            logger.warning(f"{phone}: ⚠️ Error stopping client - {type(e).__name__}: {e}\n{tb}")
-        finally:
-            client_pool.pop(phone, None)
-            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()
-    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)
-
-def get_active_accounts() -> Set[str]:
-    return set(accounts())