Update renewer.py

renewer.py

@@ -3,11 +3,7 @@ import json
 import os
 import logging
 from datetime import datetime, timedelta
-try:
-    from bs4 import BeautifulSoup
-    BS4_AVAILABLE = True
-except ImportError:
-    BS4_AVAILABLE = False
+from bs4 import BeautifulSoup
 
 logging.basicConfig(
     level=logging.INFO,
@@ -31,7 +27,7 @@ def save_accounts(accounts):
 
 
 def get_host(username, token):
-    """Detect if account is on US or EU server using API token."""
+    """اكتشاف الخادم (US أو EU) عبر الـ Token"""
     for host in ["www.pythonanywhere.com", "eu.pythonanywhere.com"]:
         try:
             r = requests.get(
@@ -46,228 +42,142 @@ def get_host(username, token):
     return None
 
 
-def get_host_by_password(username, password):
-    """Detect server by trying to login."""
-    for host in ["www.pythonanywhere.com", "eu.pythonanywhere.com"]:
-        try:
-            session = requests.Session()
-            r = session.get(f"https://{host}/login/", timeout=10)
-            if r.status_code == 200:
-                return host, session
-        except Exception:
-            continue
-    return None, None
-
-
-# ─────────────────────────────────────────────
-# Method 1: API Token → /webapps/{domain}/reload/
-# ─────────────────────────────────────────────
-
-def extend_webapp_token(username, token, host):
-    """Extend all webapps via API reload endpoint (token-based)."""
-    results = []
-    try:
-        r = requests.get(
-            f"https://{host}/api/v0/user/{username}/webapps/",
-            headers={"Authorization": f"Token {token}"},
-            timeout=10
-        )
-        if r.status_code != 200:
-            logger.warning(f"[{username}] Failed to list webapps: {r.status_code}")
-            return results
-
-        webapps = r.json()
-        for app in webapps:
-            domain = app.get("domain_name")
-            reload_r = requests.post(
-                f"https://{host}/api/v0/user/{username}/webapps/{domain}/reload/",
-                headers={"Authorization": f"Token {token}"},
-                timeout=10
-            )
-            status = "✅ OK" if reload_r.status_code == 200 else f"❌ {reload_r.status_code}"
-            logger.info(f"[{username}] Reload {domain}: {status}")
-            results.append({"domain": domain, "status": status})
-    except Exception as e:
-        logger.error(f"[{username}] Error (token method): {e}")
-    return results
-
-
-# ─────────────────────────────────────────────
-# Method 2: Password → session login → /extend
-# ─────────────────────────────────────────────
-
-def extend_webapp_password(username, password, host=None):
-    """Extend webapps via session login + CSRF extend endpoint (password-based)."""
-    if not BS4_AVAILABLE:
-        logger.error("beautifulsoup4 is not installed. Cannot use password method.")
-        return []
-
-    if not host:
-        host = "www.pythonanywhere.com"
-
-    results = []
+def extend_webapp(username, password, host="www.pythonanywhere.com"):
+    """
+    التمديد الحقيقي عبر session + CSRF
+    يضغط زر Extend تماماً كما لو فعلته يدوياً
+    """
     session = requests.Session()
+    results = []
 
     try:
-        # Step 1: Get login page and extract CSRF token
+        # الخطوة 1: فتح صفحة تسجيل الدخول وجلب CSRF
         login_url = f"https://{host}/login/"
-        login_page = session.get(login_url, timeout=10)
+        login_page = session.get(login_url, timeout=15)
+
         soup = BeautifulSoup(login_page.text, "html.parser")
         csrf_input = soup.find("input", {"name": "csrfmiddlewaretoken"})
         if not csrf_input:
-            logger.error(f"[{username}] Could not find CSRF token on login page.")
-            return results
+            logger.error(f"[{username}] لم يتم العثور على CSRF في صفحة تسجيل الدخول")
+            return []
         csrf = csrf_input["value"]
 
-        # Step 2: POST login credentials
+        # الخطوة 2: تسجيل الدخول
         login_data = {
             "auth-username": username,
             "auth-password": password,
             "csrfmiddlewaretoken": csrf,
             "next": "/"
         }
-        login_resp = session.post(
+        session.post(
             login_url,
             data=login_data,
             headers={"Referer": login_url},
-            timeout=10,
+            timeout=15,
             allow_redirects=True
         )
-        if login_resp.status_code not in (200, 302):
-            logger.error(f"[{username}] Login failed: HTTP {login_resp.status_code}")
-            return results
 
-        # Verify we are actually logged in
-        dashboard = session.get(f"https://{host}/dashboard/", timeout=10)
-        if "login" in dashboard.url.lower() or username.lower() not in dashboard.text.lower():
-            logger.error(f"[{username}] Login appears to have failed (redirected to login page).")
-            return results
+        # التحقق من نجاح تسجيل الدخول
+        check = session.get(f"https://{host}/dashboard/", timeout=10)
+        if username.lower() not in check.text.lower():
+            logger.error(f"[{username}] فشل تسجيل الدخول — تحقق من كلمة المرور")
+            return []
 
-        logger.info(f"[{username}] Logged in successfully via password on {host}")
+        logger.info(f"[{username}] تم تسجيل الدخول بنجاح على {host}")
 
-        # Step 3: Open webapps page to get a fresh CSRF token
+        # الخطوة 3: فتح صفحة الويب آب وجلب CSRF جديد
         webapps_url = f"https://{host}/user/{username}/webapps/"
-        page = session.get(webapps_url, timeout=10)
+        page = session.get(webapps_url, timeout=15)
         soup = BeautifulSoup(page.text, "html.parser")
+
         csrf_input = soup.find("input", {"name": "csrfmiddlewaretoken"})
         if not csrf_input:
-            # Try meta tag fallback
-            meta = soup.find("meta", {"name": "csrf-token"})
-            csrf = meta["content"] if meta else None
-        else:
-            csrf = csrf_input["value"]
-
-        if not csrf:
-            logger.error(f"[{username}] Could not find CSRF token on webapps page.")
-            return results
+            logger.error(f"[{username}] لم يتم العثور على CSRF في صفحة الويب آب")
+            return []
+        csrf = csrf_input["value"]
 
-        # Step 4: Find all webapp domains on this page
+        # الخطوة 4: اكتشاف النطاقات المتاحة
         domains = []
         for link in soup.find_all("a", href=True):
             href = link["href"]
-            if f"/user/{username}/webapps/" in href and "extend" not in href:
-                domain_part = href.split(f"/user/{username}/webapps/")[-1].strip("/")
-                if domain_part and "." in domain_part and domain_part not in domains:
-                    domains.append(domain_part)
+            if f"/user/{username}/webapps/" in href:
+                part = href.split(f"/user/{username}/webapps/")[-1].strip("/")
+                if part and "." in part and part not in domains:
+                    domains.append(part)
 
-        # Fallback: try the default domain if none found
+        # إذا لم يجد نطاقات، يجرب النطاق الافتراضي
         if not domains:
-            default_domain = f"{username}.pythonanywhere.com"
-            domains = [default_domain]
-            logger.warning(f"[{username}] Could not detect domains, trying default: {default_domain}")
+            domains = [f"{username}.pythonanywhere.com"]
+            logger.warning(f"[{username}] لم يتم اكتشاف نطاقات، سيجرب: {domains[0]}")
 
-        # Step 5: POST extend for each domain
+        # الخطوة 5: إرسال طلب التمديد لكل نطاق
         for domain in domains:
             extend_url = f"https://{host}/user/{username}/webapps/{domain}/extend"
             resp = session.post(
                 extend_url,
                 data={"csrfmiddlewaretoken": csrf},
                 headers={"Referer": webapps_url},
-                timeout=10
+                timeout=15
             )
             if resp.status_code in (200, 302):
-                status = "✅ OK"
+                status = "✅ تم التمديد"
             else:
-                status = f"❌ {resp.status_code}"
+                status = f"❌ فشل ({resp.status_code})"
+
             logger.info(f"[{username}] Extend {domain}: {status}")
             results.append({"domain": domain, "status": status})
 
     except Exception as e:
-        logger.error(f"[{username}] Error (password method): {e}")
+        logger.error(f"[{username}] خطأ أثناء التمديد: {e}")
 
     return results
 
 
-# ─────────────────────────────────────────────
-# Unified renew_account
-# ─────────────────────────────────────────────
-
 def renew_account(account):
     username = account["username"]
-    token    = account.get("token", "").strip()
     password = account.get("password", "").strip()
-    host     = account.get("host")
+    host     = account.get("host", "www.pythonanywhere.com")
 
-    results = []
-    success = False
-
-    # ── Priority 1: password method (uses /extend endpoint) ──
-    if password and BS4_AVAILABLE:
-        if not host:
-            host = "www.pythonanywhere.com"   # default; extend_webapp_password will auto-login
-        logger.info(f"[{username}] Using password method on {host}")
-        results = extend_webapp_password(username, password, host)
-        success = any("✅" in r.get("status", "") for r in results) if results else False
-
-    # ── Priority 2: token method (API reload) ──
-    elif token:
-        if not host:
-            host = get_host(username, token)
-        if not host:
-            logger.error(f"[{username}] Cannot connect - invalid token?")
-            return False, []
-        account["host"] = host
-        logger.info(f"[{username}] Using token method on {host}")
-        results = extend_webapp_token(username, token, host)
-        success = any("✅" in r.get("status", "") for r in results) if results else False
-
-    # ── Fallback: try password method even without bs4 ──
-    else:
-        logger.error(f"[{username}] No token or password provided.")
+    if not password:
+        logger.error(f"[{username}] لا توجد كلمة مرور — لا يمكن التمديد")
         return False, []
 
+    results = extend_webapp(username, password, host)
+    success = any("✅" in r.get("status", "") for r in results) if results else False
+
     account["host"]         = host
     account["last_renewed"] = datetime.utcnow().isoformat()
     account["next_renewal"] = (datetime.utcnow() + timedelta(days=10)).isoformat()
     account["last_results"] = results
+
     return success, results
 
 
 def run_renewals():
     accounts = load_accounts()
     if not accounts:
-        logger.info("No accounts configured yet.")
+        logger.info("لا توجد حسابات.")
         return
 
     now = datetime.utcnow()
     renewed_count = 0
 
     for account in accounts:
-        username = account["username"]
+        username         = account["username"]
         next_renewal_str = account.get("next_renewal")
 
         if next_renewal_str:
             next_renewal = datetime.fromisoformat(next_renewal_str)
             if now < next_renewal:
                 remaining = (next_renewal - now).days
-                logger.info(f"[{username}] Skipping - next renewal in {remaining} days")
+                logger.info(f"[{username}] لا حاجة للتجديد — بعد {remaining} يوم")
                 continue
 
-        logger.info(f"[{username}] Starting renewal...")
+        logger.info(f"[{username}] جاري التمديد...")
         success, results = renew_account(account)
         if success:
             renewed_count += 1
 
     save_accounts(accounts)
-    logger.info(f"Done. Renewed {renewed_count}/{len(accounts)} accounts.")
+    logger.info(f"اكتمل. تم تمديد {renewed_count}/{len(accounts)} حساب.")
     return accounts