CliRemote 1.6.1__py3-none-any.whl → 1.7.0__py3-none-any.whl

{cliremote-1.6.1.dist-info → cliremote-1.7.0.dist-info}/METADATA

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

{cliremote-1.6.1.dist-info → cliremote-1.7.0.dist-info}/RECORD

@@ -1,15 +1,15 @@
-cliremote-1.6.1.dist-info/licenses/LICENSE,sha256=O-0zMbcEi6wXz1DiSdVgzMlQjJcNqNe5KDv08uYzqR0,1055
+cliremote-1.7.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
 remote/admin_manager.py,sha256=WiUUVmSs5JTUdXeSry8PkK_3TRemAdSZjm0G1ilAA-A,3532
-remote/analytics_manager.py,sha256=cQ_uATzOK345U1J88Fki3gOfNedS4Ur5NpLjazsxQkg,3625
+remote/analytics_manager.py,sha256=6jPvwt_ELA4RMbQdD8W_ltfAoaSgILnEkOAp6HZAqsU,7382
 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=lU4e7R_myESbk-uxpfXoro816BZ9TdQcbnuKeJ0rgn4,8908
-remote/client_picker.py,sha256=DR-Q3Nt_7DoubqGKF0RfGiNtRUftNuvoXLO-MQtCSs0,1427
+remote/client_manager.py,sha256=dI9ZKOVPDXsq6_9Hi5Y_E_zKWyhSaqOxjiyRlr0hG5Y,10158
+remote/client_picker.py,sha256=6WDIabYhcXSwcCAuRUfJfh6V1ZXP2EiFdAnutK2qLTk,139
 remote/config.py,sha256=VK0e96gEINRViKIq99CYYuYyaVZTLtlWlPKKkBd41Cg,2377
 remote/device_manager.py,sha256=SUCONe1qa5jMHOMqqS27ATtv3CaqAT8cN9jNi7AI_Go,5813
 remote/file_sender.py,sha256=5_3ptTkoFejhJhaSyzh-8y5l_k7frxFq9LS_WL5jsGc,3657
@@ -31,8 +31,9 @@ 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
+remote/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 remote/utils/sqlite_utils.py,sha256=5i0oUXsBgKC_8qHZPJ-Gyhp9D1TwqKHVvuZRIhKpS6w,1260
-cliremote-1.6.1.dist-info/METADATA,sha256=vdb8xaGfPGuE93R9w_LsiWLCoiE4e1H2518ojII1-X4,1202
-cliremote-1.6.1.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-cliremote-1.6.1.dist-info/top_level.txt,sha256=yBZidJ6zCix_a2ubGlYaewvlzBFXWbckQt20dudxJ1E,7
-cliremote-1.6.1.dist-info/RECORD,,
+cliremote-1.7.0.dist-info/METADATA,sha256=VGS_PWhg3OeLc54ljTRbmGiAWIfTjn2snD3-Fwr2rk8,1202
+cliremote-1.7.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+cliremote-1.7.0.dist-info/top_level.txt,sha256=yBZidJ6zCix_a2ubGlYaewvlzBFXWbckQt20dudxJ1E,7
+cliremote-1.7.0.dist-info/RECORD,,

remote/analytics_manager.py

@@ -1,98 +1,199 @@
-# antispam_core/analytics_manager.py
-import json, os, logging
+import os
+import json
+import logging
+import traceback
+import asyncio
 from datetime import datetime
-from . import admin_manager
+from typing import Dict, Any
 
+# =========================
+# لاگ
+# =========================
+os.makedirs("logs", exist_ok=True)
 logger = logging.getLogger(__name__)
-STATS_FILE = "analytics_stats.json"
+logger.setLevel(logging.INFO)
+if not any(getattr(h, "baseFilename", "").endswith("logs/analytics_log.txt") for h in logger.handlers if hasattr(h, "baseFilename")):
+    fh = logging.FileHandler("logs/analytics_log.txt", encoding="utf-8")
+    fmt = logging.Formatter("%(asctime)s - %(levelname)s - %(message)s", "%Y-%m-%d %H:%M:%S")
+    fh.setFormatter(fmt)
+    logger.addHandler(fh)
 
