Skip to content

pyppeteer fast puppeteer fetch - be sure viewport is set to --window-size if --window-size is set #3157

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dgtlmoon merged 1 commit into from
Apr 29, 2025
Merged

pyppeteer fast puppeteer fetch - be sure viewport is set to --window-size if --window-size is set #3157

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 12 additions & 2 deletions changedetectionio/content_fetchers/puppeteer.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,7 @@ async def fetch_page(self,
is_binary,
empty_pages_are_a_change
):

import re
self.delete_browser_steps_screenshots()
extra_wait = int(os.getenv("WEBDRIVER_DELAY_BEFORE_CONTENT_READY", 5)) + self.render_extract_delay

Expand All @@ -172,6 +172,17 @@ async def fetch_page(self,
# headless - ask a new page
self.page = (pages := await browser.pages) and len(pages) or await browser.newPage()

if '--window-size' in self.browser_connection_url:
# Be sure the viewport is always the window-size, this is often not the same thing
match = re.search(r'--window-size=(\d+),(\d+)', self.browser_connection_url)
if match:
logger.debug(f"Setting viewport to same as --window-size in browser connection URL {int(match.group(1))},{int(match.group(2))}")
await self.page.setViewport({
"width": int(match.group(1)),
"height": int(match.group(2))
})
logger.debug(f"Puppeteer viewport size {self.page.viewport}")

try:
from pyppeteerstealth import inject_evasions_into_page
except ImportError:
Expand Down Expand Up @@ -218,7 +229,6 @@ async def fetch_page(self,

response = await self.page.goto(url, waitUntil="load")


if response is None:
await self.page.close()
await browser.close()
Expand Down
Loading