Fix Bytelixir collector: use session cookie (hCaptcha blocks login)

GeiserX · GeiserX · commit d414eab1a315 · 2026-03-26T22:24:57.000+01:00
diff --git a/app/collectors/__init__.py b/app/collectors/__init__.py
@@ -57,7 +57,7 @@
     "earnfm": ["email", "password"],
     "packetstream": ["auth_token"],
     "grass": ["access_token"],
-    "bytelixir": ["email", "password"],
+    "bytelixir": ["session_cookie"],
 }
 
 
diff --git a/app/collectors/bytelixir.py b/app/collectors/bytelixir.py
@@ -1,12 +1,17 @@
 """Bytelixir earnings collector.
 
-Authenticates via email/password to the Bytelixir dashboard API and
-fetches the current balance.
+Uses session cookie from the browser to fetch balance. Bytelixir is a
+Laravel app with hCaptcha on login, so automated email/password login
+is not possible. Users must extract session cookies from their browser.
+
+To get the cookie: open dash.bytelixir.com, log in (tick "Remember Me"),
+press F12 > Application > Cookies, and copy the `bytelixir_session` value.
 """
 
 from __future__ import annotations
 
 import logging
+import re
 
 import httpx
 
@@ -18,78 +23,33 @@
 
 
 class BytelixirCollector(BaseCollector):
-    """Collect earnings from Bytelixir's dashboard."""
+    """Collect earnings from Bytelixir using a session cookie."""
 
     platform = "bytelixir"
 
-    def __init__(self, email: str, password: str) -> None:
-        self.email = email
-        self.password = password
-        self._token: str | None = None
-
-    async def _authenticate(self, client: httpx.AsyncClient) -> str:
-        """Log in and obtain a session/token."""
-        resp = await client.post(
-            f"{DASH_BASE}/api/auth/login",
-            json={"email": self.email, "password": self.password},
-            headers={
-                "User-Agent": "Mozilla/5.0",
-                "Origin": DASH_BASE,
-                "Referer": f"{DASH_BASE}/",
-            },
-        )
-        resp.raise_for_status()
-        data = resp.json()
-
-        # Try common token locations in response
-        token = (
-            data.get("token")
-            or data.get("access_token")
-            or data.get("data", {}).get("token", "")
-            or data.get("data", {}).get("access_token", "")
-        )
-        if not token:
-            raise ValueError(f"No token in Bytelixir login response (keys: {list(data.keys())})")
-        return token
+    def __init__(self, session_cookie: str) -> None:
+        self.session_cookie = session_cookie
 
     async def collect(self) -> EarningsResult:
         """Fetch current Bytelixir balance."""
         try:
-            async with httpx.AsyncClient(timeout=30, follow_redirects=True) as client:
-                if not self._token:
-                    self._token = await self._authenticate(client)
-
-                headers = {
-                    "Authorization": f"Bearer {self._token}",
-                    "User-Agent": "Mozilla/5.0",
-                    "Accept": "application/json",
-                    "Origin": DASH_BASE,
-                    "Referer": f"{DASH_BASE}/",
-                }
-
-                # Try the dashboard/earnings endpoints
-                for path in (
-                    "/api/user/balance",
-                    "/api/user/earnings",
-                    "/api/dashboard",
-                    "/api/user",
-                    "/api/me",
-                ):
-                    resp = await client.get(
-                        f"{DASH_BASE}{path}",
-                        headers=headers,
-                    )
+            cookies = {"bytelixir_session": self.session_cookie}
+            headers = {
+                "User-Agent": "Mozilla/5.0",
+                "Accept": "application/json, text/html",
+                "X-Requested-With": "XMLHttpRequest",
+                "Referer": f"{DASH_BASE}/",
+            }
 
-                    # Token expired — retry auth once
-                    if resp.status_code == 401:
-                        self._token = await self._authenticate(client)
-                        headers["Authorization"] = f"Bearer {self._token}"
-                        resp = await client.get(
-                            f"{DASH_BASE}{path}",
-                            headers=headers,
-                        )
+            async with httpx.AsyncClient(timeout=30, follow_redirects=True, cookies=cookies) as client:
+                # Try the JSON API first
+                resp = await client.get(
+                    f"{DASH_BASE}/api/v1/user",
+                    headers=headers,
+                )
 
-                    if resp.status_code == 200:
+                if resp.status_code == 200:
+                    try:
                         data = resp.json()
                         balance = _extract_balance(data)
                         if balance is not None:
@@ -98,11 +58,36 @@ async def collect(self) -> EarningsResult:
                                 balance=round(balance, 4),
                                 currency="USD",
                             )
