diff --git a/src/content.py b/src/content.py index 81a67d9..8745e39 100644 --- a/src/content.py +++ b/src/content.py @@ -1,18 +1,15 @@ import base64 -from contextlib import suppress -from invisible_playwright.async_api import Error from playwright.async_api import Page from src.models import LinkRequest -from src.utils import TimeoutTimer, logger, remaining_ms +from src.utils import logger async def build_response_content( page: Page, request: LinkRequest, page_request: object, - timer: TimeoutTimer, ) -> tuple[str, str]: """Build (content_type, response_content) from the settled page.""" if request.return_only_cookies: @@ -23,18 +20,7 @@ async def build_response_content( ): return await fetch_pdf_content(page) - return "text/html", await read_settled_html(page, timer) - - -async def read_settled_html(page: Page, timer: TimeoutTimer) -> str: - """Read the page's HTML, reading it again if a navigation pulled it away.""" - try: - return await page.content() - except Error: - logger.info("Page navigated while being read; reading it again once idle") - with suppress(Error): - await page.wait_for_load_state("networkidle", timeout=remaining_ms(timer)) - return await page.content() + return "text/html", await page.content() async def fetch_pdf_content(page: Page) -> tuple[str, str]: diff --git a/src/endpoints.py b/src/endpoints.py index 6663707..bd68b4f 100644 --- a/src/endpoints.py +++ b/src/endpoints.py @@ -88,7 +88,6 @@ async def read_item(request: LinkRequest, dep: BrowserDep) -> LinkResponse: dep.page, request, page_request, - timer, ) user_agent = ( diff --git a/tests/main_test.py b/tests/main_test.py index a5ff17f..4cd41d6 100644 --- a/tests/main_test.py +++ b/tests/main_test.py @@ -225,20 +225,6 @@ async def test_html_is_read_after_a_js_redirect_lands(): assert response.solution.response == "