-class Analytics:
+# =========================
+# ابزار مسیر امن
+# =========================
+BASE_DIR = os.path.abspath(os.getcwd())
+AN_DIR = os.path.join(BASE_DIR, "analytics")
+os.makedirs(AN_DIR, exist_ok=True)
+try:
+    os.chmod(AN_DIR, 0o777)
+except Exception:
+    pass
+
+def _sanitize_target(t: Any) -> str:
+    """
+    target (chat_id / username / لینک) را به نام فایل امن تبدیل می‌کند.
+    مثال: -100123..., user_name, t.me/+hash  →  chat_-100123..., user_name, invite_hash_xxx
+    """
+    s = str(t)
+    # دسته‌بندی ساده برای خوانایی فایل‌ها
+    if s.lstrip("-").isdigit():
+        prefix = "chat_"
+    elif "joinchat" in s or s.startswith("https://t.me/+") or s.startswith("+"):
+        prefix = "invite_"
+    else:
+        prefix = "name_"
+
+    # کاراکترهای ناامن را با '_' جایگزین کن
+    safe = []
+    for ch in s:
+        if ch.isalnum() or ch in ("-", "_"):
+            safe.append(ch)
+        else:
+            safe.append("_")
+    name = prefix + "".join(safe)
+    # طول زیاد را کوتاه کن
+    if len(name) > 120:
+        name = name[:120]
+    return name
+
+def _file_for_target(target: Any) -> str:
+    return os.path.join(AN_DIR, f"{_sanitize_target(target)}.json")
+
+# =========================
+# ذخیره/خواندن اتمیک
+# =========================
+def _atomic_write_json(path: str, data: Dict[str, Any]) -> None:
+    tmp = path + ".tmp"
+    # ensure parent
+    os.makedirs(os.path.dirname(path) or ".", exist_ok=True)
+    with open(tmp, "w", encoding="utf-8") as f:
+        json.dump(data, f, ensure_ascii=False, indent=2)
+    os.replace(tmp, path)  # اتمیک روی همان پارتیشن
+
+def _load_json(path: str) -> Dict[str, Any]:
+    if not os.path.exists(path):
+        return {}
+    try:
+        with open(path, "r", encoding="utf-8") as f:
+            return json.load(f)
+    except Exception as e:
+        # اگر خراب شده بود، بک‌آپ بگیریم و از صفر شروع کنیم
+        try:
+            bak = path + ".corrupt." + datetime.now().strftime("%Y%m%d_%H%M%S")
+            os.rename(path, bak)
+            logger.warning("analytics: corrupted file moved to %s", bak)
+        except Exception:
+            pass
+        logger.error("analytics: read error %s: %s: %s", path, type(e).__name__, e)
+        return {}
+
+# =========================
+# مدیر آمار
+# =========================
+class _Analytics:
     def __init__(self):
