@browserless/screenshot 9.3.0-beta.7 → 9.3.1

package/package.json

@@ -2,7 +2,7 @@
   "name": "@browserless/screenshot",
   "description": "Take clean screenshot of any website",
   "homepage": "https://browserless.js.org/#/?id=screenshoturl-options",
-  "version": "9.3.0-beta.7",
+  "version": "9.3.1",
   "main": "src/index.js",
   "author": {
     "email": "hello@microlink.io",
@@ -28,7 +28,7 @@
     "screenshot"
   ],
   "dependencies": {
-    "@browserless/goto": "^9.3.0-beta.7",
+    "@browserless/goto": "^9.3.1",
     "debug-logfmt": "~1.0.4",
     "got": "~11.8.3",
     "is-html-content": "~1.0.0",
@@ -58,5 +58,5 @@
     "test": "exit 0"
   },
   "license": "MIT",
-  "gitHead": "985d388b09f2a008c3875c7079d3f7ecab69a4a8"
+  "gitHead": "898ac18eec3d0649c2f8d84211d469f9565a32e8"
 }

package/src/index.js

@@ -55,10 +55,14 @@ module.exports = ({ goto, ...gotoOpts }) => {
     let screenshot
     let response
 
-    const beforeScreenshot = response =>
-      Promise.all(
+    const beforeScreenshot = response => {
+      const timeout = goto.timeouts.action(goto.timeouts.base(opts.timeout))
+      return Promise.all(
         [
-          { fn: () => page.evaluate('document.fonts.ready'), debug: 'beforeScreenshot:fontsReady' },
+          {
+            fn: () => page.evaluate('document.fonts.ready'),
+            debug: 'beforeScreenshot:fontsReady'
+          },
           {
             fn: () => waitForPrism(page, response, { codeScheme, ...opts }),
             debug: 'beforeScreenshot:waitForPrism'
@@ -67,8 +71,9 @@ module.exports = ({ goto, ...gotoOpts }) => {
             fn: () => waitForImagesOnViewport(page),
             debug: 'beforeScreenshot:waitForImagesOnViewport'
           }
-        ].map(({ fn, ...opts }) => goto.run({ fn: fn(), timeout: goto.actionTimeout, ...opts }))
+        ].map(({ fn, ...opts }) => goto.run({ fn: fn(), ...opts, timeout }))
       )
+    }
 
     const takeScreenshot = async opts => {
       screenshot = await page.screenshot(opts)

package/src/pretty/index.js

@@ -1,9 +1,9 @@
 'use strict'
 
 const debug = require('debug-logfmt')('browserless:screenshot')
+const isHtmlContent = require('is-html-content')
 const { readFile } = require('fs').promises
 const { extension } = require('mime-types')
-const isHtml = require('is-html-content')
 const prettyMs = require('pretty-ms')
 const timeSpan = require('time-span')
 const path = require('path')
@@ -14,14 +14,14 @@ const getHtml = require('./html')
 
 const PRETTY_CONTENT_TYPES = ['json', 'text', 'html']
 
-const { injectScripts, injectStyles } = require('@browserless/goto')
+const { inject } = require('@browserless/goto')
 
 const getContentType = headers => {
   const contentType = extension(headers['content-type'])
   return contentType === 'txt' ? 'text' : contentType
 }
 
-module.exports = async (page, response, { codeScheme, styles, scripts, modules }) => {
+module.exports = async (page, response, { timeout, codeScheme, styles, scripts, modules }) => {
   if (!response || !codeScheme) return
 
   const contentType = getContentType(response.headers())
@@ -30,25 +30,18 @@ module.exports = async (page, response, { codeScheme, styles, scripts, modules }
 
   const isHtmlContentType = contentType === 'html'
 
-  const [theme, payload, prism] = await Promise.all([
+  const [theme, content, prism] = await Promise.all([
     getTheme(codeScheme),
     response[isHtmlContentType ? 'text' : contentType](),
     getPrism
   ])
 
-  if (isHtmlContentType && isHtml(payload)) return
+  if (isHtmlContentType && isHtmlContent(content)) return
 
   const timePretty = timeSpan()
-  const html = getHtml(payload, { contentType, prism, theme })
+  const html = getHtml(content, { contentType, prism, theme })
   await page.setContent(html)
-
-  await Promise.all(
-    [
-      modules && injectScripts(page, modules, { type: 'modules' }),
-      scripts && injectScripts(page, scripts),
-      styles && injectStyles(page, styles)
-    ].filter(Boolean)
-  )
+  await inject(page, { timeout, modules, scripts, styles })
 
   debug('pretty', { duration: prettyMs(timePretty()) })
 }