Merge 638fa4e into 872c525

microlinkhq · Apr 22, 2024 · eadb3df · eadb3df
2 parents 872c525 + 638fa4e
commit eadb3df
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 3 deletions.
diff --git a/packages/goto/src/index.js b/packages/goto/src/index.js
@@ -197,7 +197,7 @@ module.exports = ({ defaultDevice = 'Macbook Pro 13', timeout: globalTimeout, ..
       scripts,
       scroll,
       styles,
-      timeout = globalTimeout,
+      timeout,
       timezone,
       url,
       username,
@@ -210,7 +210,7 @@ module.exports = ({ defaultDevice = 'Macbook Pro 13', timeout: globalTimeout, ..
       ...args
     }
   ) => {
-    const baseTimeout = timeouts.base(globalTimeout)
+    const baseTimeout = timeouts.base(timeout || globalTimeout)
     const actionTimeout = timeouts.action(baseTimeout)
     const gotoTimeout = timeouts.goto(baseTimeout)
 
@@ -363,7 +363,10 @@ module.exports = ({ defaultDevice = 'Macbook Pro 13', timeout: globalTimeout, ..
     const { value: response, reason: error } = await run({
       fn: html
         ? page.setContent(html, { waitUntil, ...args })
-        : page.goto(url, { waitUntil, ...args }),
+        : Promise.race([
+          page.goto(url, { waitUntil, ...args }),
+          setTimeout(gotoTimeout).then(() => page._client().send('Page.stopLoading'))
+        ]),
       timeout: gotoTimeout,
       debug: { fn: html ? 'html' : 'url', waitUntil }
     })

diff --git a/packages/goto/test/index.js b/packages/goto/test/index.js
@@ -61,3 +61,14 @@ test('handle page disconnections', async t => {
 
   await intercept('chrome://version')
 })
+
+test('handle page.goto hanging', async t => {
+  const browserless = await getBrowserContext(t)
+
+  const html = await browserless.html('https://test-timeout.vercel.app/', {
+    timeout: 5000,
+    animations: true
+  })
+
+  t.is(html, '<html><head></head><body></body></html>')
+})