@browserless/function 10.12.9 → 10.12.12

package/package.json

@@ -2,7 +2,7 @@
   "name": "@browserless/function",
   "description": "Execute arbitrary JavaScript code in a secure browser sandbox with access to page DOM and network.",
   "homepage": "https://browserless.js.org",
-  "version": "10.12.9",
+  "version": "10.12.12",
   "main": "src/index.js",
   "author": {
     "email": "hello@microlink.io",
@@ -31,7 +31,7 @@
     "vm"
   ],
   "dependencies": {
-    "@browserless/errors": "^10.12.9",
+    "@browserless/errors": "^10.12.12",
     "isolated-function": "~0.1.51",
     "require-one-of": "~1.0.24"
   },
@@ -57,5 +57,5 @@
     "timeout": "2m",
     "workerThreads": false
   },
-  "gitHead": "d07a808e13dd69583ffe6235359fcd33862887af"
+  "gitHead": "824570864568b193af8ab3679390b4ab5dbfe502"
 }

package/src/index.js

@@ -6,6 +6,17 @@ const runFunction = require('./function')
 
 const stringify = fn => fn.toString().trim().replace(/;$/, '')
 
+const getTargetId = async page => {
+  try {
+    const session = await page.createCDPSession()
+    const { targetInfo } = await session.send('Target.getTargetInfo')
+    await session.detach()
+    return targetInfo.targetId
+  } catch {
+    return undefined
+  }
+}
+
 const serializeResponse = response => ({
   status: response.status(),
   statusText: response.statusText(),
@@ -50,6 +61,8 @@ module.exports = (
     return browserless.withPage((page, goto) => async () => {
       const { device, response } = await goto(page, { url, timeout, ...gotoOpts })
 
+      const targetId = await getTargetId(page)
+
       const runFunctionOpts = {
         url,
         code,
@@ -73,6 +86,7 @@ module.exports = (
 
         if (!browserWSEndpoint) throw new Error('Browser WebSocket endpoint not found')
         runFunctionOpts.browserWSEndpoint = browserWSEndpoint
+        runFunctionOpts.targetId = targetId
       }
 
       const result = await runFunction(runFunctionOpts)

package/src/template.js

@@ -50,7 +50,19 @@ const template = (code, usesPage = isUsingPage(code)) => {
       const puppeteer = require('@cloudflare/puppeteer')
       const browser = await puppeteer.connect({ browserWSEndpoint })
       const pages = await browser.pages()
-      const page = pages[pages.length - 1]
+      const { targetId } = opts
+      let page
+      if (targetId && pages.length > 1) {
+        for (const p of pages) {
+          try {
+            const session = await p.createCDPSession()
+            const { targetInfo } = await session.send('Target.getTargetInfo')
+            await session.detach()
+            if (targetInfo.targetId === targetId) { page = p; break }
+          } catch {}
+        }
+      }
+      if (!page) page = pages[pages.length - 1]
       try {
         return await (${code})({ page, response, ...rest })
       } finally {