adding support for web fonts timeout

Author: Julien Neuhart

docker-compose.yml

@@ -12,6 +12,6 @@ services:
       - ./:/usr/src/app:rw
 
   gotenberg:
-    image: thecodingmachine/gotenberg:4
+    image: thecodingmachine/gotenberg:4.1
     container_name: gotenberg
     restart: 'no'

src/ChromeRequest.php

@@ -31,6 +31,9 @@ abstract class ChromeRequest extends Request implements GotenbergRequestInterfac
     /** @var bool */
     protected $landscape;
 
+    /** @var int|null */
+    protected $webFontsTimeout;
+
     /**
      * @return array<string,mixed>
      */
@@ -58,6 +61,9 @@ public function getFormValues(): array
         if (!is_null($this->marginRight)) {
             $values[self::MARGIN_RIGHT] = $this->marginRight;
         }
+        if (!is_null($this->webFontsTimeout)) {
+            $values[self::WEB_FONTS_TIMEOUT] = $this->webFontsTimeout;
+        }
         $values[self::LANDSCAPE] = $this->landscape;
         return $values;
     }
@@ -176,4 +182,12 @@ public function setLandscape(bool $landscape): void
     {
         $this->landscape = $landscape;
     }
+
+    /**
+     * @param int|null $webFontsTimeout
+     */
+    public function setWebFontsTimeout(?int $webFontsTimeout): void
+    {
+        $this->webFontsTimeout = $webFontsTimeout;
+    }
 }

src/Client.php

@@ -9,7 +9,6 @@
 use Psr\Http\Message\RequestInterface;
 use Psr\Http\Message\ResponseInterface;
 use Safe\Exceptions\FilesystemException;
-use function Safe\mkdir;
 use function Safe\fopen;
 use function Safe\fwrite;
 use function Safe\fclose;

src/Request.php

@@ -25,6 +25,7 @@ abstract class Request
     protected const MARGIN_LEFT = 'marginLeft';
     protected const MARGIN_RIGHT = 'marginRight';
     protected const LANDSCAPE = 'landscape';
+    protected const WEB_FONTS_TIMEOUT = 'webFontsTimeout';
 
     /** @var string|null */
     protected $webhookURL;

tests/ClientTest.php

@@ -56,6 +56,7 @@ private function createHTMLRequest(): HTMLRequest
         $request->setAssets($assets);
         $request->setPaperSize(Request::A4);
         $request->setMargins(Request::NO_MARGINS);
+        $request->setWebFontsTimeout(500);
         return $request;
     }
 
@@ -72,6 +73,7 @@ private function createURLRequest(): URLRequest
         $request->setFooter($footer);
         $request->setPaperSize(Request::A4);
         $request->setMargins(Request::NO_MARGINS);
+        $request->setWebFontsTimeout(500);
         return $request;
     }
 
@@ -100,6 +102,7 @@ public function createMarkdownRequest(): MarkdownRequest
         $request->setAssets($assets);
         $request->setPaperSize(Request::A4);
         $request->setMargins(Request::NO_MARGINS);
+        $request->setWebFontsTimeout(500);
         return $request;
     }
 
@@ -125,6 +128,7 @@ public function createMergeRequest(): MergeRequest
             DocumentFactory::makeFromPath('gotenberg2.pdf', __DIR__ . '/assets/pdf/gotenberg.pdf'),
         ];
         $request = new MergeRequest($files);
+
         return $request;
     }