+                    except Exception:
+                        pass
+
+                # Fallback: scrape the dashboard HTML for data-balance
+                resp = await client.get(
+                    f"{DASH_BASE}/en",
+                    headers={**headers, "Accept": "text/html"},
+                )
+
+                if resp.status_code == 200:
+                    balance = _extract_balance_from_html(resp.text)
+                    if balance is not None:
+                        return EarningsResult(
+                            platform=self.platform,
+                            balance=round(balance, 4),
+                            currency="USD",
+                        )
+
+                # Check if session expired (redirected to login)
+                if "/sign-in" in str(resp.url):
+                    return EarningsResult(
+                        platform=self.platform,
+                        balance=0.0,
+                        error="Session expired — get a new bytelixir_session cookie from your browser",
+                    )
 
                 return EarningsResult(
                     platform=self.platform,
                     balance=0.0,
-                    error="Could not find balance in Bytelixir API responses",
+                    error="Could not extract balance from Bytelixir dashboard",
                 )
         except Exception as exc:
             logger.error("Bytelixir collection failed: %s", exc)
@@ -114,8 +99,7 @@ async def collect(self) -> EarningsResult:
 
 
 def _extract_balance(data: dict) -> float | None:
-    """Try to extract a USD balance from various response shapes."""
-    # Direct balance field
+    """Try to extract a USD balance from JSON response."""
     for key in ("balance", "total_balance", "earnings", "total_earnings"):
         val = data.get(key)
         if val is not None:
@@ -124,26 +108,35 @@ def _extract_balance(data: dict) -> float | None:
             except (ValueError, TypeError):
                 continue
 
-    # Nested under 'data'
-    inner = data.get("data", {})
-    if isinstance(inner, dict):
-        for key in ("balance", "total_balance", "earnings", "total_earnings"):
-            val = inner.get(key)
-            if val is not None:
-                try:
-                    return float(val)
-                except (ValueError, TypeError):
-                    continue
-
-    # Nested under 'user'
-    user = data.get("user", {})
-    if isinstance(user, dict):
-        for key in ("balance", "earnings"):
-            val = user.get(key)
-            if val is not None:
-                try:
-                    return float(val)
-                except (ValueError, TypeError):
-                    continue
+    # Nested under 'data' or 'user'
+    for wrapper in ("data", "user"):
+        inner = data.get(wrapper, {})
+        if isinstance(inner, dict):
+            for key in ("balance", "total_balance", "earnings", "total_earnings"):
+                val = inner.get(key)
+                if val is not None:
+                    try:
+                        return float(val)
+                    except (ValueError, TypeError):
+                        continue
+    return None
+
+
+def _extract_balance_from_html(html: str) -> float | None:
+    """Extract balance from data-balance attribute in dashboard HTML."""
+    match = re.search(r'data-balance=["\']([^"\']+)["\']', html)
+    if match:
+        try:
+            return float(match.group(1))
+        except (ValueError, TypeError):
+            pass
+
+    # Also try matching a balance-like number near "balance" text
+    match = re.search(r"(?:balance|earnings)[^>]*>\s*\$?\s*([\d.]+)", html, re.IGNORECASE)
+    if match:
+        try:
+            return float(match.group(1))
+        except (ValueError, TypeError):
+            pass
 
     return None
diff --git a/app/templates/settings.html b/app/templates/settings.html
@@ -164,12 +164,10 @@ <h3 class="settings-section-title">Earnings Collection</h3>
     </summary>
     <div class="collector-body">
       <div class="form-group">
-        <label class="form-label">Email</label>
-        <input class="form-input collector-input" type="text" data-config="bytelixir_email" placeholder="Your Bytelixir email">
-      </div>
-      <div class="form-group">
-        <label class="form-label">Password</label>
-        <input class="form-input collector-input" type="password" data-config="bytelixir_password" placeholder="Your Bytelixir password">
+        <label class="form-label">Session Cookie</label>
+        <input class="form-input collector-input" type="password" data-config="bytelixir_session_cookie"
+               placeholder="bytelixir_session cookie value from browser">
+        <div class="form-hint">Open <a href="https://dash.bytelixir.com" target="_blank">dash.bytelixir.com</a>, log in (tick &ldquo;Remember Me&rdquo;), press F12, go to Application &gt; Cookies, and copy the <code>bytelixir_session</code> value.</div>
       </div>
     </div>
   </details>

Original file line number	Diff line number	Diff line change
`@@ -57,7 +57,7 @@`
`57`	`57`	`"earnfm": ["email", "password"],`
`58`	`58`	`"packetstream": ["auth_token"],`
`59`	`59`	`"grass": ["access_token"],`
`60`		`- "bytelixir": ["email", "password"],`
	`60`	`+ "bytelixir": ["session_cookie"],`
`61`	`61`	`}`
`62`	`62`
`63`	`63`