@browserless/pdf 13.6.12 → 13.8.0

package/package.json

@@ -2,7 +2,7 @@
   "name": "@browserless/pdf",
   "description": "Convert websites to high-quality PDFs with customizable margins, background printing, and optimized scaling.",
   "homepage": "https://browserless.js.org/#/?id=pdfurl-options",
-  "version": "13.6.12",
+  "version": "13.8.0",
   "main": "src",
   "author": {
     "email": "hello@microlink.io",
@@ -30,8 +30,8 @@
     "website-to-pdf"
   ],
   "dependencies": {
-    "@browserless/goto": "13.6.12",
-    "@browserless/screenshot": "13.6.12",
+    "@browserless/goto": "13.8.0",
+    "@browserless/screenshot": "13.8.0",
     "@kikobeats/time-span": "~1.0.12",
     "debug-logfmt": "~1.4.10",
     "p-reflect": "~2.1.0",
@@ -47,5 +47,5 @@
     "test": "exit 0"
   },
   "license": "MIT",
-  "gitHead": "363898247585b3b6cd51781fbd55ca61ee9ef8a6"
+  "gitHead": "c8ee02797b7f301426683171bf7132b0df695ca1"
 }

package/src/index.js

@@ -73,19 +73,29 @@ module.exports = ({ goto, ...gotoOpts } = {}) => {
       ...rest
     } = opts
 
+    const hasActionPdf =
+      Array.isArray(rest.actions) && rest.actions.some(action => action.type === 'pdf')
+
     if (waitUntil !== 'auto') {
-      await goto(page, { ...rest, url, waitUntil })
-      await prepareFullDocument(page, { goto, timeout: rest.timeout })
-      return
+      const { actionCaptures } = await goto(page, { ...rest, url, waitUntil })
+      if (!hasActionPdf) {
+        await prepareFullDocument(page, { goto, timeout: rest.timeout })
+      }
+      return { actionCaptures, hasActionPdf }
     }
 
     let readiness
     let isReady = false
     let didHydrateScroll = false
 
-    await goto(page, { ...rest, url, waitUntil, waitUntilAuto })
+    const { actionCaptures } = await goto(page, {
+      ...rest,
+      url,
+      waitUntil,
+      waitUntilAuto
+    })
 
-    if (isReady) {
+    if (isReady && !hasActionPdf) {
       const prep = await prepareFullDocument(page, {
         goto,
         timeout: rest.timeout,
@@ -94,9 +104,10 @@ module.exports = ({ goto, ...gotoOpts } = {}) => {
       readiness = { ...readiness, ...prep }
     }
 
-    return readiness
+    return { readiness, actionCaptures, hasActionPdf }
 
     async function waitUntilAuto (page, { response, timeout: autoTimeout } = {}) {
+      if (hasActionPdf) return
       const timeout = autoTimeout ?? goto.timeouts.action(rest.timeout)
       let didHydrateAttempt = false
 
@@ -165,7 +176,14 @@ module.exports = ({ goto, ...gotoOpts } = {}) => {
   const pdf =
     page =>
       async (url, opts = {}) => {
-        await prepare(page, url, opts)
+        const prepared = await prepare(page, url, opts)
+        if (prepared?.hasActionPdf) {
+          const last = prepared.actionCaptures?.pdfs?.at(-1)
+          if (!last?.buffer) {
+            throw new Error('actions: pdf action produced no buffer')
+          }
+          return last.buffer
+        }
         return render(page, opts)
       }