Update handling of browser output for Puppeteer ^23.0.0

spatie · Aug 20, 2024 · dbc8c71 · dbc8c71
1 parent 1ff65aa
commit dbc8c71
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 5 deletions.
diff --git a/bin/browser.cjs b/bin/browser.cjs
@@ -47,9 +47,14 @@ const getOutput = async (request, page = null) => {
             output.result = await page.evaluate(request.options.pageFunction);
         } else {
             const result = await page[request.action](request.options);
+            const resultBuffer = Buffer.from(result);
 
-            // Ignore output result when saving to a file
-            output.result = request.options.path ? '' : result.toString('base64');
+            if (request.action === 'screenshot') {
+                output.result = resultBuffer.toString('base64');
+            } else {
+                // Ignore output result when saving to a file
+                output.result = request.options.path ? '' : resultBuffer.toString();
+            }
         }
     }
 

diff --git a/src/Browsershot.php b/src/Browsershot.php
@@ -674,7 +674,7 @@ public function pdf(): string
 
         $this->cleanupTemporaryHtmlFile();
 
-        return base64_decode($encodedPdf);
+        return $encodedPdf;
     }
 
     public function savePdf(string $targetPath)
@@ -694,11 +694,11 @@ public function base64pdf(): string
     {
         $command = $this->createPdfCommand();
 
-        $encodedPdf = $this->callBrowser($command);
+        $pdf = $this->callBrowser($command);
 
         $this->cleanupTemporaryHtmlFile();
 
-        return $encodedPdf;
+        return base64_encode($pdf);
     }
 
     public function evaluate(string $pageFunction): string