-        self.stats = {
-            "total_sent": 0,
-            "successful": 0,
-            "failed": 0,
-            "account_performance": {},
-            "hourly_activity": {h: 0 for h in range(24)},
+        self._locks: Dict[str, asyncio.Lock] = {}
+
+    def _lock_for(self, target_path: str) -> asyncio.Lock:
+        if target_path not in self._locks:
+            self._locks[target_path] = asyncio.Lock()
+        return self._locks[target_path]
+
+    async def update_stats(self, account: str, success: bool, target: Any) -> None:
+        """
+        استات‌ها را برای target بروز می‌کند.
+        ساختار فایل:
+        {
+          "target": "<sanitized>",
+          "created_at": "...",
+          "updated_at": "...",
+          "total": 123,
+          "success": 100,
+          "fail": 23,
+          "by_account": {
+              "<phone>": {"total": X, "success": Y, "fail": Z, "last": "..."}
+          }
         }
-        self.load()
+        """
+        path = _file_for_target(target)
+        lock = self._lock_for(path)
 
-    # --------------------------
-    # ذخیره و بارگذاری داده‌ها
-    # --------------------------
-    def save(self):
         try:
-            with open(STATS_FILE, "w", encoding="utf-8") as f:
-                json.dump(self.stats, f, ensure_ascii=False, indent=2)
-        except Exception as e:
-            logger.error(f"Error saving stats: {e}")
+            async with lock:
+                data = _load_json(path)
+                now = datetime.utcnow().strftime("%Y-%m-%d %H:%M:%S")
 
-    def load(self):
-        try:
-            if os.path.exists(STATS_FILE):
-                with open(STATS_FILE, "r", encoding="utf-8") as f:
-                    data = json.load(f)
-                    if isinstance(data, dict):
-                        self.stats.update(data)
-                        logger.info("📈 Analytics data loaded successfully.")
-        except Exception as e:
-            logger.error(f"Error loading stats: {e}")
+                if not data:
+                    data = {
+                        "target": _sanitize_target(target),
+                        "created_at": now,
+                        "updated_at": now,
+                        "total": 0,
+                        "success": 0,
+                        "fail": 0,
+                        "by_account": {},
+                    }
 
-    # --------------------------
-    # بروزرسانی آمارها
-    # --------------------------
-    async def update_stats(self, account: str, success: bool, chat_id: int = None):
-        try:
-            self.stats["total_sent"] += 1
-            if success:
-                self.stats["successful"] += 1
-            else:
-                self.stats["failed"] += 1
+                data["total"] = int(data.get("total", 0)) + 1
+                if success:
+                    data["success"] = int(data.get("success", 0)) + 1
+                else:
+                    data["fail"] = int(data.get("fail", 0)) + 1
 
-            hour = datetime.now().hour
-            self.stats["hourly_activity"][hour] += 1
+                ba = data.setdefault("by_account", {})
+                acc = ba.setdefault(str(account), {"total": 0, "success": 0, "fail": 0, "last": now})
+                acc["total"] = int(acc.get("total", 0)) + 1
+                if success:
+                    acc["success"] = int(acc.get("success", 0)) + 1
+                else:
+                    acc["fail"] = int(acc.get("fail", 0)) + 1
+                acc["last"] = now
 
-            if account not in self.stats["account_performance"]:
-                self.stats["account_performance"][account] = {"success": 0, "total": 0}
+                data["updated_at"] = now
 
-            self.stats["account_performance"][account]["total"] += 1
-            if success:
-                self.stats["account_performance"][account]["success"] += 1
+                _atomic_write_json(path, data)
 
-            # ذخیره خودکار پس از هر بروزرسانی
-            self.save()
         except Exception as e:
-            logger.error(f"Error in update_stats: {e}")
+            # این لاگ تمام جزئیات خطا را می‌نویسد؛ اگر قبلاً فقط عدد 20 می‌دیدی، اینجا traceback کامل می‌بینی
+            tb = traceback.format_exc()
+            logger.error(
+                "Error in update_stats → account=%s success=%s target=%s path=%s\n%s",
+                account, success, target, path, tb
+            )
+
+    async def show_stats_cmd(self, message):
+        """
+        نمایش خلاصه‌ای از آمار همه‌ی فایل‌ها (برای دستور /stats)
+        """
+        try:
+            rows = []
+            for fn in os.listdir(AN_DIR):
+                if not fn.endswith(".json"):
+                    continue
+                path = os.path.join(AN_DIR, fn)
+                data = _load_json(path)
+                if not data:
+                    continue
+                total = int(data.get("total", 0))
+                succ = int(data.get("success", 0))
+                fail = int(data.get("fail", 0))
+                rows.append((fn[:-5], total, succ, fail))
 
+            if not rows:
+                await message.reply("📊 هنوز آماری ثبت نشده است.")
+                return
 
-analytics = Analytics()
+            rows.sort(key=lambda x: x[1], reverse=True)
+            text = ["📊 **Analytics Summary**"]
+            for name, total, succ, fail in rows[:20]:
+                text.append(f"- `{name}` → total: **{total}**, ✅ {succ}, ❌ {fail}")
+            await message.reply("\n".join(text))
+        except Exception as e:
+            tb = traceback.format_exc()
+            logger.error("show_stats_cmd error: %s: %s\n%s", type(e).__name__, e, tb)
+            await message.reply(f"❌ show_stats error: `{type(e).__name__}`")
 
-# --------------------------
-# دستور /stats
-# --------------------------
-async def show_stats_cmd(message):
-    try:
-        stats = analytics.stats
-        total = stats["total_sent"]
-        success_rate = stats["successful"] / total * 100 if total > 0 else 0
-
-        report_msg = (
-            "📊 <b>آمار کلی ارسال‌ها:</b>\n"
-            f"🔹 کل ارسال‌ها: {stats['total_sent']}\n"
-            f"✅ موفق: {stats['successful']}\n"
-            f"❌ ناموفق: {stats['failed']}\n"
-            f"📈 نرخ موفقیت: {success_rate:.2f}%\n\n"
-        )
-
-        # نمایش آمار بر اساس حساب‌ها
-        if stats["account_performance"]:
-            report_msg += "<b>📋 عملکرد هر اکانت:</b>\n"
-            for acc, data in stats["account_performance"].items():
-                total_acc = data["total"]
-                rate = (data["success"] / total_acc * 100) if total_acc else 0
-                report_msg += f"• {acc}: {rate:.1f}% ({data['success']}/{total_acc})\n"
-
-        await message.reply(report_msg)
-    except Exception as e:
-        logger.error(f"Error showing stats: {e}")
-        await message.reply(f"خطا در نمایش آمار: {e}")
+# singleton
+analytics = _Analytics()
+
+logger.info("📈 Analytics manager initialized successfully.")

remote/client_manager.py

@@ -245,3 +245,37 @@ def remove_client_from_pool(phone_number: str) -> None:
     client_pool.pop(phone_number, None)
     client_locks.pop(phone_number, None)
     logger.info("%s: removed from client_pool and client_locks", phone_number)
+
+async def get_any_client(message=None) -> Optional[object]:
+    """
+    یک کلاینت آماده برمی‌گرداند:
+      1) اگر کلاینت متصل در pool هست، همان را برمی‌گرداند.
+      2) وگرنه از بین active_accounts یکی را استارت می‌کند.
+    """
+    # Use any connected client
+    for phone, cli in list(client_pool.items()):
+        try:
+            if getattr(cli, "is_connected", False):
+                logger.debug("get_any_client: using connected client %s", phone)
+                return cli
+        except Exception:
+            pass
+
+    # Start one if needed
+    accs = list(get_active_accounts())
+    if not accs:
+        logger.warning("get_any_client: no active accounts")
+        return None
+
+    random.shuffle(accs)
+    for phone in accs:
+        try:
+            cli = await get_or_start_client(phone)
+            if cli and getattr(cli, "is_connected", False):
+                logger.info("get_any_client: started %s", phone)
+                return cli
+        except Exception as e:
+            logger.warning("get_any_client: failed start %s: %s: %s", phone, type(e).__name__, e)
+
+    logger.error("get_any_client: could not get any client")
+    return None

remote/client_picker.py

@@ -2,39 +2,3 @@ import random
 import logging
 from typing import Optional
 from .client_manager import client_pool, get_active_accounts, get_or_start_client
-
-logger = logging.getLogger(__name__)
-
-async def get_any_client(message=None) -> Optional[object]:
-    """
-    یک کلاینت آماده برمی‌گرداند:
-      1) اگر کلاینت متصل در pool هست، همان را برمی‌گرداند.
-      2) وگرنه از بین active_accounts یکی را استارت می‌کند.
-    """
-    # Use any connected client
-    for phone, cli in list(client_pool.items()):
-        try:
-            if getattr(cli, "is_connected", False):
-                logger.debug("get_any_client: using connected client %s", phone)
-                return cli
-        except Exception:
-            pass
-
-    # Start one if needed
-    accs = list(get_active_accounts())
-    if not accs:
-        logger.warning("get_any_client: no active accounts")
-        return None
-
-    random.shuffle(accs)
-    for phone in accs:
-        try:
-            cli = await get_or_start_client(phone)
-            if cli and getattr(cli, "is_connected", False):
-                logger.info("get_any_client: started %s", phone)
-                return cli
-        except Exception as e:
-            logger.warning("get_any_client: failed start %s: %s: %s", phone, type(e).__name__, e)
-
-    logger.error("get_any_client: could not get any client")
-    return None