diff --git a/scrapers/atcoder.py b/scrapers/atcoder.py index c31a6ee..b25ea7e 100644 --- a/scrapers/atcoder.py +++ b/scrapers/atcoder.py @@ -306,6 +306,12 @@ def _login_headless(credentials: dict[str, str]) -> LoginResult: cookie_cache = Path.home() / ".cache" / "cp-nvim" / "atcoder-cookies.json" cookie_cache.parent.mkdir(parents=True, exist_ok=True) + saved_cookies: list[dict[str, Any]] = [] + if cookie_cache.exists(): + try: + saved_cookies = json.loads(cookie_cache.read_text()) + except Exception: + pass logged_in = False login_error: str | None = None @@ -334,24 +340,34 @@ def _login_headless(credentials: dict[str, str]) -> LoginResult: headless=True, timeout=BROWSER_SESSION_TIMEOUT, google_search=False, + cookies=saved_cookies if saved_cookies else [], ) as session: - print(json.dumps({"status": "logging_in"}), flush=True) - session.fetch( - f"{BASE_URL}/login", - page_action=login_action, - solve_cloudflare=True, - ) - if login_error: - return LoginResult(success=False, error=f"Login failed: {login_error}") - - session.fetch( - f"{BASE_URL}/home", page_action=check_login, network_idle=True - ) - if not logged_in: - return LoginResult( - success=False, error="Login failed (bad credentials?)" + if saved_cookies: + print(json.dumps({"status": "checking_login"}), flush=True) + session.fetch( + f"{BASE_URL}/home", page_action=check_login, network_idle=True ) + if not logged_in: + print(json.dumps({"status": "logging_in"}), flush=True) + session.fetch( + f"{BASE_URL}/login", + page_action=login_action, + solve_cloudflare=True, + ) + if login_error: + return LoginResult( + success=False, error=f"Login failed: {login_error}" + ) + + session.fetch( + f"{BASE_URL}/home", page_action=check_login, network_idle=True + ) + if not logged_in: + return LoginResult( + success=False, error="Login failed (bad credentials?)" + ) + try: browser_cookies = session.context.cookies() if any(c["name"] == "REVEL_SESSION" for c in browser_cookies): diff --git a/scrapers/codechef.py b/scrapers/codechef.py index 614e8c2..8f13eee 100644 --- a/scrapers/codechef.py +++ b/scrapers/codechef.py @@ -65,6 +65,12 @@ def _login_headless_codechef(credentials: dict[str, str]) -> LoginResult: _ensure_browser() _COOKIE_PATH.parent.mkdir(parents=True, exist_ok=True) + saved_cookies: list[dict[str, Any]] = [] + if _COOKIE_PATH.exists(): + try: + saved_cookies = json.loads(_COOKIE_PATH.read_text()) + except Exception: + pass logged_in = False login_error: str | None = None @@ -94,18 +100,30 @@ def _login_headless_codechef(credentials: dict[str, str]) -> LoginResult: headless=True, timeout=BROWSER_SESSION_TIMEOUT, google_search=False, + cookies=saved_cookies if saved_cookies else [], ) as session: - print(json.dumps({"status": "logging_in"}), flush=True) - session.fetch(f"{BASE_URL}/login", page_action=login_action) - if login_error: - return LoginResult(success=False, error=f"Login failed: {login_error}") - - session.fetch(f"{BASE_URL}/", page_action=check_login, network_idle=True) - if not logged_in: - return LoginResult( - success=False, error="Login failed (bad credentials?)" + if saved_cookies: + print(json.dumps({"status": "checking_login"}), flush=True) + session.fetch( + f"{BASE_URL}/", page_action=check_login, network_idle=True ) + if not logged_in: + print(json.dumps({"status": "logging_in"}), flush=True) + session.fetch(f"{BASE_URL}/login", page_action=login_action) + if login_error: + return LoginResult( + success=False, error=f"Login failed: {login_error}" + ) + + session.fetch( + f"{BASE_URL}/", page_action=check_login, network_idle=True + ) + if not logged_in: + return LoginResult( + success=False, error="Login failed (bad credentials?)" + ) + try: browser_cookies = session.context.cookies() if browser_cookies: diff --git a/scrapers/codeforces.py b/scrapers/codeforces.py index d5b6161..8ae768e 100644 --- a/scrapers/codeforces.py +++ b/scrapers/codeforces.py @@ -348,6 +348,12 @@ def _login_headless_cf(credentials: dict[str, str]) -> LoginResult: cookie_cache = Path.home() / ".cache" / "cp-nvim" / "codeforces-cookies.json" cookie_cache.parent.mkdir(parents=True, exist_ok=True) + saved_cookies: list[dict[str, Any]] = [] + if cookie_cache.exists(): + try: + saved_cookies = json.loads(cookie_cache.read_text()) + except Exception: + pass logged_in = False login_error: str | None = None @@ -382,26 +388,38 @@ def _login_headless_cf(credentials: dict[str, str]) -> LoginResult: headless=True, timeout=BROWSER_SESSION_TIMEOUT, google_search=False, + cookies=saved_cookies if saved_cookies else [], ) as session: - print(json.dumps({"status": "logging_in"}), flush=True) - session.fetch( - f"{BASE_URL}/enter", - page_action=login_action, - solve_cloudflare=True, - ) - if login_error: - return LoginResult(success=False, error=f"Login failed: {login_error}") - - session.fetch( - f"{BASE_URL}/", - page_action=check_login, - network_idle=True, - ) - if not logged_in: - return LoginResult( - success=False, error="Login failed (bad credentials?)" + if saved_cookies: + print(json.dumps({"status": "checking_login"}), flush=True) + session.fetch( + f"{BASE_URL}/", + page_action=check_login, + network_idle=True, ) + if not logged_in: + print(json.dumps({"status": "logging_in"}), flush=True) + session.fetch( + f"{BASE_URL}/enter", + page_action=login_action, + solve_cloudflare=True, + ) + if login_error: + return LoginResult( + success=False, error=f"Login failed: {login_error}" + ) + + session.fetch( + f"{BASE_URL}/", + page_action=check_login, + network_idle=True, + ) + if not logged_in: + return LoginResult( + success=False, error="Login failed (bad credentials?)" + ) + try: browser_cookies = session.context.cookies() if any(c.get("name") == "X-User-Handle" for c in browser_cookies): diff --git a/scrapers/cses.py b/scrapers/cses.py index bf1edbd..bd29af4 100644 --- a/scrapers/cses.py +++ b/scrapers/cses.py @@ -239,6 +239,21 @@ class CSESScraper(BaseScraper): return self._login_error("Missing username or password") async with httpx.AsyncClient(follow_redirects=True) as client: + token = credentials.get("token") + + if token: + print(json.dumps({"status": "checking_login"}), flush=True) + if await self._check_token(client, token): + return LoginResult( + success=True, + error="", + credentials={ + "username": username, + "password": password, + "token": token, + }, + ) + print(json.dumps({"status": "logging_in"}), flush=True) token = await self._web_login(client, username, password) if not token: diff --git a/scrapers/usaco.py b/scrapers/usaco.py index 53f92be..5ab89f7 100644 --- a/scrapers/usaco.py +++ b/scrapers/usaco.py @@ -423,7 +423,11 @@ class USACOScraper(BaseScraper): async with httpx.AsyncClient(follow_redirects=True) as client: await _load_usaco_cookies(client) - if not client.cookies: + print(json.dumps({"status": "checking_login"}), flush=True) + logged_in = bool(client.cookies) and await _check_usaco_login( + client, username + ) + if not logged_in: print(json.dumps({"status": "logging_in"}), flush=True) try: ok = await _do_usaco_login(client, username, password) @@ -433,72 +437,44 @@ class USACOScraper(BaseScraper): return self._submit_error("Login failed (bad credentials?)") await _save_usaco_cookies(client) - result = await self._do_submit(client, problem_id, language_id, source) - - if result.success or result.error != "auth_failure": - return result - - client.cookies.clear() - print(json.dumps({"status": "logging_in"}), flush=True) + print(json.dumps({"status": "submitting"}), flush=True) try: - ok = await _do_usaco_login(client, username, password) + page_r = await client.get( + f"{_AUTH_BASE}/index.php?page=viewproblem2&cpid={problem_id}", + headers=HEADERS, + timeout=HTTP_TIMEOUT, + ) + form_url, hidden_fields, lang_val = _parse_submit_form( + page_r.text, language_id + ) + except Exception: + form_url = _AUTH_BASE + _SUBMIT_PATH + hidden_fields = {} + lang_val = None + + data: dict[str, str] = {"cpid": problem_id, **hidden_fields} + data["language"] = lang_val if lang_val is not None else language_id + ext = "py" if "python" in language_id.lower() else "cpp" + try: + r = await client.post( + form_url, + data=data, + files={"sourcefile": (f"solution.{ext}", source, "text/plain")}, + headers=HEADERS, + timeout=HTTP_TIMEOUT, + ) + r.raise_for_status() except Exception as e: - return self._submit_error(f"Login failed: {e}") - if not ok: - return self._submit_error("Login failed (bad credentials?)") - await _save_usaco_cookies(client) + return self._submit_error(f"Submit request failed: {e}") - return await self._do_submit(client, problem_id, language_id, source) - - async def _do_submit( - self, - client: httpx.AsyncClient, - problem_id: str, - language_id: str, - source: bytes, - ) -> SubmitResult: - print(json.dumps({"status": "submitting"}), flush=True) - try: - page_r = await client.get( - f"{_AUTH_BASE}/index.php?page=viewproblem2&cpid={problem_id}", - headers=HEADERS, - timeout=HTTP_TIMEOUT, + try: + resp = r.json() + sid = str(resp.get("submission_id", resp.get("id", ""))) + except Exception: + sid = "" + return SubmitResult( + success=True, error="", submission_id=sid, verdict="submitted" ) - if "login" in page_r.url.path.lower() or "Login" in page_r.text[:2000]: - return self._submit_error("auth_failure") - form_url, hidden_fields, lang_val = _parse_submit_form( - page_r.text, language_id - ) - except Exception: - form_url = _AUTH_BASE + _SUBMIT_PATH - hidden_fields = {} - lang_val = None - - data: dict[str, str] = {"cpid": problem_id, **hidden_fields} - data["language"] = lang_val if lang_val is not None else language_id - ext = "py" if "python" in language_id.lower() else "cpp" - try: - r = await client.post( - form_url, - data=data, - files={"sourcefile": (f"solution.{ext}", source, "text/plain")}, - headers=HEADERS, - timeout=HTTP_TIMEOUT, - ) - r.raise_for_status() - except Exception as e: - return self._submit_error(f"Submit request failed: {e}") - - try: - resp = r.json() - if resp.get("code") == 0 and "login" in resp.get("message", "").lower(): - return self._submit_error("auth_failure") - sid = str(resp.get("submission_id", resp.get("id", ""))) - except Exception: - sid = "" - return SubmitResult( - success=True, error="", submission_id=sid, verdict="submitted" - ) async def login(self, credentials: dict[str, str]) -> LoginResult: username = credentials.get("username", "")