@browserless/goto 9.4.1 → 9.6.0

package/package.json

@@ -2,7 +2,7 @@
   "name": "@browserless/goto",
   "description": "Go to a page aborting unnecessary requests",
   "homepage": "https://browserless.js.org/#/?id=gotopage-options",
-  "version": "9.4.1",
+  "version": "9.6.0",
   "main": "src/index.js",
   "author": {
     "email": "hello@microlink.io",
@@ -47,7 +47,8 @@
     "@browserless/test": "latest",
     "ava": "3",
     "browserless": "latest",
-    "exit-hook": "2"
+    "exit-hook": "2",
+    "fpscanner": "latest"
   },
   "engines": {
     "node": ">= 12"
@@ -68,5 +69,5 @@
     "timeout": "2m",
     "verbose": true
   },
-  "gitHead": "06e8bc03ec49cec34ae8462ae073180c26c93766"
+  "gitHead": "ed21c66d61affc17cf23dfb54a1c2071dc08de11"
 }

package/src/evasions/index.js

@@ -2,10 +2,12 @@
 
 module.exports = {
   chromeRuntime: require('./chrome-runtime'),
-  stackTraces: require('./stack-traces'),
   mediaCodecs: require('./media-codecs'),
   navigatorPermissions: require('./navigator-permissions'),
   navigatorPlugins: require('./navigator-plugins'),
+  navigatorVendor: require('./navigator-vendor'),
   randomizeUserAgent: require('./randomize-user-agent'),
-  webglVendor: require('./webgl-vendor')
+  stackTraces: require('./stack-traces'),
+  webglVendor: require('./webgl-vendor'),
+  windowFrame: require('./window-frame')
 }

package/src/evasions/navigator-vendor.js

@@ -0,0 +1,25 @@
+module.exports = page =>
+  page.evaluateOnNewDocument(async () => {
+    const getUserAgentVendor = userAgent => {
+      let vendor
+
+      if (userAgent.includes('Firefox')) {
+        vendor = 'firefox'
+      } else if (userAgent.includes('Chrome')) {
+        vendor = 'chrome'
+      } else {
+        vendor = 'safari'
+      }
+
+      return vendor
+    }
+
+    const userAgent = navigator.userAgent
+    const userAgentVendor = getUserAgentVendor(userAgent)
+
+    if (userAgentVendor === 'chrome') return
+
+    Object.defineProperty(navigator, 'vendor', {
+      value: userAgentVendor === 'safari' ? 'Apple Computer, Inc.' : ''
+    })
+  })

package/src/evasions/window-frame.js

@@ -0,0 +1,9 @@
+'use strict'
+
+module.exports = page =>
+  page.evaluateOnNewDocument(() => {
+    if (window.outerWidth && window.outerHeight) return
+    const windowFrame = 85
+    window.outerWidth = window.innerWidth
+    window.outerHeight = window.innerHeight + windowFrame
+  })

package/src/index.js

@@ -14,6 +14,8 @@ const isUrl = require('is-url-http')
 const path = require('path')
 const fs = require('fs')
 
+const truncate = (str, n = 80) => (str.length > n ? str.substr(0, n - 1) + '…' : str)
+
 const EVASIONS = require('./evasions')
 
 const ALL_EVASIONS_KEYS = Object.keys(EVASIONS)
@@ -92,10 +94,7 @@ const disableAnimations = `
   }
 `.trim()
 
-const inject = async (
-  page,
-  { timeout, mediaType, animations, hide, remove, modules, scripts, styles }
-) => {
+const inject = async (page, { timeout, mediaType, animations, modules, scripts, styles }) => {
   const postPromises = []
 
   if (mediaType) {
@@ -118,26 +117,6 @@ const inject = async (
     )
   }
 
-  if (hide) {
-    postPromises.push(
-      run({
-        fn: injectStyle(page, `${castArray(hide).join(', ')} { visibility: hidden !important; }`),
-        timeout,
-        debug: 'hide'
-      })
-    )
-  }
-
-  if (remove) {
-    postPromises.push(
-      run({
-        fn: injectStyle(page, `${castArray(remove).join(', ')} { display: none !important; }`),
-        timeout,
-        debug: 'remove'
-      })
-    )
-  }
-
   if (modules) {
     postPromises.push(
       run({
@@ -215,12 +194,10 @@ module.exports = ({
       click,
       colorScheme,
       headers = {},
-      hide,
       html,
       javascript = true,
       mediaType,
       modules,
-      remove,
       scripts,
       scroll,
       styles,
@@ -249,13 +226,14 @@ module.exports = ({
       await page.setRequestInterception(true)
       page.on('request', req => {
         if (req.isInterceptResolutionHandled()) return
-
         const resourceType = req.resourceType()
+        const url = truncate(req.url())
+
         if (!abortTypes.includes(resourceType)) {
-          debug('continue', { url: req.url(), resourceType })
+          debug('continue', { url, resourceType })
           return req.continue(req.continueRequestOverrides(), 0)
         }
-        debug('abort', { url: req.url(), resourceType })
+        debug('abort', { url, resourceType })
         return req.abort('blockedbyclient', 0)
       })
     }
@@ -384,8 +362,6 @@ module.exports = ({
       timeout: actionTimeout,
       mediaType,
       animations,
-      hide,
-      remove,
       modules,
       scripts,
       styles