@browserless/screenshot 13.9.1 → 13.9.5

package/package.json

@@ -2,7 +2,7 @@
   "name": "@browserless/screenshot",
   "description": "Capture high-quality screenshots of websites with overlay support, device emulation, and automated image optimization.",
   "homepage": "https://browserless.js.org/#/?id=screenshoturl-options",
-  "version": "13.9.1",
+  "version": "13.9.5",
   "main": "src/index.js",
   "author": {
     "email": "hello@microlink.io",
@@ -33,7 +33,7 @@
   ],
   "dependencies": {
     "@browserless/errors": "13.6.10",
-    "@browserless/goto": "13.9.0",
+    "@browserless/goto": "13.9.5",
     "@kikobeats/content-type": "~1.0.4",
     "@kikobeats/time-span": "~1.0.12",
     "automad-prism-themes": "~0.3.7",
@@ -70,5 +70,5 @@
     "timeout": "2m",
     "workerThreads": false
   },
-  "gitHead": "9c3b5bdb192fd65deec41a870fd848e53b6886ba"
+  "gitHead": "a82ea003023e3131498bec74ed51761dfd6d6615"
 }

package/src/index.js

@@ -1,11 +1,11 @@
 'use strict'
 
 const debug = require('debug-logfmt')('browserless:screenshot')
-const { isContextDestroyed } = require('@browserless/errors')
 const createGoto = require('@browserless/goto')
 const { extname } = require('node:path')
 const pReflect = require('p-reflect')
 
+const isTransientContextLoss = require('./is-transient-context-loss')
 const isWhiteScreenshot = require('./is-white-screenshot')
 const waitForPrism = require('./pretty')
 const prettyTimeSpan = require('./time-span')
@@ -22,15 +22,22 @@ const {
 
 const timeSpan = require('@kikobeats/time-span')()
 
+// No pacing here on purpose: `waitUntilAuto` is a network-idle wait, which on a
+// live page costs at least its idle window (~500ms) and at most what is left of
+// the budget. The runaway case was never a fast loop — it was retrying a page
+// that was gone, where the wait returns instantly. Classify that and the loop
+// paces itself on real work.
 const captureWithNavigationRetry = async (capture, { page, goto, timeout }) => {
   const elapsed = timeSpan()
+  const remaining = () => timeout - elapsed()
   while (true) {
     try {
       return await capture()
     } catch (error) {
-      if (!isContextDestroyed(error) || elapsed() >= timeout) throw error
+      if (!isTransientContextLoss(page, error) || remaining() <= 0) throw error
       debug('captureWithNavigationRetry', { error: error.message })
-      await goto.waitUntilAuto(page, { timeout })
+      await goto.waitUntilAuto(page, { timeout: remaining() })
+      if (remaining() <= 0) throw error
     }
   }
 }

package/src/is-transient-context-loss.js

@@ -0,0 +1,17 @@
+'use strict'
+
+const { isContextDestroyed } = require('@browserless/errors')
+
+// Tells a frame torn down mid-flight (a client-side navigation, which settles
+// and retries fine) apart from a page we no longer have: once the page or its
+// session is closed — the request ended and its context was destroyed — nothing
+// it is waiting on can arrive, so waiting is spent on work nobody wants.
+//
+// `TargetCloseError` is puppeteer's own signal that the CDP session is detached
+// (`CdpSession.send` raises it the moment `detached` is set). Ask it as well as
+// the page: the session flips first, so between the two there is a window where
+// every call throws yet `isClosed()` still answers false.
+const isTransientContextLoss = (page, error) =>
+  isContextDestroyed(error) && error?.name !== 'TargetCloseError' && !page.isClosed()
+
+module.exports = isTransientContextLoss

package/src/wait-for-ready.js

@@ -1,7 +1,7 @@
 'use strict'
 
 const { setTimeout: sleep } = require('node:timers/promises')
-const { isContextDestroyed } = require('@browserless/errors')
+const isTransientContextLoss = require('./is-transient-context-loss')
 
 const DEFAULT_QUIET_MS = 300
 const DEFAULT_POLL_MS = 150
@@ -193,7 +193,7 @@ const waitForReady = async (
     try {
       signals = await page.evaluate(paintSignals)
     } catch (error) {
-      if (!isContextDestroyed(error)) throw error
+      if (!isTransientContextLoss(page, error)) throw error
       resets++
       lastHeight = -1
       quietSince = 0