fix(supervisor): if process is already restarting, requeue a task (#754)

Bumps [actions/setup-go](https://github.com/actions/setup-go) from 4 to 5.
- [Release notes](https://github.com/actions/setup-go/releases)
- [Commits](https://github.com/actions/setup-go/compare/v4...v5)

---
updated-dependencies:
- dependency-name: actions/setup-go
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

.github/workflows/continuous_integration.yml

@@ -17,14 +17,14 @@ jobs:
       - name: Setup Go
         uses: actions/setup-go@v5
         with:
-          go-version: '1.22'
+          go-version: '1.21'
           cache: false
       - name: Checkout source code
         uses: actions/checkout@v4
       - name: Run linters
-        uses: golangci/golangci-lint-action@v4
+        uses: golangci/golangci-lint-action@v3
         with:
-          version: v1.56.2
+          version: v1.54.2
 
   tests:
     needs:

.golangci.yml

@@ -3,8 +3,9 @@ linters-settings:
     sections:
       - standard
       - default
-      - prefix(github.com/gotenberg/gotenberg/v8)
+      - prefix(github.com/gotenberg/gotenberg/v7)
     skip-generated: true
+    skip-vendor: true
     custom-order: true
 
 linters:
@@ -26,7 +27,7 @@ linters:
     - unused
 
 run:
-  timeout: 5m
+  deadline: 5m
   issues-exit-code: 1
   tests: false
 

LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2024 Julien Neuhart
+Copyright (c) 2023 Julien Neuhart
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

Makefile

@@ -5,14 +5,14 @@ help: ## Show the help
 .PHONY: it
 it: build build-tests ## Initialize the development environment
 
-GOLANG_VERSION=1.22
+GOLANG_VERSION=1.21
 DOCKER_REPOSITORY=gotenberg
 GOTENBERG_VERSION=snapshot
 GOTENBERG_USER_GID=1001
 GOTENBERG_USER_UID=1001
-NOTO_COLOR_EMOJI_VERSION=v2.042 # See https://github.com/googlefonts/noto-emoji/releases.
+NOTO_COLOR_EMOJI_VERSION=v2.040 # See https://github.com/googlefonts/noto-emoji/releases.
 PDFTK_VERSION=v3.3.3 # See https://gitlab.com/pdftk-java/pdftk/-/releases - Binary package.
-GOLANGCI_LINT_VERSION=v1.56.2 # See https://github.com/golangci/golangci-lint/releases.
+GOLANGCI_LINT_VERSION=v1.54.2 # See https://github.com/golangci/golangci-lint/releases.
 
 .PHONY: build
 build: ## Build the Gotenberg's Docker image
@@ -35,7 +35,6 @@ API_ROOT_PATH=/
 API_TRACE_HEADER=Gotenberg-Trace
 API_DISABLE_HEALTH_CHECK_LOGGING=false
 CHROMIUM_RESTART_AFTER=0
-CHROMIUM_MAX_QUEUE_SIZE=0
 CHROMIUM_AUTO_START=false
 CHROMIUM_START_TIMEOUT=20s
 CHROMIUM_INCOGNITO=false
@@ -46,13 +45,10 @@ CHROMIUM_ALLOW_FILE_ACCESS_FROM_FILES=false
 CHROMIUM_HOST_RESOLVER_RULES=
 CHROMIUM_PROXY_SERVER=
 CHROMIUM_ALLOW_LIST=
-CHROMIUM_DENY_LIST=^file:(?!//\/tmp/).*
-CHROMIUM_CLEAR_CACHE=false
-CHROMIUM_CLEAR_COOKIES=false
+CHROMIUM_DENY_LIST="^file:///[^tmp].*"
 CHROMIUM_DISABLE_JAVASCRIPT=false
 CHROMIUM_DISABLE_ROUTES=false
 LIBREOFFICE_RESTART_AFTER=10
-LIBREOFFICE_MAX_QUEUE_SIZE=0
 LIBREOFFICE_AUTO_START=false
 LIBREOFFICE_START_TIMEOUT=20s
 LIBREOFFICE_DISABLE_ROUTES=false
@@ -91,7 +87,6 @@ run: ## Start a Gotenberg container
 	--api-disable-health-check-logging=$(API_DISABLE_HEALTH_CHECK_LOGGING) \
 	--chromium-restart-after=$(CHROMIUM_RESTART_AFTER) \
 	--chromium-auto-start=$(CHROMIUM_AUTO_START) \
-	--chromium-max-queue-size=$(CHROMIUM_MAX_QUEUE_SIZE) \
 	--chromium-start-timeout=$(CHROMIUM_START_TIMEOUT) \
 	--chromium-incognito=$(CHROMIUM_INCOGNITO) \
 	--chromium-allow-insecure-localhost=$(CHROMIUM_ALLOW_INSECURE_LOCALHOST) \
@@ -100,14 +95,11 @@ run: ## Start a Gotenberg container
 	--chromium-allow-file-access-from-files=$(CHROMIUM_ALLOW_FILE_ACCESS_FROM_FILES) \
 	--chromium-host-resolver-rules=$(CHROMIUM_HOST_RESOLVER_RULES) \
 	--chromium-proxy-server=$(CHROMIUM_PROXY_SERVER) \
-	--chromium-allow-list="$(CHROMIUM_ALLOW_LIST)" \
-	--chromium-deny-list="$(CHROMIUM_DENY_LIST)" \
-	--chromium-clear-cache=$(CHROMIUM_CLEAR_CACHE) \
-	--chromium-clear-cookies=$(CHROMIUM_CLEAR_COOKIES) \
+	--chromium-allow-list=$(CHROMIUM_ALLOW_LIST) \
+	--chromium-deny-list=$(CHROMIUM_DENY_LIST) \
 	--chromium-disable-javascript=$(CHROMIUM_DISABLE_JAVASCRIPT) \
 	--chromium-disable-routes=$(CHROMIUM_DISABLE_ROUTES) \
 	--libreoffice-restart-after=$(LIBREOFFICE_RESTART_AFTER) \
-	--libreoffice-max-queue-size=$(LIBREOFFICE_MAX_QUEUE_SIZE) \
 	--libreoffice-auto-start=$(LIBREOFFICE_AUTO_START) \
 	--libreoffice-start-timeout=$(LIBREOFFICE_START_TIMEOUT) \
 	--libreoffice-disable-routes=$(LIBREOFFICE_DISABLE_ROUTES) \
@@ -120,8 +112,8 @@ run: ## Start a Gotenberg container
 	--prometheus-collect-interval=$(PROMETHEUS_COLLECT_INTERVAL) \
 	--prometheus-disable-route-logging=$(PROMETHEUS_DISABLE_ROUTE_LOGGING) \
 	--prometheus-disable-collect=$(PROMETHEUS_DISABLE_COLLECT) \
-	--webhook-allow-list="$(WEBHOOK_ALLOW_LIST)" \
-	--webhook-deny-list="$(WEBHOOK_DENY_LIST)" \
+	--webhook-allow-list=$(WEBHOOK_ALLOW_LIST) \
+	--webhook-deny-list=$(WEBHOOK_DENY_LIST) \
 	--webhook-error-allow-list=$(WEBHOOK_ERROR_ALLOW_LIST) \
 	--webhook-error-deny-list=$(WEBHOOK_ERROR_DENY_LIST) \
 	--webhook-max-retry=$(WEBHOOK_MAX_RETRY) \
@@ -159,13 +151,13 @@ tests-once: ## Run the tests once (prefer the "tests" command while developing)
 .PHONY: fmt
 fmt: ## Format the code and "optimize" the dependencies
 	gofumpt -l -w .
-	gci write -s standard -s default -s "prefix(github.com/gotenberg/gotenberg/v8)" --skip-generated --skip-vendor --custom-order .
+	gci write -s standard -s default -s "prefix(github.com/gotenberg/gotenberg/v7)" --skip-generated --skip-vendor --custom-order .
 	go mod tidy
 
 # go install golang.org/x/tools/cmd/godoc@latest
 .PHONY: godoc
 godoc: ## Run a webserver with Gotenberg godoc
-	$(info http://localhost:6060/pkg/github.com/gotenberg/gotenberg/v8)
+	$(info http://localhost:6060/pkg/github.com/gotenberg/gotenberg/v7)
 	godoc -http=:6060
 
 .PHONY: release

README.md

@@ -15,13 +15,13 @@ numerous document formats (HTML, Markdown, Word, Excel, etc.) into PDF files, an
 Open a terminal and run the following command:
 
 ```
-docker run --rm -p 3000:3000 gotenberg/gotenberg:8
+docker run --rm -p 3000:3000 gotenberg/gotenberg:7
 ```
 
 Alternatively, using the historic Docker repository from our sponsor [TheCodingMachine](https://www.thecodingmachine.com):
 
 ```
-docker run --rm -p 3000:3000 thecodingmachine/gotenberg:8
+docker run --rm -p 3000:3000 thecodingmachine/gotenberg:7
 ```
 
 The API is now available on your host at http://localhost:3000.
@@ -41,5 +41,5 @@ Head to the [documentation](https://gotenberg.dev/docs/getting-started/introduct
 [![Docker pulls](https://img.shields.io/docker/pulls/gotenberg/gotenberg)](https://hub.docker.com/r/gotenberg/gotenberg)
 [![Docker pulls](https://img.shields.io/docker/pulls/thecodingmachine/gotenberg)](https://hub.docker.com/r/thecodingmachine/gotenberg)
 [![Continuous Integration](https://github.com/gotenberg/gotenberg/actions/workflows/continuous_integration.yml/badge.svg)](https://github.com/gotenberg/gotenberg/actions/workflows/continuous_integration.yml)
-[![Go Reference](https://pkg.go.dev/badge/github.com/gotenberg/gotenberg.svg)](https://pkg.go.dev/github.com/gotenberg/gotenberg/v8)
+[![Go Reference](https://pkg.go.dev/badge/github.com/gotenberg/gotenberg.svg)](https://pkg.go.dev/github.com/gotenberg/gotenberg/v7)
 [![Codecov](https://codecov.io/gh/gotenberg/gotenberg/branch/main/graph/badge.svg)](https://codecov.io/gh/gotenberg/gotenberg)

build/Dockerfile

@@ -24,7 +24,7 @@ RUN go mod download &&\
 COPY cmd ./cmd
 COPY pkg ./pkg
 
-RUN go build -o gotenberg -ldflags "-X 'github.com/gotenberg/gotenberg/v8/cmd.Version=$GOTENBERG_VERSION'" cmd/gotenberg/main.go
+RUN go build -o gotenberg -ldflags "-X 'github.com/gotenberg/gotenberg/v7/cmd.Version=$GOTENBERG_VERSION'" cmd/gotenberg/main.go
 
 # ----------------------------------------------
 # Final stage

cmd/gotenberg.go

@@ -11,7 +11,7 @@ import (
 	flag "github.com/spf13/pflag"
 	"golang.org/x/sync/errgroup"
 
-	"github.com/gotenberg/gotenberg/v8/pkg/gotenberg"
+	"github.com/gotenberg/gotenberg/v7/pkg/gotenberg"
 )
 
 // See https://patorjk.com/software/taag/#p=display&f=Small%20Slant&t=Gotenberg.
@@ -75,6 +75,7 @@ func Run() {
 		go func(app gotenberg.App) {
 			id := app.(gotenberg.Module).Descriptor().ID
 			err = app.Start()
+
 			if err != nil {
 				fmt.Printf("[FATAL] starting %s: %s\n", id, err)
 				os.Exit(1)

cmd/gotenberg/main.go

@@ -1,9 +1,9 @@
 package main
 
 import (
-	gotenbergcmd "github.com/gotenberg/gotenberg/v8/cmd"
+	gotenbergcmd "github.com/gotenberg/gotenberg/v7/cmd"
 	// Gotenberg modules.
-	_ "github.com/gotenberg/gotenberg/v8/pkg/standard"
+	_ "github.com/gotenberg/gotenberg/v7/pkg/standard"
 )
 
 func main() {

docs/openapi.yaml

@@ -0,0 +1,744 @@
+openapi: 3.0.3
+info:
+  title: Gotenberg
+  version: 7.x
+  license:
+    name: MIT
+    url: 'https://github.com/gotenberg/gotenberg/blob/main/LICENSE'
+  contact:
+    url: 'https://github.com/gotenberg/gotenberg'
+  description: >-
+    A Docker-powered stateless API for PDF files.
+externalDocs:
+  url: https://gotenberg.dev
+servers:
+  - url: 'http://localhost:3000'
+    description: Local server with the default Docker image and port
+tags:
+  - name: chromium
+    description: Operations of the Chromium module
+    externalDocs:
+      url: https://gotenberg.dev/docs/modules/chromium
+  - name: libreoffice
+    description: Operations of the Libreoffice module
+    externalDocs:
+      url: https://gotenberg.dev/docs/modules/libreoffice
+  - name: pdfengines
+    description: Operations of the PDF Engines module
+    externalDocs:
+      url: https://gotenberg.dev/docs/modules/pdf-engines
+paths:
+  /forms/chromium/convert/url:
+    post:
+      tags:
+        - chromium
+      summary: Convert the contents of a given URL to PDF
+      externalDocs:
+        url: https://gotenberg.dev/docs/modules/chromium
+      description: >-
+        Send a URL in your API request via the `url` form field
+        Send a remote URL in your API request via the `remoteURL` parameter, and
+        get the resulting PDF file. The API will fetch the given URL and render
+        the page to PDF using the underlying headless Chrome instance.
+        You can optionally include `header.html` and `footer.html` files as part of the request as well.
+        See externalDocs for more details.
+      parameters:
+        - in: header
+          name: Gotenberg-Output-Filename
+          description: >-
+            By default, the API generates a UUID filename.
+            However, you may also specify the filename per request,
+            thanks to the Gotenberg-Output-Filename header.
+            Caution! The API adds the file extension automatically; you don't have to set it.
+          schema:
+            type: string
+          required: false
+        - in: header
+          name: Gotenberg-Trace
+          description: >-
+            The trace, or request ID, identifies a request in the logs.
+
+            By default, the API generates a UUID trace for each request.
+            However, you may also specify the trace per request, thanks to the Gotenberg-Trace header.
+          schema:
+            type: string
+          required: false
+      requestBody:
+        required: true
+        description: >-
+          The request must be  `multipart/form-data` that includes a `url` form field.
+          The API uses a headless Chrome instance to do the conversion, therefore print
+          parameter such as margins and paper size are also accepted as optional parameters.
+        content:
+          multipart/form-data:
+            schema:
+              $ref: '#/components/schemas/URLConvertRequestBody'
+            examples: { }
+      responses:
+        '200':
+          $ref: '#/components/responses/SuccessfulPDF'
+        '400':
+          description: Bad Request
+        '503':
+          $ref: '#/components/responses/Timeout'
+
+  /forms/chromium/convert/html:
+    post:
+      tags:
+        - chromium
+      summary: Convert a given HTML file to PDF
+      externalDocs:
+        url: https://gotenberg.dev/docs/modules/chromium
+      description: >-
+        Send an HTML file called `index.html` as a multipart form request, and
+        get the resulting PDF file. You can optionally include `header.html` and
+        `footer.html` files as part of the request as well.
+        See externalDocs for more details.
+      parameters:
+        - in: header
+          name: Gotenberg-Output-Filename
+          description: >-
+            By default, the API generates a UUID filename.
+            However, you may also specify the filename per request,
+            thanks to the Gotenberg-Output-Filename header.
+            Caution! The API adds the file extension automatically; you don't have to set it.
+          schema:
+            type: string
+          required: false
+        - in: header
+          name: Gotenberg-Trace
+          description: >-
+            The trace, or request ID, identifies a request in the logs.
+
+            By default, the API generates a UUID trace for each request.
+            However, you may also specify the trace per request, thanks to the Gotenberg-Trace header.
+          schema:
+            type: string
+          required: false
+      requestBody:
+        content:
+          multipart/form-data:
+            schema:
+              $ref: '#/components/schemas/HTMLConvertRequestBody'
+        description: >-
+          The request body must have an `index.html` file in the `files` array,
+          as well as all the referred resources on the same level as the
+          `index.html` file. The request can also include `header.html` and
+          `footer.html`, given the limitations in the API description above.
+      responses:
+        '200':
+          $ref: '#/components/responses/SuccessfulPDF'
+        '400':
+          description: Bad Request
+        '503':
+          $ref: '#/components/responses/Timeout'
+
+  /forms/chromium/convert/markdown:
+    post:
+      tags:
+        - chromium
+      summary: Convert a Markdown file to PDF
+      externalDocs:
+        url: https://gotenberg.dev/docs/modules/chromium
+      description: >-
+        Accepts an HTML file called `index.html` plus markdown files as a multipart
+        form request and embeds the markdown files into the HTML file using the Golang template
+        function `toHTML`.
+        The API will convert the markdown to HTML and embed it into your `index.html` file,
+        then render the resulting page. You can include your own styling and more in your HTML file.
+        Refer to the HTML conversion page for all the options you can use when converting
+        Markdown documents as well. You can optionally include `header.html` and
+        `footer.html` files as part of the request as well.
+        See externalDocs for more details.
+      parameters:
+        - in: header
+          name: Gotenberg-Output-Filename
+          description: >-
+            By default, the API generates a UUID filename.
+            However, you may also specify the filename per request,
+            thanks to the Gotenberg-Output-Filename header.
+            Caution! The API adds the file extension automatically; you don't have to set it.
+          schema:
+            type: string
+          required: false
+        - in: header
+          name: Gotenberg-Trace
+          description: >-
+            The trace, or request ID, identifies a request in the logs.
+
+            By default, the API generates a UUID trace for each request.
+            However, you may also specify the trace per request, thanks to the Gotenberg-Trace header.
+          schema:
+            type: string
+          required: false
+      requestBody:
+        content:
+          multipart/form-data:
+            schema:
+              $ref: '#/components/schemas/MarkdownConvertRequestBody'
+        description: >-
+          The request body must have an `index.html` file in the `files` array,
+          as well as all the referred markdown resources on the same level as
+          the `index.html` file.
+      responses:
+        '200':
+          $ref: '#/components/responses/SuccessfulPDF'
+        '400':
+          description: Bad Request
+        '503':
+          $ref: '#/components/responses/Timeout'
+
+  /forms/libreoffice/convert:
+    post:
+      tags:
+        - libreoffice
+      summary: Convert an Office document to PDF
+      externalDocs:
+        url: https://gotenberg.dev/docs/modules/libreoffice
+      description: >-
+        This route accepts multipart/form-data requests and files with the following extensions:
+
+        .bib  .doc  .xml  .docx  .fodt  .html  .ltx  .txt  .odt  .ott  .pdb  .pdf  .psw  .rtf
+        .sdw  .stw  .sxw  .uot  .vor  .wps  .epub  .png  .bmp  .emf  .eps  .fodg  .gif  .jpg
+        .met  .odd  .otg  .pbm  .pct  .pgm  .ppm  .ras  .std  .svg  .svm  .swf  .sxd  .sxw
+        .tiff  .xhtml  .xpm  .fodp  .potm  .pot  .pptx  .pps  .ppt  .pwp  .sda  .sdd  .sti
+        .sxi  .uop  .wmf  .csv  .dbf  .dif  .fods  .ods  .ots  .pxl  .sdc  .slk  .stc  .sxc
+        .uos  .xls  .xlt  .xlsx  .tif  .jpeg  .odp
+
+        By default, if you send more than one file to convert, the route returns a ZIP archive of the
+        resulting PDF files. However, you may prefer to merge all the PDF files into an individual PDF file.
+
+        > **Attention:** The files will be merged alphabetically for the
+        resulting PDF.
+
+        You may also specify the page ranges to convert from the incoming Office
+        documents. The expected format is the same as the one from the print
+        options of LibreOffice, e.g. `1-1` or `1-4`.
+
+        > **Attention:** if more than one document, the page ranges will be
+        applied for each document.
+
+        See externalDocs for more details.
+      parameters:
+        - in: header
+          name: Gotenberg-Output-Filename
+          description: >-
+            By default, the API generates a UUID filename.
+            However, you may also specify the filename per request,
+            thanks to the Gotenberg-Output-Filename header.
+            Caution! The API adds the file extension automatically; you don't have to set it.
+          schema:
+            type: string
+          required: false
+        - in: header
+          name: Gotenberg-Trace
+          description: >-
+            The trace, or request ID, identifies a request in the logs.
+
+            By default, the API generates a UUID trace for each request.
+            However, you may also specify the trace per request, thanks to the Gotenberg-Trace header.
+          schema:
+            type: string
+          required: false
+      requestBody:
+        content:
+          multipart/form-data:
+            schema:
+              $ref: '#/components/schemas/OfficeConvertRequestBody'
+      responses:
+        '200':
+          $ref: '#/components/responses/SuccessfulPDF'
+        '400':
+          description: Bad Request, e.g. Both 'pdfFormat' and 'nativePdfA1aFormat' form values are provided
+        '503':
+          $ref: '#/components/responses/Timeout'
+
+  /forms/pdfengines/merge:
+    post:
+      tags:
+        - pdfengines
+      summary: Merge multiple PDFs into a single PDF
+      externalDocs:
+        url: https://gotenberg.dev/docs/modules/pdf-engines
+      description: >-
+        You can send multiple PDF files to this endpoint, the API will merge
+        them into a single PDF and return the resulting PDF file.
+
+        > **Attention:** The PDF files will be merged alphabetically.
+      parameters:
+        - in: header
+          name: Gotenberg-Output-Filename
+          description: >-
+            By default, the API generates a UUID filename.
+            However, you may also specify the filename per request,
+            thanks to the Gotenberg-Output-Filename header.
+            Caution! The API adds the file extension automatically; you don't have to set it.
+          schema:
+            type: string
+          required: false
+        - in: header
+          name: Gotenberg-Trace
+          description: >-
+            The trace, or request ID, identifies a request in the logs.
+
+            By default, the API generates a UUID trace for each request.
+            However, you may also specify the trace per request, thanks to the Gotenberg-Trace header.
+          schema:
+            type: string
+          required: false
+      requestBody:
+        content:
+          multipart/form-data:
+            schema:
+              type: object
+              properties:
+                files:
+                  type: array
+                  items:
+                    type: string
+                    format: binary
+                pdfFormat:
+                  type: string
+                  description: The PDF format of the resulting PDF
+                  example: PDF/A-1a
+              required:
+                - files
+      responses:
+        '200':
+          $ref: '#/components/responses/SuccessfulPDF'
+        '400':
+          description: Bad Request
+        '503':
+          $ref: '#/components/responses/Timeout'
+
+  /forms/pdfengines/convert:
+    post:
+      tags:
+        - pdfengines
+      summary: Convert PDFs into the given formats
+      externalDocs:
+        url: https://gotenberg.dev/docs/modules/pdf-engines
+      description: >-
+        This route accepts PDF files and a form field pdfFormat for converting them into the specified format.
+      parameters:
+        - in: header
+          name: Gotenberg-Output-Filename
+          description: >-
+            By default, the API generates a UUID filename.
+            However, you may also specify the filename per request,
+            thanks to the Gotenberg-Output-Filename header.
+            Caution! The API adds the file extension automatically; you don't have to set it.
+          schema:
+            type: string
+          required: false
+        - in: header
+          name: Gotenberg-Trace
+          description: >-
+            The trace, or request ID, identifies a request in the logs.
+
+            By default, the API generates a UUID trace for each request.
+            However, you may also specify the trace per request, thanks to the Gotenberg-Trace header.
+          schema:
+            type: string
+          required: false
+      requestBody:
+        content:
+          multipart/form-data:
+            schema:
+              type: object
+              properties:
+                files:
+                  type: array
+                  items:
+                    type: string
+                    format: binary
+                pdfFormat:
+                  type: string
+                  description: The PDF format of the resulting PDF
+                  example: PDF/A-1a
+              required:
+                - files
+                - pdfFormat
+      responses:
+        '200':
+          $ref: '#/components/responses/SuccessfulPDF'
+        '400':
+          description: >-
+            Bad Request, e.g. Invalid form data: no form file found for extensions: [.pdf]; form value 'pdfFormat' is required
+        '503':
+          $ref: '#/components/responses/Timeout'
+
+components:
+  schemas:
+    HTMLConvertRequestBody:
+      title: HTML Conversion Request Body
+      type: object
+      properties:
+        files:
+          type: array
+          description: >-
+            List of HTML files to be converted to PDF. An `index.html` file is
+            required, and any other resources that are referenced through the
+            HTML file must be included as well. All the referenced files must be
+            on the same level as the `index.html` file.
+          items:
+            type: string
+            format: binary
+        marginTop:
+          type: number
+          example: 0
+          default: 1
+          description: Top margin for the page in inches.
+        marginBottom:
+          type: number
+          example: 0
+          default: 1
+          description: Bottom margin for the page in inches.
+        marginLeft:
+          type: number
+          example: 0
+          default: 1
+          description: Left margin for the page in inches.
+        marginRight:
+          type: number
+          example: 0
+          default: 1
+          description: Right margin for the page in inches.
+        paperWidth:
+          type: number
+          example: 8.27
+          description: >-
+            Paper width to be used while rendering the PDF. The default page
+            size is A4.
+        paperHeight:
+          type: number
+          example: 11.69
+          description: >-
+            Paper height to be used while rendering the PDF. The default page
+            size is A4.
+        preferCssPageSize:
+          type: boolean
+          description: >-
+            Define whether to prefer page size as defined by CSS (default false)
+          default: false
+        printBackground:
+          type: boolean
+          description: >-
+            Print the background graphics (default false)
+          default: false
+        landscape:
+          type: boolean
+          example: true
+          default: false
+          description: >-
+            The default orientation for rendering the page is "portrait" mode.
+            By sending "landscape" parameter, you can ask the output to be
+            landscape.
+        scale:
+          type: number
+          minimum: 0.1
+          maximum: 2.0
+          example: 1.5
+          description: >-
+            The scale of the page rendering
+          default: 1.0
+        waitDelay:
+          type: string
+          example: 5s
+          description: >-
+            When the page relies on JavaScript for rendering, and you don't have access to the page's code,
+            you may want to wait a certain amount of time to make sure Chromium has fully rendered the page
+            you're trying to generate.
+        waitWindowStatus:
+          type: string
+          example: done
+          description: >-
+            If you have access to the page's code, you may set the window status and tell Gotenberg to wait for a specific value.
+            For instance
+               await promises()
+               window.status = 'ready'
+            Prefer this option over waitDelay.
+        extraHttpHeaders:
+          type: string
+          description: HTTP headers to send by Chromium while loading the HTML document (JSON format)
+        nativePageRanges:
+          type: string
+          example: 1-4
+          description: >-
+            The page ranges to be converted to PDF for the incoming Office
+            documents.
+        pdfFormat:
+          type: string
+          description: >-
+            The PDF format of the resulting PDF.
+            Caution! You cannot use both nativePdfA1aFormat and pdfFormat form fields.
+          example: PDF/A-1a
+      required:
+        - files
+    MarkdownConvertRequestBody:
+      title: Markdown Conversion Request Body
+      type: object
+      properties:
+        files:
+          type: array
+          items:
+            type: string
+            format: binary
+        marginTop:
+          type: number
+          example: 0
+          default: 1
+          description: Top margin for the page in inches.
+        marginBottom:
+          type: number
+          example: 0
+          default: 1
+          description: Bottom margin for the page in inches.
+        marginLeft:
+          type: number
+          example: 0
+          default: 1
+          description: Left margin for the page in inches.
+        marginRight:
+          type: number
+          example: 0
+          default: 1
+          description: Right margin for the page in inches.
+        paperWidth:
+          type: number
+          example: 8.27
+          description: >-
+            Paper width to be used while rendering the PDF. The default page
+            size is A4.
+        paperHeight:
+          type: number
+          example: 11.69
+          description: >-
+            Paper height to be used while rendering the PDF. The default page
+            size is A4.
+        preferCssPageSize:
+          type: boolean
+          description: >-
+            Define whether to prefer page size as defined by CSS (default false)
+          default: false
+        printBackground:
+          type: boolean
+          description: >-
+            Print the background graphics (default false)
+          default: false
+        landscape:
+          type: boolean
+          example: true
+          default: false
+          description: >-
+            The default orientation for rendering the page is "portrait" mode.
+            By sending "landscape" parameter, you can ask the output to be
+            landscape.
+        scale:
+          type: number
+          minimum: 0.1
+          maximum: 2.0
+          example: 1.5
+          description: >-
+            The scale of the page rendering
+          default: 1.0
+        waitDelay:
+          type: string
+          example: 5s
+          description: >-
+            When the page relies on JavaScript for rendering, and you don't have access to the page's code,
+            you may want to wait a certain amount of time to make sure Chromium has fully rendered the page
+            you're trying to generate.
+        waitWindowStatus:
+          type: string
+          example: done
+          description: >-
+            If you have access to the page's code, you may set the window status and tell Gotenberg to wait for a specific value.
+            For instance
+               await promises()
+               window.status = 'ready'
+            Prefer this option over waitDelay.
+        extraHttpHeaders:
+          type: string
+          description: HTTP headers to send by Chromium while loading the HTML document (JSON format)
+        nativePageRanges:
+          type: string
+          example: 1-4
+          description: >-
+            The page ranges to be converted to PDF for the incoming Office
+            documents.
+        pdfFormat:
+          type: string
+          description: >-
+            The PDF format of the resulting PDF.
+            Caution! You cannot use both nativePdfA1aFormat and pdfFormat form fields.
+          example: PDF/A-1a
+      required:
+        - files
+    URLConvertRequestBody:
+      title: URL Conversion Request Body
+      type: object
+      properties:
+        url:
+          type: string
+          example: 'https://google.com'
+        files:
+          description: Optional files named header.html and footer.html
+          type: array
+          items:
+            type: string
+            format: binary
+        marginTop:
+          type: number
+          example: 0
+          default: 1
+          description: Top margin for the page in inches.
+        marginBottom:
+          type: number
+          example: 0
+          default: 1
+          description: Bottom margin for the page in inches.
+        marginLeft:
+          type: number
+          example: 0
+          default: 1
+          description: Left margin for the page in inches.
+        marginRight:
+          type: number
+          example: 0
+          default: 1
+          description: Right margin for the page in inches.
+        paperWidth:
+          type: number
+          example: 8.27
+          description: >-
+            Paper width to be used while rendering the PDF. The default page
+            size is A4.
+        paperHeight:
+          type: number
+          example: 11.69
+          description: >-
+            Paper height to be used while rendering the PDF. The default page
+            size is A4.
+        preferCssPageSize:
+          type: boolean
+          description: >-
+            Define whether to prefer page size as defined by CSS (default false)
+          default: false
+        printBackground:
+          type: boolean
+          description: >-
+            Print the background graphics (default false)
+          default: false
+        landscape:
+          type: boolean
+          example: true
+          default: false
+          description: >-
+            The default orientation for rendering the page is "portrait" mode.
+            By sending "landscape" parameter, you can ask the output to be
+            landscape.
+        scale:
+          type: number
+          minimum: 0.1
+          maximum: 2.0
+          example: 1.5
+          description: >-
+            The scale of the page rendering
+          default: 1.0
+        waitDelay:
+          type: string
+          example: 5s
+          description: >-
+            When the page relies on JavaScript for rendering, and you don't have access to the page's code,
+            you may want to wait a certain amount of time to make sure Chromium has fully rendered the page
+            you're trying to generate.
+        waitWindowStatus:
+          type: string
+          example: done
+          description: >-
+            If you have access to the page's code, you may set the window status and tell Gotenberg to wait for a specific value.
+            For instance
+               await promises()
+               window.status = 'ready'
+            Prefer this option over waitDelay.
+        extraHttpHeaders:
+          type: string
+          description: HTTP headers to send by Chromium while loading the HTML document (JSON format)
+        nativePageRanges:
+          type: string
+          example: 1-4
+          description: >-
+            The page ranges to be converted to PDF for the incoming Office
+            documents.
+        pdfFormat:
+          type: string
+          description: >-
+            The PDF format of the resulting PDF.
+            Caution! You cannot use both nativePdfA1aFormat and pdfFormat form fields.
+          example: PDF/A-1a
+      required:
+        - url
+    OfficeConvertRequestBody:
+      title: Office Conversion Request Body
+      type: object
+      properties:
+        files:
+          type: array
+          items:
+            type: string
+            format: binary
+        nativePageRanges:
+          type: string
+          example: 1-4
+          description: >-
+            The page ranges to be converted to PDF for the incoming Office
+            documents. **If there are multiple files sent to the API, this page
+            range will apply to all of the documents**. Empty means all pages.
+        nativePdfA1aFormat:
+          type: boolean
+          description: >-
+            Use unoconv to convert the resulting PDF to the 'PDF/A-1a' format.
+            Caution! You cannot use both nativePdfA1aFormat and pdfFormat form fields.
+        pdfFormat:
+          type: string
+          description: >-
+            The PDF format of the resulting PDF.
+            Caution! You cannot use both nativePdfA1aFormat and pdfFormat form fields.
+          example: PDF/A-1a
+        landscape:
+          type: boolean
+          example: true
+          default: false
+          description: >-
+            The default orientation for rendering the page is "portrait" mode.
+            By sending "landscape" parameter, you can ask the output to be
+            landscape.
+        merge:
+          type: boolean
+          description: >-
+            Merge all PDF files into an individual PDF file.
+      required:
+        - files
+    MergeFilesRequestBody:
+      title: Merge Files Request Body
+      type: object
+      properties:
+        files:
+          type: array
+          items:
+            type: string
+            format: binary
+      required:
+        - files
+  securitySchemes: { }
+  responses:
+    SuccessfulPDF:
+      description: Resulting PDF file from the conversion.
+      content:
+        application/pdf:
+          schema:
+            type: string
+            format: binary
+    Timeout:
+      description: Service Unavailable

go.mod

@@ -1,43 +1,41 @@
-module github.com/gotenberg/gotenberg/v8
+module github.com/gotenberg/gotenberg/v7
 
-go 1.22
+go 1.21
 
 require (
 	github.com/alexliesenfeld/health v0.8.0
-	github.com/andybalholm/brotli v1.1.0 // indirect
-	github.com/chromedp/cdproto v0.0.0-20240312231614-1e5096e63154
-	github.com/chromedp/chromedp v0.9.5
+	github.com/andybalholm/brotli v1.0.6 // indirect
+	github.com/chromedp/cdproto v0.0.0-20231205062650-00455a960d61
+	github.com/chromedp/chromedp v0.9.3
 	github.com/golang/snappy v0.0.4 // indirect
-	github.com/google/uuid v1.6.0
+	github.com/google/uuid v1.5.0
 	github.com/hashicorp/go-cleanhttp v0.5.2 // indirect
 	github.com/hashicorp/go-retryablehttp v0.7.5
-	github.com/klauspost/compress v1.17.7 // indirect
+	github.com/klauspost/compress v1.17.4 // indirect
 	github.com/klauspost/pgzip v1.2.6 // indirect
-	github.com/labstack/echo/v4 v4.11.4
-	github.com/labstack/gommon v0.4.2
+	github.com/labstack/echo/v4 v4.11.3
+	github.com/labstack/gommon v0.4.1
 	github.com/mattn/go-isatty v0.0.20 // indirect
 	github.com/mholt/archiver/v3 v3.5.1
 	github.com/microcosm-cc/bluemonday v1.0.26
 	github.com/nwaples/rardecode v1.1.3 // indirect
-	github.com/pdfcpu/pdfcpu v0.7.0
-	github.com/pierrec/lz4/v4 v4.1.21 // indirect
-	github.com/prometheus/client_golang v1.19.0
+	github.com/pdfcpu/pdfcpu v0.6.0
+	github.com/pierrec/lz4/v4 v4.1.19 // indirect
+	github.com/prometheus/client_golang v1.17.0
 	github.com/russross/blackfriday/v2 v2.1.0
 	github.com/spf13/pflag v1.0.5
 	github.com/ulikunitz/xz v0.5.11 // indirect
 	go.uber.org/multierr v1.11.0
-	go.uber.org/zap v1.27.0
-	golang.org/x/crypto v0.21.0 // indirect
-	golang.org/x/image v0.15.0 // indirect
-	golang.org/x/net v0.22.0
-	golang.org/x/sync v0.6.0
-	golang.org/x/sys v0.18.0 // indirect
-	golang.org/x/term v0.18.0
+	go.uber.org/zap v1.26.0
+	golang.org/x/crypto v0.16.0 // indirect
+	golang.org/x/image v0.14.0 // indirect
+	golang.org/x/net v0.19.0
+	golang.org/x/sync v0.5.0
+	golang.org/x/sys v0.15.0 // indirect
+	golang.org/x/term v0.15.0
 	golang.org/x/text v0.14.0
 )
 
-require github.com/dlclark/regexp2 v1.11.0
-
 require (
 	github.com/aymerick/douceur v0.2.0 // indirect
 	github.com/beorn7/perks v1.0.1 // indirect
@@ -46,7 +44,7 @@ require (
 	github.com/dsnet/compress v0.0.2-0.20210315054119-f66993602bf5 // indirect
 	github.com/gobwas/httphead v0.1.0 // indirect
 	github.com/gobwas/pool v0.2.1 // indirect
-	github.com/gobwas/ws v1.3.2 // indirect
+	github.com/gobwas/ws v1.3.1 // indirect
 	github.com/gorilla/css v1.0.1 // indirect
 	github.com/hhrutter/lzw v1.0.0 // indirect
 	github.com/hhrutter/tiff v1.0.1 // indirect
@@ -54,14 +52,15 @@ require (
 	github.com/mailru/easyjson v0.7.7 // indirect
 	github.com/mattn/go-colorable v0.1.13 // indirect
 	github.com/mattn/go-runewidth v0.0.15 // indirect
+	github.com/matttproud/golang_protobuf_extensions/v2 v2.0.0 // indirect
 	github.com/pkg/errors v0.9.1 // indirect
-	github.com/prometheus/client_model v0.6.0 // indirect
-	github.com/prometheus/common v0.50.0 // indirect
-	github.com/prometheus/procfs v0.13.0 // indirect
-	github.com/rivo/uniseg v0.4.7 // indirect
+	github.com/prometheus/client_model v0.5.0 // indirect
+	github.com/prometheus/common v0.45.0 // indirect
+	github.com/prometheus/procfs v0.12.0 // indirect
+	github.com/rivo/uniseg v0.4.4 // indirect
 	github.com/valyala/bytebufferpool v1.0.0 // indirect
 	github.com/valyala/fasttemplate v1.2.2 // indirect
 	github.com/xi2/xz v0.0.0-20171230120015-48954b6210f8 // indirect
-	google.golang.org/protobuf v1.33.0 // indirect
+	google.golang.org/protobuf v1.31.0 // indirect
 	gopkg.in/yaml.v2 v2.4.0 // indirect
 )

go.sum

@@ -1,25 +1,23 @@
 github.com/alexliesenfeld/health v0.8.0 h1:lCV0i+ZJPTbqP7LfKG7p3qZBl5VhelwUFCIVWl77fgk=
 github.com/alexliesenfeld/health v0.8.0/go.mod h1:TfNP0f+9WQVWMQRzvMUjlws4ceXKEL3WR+6Hp95HUFc=
 github.com/andybalholm/brotli v1.0.1/go.mod h1:loMXtMfwqflxFJPmdbJO0a3KNoPuLBgiu3qAvBg8x/Y=
-github.com/andybalholm/brotli v1.1.0 h1:eLKJA0d02Lf0mVpIDgYnqXcUn0GqVmEFny3VuID1U3M=
-github.com/andybalholm/brotli v1.1.0/go.mod h1:sms7XGricyQI9K10gOSf56VKKWS4oLer58Q+mhRPtnY=
+github.com/andybalholm/brotli v1.0.6 h1:Yf9fFpf49Zrxb9NlQaluyE92/+X7UVHlhMNJN2sxfOI=
+github.com/andybalholm/brotli v1.0.6/go.mod h1:fO7iG3H7G2nSZ7m0zPUDn85XEX2GTukHGRSepvi9Eig=
 github.com/aymerick/douceur v0.2.0 h1:Mv+mAeH1Q+n9Fr+oyamOlAkUNPWPlA8PPGR0QAaYuPk=
 github.com/aymerick/douceur v0.2.0/go.mod h1:wlT5vV2O3h55X9m7iVYN0TBM0NH/MmbLnd30/FjWUq4=
 github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM=
 github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw=
 github.com/cespare/xxhash/v2 v2.2.0 h1:DC2CZ1Ep5Y4k3ZQ899DldepgrayRUGE6BBZ/cd9Cj44=
 github.com/cespare/xxhash/v2 v2.2.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
-github.com/chromedp/cdproto v0.0.0-20240202021202-6d0b6a386732/go.mod h1:GKljq0VrfU4D5yc+2qA6OVr8pmO/MBbPEWqWQ/oqGEs=
-github.com/chromedp/cdproto v0.0.0-20240312231614-1e5096e63154 h1:jeAmkzyOAQBPRmZMhX+i/CJv0VViLkHk1nF0qx8s0Mk=
-github.com/chromedp/cdproto v0.0.0-20240312231614-1e5096e63154/go.mod h1:GKljq0VrfU4D5yc+2qA6OVr8pmO/MBbPEWqWQ/oqGEs=
-github.com/chromedp/chromedp v0.9.5 h1:viASzruPJOiThk7c5bueOUY91jGLJVximoEMGoH93rg=
-github.com/chromedp/chromedp v0.9.5/go.mod h1:D4I2qONslauw/C7INoCir1BJkSwBYMyZgx8X276z3+Y=
+github.com/chromedp/cdproto v0.0.0-20231011050154-1d073bb38998/go.mod h1:GKljq0VrfU4D5yc+2qA6OVr8pmO/MBbPEWqWQ/oqGEs=
+github.com/chromedp/cdproto v0.0.0-20231205062650-00455a960d61 h1:XD280QPATe9jaz20dylKe3vBsNcH1w3mkssGY0lidn8=
+github.com/chromedp/cdproto v0.0.0-20231205062650-00455a960d61/go.mod h1:GKljq0VrfU4D5yc+2qA6OVr8pmO/MBbPEWqWQ/oqGEs=
+github.com/chromedp/chromedp v0.9.3 h1:Wq58e0dZOdHsxaj9Owmfcf+ibtpYN1N0FWVbaxa/esg=
+github.com/chromedp/chromedp v0.9.3/go.mod h1:NipeUkUcuzIdFbBP8eNNvl9upcceOfWzoJn6cRe4ksA=
 github.com/chromedp/sysutil v1.0.0 h1:+ZxhTpfpZlmchB58ih/LBHX52ky7w2VhQVKQMucy3Ic=
 github.com/chromedp/sysutil v1.0.0/go.mod h1:kgWmDdq8fTzXYcKIBqIYvRRTnYb9aNS9moAV0xufSww=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/dlclark/regexp2 v1.11.0 h1:G/nrcoOa7ZXlpoa/91N3X7mM3r8eIlMBBJZvsz/mxKI=
-github.com/dlclark/regexp2 v1.11.0/go.mod h1:DHkYz0B9wPfa6wondMfaivmHpzrQ3v9q8cnmRbL6yW8=
 github.com/dsnet/compress v0.0.2-0.20210315054119-f66993602bf5 h1:iFaUwBSo5Svw6L7HYpRu/0lE3e0BaElwnNO1qkNQxBY=
 github.com/dsnet/compress v0.0.2-0.20210315054119-f66993602bf5/go.mod h1:qssHWj60/X5sZFNxpG4HBPDHVqxNm4DfnCKgrbZOT+s=
 github.com/dsnet/golib v0.0.0-20171103203638-1ea166775780/go.mod h1:Lj+Z9rebOhdfkVLjJ8T6VcRQv3SXugXy999NBtR9aFY=
@@ -27,16 +25,18 @@ github.com/gobwas/httphead v0.1.0 h1:exrUm0f4YX0L7EBwZHuCF4GDp8aJfVeBrlLQrs6NqWU
 github.com/gobwas/httphead v0.1.0/go.mod h1:O/RXo79gxV8G+RqlR/otEwx4Q36zl9rqC5u12GKvMCM=
 github.com/gobwas/pool v0.2.1 h1:xfeeEhW7pwmX8nuLVlqbzVc7udMDrwetjEv+TZIz1og=
 github.com/gobwas/pool v0.2.1/go.mod h1:q8bcK0KcYlCgd9e7WYLm9LpyS+YeLd8JVDW6WezmKEw=
-github.com/gobwas/ws v1.3.2 h1:zlnbNHxumkRvfPWgfXu8RBwyNR1x8wh9cf5PTOCqs9Q=
-github.com/gobwas/ws v1.3.2/go.mod h1:hRKAFb8wOxFROYNsT1bqfWnhX+b5MFeJM9r2ZSwg/KY=
+github.com/gobwas/ws v1.3.0/go.mod h1:hRKAFb8wOxFROYNsT1bqfWnhX+b5MFeJM9r2ZSwg/KY=
+github.com/gobwas/ws v1.3.1 h1:Qi34dfLMWJbiKaNbDVzM9x27nZBjmkaW6i4+Ku+pGVU=
+github.com/gobwas/ws v1.3.1/go.mod h1:hRKAFb8wOxFROYNsT1bqfWnhX+b5MFeJM9r2ZSwg/KY=
+github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk=
 github.com/golang/snappy v0.0.2/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
 github.com/golang/snappy v0.0.4 h1:yAGX7huGHXlcLOEtBnF4w7FQwA26wojNCwOYAEhLjQM=
 github.com/golang/snappy v0.0.4/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
 github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
-github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
-github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
-github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
-github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
+github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38=
+github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
+github.com/google/uuid v1.5.0 h1:1p67kYwdtXjb0gL0BPiP1Av9wiZPo5A8z2cWkTZ+eyU=
+github.com/google/uuid v1.5.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
 github.com/gorilla/css v1.0.1 h1:ntNaBIghp6JmvWnxbZKANoLyuXTPZ4cAMlo6RyhlbO8=
 github.com/gorilla/css v1.0.1/go.mod h1:BvnYkspnSzMmwRK+b8/xgNPLiIuNZr6vbZBTPQ2A3b0=
 github.com/hashicorp/go-cleanhttp v0.5.2 h1:035FKYIWjmULyFRBKPs8TBQoi0x6d9G4xc9neXJWAZQ=
@@ -53,8 +53,8 @@ github.com/josharian/intern v1.0.0 h1:vlS4z54oSdjm0bgjRigI+G1HpF+tI+9rE5LLzOg8Hm
 github.com/josharian/intern v1.0.0/go.mod h1:5DoeVV0s6jJacbCEi61lwdGj/aVlrQvzHFFd8Hwg//Y=
 github.com/klauspost/compress v1.4.1/go.mod h1:RyIbtBH6LamlWaDj8nUwkbUhJ87Yi3uG0guNDohfE1A=
 github.com/klauspost/compress v1.11.4/go.mod h1:aoV0uJVorq1K+umq18yTdKaF57EivdYsUV+/s2qKfXs=
-github.com/klauspost/compress v1.17.7 h1:ehO88t2UGzQK66LMdE8tibEd1ErmzZjNEqWkjLAKQQg=
-github.com/klauspost/compress v1.17.7/go.mod h1:Di0epgTjJY877eYKx5yC51cX2A2Vl2ibi7bDH9ttBbw=
+github.com/klauspost/compress v1.17.4 h1:Ej5ixsIri7BrIjBkRZLTo6ghwrEtHFk7ijlczPW4fZ4=
+github.com/klauspost/compress v1.17.4/go.mod h1:/dCuZOvVtNoHsyb+cuJD3itjs3NbnF6KH9zAO4BDxPM=
 github.com/klauspost/cpuid v1.2.0/go.mod h1:Pj4uuM528wm8OyEC2QMXAi2YiTZ96dNQPGgoMS4s3ek=
 github.com/klauspost/pgzip v1.2.5/go.mod h1:Ch1tH69qFZu15pkjo5kYi6mth2Zzwzt50oCQKQE9RUs=
 github.com/klauspost/pgzip v1.2.6 h1:8RXeL5crjEUFnR2/Sn6GJNWtSQ3Dk8pq4CL3jvdDyjU=
@@ -63,10 +63,10 @@ github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE=
 github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk=
 github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
 github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
-github.com/labstack/echo/v4 v4.11.4 h1:vDZmA+qNeh1pd/cCkEicDMrjtrnMGQ1QFI9gWN1zGq8=
-github.com/labstack/echo/v4 v4.11.4/go.mod h1:noh7EvLwqDsmh/X/HWKPUl1AjzJrhyptRyEbQJfxen8=
-github.com/labstack/gommon v0.4.2 h1:F8qTUNXgG1+6WQmqoUWnz8WiEU60mXVVw0P4ht1WRA0=
-github.com/labstack/gommon v0.4.2/go.mod h1:QlUFxVM+SNXhDL/Z7YhocGIBYOiwB0mXm1+1bAPHPyU=
+github.com/labstack/echo/v4 v4.11.3 h1:Upyu3olaqSHkCjs1EJJwQ3WId8b8b1hxbogyommKktM=
+github.com/labstack/echo/v4 v4.11.3/go.mod h1:UcGuQ8V6ZNRmSweBIJkPvGfwCMIlFmiqrPqiEBfPYws=
+github.com/labstack/gommon v0.4.1 h1:gqEff0p/hTENGMABzezPoPSRtIh1Cvw0ueMOe0/dfOk=
+github.com/labstack/gommon v0.4.1/go.mod h1:TyTrpPqxR5KMk8LKVtLmfMjeQ5FEkBYdxLYPw/WfrOM=
 github.com/ledongthuc/pdf v0.0.0-20220302134840-0c2507a12d80 h1:6Yzfa6GP0rIo/kULo2bwGEkFvCePZ3qHDDTC3/J9Swo=
 github.com/ledongthuc/pdf v0.0.0-20220302134840-0c2507a12d80/go.mod h1:imJHygn/1yfhB7XSJJKlFZKl/J+dCPAknuiaGOshXAs=
 github.com/mailru/easyjson v0.7.7 h1:UGYAvKxe3sBsEDzO8ZeWOSlIQfWFlxbzLZe7hwFURr0=
@@ -78,6 +78,8 @@ github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWE
 github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y=
 github.com/mattn/go-runewidth v0.0.15 h1:UNAjwbU9l54TA3KzvqLGxwWjHmMgBUVhBiTjelZgg3U=
 github.com/mattn/go-runewidth v0.0.15/go.mod h1:Jdepj2loyihRzMpdS35Xk/zdY8IAYHsh153qUoGf23w=
+github.com/matttproud/golang_protobuf_extensions/v2 v2.0.0 h1:jWpvCLoY8Z/e3VKvlsiIGKtc+UG6U5vzxaoagmhXfyg=
+github.com/matttproud/golang_protobuf_extensions/v2 v2.0.0/go.mod h1:QUyp042oQthUoa9bqDv0ER0wrtXnBruoNd7aNjkbP+k=
 github.com/mholt/archiver/v3 v3.5.1 h1:rDjOBX9JSF5BvoJGvjqK479aL70qh9DIpZCl+k7Clwo=
 github.com/mholt/archiver/v3 v3.5.1/go.mod h1:e3dqJ7H78uzsRSEACH1joayhuSyhnonssnDhppzS1L4=
 github.com/microcosm-cc/bluemonday v1.0.26 h1:xbqSvqzQMeEHCqMi64VAs4d8uy6Mequs3rQ0k/Khz58=
@@ -87,26 +89,26 @@ github.com/nwaples/rardecode v1.1.3 h1:cWCaZwfM5H7nAD6PyEdcVnczzV8i/JtotnyW/dD9l
 github.com/nwaples/rardecode v1.1.3/go.mod h1:5DzqNKiOdpKKBH87u8VlvAnPZMXcGRhxWkRpHbbfGS0=
 github.com/orisano/pixelmatch v0.0.0-20220722002657-fb0b55479cde h1:x0TT0RDC7UhAVbbWWBzr41ElhJx5tXPWkIHA2HWPRuw=
 github.com/orisano/pixelmatch v0.0.0-20220722002657-fb0b55479cde/go.mod h1:nZgzbfBr3hhjoZnS66nKrHmduYNpc34ny7RK4z5/HM0=
-github.com/pdfcpu/pdfcpu v0.7.0 h1:cd7/z7hAyyDuzdciKfNZyQ3TYreJza2DsuPdIHYURcA=
-github.com/pdfcpu/pdfcpu v0.7.0/go.mod h1:kmpD0rk8YnZj0l3qSeGBlAB+XszHUgNv//ORH/E7EYo=
+github.com/pdfcpu/pdfcpu v0.6.0 h1:z4kARP5bcWa39TTYMcN/kjBnm7MvhTWjXgeYmkdAGMI=
+github.com/pdfcpu/pdfcpu v0.6.0/go.mod h1:kmpD0rk8YnZj0l3qSeGBlAB+XszHUgNv//ORH/E7EYo=
 github.com/pierrec/lz4/v4 v4.1.2/go.mod h1:gZWDp/Ze/IJXGXf23ltt2EXimqmTUXEy0GFuRQyBid4=
-github.com/pierrec/lz4/v4 v4.1.21 h1:yOVMLb6qSIDP67pl/5F7RepeKYu/VmTyEXvuMI5d9mQ=
-github.com/pierrec/lz4/v4 v4.1.21/go.mod h1:gZWDp/Ze/IJXGXf23ltt2EXimqmTUXEy0GFuRQyBid4=
+github.com/pierrec/lz4/v4 v4.1.19 h1:tYLzDnjDXh9qIxSTKHwXwOYmm9d887Y7Y1ZkyXYHAN4=
+github.com/pierrec/lz4/v4 v4.1.19/go.mod h1:gZWDp/Ze/IJXGXf23ltt2EXimqmTUXEy0GFuRQyBid4=
 github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
 github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
-github.com/prometheus/client_golang v1.19.0 h1:ygXvpU1AoN1MhdzckN+PyD9QJOSD4x7kmXYlnfbA6JU=
-github.com/prometheus/client_golang v1.19.0/go.mod h1:ZRM9uEAypZakd+q/x7+gmsvXdURP+DABIEIjnmDdp+k=
-github.com/prometheus/client_model v0.6.0 h1:k1v3CzpSRUTrKMppY35TLwPvxHqBu0bYgxZzqGIgaos=
-github.com/prometheus/client_model v0.6.0/go.mod h1:NTQHnmxFpouOD0DpvP4XujX3CdOAGQPoaGhyTchlyt8=
-github.com/prometheus/common v0.50.0 h1:YSZE6aa9+luNa2da6/Tik0q0A5AbR+U003TItK57CPQ=
-github.com/prometheus/common v0.50.0/go.mod h1:wHFBCEVWVmHMUpg7pYcOm2QUR/ocQdYSJVQJKnHc3xQ=
-github.com/prometheus/procfs v0.13.0 h1:GqzLlQyfsPbaEHaQkO7tbDlriv/4o5Hudv6OXHGKX7o=
-github.com/prometheus/procfs v0.13.0/go.mod h1:cd4PFCR54QLnGKPaKGA6l+cfuNXtht43ZKY6tow0Y1g=
+github.com/prometheus/client_golang v1.17.0 h1:rl2sfwZMtSthVU752MqfjQozy7blglC+1SOtjMAMh+Q=
+github.com/prometheus/client_golang v1.17.0/go.mod h1:VeL+gMmOAxkS2IqfCq0ZmHSL+LjWfWDUmp1mBz9JgUY=
+github.com/prometheus/client_model v0.5.0 h1:VQw1hfvPvk3Uv6Qf29VrPF32JB6rtbgI6cYPYQjL0Qw=
+github.com/prometheus/client_model v0.5.0/go.mod h1:dTiFglRmd66nLR9Pv9f0mZi7B7fk5Pm3gvsjB5tr+kI=
+github.com/prometheus/common v0.45.0 h1:2BGz0eBc2hdMDLnO/8n0jeB3oPrt2D08CekT0lneoxM=
+github.com/prometheus/common v0.45.0/go.mod h1:YJmSTw9BoKxJplESWWxlbyttQR4uaEcGyv9MZjVOJsY=
+github.com/prometheus/procfs v0.12.0 h1:jluTpSng7V9hY0O2R9DzzJHYb2xULk9VTR1V1R/k6Bo=
+github.com/prometheus/procfs v0.12.0/go.mod h1:pcuDEFsWDnvcgNzo4EEweacyhjeA9Zk3cnaOZAZEfOo=
 github.com/rivo/uniseg v0.2.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc=
-github.com/rivo/uniseg v0.4.7 h1:WUdvkW8uEhrYfLC4ZzdpI2ztxP1I582+49Oc5Mq64VQ=
-github.com/rivo/uniseg v0.4.7/go.mod h1:FN3SvrM+Zdj16jyLfmOkMNblXMcoc8DfTHruCPUcx88=
+github.com/rivo/uniseg v0.4.4 h1:8TfxU8dW6PdqD27gjM8MVNuicgxIjxpm4K7x4jp8sis=
+github.com/rivo/uniseg v0.4.4/go.mod h1:FN3SvrM+Zdj16jyLfmOkMNblXMcoc8DfTHruCPUcx88=
 github.com/rogpeppe/go-internal v1.10.0 h1:TMyTOH3F/DB16zRVcYyreMH6GnZZrwQVAoYjRBZyWFQ=
 github.com/rogpeppe/go-internal v1.10.0/go.mod h1:UQnix2H7Ngw/k4C5ijL5+65zddjncjaFoBhdsK/akog=
 github.com/russross/blackfriday/v2 v2.1.0 h1:JIOH55/0cWyOuilr9/qlrm0BSXldqnqwMsf35Ld67mk=
@@ -128,32 +130,32 @@ github.com/valyala/fasttemplate v1.2.2 h1:lxLXG0uE3Qnshl9QyaK6XJxMXlQZELvChBOCmQ
 github.com/valyala/fasttemplate v1.2.2/go.mod h1:KHLXt3tVN2HBp8eijSv/kGJopbvo7S+qRAEEKiv+SiQ=
 github.com/xi2/xz v0.0.0-20171230120015-48954b6210f8 h1:nIPpBwaJSVYIxUFsDv3M8ofmx9yWTog9BfvIu0q41lo=
 github.com/xi2/xz v0.0.0-20171230120015-48954b6210f8/go.mod h1:HUYIGzjTL3rfEspMxjDjgmT5uz5wzYJKVo23qUhYTos=
-go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto=
-go.uber.org/goleak v1.3.0/go.mod h1:CoHD4mav9JJNrW/WLlf7HGZPjdw8EucARQHekz1X6bE=
+go.uber.org/goleak v1.2.0 h1:xqgm/S+aQvhWFTtR0XK3Jvg7z8kGV8P4X14IzwN3Eqk=
+go.uber.org/goleak v1.2.0/go.mod h1:XJYK+MuIchqpmGmUSAzotztawfKvYLUIgg7guXrwVUo=
 go.uber.org/multierr v1.11.0 h1:blXXJkSxSSfBVBlC76pxqeO+LN3aDfLQo+309xJstO0=
 go.uber.org/multierr v1.11.0/go.mod h1:20+QtiLqy0Nd6FdQB9TLXag12DsQkrbs3htMFfDN80Y=
-go.uber.org/zap v1.27.0 h1:aJMhYGrd5QSmlpLMr2MftRKl7t8J8PTZPA732ud/XR8=
-go.uber.org/zap v1.27.0/go.mod h1:GB2qFLM7cTU87MWRP2mPIjqfIDnGu+VIO4V/SdhGo2E=
-golang.org/x/crypto v0.21.0 h1:X31++rzVUdKhX5sWmSOFZxx8UW/ldWx55cbf08iNAMA=
-golang.org/x/crypto v0.21.0/go.mod h1:0BP7YvVV9gBbVKyeTG0Gyn+gZm94bibOW5BjDEYAOMs=
-golang.org/x/image v0.15.0 h1:kOELfmgrmJlw4Cdb7g/QGuB3CvDrXbqEIww/pNtNBm8=
-golang.org/x/image v0.15.0/go.mod h1:HUYqC05R2ZcZ3ejNQsIHQDQiwWM4JBqmm6MKANTp4LE=
-golang.org/x/net v0.22.0 h1:9sGLhx7iRIHEiX0oAJ3MRZMUCElJgy7Br1nO+AMN3Tc=
-golang.org/x/net v0.22.0/go.mod h1:JKghWKKOSdJwpW2GEx0Ja7fmaKnMsbu+MWVZTokSYmg=
-golang.org/x/sync v0.6.0 h1:5BMeUDZ7vkXGfEr1x9B4bRcTH4lpkTkpdh0T/J+qjbQ=
-golang.org/x/sync v0.6.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
+go.uber.org/zap v1.26.0 h1:sI7k6L95XOKS281NhVKOFCUNIvv9e0w4BF8N3u+tCRo=
+go.uber.org/zap v1.26.0/go.mod h1:dtElttAiwGvoJ/vj4IwHBS/gXsEu/pZ50mUIRWuG0so=
+golang.org/x/crypto v0.16.0 h1:mMMrFzRSCF0GvB7Ne27XVtVAaXLrPmgPC7/v0tkwHaY=
+golang.org/x/crypto v0.16.0/go.mod h1:gCAAfMLgwOJRpTjQ2zCCt2OcSfYMTeZVSRtQlPC7Nq4=
+golang.org/x/image v0.14.0 h1:tNgSxAFe3jC4uYqvZdTr84SZoM1KfwdC9SKIFrLjFn4=
+golang.org/x/image v0.14.0/go.mod h1:HUYqC05R2ZcZ3ejNQsIHQDQiwWM4JBqmm6MKANTp4LE=
+golang.org/x/net v0.19.0 h1:zTwKpTd2XuCqf8huc7Fo2iSy+4RHPd10s4KzeTnVr1c=
+golang.org/x/net v0.19.0/go.mod h1:CfAk/cbD4CthTvqiEl8NpboMuiuOYsAr/7NOjZJtv1U=
+golang.org/x/sync v0.5.0 h1:60k92dhOjHxJkrqnwsfl8KuaHbn/5dl0lUPUklKo3qE=
+golang.org/x/sync v0.5.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
 golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.16.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
-golang.org/x/sys v0.18.0 h1:DBdB3niSjOA/O0blCZBqDefyWNYveAYMNF1Wum0DYQ4=
-golang.org/x/sys v0.18.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
-golang.org/x/term v0.18.0 h1:FcHjZXDMxI8mM3nwhX9HlKop4C0YQvCVCdwYl2wOtE8=
-golang.org/x/term v0.18.0/go.mod h1:ILwASektA3OnRv7amZ1xhE/KTR+u50pbXfZ03+6Nx58=
+golang.org/x/sys v0.15.0 h1:h48lPFYpsTvQJZF4EKyI4aLHaev3CxivZmv7yZig9pc=
+golang.org/x/sys v0.15.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
+golang.org/x/term v0.15.0 h1:y/Oo/a/q3IXu26lQgl04j/gjuBDOBlx7X6Om1j2CPW4=
+golang.org/x/term v0.15.0/go.mod h1:BDl952bC7+uMoWR75FIrCDx79TPU9oHkTZ9yRbYOrX0=
 golang.org/x/text v0.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ=
 golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
-google.golang.org/protobuf v1.33.0 h1:uNO2rsAINq/JlFpSdYEKIZ0uKD/R9cpdv0T+yoGwGmI=
-google.golang.org/protobuf v1.33.0/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos=
+google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw=
+google.golang.org/protobuf v1.31.0 h1:g0LDEJHgrBl9N9r17Ru3sqWhkIx2NB67okBHPwC7hs8=
+google.golang.org/protobuf v1.31.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=
 gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q=

pkg/gotenberg/filter.go

@@ -1,53 +0,0 @@
-package gotenberg
-
-import (
-	"context"
-	"errors"
-	"fmt"
-	"time"
-
-	"github.com/dlclark/regexp2"
-)
-
-// ErrFiltered happens if a value is filtered by the [FilterDeadline] function.
-var ErrFiltered = errors.New("value filtered")
-
-// FilterDeadline checks if given value is allowed and not denied according to
-// regex patterns. It returns a [context.DeadlineExceeded] if it takes too long
-// to process.
-func FilterDeadline(allowed, denied *regexp2.Regexp, s string, deadline time.Time) error {
-	// FIXME: not ideal to compile everytime, but is there another way to create a clone?
-	if allowed.String() != "" {
-		allow := regexp2.MustCompile(allowed.String(), 0)
-		allow.MatchTimeout = time.Until(deadline)
-
-		ok, err := allow.MatchString(s)
-		if err != nil {
-			if time.Now().After(deadline) {
-				return context.DeadlineExceeded
-			}
-			return fmt.Errorf("'%s' cannot handle '%s': %w", allow.String(), s, err)
-		}
-		if !ok {
-			return fmt.Errorf("'%s' does not match the expression from the allowed list: %w", s, ErrFiltered)
-		}
-	}
-
-	if denied.String() != "" {
-		deny := regexp2.MustCompile(denied.String(), 0)
-		deny.MatchTimeout = time.Until(deadline)
-
-		ok, err := deny.MatchString(s)
-		if err != nil {
-			if time.Now().After(deadline) {
-				return context.DeadlineExceeded
-			}
-			return fmt.Errorf("'%s' cannot handle '%s': %w", deny.String(), s, err)
-		}
-		if ok {
-			return fmt.Errorf("'%s' matches the expression from the denied list: %w", s, ErrFiltered)
-		}
-	}
-
-	return nil
-}

pkg/gotenberg/filter_test.go

@@ -1,83 +0,0 @@
-package gotenberg
-
-import (
-	"context"
-	"errors"
-	"testing"
-	"time"
-
-	"github.com/dlclark/regexp2"
-)
-
-func TestFilterDeadline(t *testing.T) {
-	for _, tc := range []struct {
-		scenario      string
-		allowed       *regexp2.Regexp
-		denied        *regexp2.Regexp
-		s             string
-		deadline      time.Time
-		expectError   bool
-		expectedError error
-	}{
-		{
-			scenario:      "DeadlineExceeded (allowed)",
-			allowed:       regexp2.MustCompile("foo", 0),
-			denied:        regexp2.MustCompile("", 0),
-			s:             "foo",
-			deadline:      time.Now().Add(time.Duration(-1) * time.Hour),
-			expectError:   true,
-			expectedError: context.DeadlineExceeded,
-		},
-		{
-			scenario:      "ErrFiltered (allowed)",
-			allowed:       regexp2.MustCompile("foo", 0),
-			denied:        regexp2.MustCompile("", 0),
-			s:             "bar",
-			deadline:      time.Now().Add(time.Duration(5) * time.Second),
-			expectError:   true,
-			expectedError: ErrFiltered,
-		},
-		{
-			scenario:      "DeadlineExceeded (denied)",
-			allowed:       regexp2.MustCompile("", 0),
-			denied:        regexp2.MustCompile("foo", 0),
-			s:             "foo",
-			deadline:      time.Now().Add(time.Duration(-1) * time.Hour),
-			expectError:   true,
-			expectedError: context.DeadlineExceeded,
-		},
-		{
-			scenario:      "ErrFiltered (denied)",
-			allowed:       regexp2.MustCompile("", 0),
-			denied:        regexp2.MustCompile("foo", 0),
-			s:             "foo",
-			deadline:      time.Now().Add(time.Duration(5) * time.Second),
-			expectError:   true,
-			expectedError: ErrFiltered,
-		},
-		{
-			scenario:    "success",
-			allowed:     regexp2.MustCompile("", 0),
-			denied:      regexp2.MustCompile("", 0),
-			s:           "foo",
-			deadline:    time.Now().Add(time.Duration(5) * time.Second),
-			expectError: false,
-		},
-	} {
-		t.Run(tc.scenario, func(t *testing.T) {
-			err := FilterDeadline(tc.allowed, tc.denied, tc.s, tc.deadline)
-
-			if tc.expectError && err == nil {
-				t.Fatal("expected an error but got none")
-			}
-
-			if !tc.expectError && err != nil {
-				t.Fatalf("expected no error but got: %v", err)
-			}
-
-			if tc.expectedError != nil && !errors.Is(err, tc.expectedError) {
-				t.Fatalf("expected error %v but got: %v", tc.expectedError, err)
-			}
-		})
-	}
-}

pkg/gotenberg/flags.go

@@ -1,9 +1,9 @@
 package gotenberg
 
 import (
+	"regexp"
 	"time"
 
-	"github.com/dlclark/regexp2"
 	"github.com/labstack/gommon/bytes"
 	flag "github.com/spf13/pflag"
 )
@@ -199,19 +199,19 @@ func (f *ParsedFlags) MustDeprecatedHumanReadableBytesString(deprecated string,
 
 // MustRegexp returns the regular expression of a flag given by name.
 // It panics if an error occurs.
-func (f *ParsedFlags) MustRegexp(name string) *regexp2.Regexp {
+func (f *ParsedFlags) MustRegexp(name string) *regexp.Regexp {
 	val, err := f.GetString(name)
 	if err != nil {
 		panic(err)
 	}
 
-	return regexp2.MustCompile(val, 0)
+	return regexp.MustCompile(val)
 }
 
 // MustDeprecatedRegexp returns the regular expression of a deprecated flag if
 // it was explicitly set or the regular expression of the new flag.
 // It panics if an error occurs.
-func (f *ParsedFlags) MustDeprecatedRegexp(deprecated string, newName string) *regexp2.Regexp {
+func (f *ParsedFlags) MustDeprecatedRegexp(deprecated string, newName string) *regexp.Regexp {
 	if f.Changed(deprecated) {
 		return f.MustRegexp(deprecated)
 	}

pkg/gotenberg/fs.go

@@ -51,11 +51,3 @@ func (fs *FileSystem) MkdirAll() (string, error) {
 
 	return path, nil
 }
-
-// PathRename defines the method signature for renaming files. Implement this
-// interface if you don't want to rely on [os.Rename], notably for testing
-// purpose.
-type PathRename interface {
-	// Rename uses the same signature as [os.Rename].
-	Rename(oldpath, newpath string) error
-}

pkg/gotenberg/mocks.go

@@ -127,15 +127,6 @@ func (provider *MetricsProviderMock) Metrics() ([]Metric, error) {
 	return provider.MetricsMock()
 }
 
-// PathRenameMock is a mock for the [PathRename] interface.
-type PathRenameMock struct {
-	RenameMock func(oldpath, newpath string) error
-}
-
-func (rename *PathRenameMock) Rename(oldpath, newpath string) error {
-	return rename.RenameMock(oldpath, newpath)
-}
-
 // Interface guards.
 var (
 	_ Module            = (*ModuleMock)(nil)

pkg/gotenberg/mocks_test.go

@@ -188,16 +188,3 @@ func TestMetricsProviderMock(t *testing.T) {
 		t.Errorf("expected no error from MetricsProviderMock.Metrics, but got: %v", err)
 	}
 }
-
-func TestPathRenameMock(t *testing.T) {
-	mock := &PathRenameMock{
-		RenameMock: func(oldpath, newpath string) error {
-			return nil
-		},
-	}
-
-	err := mock.Rename("", "")
-	if err != nil {
-		t.Errorf("expected no error from PathRenameMock.Rename, but got: %v", err)
-	}
-}

pkg/gotenberg/modules.go

@@ -83,7 +83,7 @@ type SystemLogger interface {
 //		gotenberg.MustRegisterModule(YourModule{})
 //	}
 //
-// Then, in the main command (github.com/gotenberg/gotenberg/v8/cmd/gotenberg),
+// Then, in the main command (github.com/gotenberg/gotenberg/v7/cmd/gotenberg),
 // import the module:
 //
 //	imports (

pkg/gotenberg/sort.go

@@ -1,69 +0,0 @@
-package gotenberg
-
-import (
-	"regexp"
-	"sort"
-	"strconv"
-)
-
-// AlphanumericSort implements sort.Interface and helps to sort strings
-// alphanumerically.
-//
-// See https://github.com/gotenberg/gotenberg/issues/805.
-type AlphanumericSort []string
-
-func (s AlphanumericSort) Len() int {
-	return len(s)
-}
-
-func (s AlphanumericSort) Swap(i, j int) {
-	s[i], s[j] = s[j], s[i]
-}
-
-func (s AlphanumericSort) Less(i, j int) bool {
-	numI, restI := extractPrefix(s[i])
-	numJ, restJ := extractPrefix(s[j])
-
-	// Compares numerical prefixes if they exist.
-	if numI != -1 && numJ != -1 {
-		if numI != numJ {
-			return numI < numJ
-		}
-		// If numbers are equal, falls back to string comparison of the rest.
-		return restI < restJ
-	}
-
-	// If one has a numerical prefix and the other doesn't, the one with the
-	// number comes first.
-	if numI != -1 {
-		return true
-	}
-	if numJ != -1 {
-		return false
-	}
-
-	// If neither has a numerical prefix, compare as strings
-	return s[i] < s[j]
-}
-
-// extractPrefix attempts to extract a numerical prefix and the rest of the filename
-func extractPrefix(filename string) (int, string) {
-	matches := numPrefixRegexp.FindStringSubmatch(filename)
-	if len(matches) > 2 {
-		prefix, err := strconv.Atoi(matches[1])
-		if err == nil {
-			return prefix, matches[2]
-		}
-	}
-
-	// Returns -1 if no numerical prefix is found, indicating to just compare
-	// as strings.
-	return -1, filename
-}
-
-var numPrefixRegexp = regexp.MustCompile(`^(\d+)(.*)$`)
-
-// Interface guard.
-var (
-	_ sort.Interface = (*AlphanumericSort)(nil)
-)

pkg/gotenberg/sort_test.go

@@ -1,34 +0,0 @@
-package gotenberg
-
-import (
-	"reflect"
-	"sort"
-	"testing"
-)
-
-func TestAlphanumericSort(t *testing.T) {
-	for _, tc := range []struct {
-		scenario     string
-		values       []string
-		expectedSort []string
-	}{
-		{
-			scenario:     "numeric and letters",
-			values:       []string{"10qux.pdf", "2_baz.txt", "2_aza.txt", "1bar.pdf", "Afoo.txt", "Bbar.docx", "25zeta.txt", "3.pdf", "4_foo.pdf"},
-			expectedSort: []string{"1bar.pdf", "2_aza.txt", "2_baz.txt", "3.pdf", "4_foo.pdf", "10qux.pdf", "25zeta.txt", "Afoo.txt", "Bbar.docx"},
-		},
-		{
-			scenario:     "hrtime (PHP library)",
-			values:       []string{"245654773395259", "245654773395039", "245654773395149", "245654773394919", "245654773394369"},
-			expectedSort: []string{"245654773394369", "245654773394919", "245654773395039", "245654773395149", "245654773395259"},
-		},
-	} {
-		t.Run(tc.scenario, func(t *testing.T) {
-			sort.Sort(AlphanumericSort(tc.values))
-
-			if !reflect.DeepEqual(tc.values, tc.expectedSort) {
-				t.Fatalf("expected %+v but got: %+v", tc.expectedSort, tc.values)
-			}
-		})
-	}
-}

pkg/gotenberg/supervisor.go

@@ -13,10 +13,6 @@ import (
 // to restart an already restarting [Process].
 var ErrProcessAlreadyRestarting = errors.New("process already restarting")
 
-// ErrMaximumQueueSizeExceeded happens if Run() is called but the maximum queue
-// size is already used.
-var ErrMaximumQueueSizeExceeded = errors.New("maximum queue size exceeded")
-
 // Process is an interface that represents an abstract process
 // and provides methods for starting, stopping, and checking the health of the
 // process.
@@ -78,7 +74,6 @@ type processSupervisor struct {
 	logger          *zap.Logger
 	process         Process
 	maxReqLimit     int64
-	maxQueueSize    int64
 	mutexChan       chan struct{}
 	firstStart      atomic.Bool
 	reqCounter      atomic.Int64
@@ -88,13 +83,12 @@ type processSupervisor struct {
 }
 
 // NewProcessSupervisor initializes a new [ProcessSupervisor].
-func NewProcessSupervisor(logger *zap.Logger, process Process, maxReqLimit, maxQueueSize int64) ProcessSupervisor {
+func NewProcessSupervisor(logger *zap.Logger, process Process, maxReqLimit int64) ProcessSupervisor {
 	b := &processSupervisor{
-		logger:       logger,
-		process:      process,
-		mutexChan:    make(chan struct{}, 1),
-		maxReqLimit:  maxReqLimit,
-		maxQueueSize: maxQueueSize,
+		logger:      logger,
+		process:     process,
+		mutexChan:   make(chan struct{}, 1),
+		maxReqLimit: maxReqLimit,
 	}
 	b.reqCounter.Store(0)
 	b.reqQueueSize.Store(0)
@@ -173,11 +167,6 @@ func (s *processSupervisor) Healthy() bool {
 }
 
 func (s *processSupervisor) Run(ctx context.Context, logger *zap.Logger, task func() error) error {
-	currentQueueSize := s.reqQueueSize.Load()
-	if s.maxQueueSize > 0 && currentQueueSize >= s.maxQueueSize {
-		return ErrMaximumQueueSizeExceeded
-	}
-
 	s.reqQueueSize.Add(1)
 
 	for {

pkg/gotenberg/supervisor_test.go

@@ -46,7 +46,7 @@ func TestProcessSupervisor_Launch(t *testing.T) {
 				},
 			}
 
-			ps := NewProcessSupervisor(logger, process, 5, 0).(*processSupervisor)
+			ps := NewProcessSupervisor(logger, process, 5).(*processSupervisor)
 			if tc.firstStartSet {
 				ps.firstStart.Store(true)
 			}
@@ -94,7 +94,7 @@ func TestProcessSupervisor_Shutdown(t *testing.T) {
 				},
 			}
 
-			ps := NewProcessSupervisor(logger, process, 5, 0)
+			ps := NewProcessSupervisor(logger, process, 5)
 			err := ps.Shutdown()
 
 			if !tc.expectError && err != nil {
@@ -154,7 +154,7 @@ func TestProcessSupervisor_restart(t *testing.T) {
 				},
 			}
 
-			ps := NewProcessSupervisor(logger, process, 5, 0).(*processSupervisor)
+			ps := NewProcessSupervisor(logger, process, 5).(*processSupervisor)
 			if tc.initiallyRestarting {
 				ps.isRestarting.Store(true)
 			}
@@ -217,7 +217,7 @@ func TestProcessSupervisor_Healthy(t *testing.T) {
 				},
 			}
 
-			ps := NewProcessSupervisor(logger, process, 5, 0).(*processSupervisor)
+			ps := NewProcessSupervisor(logger, process, 5).(*processSupervisor)
 			if tc.initiallyStarted {
 				ps.firstStart.Store(true)
 			}
@@ -249,8 +249,6 @@ func TestProcessSupervisor_Run(t *testing.T) {
 		expectedStartCalls   int64
 		expectedHealthyCalls int64
 		expectedStopCalls    int64
-		currentQueueSize     int64
-		maxQueueSize         int64
 	}{
 		{
 			scenario:             "successfully run task on non-started process",
@@ -350,34 +348,6 @@ func TestProcessSupervisor_Run(t *testing.T) {
 			expectedHealthyCalls: 1,
 			expectedStopCalls:    0,
 		},
-		{
-			scenario:             "queue size exceeded",
-			initiallyStarted:     false,
-			isRestarting:         false,
-			processHealthy:       true,
-			maxReqLimit:          2,
-			tasksToRun:           1,
-			expectError:          true,
-			expectedStartCalls:   0,
-			expectedHealthyCalls: 0,
-			expectedStopCalls:    0,
-			currentQueueSize:     1,
-			maxQueueSize:         1,
-		},
-		{
-			scenario:             "queue size not exceeded",
-			initiallyStarted:     false,
-			isRestarting:         false,
-			processHealthy:       true,
-			maxReqLimit:          2,
-			tasksToRun:           1,
-			expectError:          true,
-			expectedStartCalls:   1,
-			expectedHealthyCalls: 1,
-			expectedStopCalls:    0,
-			currentQueueSize:     1,
-			maxQueueSize:         2,
-		},
 	} {
 		t.Run(tc.scenario, func(t *testing.T) {
 			logger := zap.NewNop()
@@ -402,16 +372,13 @@ func TestProcessSupervisor_Run(t *testing.T) {
 				},
 			}
 
-			ps := NewProcessSupervisor(logger, process, tc.maxReqLimit, tc.maxQueueSize).(*processSupervisor)
+			ps := NewProcessSupervisor(logger, process, tc.maxReqLimit).(*processSupervisor)
 			if tc.initiallyStarted {
 				ps.firstStart.Store(true)
 			}
 			if tc.isRestarting {
 				ps.isRestarting.Store(true)
 			}
-			if tc.currentQueueSize > 0 {
-				ps.reqQueueSize.Store(tc.currentQueueSize)
-			}
 
 			task := func() error {
 				return tc.taskError
@@ -484,13 +451,13 @@ func TestProcessSupervisor_runWithDeadline(t *testing.T) {
 		},
 	} {
 		t.Run(tc.scenario, func(t *testing.T) {
-			ps := NewProcessSupervisor(zap.NewNop(), new(ProcessMock), 0, 0).(*processSupervisor)
+			ps := NewProcessSupervisor(zap.NewNop(), new(ProcessMock), 0).(*processSupervisor)
 
 			ctx, cancel := context.WithTimeout(context.Background(), 1*time.Second)
+			defer cancel()
+
 			if tc.ctxDone {
 				cancel()
-			} else {
-				defer cancel()
 			}
 
 			err := ps.runWithDeadline(ctx, func() error {
@@ -518,7 +485,7 @@ func TestProcessSupervisor_ReqQueueSize(t *testing.T) {
 			return true
 		},
 	}
-	ps := NewProcessSupervisor(logger, process, 0, 0).(*processSupervisor)
+	ps := NewProcessSupervisor(logger, process, 0).(*processSupervisor)
 
 	// Simulating a lock.
 	ps.mutexChan <- struct{}{}
@@ -619,7 +586,7 @@ func TestProcessSupervisor_RestartsCount(t *testing.T) {
 				},
 			}
 
-			ps := NewProcessSupervisor(logger, process, 0, 0).(*processSupervisor)
+			ps := NewProcessSupervisor(logger, process, 0).(*processSupervisor)
 			ps.restartsCounter.Store(tc.initialRestartsCount)
 
 			for i := 0; i < tc.restartAttempts; i++ {

pkg/modules/api/api.go

@@ -19,7 +19,7 @@ import (
 	"golang.org/x/net/http2"
 	"golang.org/x/sync/errgroup"
 
-	"github.com/gotenberg/gotenberg/v8/pkg/gotenberg"
+	"github.com/gotenberg/gotenberg/v7/pkg/gotenberg"
 )
 
 func init() {
@@ -30,6 +30,8 @@ func init() {
 // middlewares or health checks.
 type Api struct {
 	port                      int
+	readTimeout               time.Duration
+	writeTimeout              time.Duration
 	startTimeout              time.Duration
 	timeout                   time.Duration
 	rootPath                  string
@@ -160,11 +162,23 @@ func (a *Api) Descriptor() gotenberg.ModuleDescriptor {
 			fs.Int("api-port", 3000, "Set the port on which the API should listen")
 			fs.String("api-port-from-env", "", "Set the environment variable with the port on which the API should listen - override the default port")
 			fs.Duration("api-start-timeout", time.Duration(30)*time.Second, "Set the time limit for the API to start")
+			fs.Duration("api-read-timeout", time.Duration(30)*time.Second, "Set the maximum duration allowed to read a complete request, including the body")
+			fs.Duration("api-process-timeout", time.Duration(30)*time.Second, "Set the maximum duration allowed to process a request")
+			fs.Duration("api-write-timeout", time.Duration(30)*time.Second, "Set the maximum duration before timing out writes of the response")
 			fs.Duration("api-timeout", time.Duration(30)*time.Second, "Set the time limit for requests")
 			fs.String("api-root-path", "/", "Set the root path of the API - for service discovery via URL paths")
 			fs.String("api-trace-header", "Gotenberg-Trace", "Set the header name to use for identifying requests")
 			fs.Bool("api-disable-health-check-logging", false, "Disable health check logging")
 
+			var err error
+			err = multierr.Append(err, fs.MarkDeprecated("api-read-timeout", "use api-timeout instead"))
+			err = multierr.Append(err, fs.MarkDeprecated("api-process-timeout", "use api-timeout instead"))
+			err = multierr.Append(err, fs.MarkDeprecated("api-write-timeout", "use api-timeout instead"))
+
+			if err != nil {
+				panic(fmt.Errorf("create deprecated flags for the api module: %v", err))
+			}
+
 			return fs
 		}(),
 		New: func() gotenberg.Module { return new(Api) },
@@ -176,7 +190,9 @@ func (a *Api) Provision(ctx *gotenberg.Context) error {
 	flags := ctx.ParsedFlags()
 	a.port = flags.MustInt("api-port")
 	a.startTimeout = flags.MustDuration("api-start-timeout")
-	a.timeout = flags.MustDuration("api-timeout")
+	a.readTimeout = flags.MustDeprecatedDuration("api-read-timeout", "api-timeout")
+	a.writeTimeout = flags.MustDeprecatedDuration("api-write-timeout", "api-timeout")
+	a.timeout = flags.MustDeprecatedDuration("api-process-timeout", "api-timeout")
 	a.rootPath = flags.MustString("api-root-path")
 	a.traceHeader = flags.MustString("api-trace-header")
 	a.disableHealthCheckLogging = flags.MustBool("api-disable-health-check-logging")
@@ -364,10 +380,10 @@ func (a *Api) Start() error {
 	a.srv = echo.New()
 	a.srv.HideBanner = true
 	a.srv.HidePort = true
-	a.srv.Server.ReadTimeout = a.timeout
+	a.srv.Server.ReadTimeout = a.readTimeout
 	a.srv.Server.IdleTimeout = a.timeout
 	// See https://github.com/gotenberg/gotenberg/issues/396.
-	a.srv.Server.WriteTimeout = a.timeout + a.timeout
+	a.srv.Server.WriteTimeout = a.writeTimeout + a.writeTimeout
 	a.srv.HTTPErrorHandler = httpErrorHandler()
 
 	// Let's prepare the modules' routes.

pkg/modules/api/api_test.go

@@ -16,7 +16,7 @@ import (
 	"github.com/labstack/echo/v4"
 	"go.uber.org/zap"
 
-	"github.com/gotenberg/gotenberg/v8/pkg/gotenberg"
+	"github.com/gotenberg/gotenberg/v7/pkg/gotenberg"
 )
 
 func TestApi_Descriptor(t *testing.T) {

pkg/modules/api/context.go

@@ -19,7 +19,7 @@ import (
 	"go.uber.org/zap"
 	"golang.org/x/text/unicode/norm"
 
-	"github.com/gotenberg/gotenberg/v8/pkg/gotenberg"
+	"github.com/gotenberg/gotenberg/v7/pkg/gotenberg"
 )
 
 var (
@@ -34,24 +34,18 @@ var (
 
 // Context is the request context for a "multipart/form-data" requests.
 type Context struct {
-	dirPath     string
-	values      map[string][]string
-	files       map[string]string
+	dirPath string
+	values  map[string][]string
+	files   map[string]string
+
 	outputPaths []string
-	cancelled   bool
 
-	logger     *zap.Logger
-	echoCtx    echo.Context
-	pathRename gotenberg.PathRename
+	cancelled bool
+	logger    *zap.Logger
+	echoCtx   echo.Context
 	context.Context
 }
 
-type osPathRename struct{}
-
-func (o *osPathRename) Rename(oldpath, newpath string) error {
-	return os.Rename(oldpath, newpath)
-}
-
 // newContext returns a [Context] by parsing a "multipart/form-data" request.
 func newContext(echoCtx echo.Context, logger *zap.Logger, fs *gotenberg.FileSystem, timeout time.Duration) (*Context, context.CancelFunc, error) {
 	processCtx, processCancel := context.WithTimeout(context.Background(), timeout)
@@ -61,7 +55,6 @@ func newContext(echoCtx echo.Context, logger *zap.Logger, fs *gotenberg.FileSyst
 		cancelled:   false,
 		logger:      logger,
 		echoCtx:     echoCtx,
-		pathRename:  new(osPathRename),
 		Context:     processCtx,
 	}
 
@@ -171,6 +164,7 @@ func newContext(echoCtx echo.Context, logger *zap.Logger, fs *gotenberg.FileSyst
 	for _, files := range form.File {
 		for _, fh := range files {
 			err = copyToDisk(fh)
+
 			if err != nil {
 				return ctx, cancel, fmt.Errorf("copy to disk: %w", err)
 			}
@@ -197,20 +191,10 @@ func (ctx *Context) FormData() *FormData {
 	}
 }
 
-// GeneratePath generates a path within the context's working directory.
-// It generates a new UUID-based filename. It does not create a file.
+// GeneratePath generates a path within the context's working directory. It
+// does not create a file.
 func (ctx *Context) GeneratePath(extension string) string {
-	return fmt.Sprintf("%s/%s%s", ctx.dirPath, uuid.New().String(), extension)
-}
-
-// Rename is just a wrapper around [os.Rename], as we need to mock this
-// behavior in our tests.
-func (ctx *Context) Rename(oldpath, newpath string) error {
-	err := ctx.pathRename.Rename(oldpath, newpath)
-	if err != nil {
-		return fmt.Errorf("rename path: %w", err)
-	}
-	return nil
+	return fmt.Sprintf("%s/%s%s", ctx.dirPath, uuid.New(), extension)
 }
 
 // AddOutputPaths adds the given paths. Those paths will be used later to build
@@ -285,8 +269,3 @@ func (ctx *Context) OutputFilename(outputPath string) string {
 
 	return fmt.Sprintf("%s%s", filename, filepath.Ext(outputPath))
 }
-
-// Interface guard.
-var (
-	_ gotenberg.PathRename = (*osPathRename)(nil)
-)

pkg/modules/api/context_test.go

@@ -3,77 +3,21 @@ package api
 import (
 	"bytes"
 	"errors"
-	"fmt"
-	"io"
 	"mime/multipart"
 	"net/http"
 	"net/http/httptest"
 	"os"
-	"path/filepath"
 	"reflect"
 	"strings"
 	"testing"
 	"time"
 
-	"github.com/google/uuid"
 	"github.com/labstack/echo/v4"
 	"go.uber.org/zap"
 
-	"github.com/gotenberg/gotenberg/v8/pkg/gotenberg"
+	"github.com/gotenberg/gotenberg/v7/pkg/gotenberg"
 )
 
-func TestOsPathRename_Rename(t *testing.T) {
-	dirPath, err := gotenberg.NewFileSystem().MkdirAll()
-	if err != nil {
-		t.Fatalf("create working directory: %v", err)
-	}
-
-	path := "/tests/test/testdata/api/sample1.txt"
-	copyPath := filepath.Join(dirPath, fmt.Sprintf("%s.txt", uuid.NewString()))
-
-	in, err := os.Open(path)
-	if err != nil {
-		t.Fatalf("open file: %v", err)
-	}
-
-	defer func() {
-		err := in.Close()
-		if err != nil {
-			t.Fatalf("close file: %v", err)
-		}
-	}()
-
-	out, err := os.Create(copyPath)
-	if err != nil {
-		t.Fatalf("create new file: %v", err)
-	}
-
-	defer func() {
-		err := out.Close()
-		if err != nil {
-			t.Fatalf("close new file: %v", err)
-		}
-	}()
-
-	_, err = io.Copy(out, in)
-	if err != nil {
-		t.Fatalf("copy file to new file: %v", err)
-	}
-
-	rename := new(osPathRename)
-	newPath := filepath.Join(dirPath, fmt.Sprintf("%s.txt", uuid.NewString()))
-
-	err = rename.Rename(copyPath, newPath)
-	if err != nil {
-		t.Errorf("expected no error but got: %v", err)
-	}
-
-	err = os.RemoveAll(dirPath)
-	if err != nil {
-		t.Fatalf("remove working directory: %v", err)
-	}
-}
-
 func TestNewContext(t *testing.T) {
 	for _, tc := range []struct {
 		scenario         string
@@ -247,46 +191,12 @@ func TestContext_GeneratePath(t *testing.T) {
 	}
 
 	path := ctx.GeneratePath(".pdf")
+
 	if !strings.HasPrefix(path, ctx.dirPath) {
 		t.Errorf("expected '%s' to start with '%s'", path, ctx.dirPath)
 	}
 }
 
-func TestContext_Rename(t *testing.T) {
-	for _, tc := range []struct {
-		scenario    string
-		ctx         *Context
-		expectError bool
-	}{
-		{
-			scenario: "failure",
-			ctx: &Context{pathRename: &gotenberg.PathRenameMock{RenameMock: func(oldpath, newpath string) error {
-				return errors.New("cannot rename")
-			}}},
-			expectError: true,
-		},
-		{
-			scenario: "success",
-			ctx: &Context{pathRename: &gotenberg.PathRenameMock{RenameMock: func(oldpath, newpath string) error {
-				return nil
-			}}},
-			expectError: false,
-		},
-	} {
-		t.Run(tc.scenario, func(t *testing.T) {
-			err := tc.ctx.Rename("", "")
-
-			if tc.expectError && err == nil {
-				t.Fatal("expected error but got none", err)
-			}
-
-			if !tc.expectError && err != nil {
-				t.Fatalf("expected no error but got: %v", err)
-			}
-		})
-	}
-}
-
 func TestContext_AddOutputPaths(t *testing.T) {
 	for _, tc := range []struct {
 		scenario    string

pkg/modules/api/formdata.go

@@ -11,8 +11,6 @@ import (
 	"time"
 
 	"go.uber.org/multierr"
-
-	"github.com/gotenberg/gotenberg/v8/pkg/gotenberg"
 )
 
 // FormData is a helper for validating and hydrating values from a
@@ -306,7 +304,7 @@ func (form *FormData) paths(extensions []string, target *[]string) *FormData {
 	}
 
 	// See https://github.com/gotenberg/gotenberg/issues/139.
-	sort.Sort(gotenberg.AlphanumericSort(*target))
+	sort.Strings(*target)
 
 	return form
 }

pkg/modules/api/middlewares.go

@@ -12,7 +12,7 @@ import (
 	"github.com/labstack/echo/v4"
 	"go.uber.org/zap"
 
-	"github.com/gotenberg/gotenberg/v8/pkg/gotenberg"
+	"github.com/gotenberg/gotenberg/v7/pkg/gotenberg"
 )
 
 // ErrAsyncProcess happens when a handler or middleware handles a request in an
@@ -32,18 +32,6 @@ func ParseError(err error) (int, string) {
 		return http.StatusServiceUnavailable, http.StatusText(http.StatusServiceUnavailable)
 	}
 
-	if errors.Is(err, gotenberg.ErrFiltered) {
-		return http.StatusForbidden, http.StatusText(http.StatusForbidden)
-	}
-
-	if errors.Is(err, gotenberg.ErrMaximumQueueSizeExceeded) {
-		return http.StatusTooManyRequests, http.StatusText(http.StatusTooManyRequests)
-	}
-
-	if errors.Is(err, gotenberg.ErrPdfFormatNotSupported) {
-		return http.StatusBadRequest, "At least one PDF engine cannot process the requested PDF format, while others may have failed to convert due to different issues"
-	}
-
 	var httpErr HttpError
 	if errors.As(err, &httpErr) {
 		return httpErr.HttpError()

pkg/modules/api/middlewares_test.go

@@ -14,7 +14,7 @@ import (
 	"github.com/labstack/echo/v4"
 	"go.uber.org/zap"
 
-	"github.com/gotenberg/gotenberg/v8/pkg/gotenberg"
+	"github.com/gotenberg/gotenberg/v7/pkg/gotenberg"
 )
 
 func TestParseError(t *testing.T) {
@@ -29,19 +29,9 @@ func TestParseError(t *testing.T) {
 			expectMessage: http.StatusText(http.StatusInternalServerError),
 		},
 		{
-			err:           gotenberg.ErrFiltered,
-			expectStatus:  http.StatusForbidden,
-			expectMessage: http.StatusText(http.StatusForbidden),
-		},
-		{
-			err:           gotenberg.ErrMaximumQueueSizeExceeded,
-			expectStatus:  http.StatusTooManyRequests,
-			expectMessage: http.StatusText(http.StatusTooManyRequests),
-		},
-		{
-			err:           gotenberg.ErrPdfFormatNotSupported,
-			expectStatus:  http.StatusBadRequest,
-			expectMessage: "At least one PDF engine cannot process the requested PDF format, while others may have failed to convert due to different issues",
+			err:           context.DeadlineExceeded,
+			expectStatus:  http.StatusServiceUnavailable,
+			expectMessage: http.StatusText(http.StatusServiceUnavailable),
 		},
 		{
 			err: WrapError(

pkg/modules/api/mocks.go

@@ -4,8 +4,6 @@ import (
 	"github.com/alexliesenfeld/health"
 	"github.com/labstack/echo/v4"
 	"go.uber.org/zap"
-
-	"github.com/gotenberg/gotenberg/v8/pkg/gotenberg"
 )
 
 // ContextMock is a helper for tests.
@@ -78,7 +76,7 @@ func (ctx *ContextMock) SetLogger(logger *zap.Logger) {
 	ctx.logger = logger
 }
 
-// SetEchoContext sets the [echo.Context].
+// SetEchoContext sets the echo.Context.
 //
 //	ctx := &api.ContextMock{Context: &api.Context{}}
 //	ctx.setEchoContext(c)
@@ -86,14 +84,6 @@ func (ctx *ContextMock) SetEchoContext(c echo.Context) {
 	ctx.Context.echoCtx = c
 }
 
-// SetPathRename sets the [gotenberg.PathRename].
-//
-//	ctx := &api.ContextMock{Context: &api.Context{}}
-//	ctx.setPathRename(rename)
-func (ctx *ContextMock) SetPathRename(rename gotenberg.PathRename) {
-	ctx.Context.pathRename = rename
-}
-
 // RouterMock is a mock for the [Router] interface.
 type RouterMock struct {
 	RoutesMock func() ([]Route, error)

pkg/modules/api/mocks_test.go

@@ -117,19 +117,6 @@ func TestContextMock_SetEchoContext(t *testing.T) {
 	}
 }
 
-func TestContextMock_SetPathRename(t *testing.T) {
-	mock := ContextMock{&Context{}}
-
-	expect := new(osPathRename)
-	mock.SetPathRename(expect)
-
-	actual := mock.pathRename
-
-	if actual != expect {
-		t.Errorf("expected %v but got %v", expect, actual)
-	}
-}
-
 func TestRouterMock(t *testing.T) {
 	mock := &RouterMock{
 		RoutesMock: func() ([]Route, error) {

pkg/modules/chromium/browser.go

@@ -5,6 +5,7 @@ import (
 	"errors"
 	"fmt"
 	"os"
+	"regexp"
 	"strings"
 	"sync"
 	"sync/atomic"
@@ -14,16 +15,14 @@ import (
 	"github.com/chromedp/cdproto/network"
 	"github.com/chromedp/cdproto/runtime"
 	"github.com/chromedp/chromedp"
-	"github.com/dlclark/regexp2"
 	"go.uber.org/zap"
 
-	"github.com/gotenberg/gotenberg/v8/pkg/gotenberg"
+	"github.com/gotenberg/gotenberg/v7/pkg/gotenberg"
 )
 
 type browser interface {
 	gotenberg.Process
-	pdf(ctx context.Context, logger *zap.Logger, url, outputPath string, options PdfOptions) error
-	screenshot(ctx context.Context, logger *zap.Logger, url, outputPath string, options ScreenshotOptions) error
+	pdf(ctx context.Context, logger *zap.Logger, url, outputPath string, options Options) error
 }
 
 type browserArguments struct {
@@ -39,10 +38,8 @@ type browserArguments struct {
 	wsUrlReadTimeout         time.Duration
 
 	// Tasks specific.
-	allowList         *regexp2.Regexp
-	denyList          *regexp2.Regexp
-	clearCache        bool
-	clearCookies      bool
+	allowList         *regexp.Regexp
+	denyList          *regexp.Regexp
 	disableJavaScript bool
 }
 
@@ -90,8 +87,6 @@ func (b *chromiumBrowser) Start(logger *zap.Logger) error {
 		// https://github.com/puppeteer/puppeteer/issues/2410
 		chromedp.Flag("font-render-hinting", "none"),
 		chromedp.UserDataDir(b.userProfileDirPath),
-		// See https://github.com/gotenberg/gotenberg/issues/831.
-		chromedp.Flag("disable-pdf-tagging", true),
 	)
 
 	if b.arguments.incognito {
@@ -166,7 +161,7 @@ func (b *chromiumBrowser) Stop(logger *zap.Logger) error {
 		go func() {
 			// FIXME: Chromium seems to recreate the user profile directory
 			//  right after its deletion if we do not wait a certain amount
-			//  of time before deleting it.
+			//  of time before re-deleting it.
 			<-time.After(10 * time.Second)
 
 			err := os.RemoveAll(userProfileDirPath)
@@ -216,53 +211,18 @@ func (b *chromiumBrowser) Healthy(logger *zap.Logger) bool {
 	return true
 }
 
-func (b *chromiumBrowser) pdf(ctx context.Context, logger *zap.Logger, url, outputPath string, options PdfOptions) error {
-	// Note: no error wrapping because it leaks on errors we want to display to
-	// the end user.
-	return b.do(ctx, logger, url, options.Options, chromedp.Tasks{
-		network.Enable(),
-		fetch.Enable(),
-		runtime.Enable(),
-		clearCacheActionFunc(logger, b.arguments.clearCache),
-		clearCookiesActionFunc(logger, b.arguments.clearCookies),
-		disableJavaScriptActionFunc(logger, b.arguments.disableJavaScript),
-		extraHttpHeadersActionFunc(logger, options.ExtraHttpHeaders),
-		navigateActionFunc(logger, url, options.SkipNetworkIdleEvent),
-		hideDefaultWhiteBackgroundActionFunc(logger, options.OmitBackground, options.PrintBackground),
-		forceExactColorsActionFunc(),
-		emulateMediaTypeActionFunc(logger, options.EmulatedMediaType),
-		waitDelayBeforePrintActionFunc(logger, b.arguments.disableJavaScript, options.WaitDelay),
-		waitForExpressionBeforePrintActionFunc(logger, b.arguments.disableJavaScript, options.WaitForExpression),
-		// PDF specific.
-		printToPdfActionFunc(logger, outputPath, options),
-	})
-}
-
-func (b *chromiumBrowser) screenshot(ctx context.Context, logger *zap.Logger, url, outputPath string, options ScreenshotOptions) error {
-	// Note: no error wrapping because it leaks on errors we want to display to
-	// the end user.
-	return b.do(ctx, logger, url, options.Options, chromedp.Tasks{
-		network.Enable(),
-		fetch.Enable(),
-		runtime.Enable(),
-		clearCacheActionFunc(logger, b.arguments.clearCache),
-		clearCookiesActionFunc(logger, b.arguments.clearCookies),
-		disableJavaScriptActionFunc(logger, b.arguments.disableJavaScript),
-		extraHttpHeadersActionFunc(logger, options.ExtraHttpHeaders),
-		navigateActionFunc(logger, url, options.SkipNetworkIdleEvent),
-		hideDefaultWhiteBackgroundActionFunc(logger, options.OmitBackground, true),
-		forceExactColorsActionFunc(),
-		emulateMediaTypeActionFunc(logger, options.EmulatedMediaType),
-		waitDelayBeforePrintActionFunc(logger, b.arguments.disableJavaScript, options.WaitDelay),
-		waitForExpressionBeforePrintActionFunc(logger, b.arguments.disableJavaScript, options.WaitForExpression),
-		// Screenshot specific.
-		captureScreenshotActionFunc(logger, outputPath, options),
-	})
-}
-
-func (b *chromiumBrowser) do(ctx context.Context, logger *zap.Logger, url string, options Options, tasks chromedp.Tasks) error {
+func (b *chromiumBrowser) pdf(ctx context.Context, logger *zap.Logger, url, outputPath string, options Options) error {
 	if !b.isStarted.Load() {
-		return errors.New("browser not started, cannot handle tasks")
+		return errors.New("browser not started, cannot handle PDF conversion")
+	}
+
+	// We validate the "main" URL against our allow / deny lists.
+	if !b.arguments.allowList.MatchString(url) {
+		return fmt.Errorf("'%s' does not match the expression from the allowed list: %w", url, ErrUrlNotAuthorized)
+	}
+
+	if b.arguments.denyList.String() != "" && b.arguments.denyList.MatchString(url) {
+		return fmt.Errorf("'%s' matches the expression from the denied list: %w", url, ErrUrlNotAuthorized)
 	}
 
 	deadline, ok := ctx.Deadline()
@@ -270,12 +230,6 @@ func (b *chromiumBrowser) do(ctx context.Context, logger *zap.Logger, url string
 		return errors.New("context has no deadline")
 	}
 
-	// We validate the "main" URL against our allow / deny lists.
-	err := gotenberg.FilterDeadline(b.arguments.allowList, b.arguments.denyList, url, deadline)
-	if err != nil {
-		return fmt.Errorf("filter URL: %w", err)
-	}
-
 	b.ctxMu.RLock()
 	defer b.ctxMu.RUnlock()
 
@@ -289,16 +243,6 @@ func (b *chromiumBrowser) do(ctx context.Context, logger *zap.Logger, url string
 	// If a request does not pass the validation, we make it fail.
 	listenForEventRequestPaused(taskCtx, logger, b.arguments.allowList, b.arguments.denyList)
 
-	var (
-		invalidHttpStatusCode   error
-		invalidHttpStatusCodeMu sync.RWMutex
-	)
-
-	// See https://github.com/gotenberg/gotenberg/issues/613.
-	if len(options.FailOnHttpStatusCodes) != 0 {
-		listenForEventResponseReceived(taskCtx, logger, url, options.FailOnHttpStatusCodes, &invalidHttpStatusCode, &invalidHttpStatusCodeMu)
-	}
-
 	var (
 		consoleExceptions   error
 		consoleExceptionsMu sync.RWMutex
@@ -309,7 +253,22 @@ func (b *chromiumBrowser) do(ctx context.Context, logger *zap.Logger, url string
 		listenForEventExceptionThrown(taskCtx, logger, &consoleExceptions, &consoleExceptionsMu)
 	}
 
-	err = chromedp.Run(taskCtx, tasks...)
+	tasks := chromedp.Tasks{
+		network.Enable(),
+		fetch.Enable(),
+		runtime.Enable(),
+		disableJavaScriptActionFunc(logger, b.arguments.disableJavaScript),
+		extraHttpHeadersActionFunc(logger, options.ExtraHttpHeaders),
+		navigateActionFunc(logger, url),
+		hideDefaultWhiteBackgroundActionFunc(logger, options.OmitBackground, options.PrintBackground),
+		forceExactColorsActionFunc(),
+		emulateMediaTypeActionFunc(logger, options.EmulatedMediaType),
+		waitDelayBeforePrintActionFunc(logger, b.arguments.disableJavaScript, options.WaitDelay),
+		waitForExpressionBeforePrintActionFunc(logger, b.arguments.disableJavaScript, options.WaitForExpression),
+		printToPdfActionFunc(logger, outputPath, options),
+	}
+
+	err := chromedp.Run(taskCtx, tasks...)
 	if err != nil {
 		errMessage := err.Error()
 
@@ -325,15 +284,7 @@ func (b *chromiumBrowser) do(ctx context.Context, logger *zap.Logger, url string
 			return ErrRpccMessageTooLarge
 		}
 
-		return fmt.Errorf("handle tasks: %w", err)
-	}
-
-	// See https://github.com/gotenberg/gotenberg/issues/613.
-	invalidHttpStatusCodeMu.RLock()
-	defer invalidHttpStatusCodeMu.RUnlock()
-
-	if invalidHttpStatusCode != nil {
-		return fmt.Errorf("%v: %w", invalidHttpStatusCode, ErrInvalidHttpStatusCode)
+		return fmt.Errorf("print to PDF: %w", err)
 	}
 
 	// See https://github.com/gotenberg/gotenberg/issues/262.

pkg/modules/chromium/chromium.go

@@ -9,10 +9,11 @@ import (
 
 	"github.com/alexliesenfeld/health"
 	flag "github.com/spf13/pflag"
+	"go.uber.org/multierr"
 	"go.uber.org/zap"
 
-	"github.com/gotenberg/gotenberg/v8/pkg/gotenberg"
-	"github.com/gotenberg/gotenberg/v8/pkg/modules/api"
+	"github.com/gotenberg/gotenberg/v7/pkg/gotenberg"
+	"github.com/gotenberg/gotenberg/v7/pkg/modules/api"
 )
 
 func init() {
@@ -20,6 +21,14 @@ func init() {
 }
 
 var (
+	// ErrUrlNotAuthorized happens if a URL is not acceptable according to the
+	// allowed/denied lists.
+	ErrUrlNotAuthorized = errors.New("URL not authorized")
+
+	// ErrOmitBackgroundWithoutPrintBackground happens if
+	// Options.OmitBackground is set to true but not Options.PrintBackground.
+	ErrOmitBackgroundWithoutPrintBackground = errors.New("omit background without print background")
+
 	// ErrInvalidEmulatedMediaType happens if the emulated media type is not
 	// "screen" nor "print". Empty value are allowed though.
 	ErrInvalidEmulatedMediaType = errors.New("invalid emulated media type")
@@ -28,32 +37,22 @@ var (
 	// returns an exception or undefined.
 	ErrInvalidEvaluationExpression = errors.New("invalid evaluation expression")
 
+	// ErrInvalidPrinterSettings happens if the Options have one or more
+	// aberrant values.
+	ErrInvalidPrinterSettings = errors.New("invalid printer settings")
+
+	// ErrPageRangesSyntaxError happens if the Options have an invalid page
+	// ranges.
+	ErrPageRangesSyntaxError = errors.New("page ranges syntax error")
+
 	// ErrRpccMessageTooLarge happens when the messages received by
 	// ChromeDevTools are larger than 100 MB.
 	ErrRpccMessageTooLarge = errors.New("rpcc message too large")
 
-	// ErrInvalidHttpStatusCode happens when the status code from the main page
-	// matches with one of the entry in [Options.FailOnHttpStatusCodes].
-	ErrInvalidHttpStatusCode = errors.New("invalid HTTP status code")
-
 	// ErrConsoleExceptions happens when there are exceptions in the Chromium
 	// console. It also happens only if the [Options.FailOnConsoleExceptions]
 	// is set to true.
 	ErrConsoleExceptions = errors.New("console exceptions")
-
-	// PDF specific.
-
-	// ErrOmitBackgroundWithoutPrintBackground happens if
-	// PdfOptions.OmitBackground is set to true but not PdfOptions.PrintBackground.
-	ErrOmitBackgroundWithoutPrintBackground = errors.New("omit background without print background")
-
-	// ErrInvalidPrinterSettings happens if the PdfOptions have one or more
-	// aberrant values.
-	ErrInvalidPrinterSettings = errors.New("invalid printer settings")
-
-	// ErrPageRangesSyntaxError happens if the PdfOptions have an invalid page
-	// ranges.
-	ErrPageRangesSyntaxError = errors.New("page ranges syntax error")
 )
 
 // Chromium is a module which provides both an [Api] and routes for converting
@@ -69,37 +68,25 @@ type Chromium struct {
 	engine     gotenberg.PdfEngine
 }
 
-// Options are the common options for all conversions.
+// Options are the available expectedOptions for converting HTML document to PDF.
 type Options struct {
-	// SkipNetworkIdleEvent set if the conversion should wait for the
-	// "networkIdle" event, drastically improving the conversion speed. It may
-	// not be suitable for all HTML documents, as some may not be fully
-	// rendered until this event is fired.
-	// Optional.
-	SkipNetworkIdleEvent bool
-
-	// FailOnHttpStatusCodes sets if the conversion should fail if the status
-	// code from the main page matches with one of its entries.
-	// Optional.
-	FailOnHttpStatusCodes []int64
-
 	// FailOnConsoleExceptions sets if the conversion should fail if there are
 	// exceptions in the Chromium console.
 	// Optional.
 	FailOnConsoleExceptions bool
 
 	// WaitDelay is the duration to wait when loading an HTML document before
-	// converting it.
+	// converting it to PDF.
 	// Optional.
 	WaitDelay time.Duration
 
 	// WaitWindowStatus is the window.status value to wait for before
-	// converting an HTML document.
+	// converting an HTML document to PDF.
 	// Optional.
 	WaitWindowStatus string
 
 	// WaitForExpression is the custom JavaScript expression to wait before
-	// converting an HTML document until it returns true
+	// converting an HTML document to PDF until it returns true
 	// Optional.
 	WaitForExpression string
 
@@ -113,31 +100,6 @@ type Options struct {
 	// Optional.
 	EmulatedMediaType string
 
-	// OmitBackground hides default white background and allows generating PDFs
-	// with transparency.
-	// Optional.
-	OmitBackground bool
-}
-
-// DefaultOptions returns the default values for Options.
-func DefaultOptions() Options {
-	return Options{
-		SkipNetworkIdleEvent:    false,
-		FailOnHttpStatusCodes:   []int64{499, 599},
-		FailOnConsoleExceptions: false,
-		WaitDelay:               0,
-		WaitWindowStatus:        "",
-		WaitForExpression:       "",
-		ExtraHttpHeaders:        nil,
-		EmulatedMediaType:       "",
-		OmitBackground:          false,
-	}
-}
-
-// PdfOptions are the available options for converting an HTML document to PDF.
-type PdfOptions struct {
-	Options
-
 	// Landscape sets the paper orientation.
 	// Optional.
 	Landscape bool
@@ -146,15 +108,15 @@ type PdfOptions struct {
 	// Optional.
 	PrintBackground bool
 
+	// OmitBackground hides default white background and allows generating PDFs
+	// with transparency.
+	// Optional.
+	OmitBackground bool
+
 	// Scale is the scale of the page rendering.
 	// Optional.
 	Scale float64
 
-	// SinglePage defines whether to print the entire content in one single
-	// page.
-	// Optional.
-	SinglePage bool
-
 	// PaperWidth is the paper width, in inches.
 	// Optional.
 	PaperWidth float64
@@ -207,61 +169,35 @@ type PdfOptions struct {
 	PreferCssPageSize bool
 }
 
-// DefaultPdfOptions returns the default values for PdfOptions.
-func DefaultPdfOptions() PdfOptions {
-	return PdfOptions{
-		Options:           DefaultOptions(),
-		Landscape:         false,
-		PrintBackground:   false,
-		Scale:             1.0,
-		SinglePage:        false,
-		PaperWidth:        8.5,
-		PaperHeight:       11,
-		MarginTop:         0.39,
-		MarginBottom:      0.39,
-		MarginLeft:        0.39,
-		MarginRight:       0.39,
-		PageRanges:        "",
-		HeaderTemplate:    "<html><head></head><body></body></html>",
-		FooterTemplate:    "<html><head></head><body></body></html>",
-		PreferCssPageSize: false,
-	}
-}
-
-// ScreenshotOptions are the available options for capturing a screenshot from
-// an HTML document.
-type ScreenshotOptions struct {
-	Options
-
-	// Format is the image compression format, either "png" or "jpeg" or
-	// "webp".
-	// Optional.
-	Format string
-
-	// Quality is the compression quality from range [0..100] (jpeg only).
-	// Optional.
-	Quality int
-
-	// OptimizeForSpeed defines whether to optimize image encoding for speed,
-	// not for resulting size.
-	// Optional.
-	OptimizeForSpeed bool
-}
-
-// DefaultScreenshotOptions returns the default values for ScreenshotOptions.
-func DefaultScreenshotOptions() ScreenshotOptions {
-	return ScreenshotOptions{
-		Options:          DefaultOptions(),
-		Format:           "png",
-		Quality:          100,
-		OptimizeForSpeed: false,
+// DefaultOptions returns the default values for Options.
+func DefaultOptions() Options {
+	return Options{
+		FailOnConsoleExceptions: false,
+		WaitDelay:               0,
+		WaitWindowStatus:        "",
+		WaitForExpression:       "",
+		ExtraHttpHeaders:        nil,
+		EmulatedMediaType:       "",
+		Landscape:               false,
+		PrintBackground:         false,
+		OmitBackground:          false,
+		Scale:                   1.0,
+		PaperWidth:              8.5,
+		PaperHeight:             11,
+		MarginTop:               0.39,
+		MarginBottom:            0.39,
+		MarginLeft:              0.39,
+		MarginRight:             0.39,
+		PageRanges:              "",
+		HeaderTemplate:          "<html><head></head><body></body></html>",
+		FooterTemplate:          "<html><head></head><body></body></html>",
+		PreferCssPageSize:       false,
 	}
 }
 
 // Api helps to interact with Chromium for converting HTML documents to PDF.
 type Api interface {
-	Pdf(ctx context.Context, logger *zap.Logger, url, outputPath string, options PdfOptions) error
-	Screenshot(ctx context.Context, logger *zap.Logger, url, outputPath string, options ScreenshotOptions) error
+	Pdf(ctx context.Context, logger *zap.Logger, url, outputPath string, options Options) error
 }
 
 // Provider is a module interface which exposes a method for creating an [Api]
@@ -281,8 +217,19 @@ func (mod *Chromium) Descriptor() gotenberg.ModuleDescriptor {
 		ID: "chromium",
 		FlagSet: func() *flag.FlagSet {
 			fs := flag.NewFlagSet("chromium", flag.ExitOnError)
+			// Deprecated flags.
+			fs.String("chromium-user-agent", "", "Override the default User-Agent header")
+			fs.Int("chromium-failed-starts-threshold", 5, "Set the number of consecutive failed starts after which the module is considered unhealthy - 0 means ignore")
+
+			var err error
+			err = multierr.Append(err, fs.MarkDeprecated("chromium-user-agent", "use the extraHttpHeaders form field instead"))
+			err = multierr.Append(err, fs.MarkDeprecated("chromium-failed-starts-threshold", "use the chromium-restart-after property instead"))
+
+			if err != nil {
+				panic(fmt.Errorf("create deprecated flags for the Chromium module: %v", err))
+			}
+
 			fs.Int64("chromium-restart-after", 0, "Number of conversions after which Chromium will automatically restart. Set to 0 to disable this feature")
-			fs.Int64("chromium-max-queue-size", 0, "Maximum request queue size for Chromium. Set to 0 to disable this feature")
 			fs.Bool("chromium-auto-start", false, "Automatically launch Chromium upon initialization if set to true; otherwise, Chromium will start at the time of the first conversion")
 			fs.Duration("chromium-start-timeout", time.Duration(20)*time.Second, "Maximum duration to wait for Chromium to start or restart")
 			fs.Bool("chromium-incognito", false, "Start Chromium with incognito mode")
@@ -293,9 +240,7 @@ func (mod *Chromium) Descriptor() gotenberg.ModuleDescriptor {
 			fs.String("chromium-host-resolver-rules", "", "Set custom mappings to the host resolver")
 			fs.String("chromium-proxy-server", "", "Set the outbound proxy server; this switch only affects HTTP and HTTPS requests")
 			fs.String("chromium-allow-list", "", "Set the allowed URLs for Chromium using a regular expression")
-			fs.String("chromium-deny-list", `^file:(?!//\/tmp/).*`, "Set the denied URLs for Chromium using a regular expression")
-			fs.Bool("chromium-clear-cache", false, "Clear Chromium cache between each conversion")
-			fs.Bool("chromium-clear-cookies", false, "Clear Chromium cookies between each conversion")
+			fs.String("chromium-deny-list", "^file:///[^tmp].*", "Set the denied URLs for Chromium using a regular expression")
 			fs.Bool("chromium-disable-javascript", false, "Disable JavaScript")
 			fs.Bool("chromium-disable-routes", false, "Disable the routes")
 
@@ -329,8 +274,6 @@ func (mod *Chromium) Provision(ctx *gotenberg.Context) error {
 
 		allowList:         flags.MustRegexp("chromium-allow-list"),
 		denyList:          flags.MustRegexp("chromium-deny-list"),
-		clearCache:        flags.MustBool("chromium-clear-cache"),
-		clearCookies:      flags.MustBool("chromium-clear-cookies"),
 		disableJavaScript: flags.MustBool("chromium-disable-javascript"),
 	}
 
@@ -347,7 +290,7 @@ func (mod *Chromium) Provision(ctx *gotenberg.Context) error {
 
 	// Process.
 	mod.browser = newChromiumBrowser(mod.args)
-	mod.supervisor = gotenberg.NewProcessSupervisor(mod.logger, mod.browser, flags.MustInt64("chromium-restart-after"), flags.MustInt64("chromium-max-queue-size"))
+	mod.supervisor = gotenberg.NewProcessSupervisor(mod.logger, mod.browser, flags.MustInt64("chromium-restart-after"))
 
 	// PDF Engine.
 	provider, err := ctx.Module(new(gotenberg.PdfEngineProvider))
@@ -416,6 +359,22 @@ func (mod *Chromium) Stop(ctx context.Context) error {
 // Metrics returns the metrics.
 func (mod *Chromium) Metrics() ([]gotenberg.Metric, error) {
 	return []gotenberg.Metric{
+		{
+			// TODO: remove deprecated.
+			Name:        "chromium_active_instances_count",
+			Description: "Current number of active Chromium instances - deprecated.",
+			Read: func() float64 {
+				return 1
+			},
+		},
+		{
+			// TODO: remove deprecated.
+			Name:        "chromium_failed_starts_count",
+			Description: "Current number of Chromium consecutive starting failures - deprecated.",
+			Read: func() float64 {
+				return 0
+			},
+		},
 		{
 			Name:        "chromium_requests_queue_size",
 			Description: "Current number of Chromium conversion requests waiting to be treated.",
@@ -491,31 +450,19 @@ func (mod *Chromium) Routes() ([]api.Route, error) {
 
 	return []api.Route{
 		convertUrlRoute(mod, mod.engine),
-		screenshotUrlRoute(mod),
 		convertHtmlRoute(mod, mod.engine),
-		screenshotHtmlRoute(mod),
 		convertMarkdownRoute(mod, mod.engine),
-		screenshotMarkdownRoute(mod),
 	}, nil
 }
 
 // Pdf converts a URL to PDF.
-func (mod *Chromium) Pdf(ctx context.Context, logger *zap.Logger, url, outputPath string, options PdfOptions) error {
-	// Note: no error wrapping because it leaks on errors we want to display to
-	// the end user.
+func (mod *Chromium) Pdf(ctx context.Context, logger *zap.Logger, url, outputPath string, options Options) error {
+	// FIXME: no error wrapping because it leaks on console exceptions output.
 	return mod.supervisor.Run(ctx, logger, func() error {
 		return mod.browser.pdf(ctx, logger, url, outputPath, options)
 	})
 }
 
-func (mod *Chromium) Screenshot(ctx context.Context, logger *zap.Logger, url, outputPath string, options ScreenshotOptions) error {
-	// Note: no error wrapping because it leaks on errors we want to display to
-	// the end user.
-	return mod.supervisor.Run(ctx, logger, func() error {
-		return mod.browser.screenshot(ctx, logger, url, outputPath, options)
-	})
-}
-
 // Interface guards.
 var (
 	_ gotenberg.Module          = (*Chromium)(nil)

pkg/modules/chromium/chromium_test.go

@@ -11,12 +11,12 @@ import (
 	"github.com/alexliesenfeld/health"
 	"go.uber.org/zap"
 
-	"github.com/gotenberg/gotenberg/v8/pkg/gotenberg"
+	"github.com/gotenberg/gotenberg/v7/pkg/gotenberg"
 )
 
 func TestDefaultOptions(t *testing.T) {
-	actual := DefaultPdfOptions()
-	notExpect := PdfOptions{}
+	actual := DefaultOptions()
+	notExpect := Options{}
 
 	if reflect.DeepEqual(actual, notExpect) {
 		t.Errorf("expected %v and got identical %v", actual, notExpect)
@@ -334,16 +334,26 @@ func TestChromium_Metrics(t *testing.T) {
 		t.Fatalf("expected no error but got: %v", err)
 	}
 
-	if len(metrics) != 2 {
-		t.Fatalf("expected %d metrics, but got %d", 2, len(metrics))
+	if len(metrics) != 4 {
+		t.Fatalf("expected %d metrics, but got %d", 4, len(metrics))
 	}
 
 	actual := metrics[0].Read()
+	if actual != float64(1) {
+		t.Errorf("expected %f for chromium_active_instances_count, but got %f", float64(1), actual)
+	}
+
+	actual = metrics[1].Read()
+	if actual != float64(0) {
+		t.Errorf("expected %f for chromium_failed_starts_count, but got %f", float64(0), actual)
+	}
+
+	actual = metrics[2].Read()
 	if actual != float64(10) {
 		t.Errorf("expected %f for chromium_requests_queue_size, but got %f", float64(10), actual)
 	}
 
-	actual = metrics[1].Read()
+	actual = metrics[3].Read()
 	if actual != float64(0) {
 		t.Errorf("expected %f for chromium_restarts_count, but got %f", float64(0), actual)
 	}
@@ -461,7 +471,7 @@ func TestChromium_Routes(t *testing.T) {
 	}{
 		{
 			scenario:      "routes not disabled",
-			expectRoutes:  6,
+			expectRoutes:  3,
 			disableRoutes: false,
 		},
 		{
@@ -495,14 +505,14 @@ func TestChromium_Pdf(t *testing.T) {
 	}{
 		{
 			scenario: "PDF task success",
-			browser: &browserMock{pdfMock: func(ctx context.Context, logger *zap.Logger, url, outputPath string, options PdfOptions) error {
+			browser: &browserMock{pdfMock: func(ctx context.Context, logger *zap.Logger, url, outputPath string, options Options) error {
 				return nil
 			}},
 			expectError: false,
 		},
 		{
 			scenario: "PDF task error",
-			browser: &browserMock{pdfMock: func(ctx context.Context, logger *zap.Logger, url, outputPath string, options PdfOptions) error {
+			browser: &browserMock{pdfMock: func(ctx context.Context, logger *zap.Logger, url, outputPath string, options Options) error {
 				return errors.New("PDF task error")
 			}},
 			expectError: true,
@@ -515,49 +525,7 @@ func TestChromium_Pdf(t *testing.T) {
 			}}
 			mod.browser = tc.browser
 
-			err := mod.Pdf(context.Background(), zap.NewNop(), "", "", PdfOptions{})
-
-			if !tc.expectError && err != nil {
-				t.Fatalf("expected no error but got: %v", err)
-			}
-
-			if tc.expectError && err == nil {
-				t.Fatal("expected error but got none")
-			}
-		})
-	}
-}
-
-func TestChromium_Screenshot(t *testing.T) {
-	for _, tc := range []struct {
-		scenario    string
-		supervisor  gotenberg.ProcessSupervisor
-		browser     browser
-		expectError bool
-	}{
-		{
-			scenario: "Screenshot task success",
-			browser: &browserMock{screenshotMock: func(ctx context.Context, logger *zap.Logger, url, outputPath string, options ScreenshotOptions) error {
-				return nil
-			}},
-			expectError: false,
-		},
-		{
-			scenario: "Screenshot task error",
-			browser: &browserMock{screenshotMock: func(ctx context.Context, logger *zap.Logger, url, outputPath string, options ScreenshotOptions) error {
-				return errors.New("screenshot task error")
-			}},
-			expectError: true,
-		},
-	} {
-		t.Run(tc.scenario, func(t *testing.T) {
-			mod := new(Chromium)
-			mod.supervisor = &gotenberg.ProcessSupervisorMock{RunMock: func(ctx context.Context, logger *zap.Logger, task func() error) error {
-				return task()
-			}}
-			mod.browser = tc.browser
-
-			err := mod.Screenshot(context.Background(), zap.NewNop(), "", "", ScreenshotOptions{})
+			err := mod.Pdf(context.Background(), zap.NewNop(), "", "", Options{})
 
 			if !tc.expectError && err != nil {
 				t.Fatalf("expected no error but got: %v", err)

pkg/modules/chromium/events.go

@@ -3,7 +3,7 @@ package chromium
 import (
 	"context"
 	"fmt"
-	"slices"
+	"regexp"
 	"sync"
 
 	"github.com/chromedp/cdproto/cdp"
@@ -12,17 +12,14 @@ import (
 	"github.com/chromedp/cdproto/page"
 	"github.com/chromedp/cdproto/runtime"
 	"github.com/chromedp/chromedp"
-	"github.com/dlclark/regexp2"
 	"go.uber.org/multierr"
 	"go.uber.org/zap"
 	"golang.org/x/sync/errgroup"
-
-	"github.com/gotenberg/gotenberg/v8/pkg/gotenberg"
 )
 
 // listenForEventRequestPaused listens for requests to check if they are
 // allowed or not.
-func listenForEventRequestPaused(ctx context.Context, logger *zap.Logger, allowList *regexp2.Regexp, denyList *regexp2.Regexp) {
+func listenForEventRequestPaused(ctx context.Context, logger *zap.Logger, allowList *regexp.Regexp, denyList *regexp.Regexp) {
 	chromedp.ListenTarget(ctx, func(ev interface{}) {
 		switch e := ev.(type) {
 		case *fetch.EventRequestPaused:
@@ -30,15 +27,13 @@ func listenForEventRequestPaused(ctx context.Context, logger *zap.Logger, allowL
 				logger.Debug(fmt.Sprintf("event EventRequestPaused fired for '%s'", e.Request.URL))
 				allow := true
 
-				deadline, ok := ctx.Deadline()
-				if !ok {
-					logger.Error("context has no deadline, cannot filter URL")
-					return
+				if !allowList.MatchString(e.Request.URL) {
+					logger.Warn(fmt.Sprintf("'%s' does not match the expression from the allowed list", e.Request.URL))
+					allow = false
 				}
 
-				err := gotenberg.FilterDeadline(allowList, denyList, e.Request.URL, deadline)
-				if err != nil {
-					logger.Warn(err.Error())
+				if denyList.String() != "" && denyList.MatchString(e.Request.URL) {
+					logger.Warn(fmt.Sprintf("'%s' matches the expression from the denied list", e.Request.URL))
 					allow = false
 				}
 
@@ -47,15 +42,16 @@ func listenForEventRequestPaused(ctx context.Context, logger *zap.Logger, allowL
 
 				if allow {
 					req := fetch.ContinueRequest(e.RequestID)
-					err = req.Do(executorCtx)
+					err := req.Do(executorCtx)
 					if err != nil {
 						logger.Error(fmt.Sprintf("continue request: %s", err))
 					}
+
 					return
 				}
 
 				req := fetch.FailRequest(e.RequestID, network.ErrorReasonAccessDenied)
-				err = req.Do(executorCtx)
+				err := req.Do(executorCtx)
 				if err != nil {
 					logger.Error(fmt.Sprintf("fail request: %s", err))
 				}
@@ -64,37 +60,6 @@ func listenForEventRequestPaused(ctx context.Context, logger *zap.Logger, allowL
 	})
 }
 
-// listenForEventResponseReceived listens for an invalid HTTP status code is
-// returned by the main page.
-// See https://github.com/gotenberg/gotenberg/issues/613.
-func listenForEventResponseReceived(ctx context.Context, logger *zap.Logger, url string, failOnHttpStatusCodes []int64, invalidHttpStatusCode *error, invalidHttpStatusCodeMu *sync.RWMutex) {
-	for _, code := range []int64{199, 299, 399, 499, 599} {
-		if slices.Contains(failOnHttpStatusCodes, code) {
-			for i := code - 99; i <= code; i++ {
-				failOnHttpStatusCodes = append(failOnHttpStatusCodes, i)
-			}
-		}
-	}
-
-	chromedp.ListenTarget(ctx, func(ev interface{}) {
-		switch ev := ev.(type) {
-		case *network.EventResponseReceived:
-			if ev.Response.URL != url {
-				return
-			}
-
-			logger.Debug(fmt.Sprintf("event EventResponseReceived fired for main page: %+v", ev.Response))
-
-			if slices.Contains(failOnHttpStatusCodes, ev.Response.Status) {
-				invalidHttpStatusCodeMu.Lock()
-				defer invalidHttpStatusCodeMu.Unlock()
-
-				*invalidHttpStatusCode = fmt.Errorf("%d: %s", ev.Response.Status, ev.Response.StatusText)
-			}
-		}
-	})
-}
-
 // listenForEventExceptionThrown listens for exceptions in the console and
 // appends those exceptions to the given error pointer.
 // See https://github.com/gotenberg/gotenberg/issues/262.

pkg/modules/chromium/mocks.go

@@ -5,38 +5,28 @@ import (
 
 	"go.uber.org/zap"
 
-	"github.com/gotenberg/gotenberg/v8/pkg/gotenberg"
+	"github.com/gotenberg/gotenberg/v7/pkg/gotenberg"
 )
 
 // ApiMock is a mock for the [Api] interface.
 type ApiMock struct {
-	PdfMock        func(ctx context.Context, logger *zap.Logger, url, outputPath string, options PdfOptions) error
-	ScreenshotMock func(ctx context.Context, logger *zap.Logger, url, outputPath string, options ScreenshotOptions) error
+	PdfMock func(ctx context.Context, logger *zap.Logger, url, outputPath string, options Options) error
 }
 
-func (api *ApiMock) Pdf(ctx context.Context, logger *zap.Logger, url, outputPath string, options PdfOptions) error {
+func (api *ApiMock) Pdf(ctx context.Context, logger *zap.Logger, url, outputPath string, options Options) error {
 	return api.PdfMock(ctx, logger, url, outputPath, options)
 }
 
-func (api *ApiMock) Screenshot(ctx context.Context, logger *zap.Logger, url, outputPath string, options ScreenshotOptions) error {
-	return api.ScreenshotMock(ctx, logger, url, outputPath, options)
-}
-
 // browserMock is a mock for the [browser] interface.
 type browserMock struct {
 	gotenberg.ProcessMock
-	pdfMock        func(ctx context.Context, logger *zap.Logger, url, outputPath string, options PdfOptions) error
-	screenshotMock func(ctx context.Context, logger *zap.Logger, url, outputPath string, options ScreenshotOptions) error
+	pdfMock func(ctx context.Context, logger *zap.Logger, url, outputPath string, options Options) error
 }
 
-func (b *browserMock) pdf(ctx context.Context, logger *zap.Logger, url, outputPath string, options PdfOptions) error {
+func (b *browserMock) pdf(ctx context.Context, logger *zap.Logger, url, outputPath string, options Options) error {
 	return b.pdfMock(ctx, logger, url, outputPath, options)
 }
 
-func (b *browserMock) screenshot(ctx context.Context, logger *zap.Logger, url, outputPath string, options ScreenshotOptions) error {
-	return b.screenshotMock(ctx, logger, url, outputPath, options)
-}
-
 // Interface guards.
 var (
 	_ Api     = (*ApiMock)(nil)

pkg/modules/chromium/mocks_test.go

@@ -9,42 +9,26 @@ import (
 
 func TestApiMock(t *testing.T) {
 	mock := &ApiMock{
-		PdfMock: func(ctx context.Context, logger *zap.Logger, url, outputPath string, options PdfOptions) error {
-			return nil
-		},
-		ScreenshotMock: func(ctx context.Context, logger *zap.Logger, url, outputPath string, options ScreenshotOptions) error {
+		PdfMock: func(ctx context.Context, logger *zap.Logger, url, outputPath string, options Options) error {
 			return nil
 		},
 	}
 
-	err := mock.Pdf(context.Background(), zap.NewNop(), "", "", PdfOptions{})
+	err := mock.Pdf(context.Background(), zap.NewNop(), "", "", Options{})
 	if err != nil {
 		t.Errorf("expected no error from ApiMock.Pdf, but got: %v", err)
 	}
-
-	err = mock.Screenshot(context.Background(), zap.NewNop(), "", "", ScreenshotOptions{})
-	if err != nil {
-		t.Errorf("expected no error from ApiMock.Screenshot, but got: %v", err)
-	}
 }
 
 func TestBrowserMock(t *testing.T) {
 	mock := &browserMock{
-		pdfMock: func(ctx context.Context, logger *zap.Logger, url, outputPath string, options PdfOptions) error {
-			return nil
-		},
-		screenshotMock: func(ctx context.Context, logger *zap.Logger, url, outputPath string, options ScreenshotOptions) error {
+		pdfMock: func(ctx context.Context, logger *zap.Logger, url, outputPath string, options Options) error {
 			return nil
 		},
 	}
 
-	err := mock.pdf(context.Background(), zap.NewNop(), "", "", PdfOptions{})
+	err := mock.pdf(context.Background(), zap.NewNop(), "", "", Options{})
 	if err != nil {
 		t.Errorf("expected no error from browserMock.pdf, but got: %v", err)
 	}
-
-	err = mock.screenshot(context.Background(), zap.NewNop(), "", "", ScreenshotOptions{})
-	if err != nil {
-		t.Errorf("expected no error from browserMock.screenshot, but got: %v", err)
-	}
 }

pkg/modules/chromium/routes.go

@@ -9,7 +9,6 @@ import (
 	"net/http"
 	"os"
 	"path/filepath"
-	"strconv"
 	"strings"
 	"time"
 
@@ -18,55 +17,47 @@ import (
 	"github.com/russross/blackfriday/v2"
 	"go.uber.org/multierr"
 
-	"github.com/gotenberg/gotenberg/v8/pkg/gotenberg"
-	"github.com/gotenberg/gotenberg/v8/pkg/modules/api"
+	"github.com/gotenberg/gotenberg/v7/pkg/gotenberg"
+	"github.com/gotenberg/gotenberg/v7/pkg/modules/api"
 )
 
-// FormDataChromiumOptions creates [Options] from the form data. Fallback to
+// FormDataChromiumPdfOptions creates [Options] from the form data. Fallback to
 // default value if the considered key is not present.
-func FormDataChromiumOptions(ctx *api.Context) (*api.FormData, Options) {
+func FormDataChromiumPdfOptions(ctx *api.Context) (*api.FormData, Options) {
 	defaultOptions := DefaultOptions()
 
 	var (
-		skipNetworkIdleEvent    bool
-		failOnHttpStatusCodes   []int64
-		failOnConsoleExceptions bool
-		waitDelay               time.Duration
-		waitWindowStatus        string
-		waitForExpression       string
-		extraHttpHeaders        map[string]string
-		emulatedMediaType       string
-		omitBackground          bool
+		failOnConsoleExceptions                          bool
+		waitDelay                                        time.Duration
+		waitWindowStatus                                 string
+		waitForExpression                                string
+		userAgent                                        string
+		extraHttpHeaders                                 map[string]string
+		emulatedMediaType                                string
+		landscape, printBackground, omitBackground       bool
+		scale, paperWidth, paperHeight                   float64
+		marginTop, marginBottom, marginLeft, marginRight float64
+		pageRanges                                       string
+		headerTemplate, footerTemplate                   string
+		preferCssPageSize                                bool
 	)
 
 	form := ctx.FormData().
-		Bool("skipNetworkIdleEvent", &skipNetworkIdleEvent, defaultOptions.SkipNetworkIdleEvent).
-		Custom("failOnHttpStatusCodes", func(value string) error {
-			if value == "" {
-				failOnHttpStatusCodes = defaultOptions.FailOnHttpStatusCodes
-				return nil
-			}
-
-			err := json.Unmarshal([]byte(value), &failOnHttpStatusCodes)
-			if err != nil {
-				return fmt.Errorf("unmarshal failOnHttpStatusCodes: %w", err)
-			}
-
-			return nil
-		}).
 		Bool("failOnConsoleExceptions", &failOnConsoleExceptions, defaultOptions.FailOnConsoleExceptions).
 		Duration("waitDelay", &waitDelay, defaultOptions.WaitDelay).
 		String("waitWindowStatus", &waitWindowStatus, defaultOptions.WaitWindowStatus).
 		String("waitForExpression", &waitForExpression, defaultOptions.WaitForExpression).
+		String("userAgent", &userAgent, ""). // FIXME: deprecated.
 		Custom("extraHttpHeaders", func(value string) error {
 			if value == "" {
 				extraHttpHeaders = defaultOptions.ExtraHttpHeaders
+
 				return nil
 			}
 
 			err := json.Unmarshal([]byte(value), &extraHttpHeaders)
 			if err != nil {
-				return fmt.Errorf("unmarshal extraHttpHeaders: %w", err)
+				return fmt.Errorf("unmarshal extra HTTP headers: %w", err)
 			}
 
 			return nil
@@ -74,6 +65,7 @@ func FormDataChromiumOptions(ctx *api.Context) (*api.FormData, Options) {
 		Custom("emulatedMediaType", func(value string) error {
 			if value == "" {
 				emulatedMediaType = defaultOptions.EmulatedMediaType
+
 				return nil
 			}
 
@@ -85,150 +77,87 @@ func FormDataChromiumOptions(ctx *api.Context) (*api.FormData, Options) {
 
 			return nil
 		}).
-		Bool("omitBackground", &omitBackground, defaultOptions.OmitBackground)
+		Bool("landscape", &landscape, defaultOptions.Landscape).
+		Bool("printBackground", &printBackground, defaultOptions.PrintBackground).
+		Bool("omitBackground", &omitBackground, defaultOptions.OmitBackground).
+		Float64("scale", &scale, defaultOptions.Scale).
+		Float64("paperWidth", &paperWidth, defaultOptions.PaperWidth).
+		Float64("paperHeight", &paperHeight, defaultOptions.PaperHeight).
+		Float64("marginTop", &marginTop, defaultOptions.MarginTop).
+		Float64("marginBottom", &marginBottom, defaultOptions.MarginBottom).
+		Float64("marginLeft", &marginLeft, defaultOptions.MarginLeft).
+		Float64("marginRight", &marginRight, defaultOptions.MarginRight).
+		String("nativePageRanges", &pageRanges, defaultOptions.PageRanges).
+		Content("header.html", &headerTemplate, defaultOptions.HeaderTemplate).
+		Content("footer.html", &footerTemplate, defaultOptions.FooterTemplate).
+		Bool("preferCssPageSize", &preferCssPageSize, defaultOptions.PreferCssPageSize)
+
+	// FIXME: deprecated.
+	if userAgent != "" {
+		ctx.Log().Warn("'userAgent' is deprecated; prefer the 'extraHttpHeaders' form field instead")
+
+		if extraHttpHeaders == nil {
+			extraHttpHeaders = make(map[string]string)
+		}
+
+		extraHttpHeaders["User-Agent"] = userAgent
+	}
 
 	options := Options{
-		SkipNetworkIdleEvent:    skipNetworkIdleEvent,
-		FailOnHttpStatusCodes:   failOnHttpStatusCodes,
 		FailOnConsoleExceptions: failOnConsoleExceptions,
 		WaitDelay:               waitDelay,
 		WaitWindowStatus:        waitWindowStatus,
 		WaitForExpression:       waitForExpression,
 		ExtraHttpHeaders:        extraHttpHeaders,
 		EmulatedMediaType:       emulatedMediaType,
+		Landscape:               landscape,
+		PrintBackground:         printBackground,
 		OmitBackground:          omitBackground,
+		Scale:                   scale,
+		PaperWidth:              paperWidth,
+		PaperHeight:             paperHeight,
+		MarginTop:               marginTop,
+		MarginBottom:            marginBottom,
+		MarginLeft:              marginLeft,
+		MarginRight:             marginRight,
+		PageRanges:              pageRanges,
+		HeaderTemplate:          headerTemplate,
+		FooterTemplate:          footerTemplate,
+		PreferCssPageSize:       preferCssPageSize,
 	}
 
 	return form, options
 }
 
-// FormDataChromiumPdfOptions creates [PdfOptions] from the form data. Fallback to
-// default value if the considered key is not present.
-func FormDataChromiumPdfOptions(ctx *api.Context) (*api.FormData, PdfOptions) {
-	form, options := FormDataChromiumOptions(ctx)
-	defaultPdfOptions := DefaultPdfOptions()
-
-	var (
-		landscape, printBackground, singlePage           bool
-		scale, paperWidth, paperHeight                   float64
-		marginTop, marginBottom, marginLeft, marginRight float64
-		pageRanges                                       string
-		headerTemplate, footerTemplate                   string
-		preferCssPageSize                                bool
-	)
-
-	form.
-		Bool("landscape", &landscape, defaultPdfOptions.Landscape).
-		Bool("printBackground", &printBackground, defaultPdfOptions.PrintBackground).
-		Float64("scale", &scale, defaultPdfOptions.Scale).
-		Bool("singlePage", &singlePage, defaultPdfOptions.SinglePage).
-		Float64("paperWidth", &paperWidth, defaultPdfOptions.PaperWidth).
-		Float64("paperHeight", &paperHeight, defaultPdfOptions.PaperHeight).
-		Float64("marginTop", &marginTop, defaultPdfOptions.MarginTop).
-		Float64("marginBottom", &marginBottom, defaultPdfOptions.MarginBottom).
-		Float64("marginLeft", &marginLeft, defaultPdfOptions.MarginLeft).
-		Float64("marginRight", &marginRight, defaultPdfOptions.MarginRight).
-		String("nativePageRanges", &pageRanges, defaultPdfOptions.PageRanges).
-		Content("header.html", &headerTemplate, defaultPdfOptions.HeaderTemplate).
-		Content("footer.html", &footerTemplate, defaultPdfOptions.FooterTemplate).
-		Bool("preferCssPageSize", &preferCssPageSize, defaultPdfOptions.PreferCssPageSize)
-
-	pdfOptions := PdfOptions{
-		Options:           options,
-		Landscape:         landscape,
-		PrintBackground:   printBackground,
-		Scale:             scale,
-		SinglePage:        singlePage,
-		PaperWidth:        paperWidth,
-		PaperHeight:       paperHeight,
-		MarginTop:         marginTop,
-		MarginBottom:      marginBottom,
-		MarginLeft:        marginLeft,
-		MarginRight:       marginRight,
-		PageRanges:        pageRanges,
-		HeaderTemplate:    headerTemplate,
-		FooterTemplate:    footerTemplate,
-		PreferCssPageSize: preferCssPageSize,
-	}
-
-	return form, pdfOptions
-}
-
-// FormDataChromiumScreenshotOptions creates [ScreenshotOptions] from the form
-// data. Fallback to default value if the considered key is not present.
-func FormDataChromiumScreenshotOptions(ctx *api.Context) (*api.FormData, ScreenshotOptions) {
-	form, options := FormDataChromiumOptions(ctx)
-	defaultScreenshotOptions := DefaultScreenshotOptions()
-
-	var (
-		format           string
-		quality          int
-		optimizeForSpeed bool
-	)
-
-	form.
-		Custom("format", func(value string) error {
-			if value == "" {
-				format = defaultScreenshotOptions.Format
-				return nil
-			}
-
-			if value != "png" && value != "jpeg" && value != "webp" {
-				return fmt.Errorf("wrong value, expected either 'png', 'jpeg' or 'webp'")
-			}
-
-			format = value
-
-			return nil
-		}).
-		Custom("quality", func(value string) error {
-			if value == "" {
-				quality = defaultScreenshotOptions.Quality
-				return nil
-			}
-
-			intValue, err := strconv.Atoi(value)
-			if err != nil {
-				return err
-			}
-
-			if intValue < 0 {
-				return errors.New("value is negative")
-			}
-
-			if intValue > 100 {
-				return errors.New("value is superior to 100")
-			}
-
-			quality = intValue
-			return nil
-		}).
-		Bool("optimizeForSpeed", &optimizeForSpeed, defaultScreenshotOptions.OptimizeForSpeed)
-
-	screenshotOptions := ScreenshotOptions{
-		Options:          options,
-		Format:           format,
-		Quality:          quality,
-		OptimizeForSpeed: optimizeForSpeed,
-	}
-
-	return form, screenshotOptions
-}
-
 // FormDataChromiumPdfFormats creates [gotenberg.PdfFormats] from the form
 // data. Fallback to default value if the considered key is not present.
-func FormDataChromiumPdfFormats(form *api.FormData) gotenberg.PdfFormats {
+func FormDataChromiumPdfFormats(ctx *api.Context) gotenberg.PdfFormats {
 	var (
-		pdfa  string
-		pdfua bool
+		pdfFormat string
+		pdfa      string
+		pdfua     bool
 	)
 
-	form.
+	ctx.FormData().
+		String("pdfFormat", &pdfFormat, "").
 		String("pdfa", &pdfa, "").
 		Bool("pdfua", &pdfua, false)
 
+	// FIXME: deprecated.
+	// pdfa > pdfFormat.
+	var actualPdfArchive string
+
+	if pdfFormat != "" {
+		ctx.Log().Warn("'pdfFormat' is deprecated; prefer the 'pdfa' form field instead")
+		actualPdfArchive = pdfFormat
+	}
+
+	if pdfa != "" {
+		actualPdfArchive = pdfa
+	}
+
 	return gotenberg.PdfFormats{
-		PdfA:  pdfa,
+		PdfA:  actualPdfArchive,
 		PdfUa: pdfua,
 	}
 }
@@ -242,7 +171,7 @@ func convertUrlRoute(chromium Api, engine gotenberg.PdfEngine) api.Route {
 		Handler: func(c echo.Context) error {
 			ctx := c.Get("context").(*api.Context)
 			form, options := FormDataChromiumPdfOptions(ctx)
-			pdfFormats := FormDataChromiumPdfFormats(form)
+			pdfFormats := FormDataChromiumPdfFormats(ctx)
 
 			var url string
 			err := form.
@@ -262,35 +191,6 @@ func convertUrlRoute(chromium Api, engine gotenberg.PdfEngine) api.Route {
 	}
 }
 
-// screenshotUrlRoute returns an [api.Route] which can take a screenshot from a
-// URL.
-func screenshotUrlRoute(chromium Api) api.Route {
-	return api.Route{
-		Method:      http.MethodPost,
-		Path:        "/forms/chromium/screenshot/url",
-		IsMultipart: true,
-		Handler: func(c echo.Context) error {
-			ctx := c.Get("context").(*api.Context)
-			form, options := FormDataChromiumScreenshotOptions(ctx)
-
-			var url string
-			err := form.
-				MandatoryString("url", &url).
-				Validate()
-			if err != nil {
-				return fmt.Errorf("validate form data: %w", err)
-			}
-
-			err = screenshotUrl(ctx, chromium, url, options)
-			if err != nil {
-				return fmt.Errorf("URL screenshot: %w", err)
-			}
-
-			return nil
-		},
-	}
-}
-
 // convertHtmlRoute returns an [api.Route] which can convert an HTML file to
 // PDF.
 func convertHtmlRoute(chromium Api, engine gotenberg.PdfEngine) api.Route {
@@ -301,7 +201,7 @@ func convertHtmlRoute(chromium Api, engine gotenberg.PdfEngine) api.Route {
 		Handler: func(c echo.Context) error {
 			ctx := c.Get("context").(*api.Context)
 			form, options := FormDataChromiumPdfOptions(ctx)
-			pdfFormats := FormDataChromiumPdfFormats(form)
+			pdfFormats := FormDataChromiumPdfFormats(ctx)
 
 			var inputPath string
 			err := form.
@@ -322,36 +222,6 @@ func convertHtmlRoute(chromium Api, engine gotenberg.PdfEngine) api.Route {
 	}
 }
 
-// screenshotHtmlRoute returns an [api.Route] which can take a screenshot from
-// an HTML file.
-func screenshotHtmlRoute(chromium Api) api.Route {
-	return api.Route{
-		Method:      http.MethodPost,
-		Path:        "/forms/chromium/screenshot/html",
-		IsMultipart: true,
-		Handler: func(c echo.Context) error {
-			ctx := c.Get("context").(*api.Context)
-			form, options := FormDataChromiumScreenshotOptions(ctx)
-
-			var inputPath string
-			err := form.
-				MandatoryPath("index.html", &inputPath).
-				Validate()
-			if err != nil {
-				return fmt.Errorf("validate form data: %w", err)
-			}
-
-			url := fmt.Sprintf("file://%s", inputPath)
-			err = screenshotUrl(ctx, chromium, url, options)
-			if err != nil {
-				return fmt.Errorf("HTML screenshot: %w", err)
-			}
-
-			return nil
-		},
-	}
-}
-
 // convertMarkdownRoute returns an [api.Route] which can convert markdown files
 // to PDF.
 func convertMarkdownRoute(chromium Api, engine gotenberg.PdfEngine) api.Route {
@@ -362,7 +232,7 @@ func convertMarkdownRoute(chromium Api, engine gotenberg.PdfEngine) api.Route {
 		Handler: func(c echo.Context) error {
 			ctx := c.Get("context").(*api.Context)
 			form, options := FormDataChromiumPdfOptions(ctx)
-			pdfFormats := FormDataChromiumPdfFormats(form)
+			pdfFormats := FormDataChromiumPdfFormats(ctx)
 
 			var (
 				inputPath     string
@@ -377,11 +247,79 @@ func convertMarkdownRoute(chromium Api, engine gotenberg.PdfEngine) api.Route {
 				return fmt.Errorf("validate form data: %w", err)
 			}
 
-			url, err := markdownToHtml(ctx, inputPath, markdownPaths)
+			// We have to convert each markdown file referenced in the HTML
+			// file to... HTML. Thanks to the "html/template" package, we are
+			// able to provide the "toHTML" function which the user may call
+			// directly inside the HTML file.
+
+			var markdownFilesNotFoundErr error
+
+			tmpl, err := template.
+				New(filepath.Base(inputPath)).
+				Funcs(template.FuncMap{
+					"toHTML": func(filename string) (template.HTML, error) {
+						var path string
+
+						for _, markdownPath := range markdownPaths {
+							markdownFilename := filepath.Base(markdownPath)
+
+							if filename == markdownFilename {
+								path = markdownPath
+								break
+							}
+						}
+
+						if path == "" {
+							markdownFilesNotFoundErr = multierr.Append(
+								markdownFilesNotFoundErr,
+								fmt.Errorf("'%s'", filename),
+							)
+
+							return "", nil
+						}
+
+						b, err := os.ReadFile(path)
+						if err != nil {
+							return "", fmt.Errorf("read markdown file '%s': %w", filename, err)
+						}
+
+						unsafe := blackfriday.Run(b)
+						sanitized := bluemonday.UGCPolicy().SanitizeBytes(unsafe)
+
+						// #nosec
+						return template.HTML(sanitized), nil
+					},
+				}).ParseFiles(inputPath)
 			if err != nil {
-				return fmt.Errorf("transform markdown file(s) to HTML: %w", err)
+				return fmt.Errorf("parse template file: %w", err)
 			}
 
+			var buffer bytes.Buffer
+
+			err = tmpl.Execute(&buffer, &struct{}{})
+			if err != nil {
+				return fmt.Errorf("execute template: %w", err)
+			}
+
+			if markdownFilesNotFoundErr != nil {
+				return api.WrapError(
+					fmt.Errorf("markdown files not found: %w", markdownFilesNotFoundErr),
+					api.NewSentinelHttpError(
+						http.StatusBadRequest,
+						fmt.Sprintf("Markdown file(s) not found: %s", markdownFilesNotFoundErr),
+					),
+				)
+			}
+
+			inputPath = ctx.GeneratePath(".html")
+
+			err = os.WriteFile(inputPath, buffer.Bytes(), 0o600)
+			if err != nil {
+				return fmt.Errorf("write template result: %w", err)
+			}
+
+			url := fmt.Sprintf("file://%s", inputPath)
+
 			err = convertUrl(ctx, chromium, engine, url, pdfFormats, options)
 			if err != nil {
 				return fmt.Errorf("convert markdown to PDF: %w", err)
@@ -392,126 +330,23 @@ func convertMarkdownRoute(chromium Api, engine gotenberg.PdfEngine) api.Route {
 	}
 }
 
-// screenshotMarkdownRoute returns an [api.Route] which can take a screenshot
-// from markdown files.
-func screenshotMarkdownRoute(chromium Api) api.Route {
-	return api.Route{
-		Method:      http.MethodPost,
-		Path:        "/forms/chromium/screenshot/markdown",
-		IsMultipart: true,
-		Handler: func(c echo.Context) error {
-			ctx := c.Get("context").(*api.Context)
-			form, options := FormDataChromiumScreenshotOptions(ctx)
-
-			var (
-				inputPath     string
-				markdownPaths []string
-			)
-
-			err := form.
-				MandatoryPath("index.html", &inputPath).
-				MandatoryPaths([]string{".md"}, &markdownPaths).
-				Validate()
-			if err != nil {
-				return fmt.Errorf("validate form data: %w", err)
-			}
-
-			url, err := markdownToHtml(ctx, inputPath, markdownPaths)
-			if err != nil {
-				return fmt.Errorf("transform markdown file(s) to HTML: %w", err)
-			}
-
-			err = screenshotUrl(ctx, chromium, url, options)
-			if err != nil {
-				return fmt.Errorf("markdown screenshot: %w", err)
-			}
-
-			return nil
-		},
-	}
-}
-
-func markdownToHtml(ctx *api.Context, inputPath string, markdownPaths []string) (string, error) {
-	// We have to convert each markdown file referenced in the HTML
-	// file to... HTML. Thanks to the "html/template" package, we are
-	// able to provide the "toHTML" function which the user may call
-	// directly inside the HTML file.
-
-	var markdownFilesNotFoundErr error
-
-	tmpl, err := template.
-		New(filepath.Base(inputPath)).
-		Funcs(template.FuncMap{
-			"toHTML": func(filename string) (template.HTML, error) {
-				var path string
-
-				for _, markdownPath := range markdownPaths {
-					markdownFilename := filepath.Base(markdownPath)
-
-					if filename == markdownFilename {
-						path = markdownPath
-						break
-					}
-				}
-
-				if path == "" {
-					markdownFilesNotFoundErr = multierr.Append(
-						markdownFilesNotFoundErr,
-						fmt.Errorf("'%s'", filename),
-					)
-
-					return "", nil
-				}
-
-				b, err := os.ReadFile(path)
-				if err != nil {
-					return "", fmt.Errorf("read markdown file '%s': %w", filename, err)
-				}
-
-				unsafe := blackfriday.Run(b)
-				sanitized := bluemonday.UGCPolicy().SanitizeBytes(unsafe)
-
-				// #nosec
-				return template.HTML(sanitized), nil
-			},
-		}).ParseFiles(inputPath)
-	if err != nil {
-		return "", fmt.Errorf("parse template file: %w", err)
-	}
-
-	var buffer bytes.Buffer
-
-	err = tmpl.Execute(&buffer, &struct{}{})
-	if err != nil {
-		return "", fmt.Errorf("execute template: %w", err)
-	}
-
-	if markdownFilesNotFoundErr != nil {
-		return "", api.WrapError(
-			fmt.Errorf("markdown files not found: %w", markdownFilesNotFoundErr),
-			api.NewSentinelHttpError(
-				http.StatusBadRequest,
-				fmt.Sprintf("Markdown file(s) not found: %s", markdownFilesNotFoundErr),
-			),
-		)
-	}
-
-	inputPath = ctx.GeneratePath(".html")
-
-	err = os.WriteFile(inputPath, buffer.Bytes(), 0o600)
-	if err != nil {
-		return "", fmt.Errorf("write template result: %w", err)
-	}
-
-	return fmt.Sprintf("file://%s", inputPath), nil
-}
-
-func convertUrl(ctx *api.Context, chromium Api, engine gotenberg.PdfEngine, url string, pdfFormats gotenberg.PdfFormats, options PdfOptions) error {
+// convertUrl is a stub which is called by the other methods of this file.
+func convertUrl(ctx *api.Context, chromium Api, engine gotenberg.PdfEngine, url string, pdfFormats gotenberg.PdfFormats, options Options) error {
 	outputPath := ctx.GeneratePath(".pdf")
 
 	err := chromium.Pdf(ctx, ctx.Log(), url, outputPath, options)
-	err = handleChromiumError(err, options.Options)
 	if err != nil {
+
+		if errors.Is(err, ErrUrlNotAuthorized) {
+			return api.WrapError(
+				fmt.Errorf("convert to PDF: %w", err),
+				api.NewSentinelHttpError(
+					http.StatusForbidden,
+					fmt.Sprintf("'%s' does not match the authorized URLs", url),
+				),
+			)
+		}
+
 		if errors.Is(err, ErrOmitBackgroundWithoutPrintBackground) {
 			return api.WrapError(
 				fmt.Errorf("convert to PDF: %w", err),
@@ -522,6 +357,23 @@ func convertUrl(ctx *api.Context, chromium Api, engine gotenberg.PdfEngine, url
 			)
 		}
 
+		if errors.Is(err, ErrInvalidEvaluationExpression) {
+			if options.WaitForExpression == "" {
+				// We do not expect the 'waitWindowStatus' form field to return
+				// an ErrInvalidEvaluationExpression error. In such a scenario,
+				// we return a 500.
+				return fmt.Errorf("convert to PDF: %w", err)
+			}
+
+			return api.WrapError(
+				fmt.Errorf("convert to PDF: %w", err),
+				api.NewSentinelHttpError(
+					http.StatusBadRequest,
+					fmt.Sprintf("The expression '%s' (waitForExpression) returned an exception or undefined", options.WaitForExpression),
+				),
+			)
+		}
+
 		if errors.Is(err, ErrInvalidPrinterSettings) {
 			return api.WrapError(
 				fmt.Errorf("convert to PDF: %w", err),
@@ -542,6 +394,16 @@ func convertUrl(ctx *api.Context, chromium Api, engine gotenberg.PdfEngine, url
 			)
 		}
 
+		if errors.Is(err, ErrConsoleExceptions) {
+			return api.WrapError(
+				fmt.Errorf("convert to PDF: %w", err),
+				api.NewSentinelHttpError(
+					http.StatusConflict,
+					fmt.Sprintf("Chromium console exceptions:\n %s", strings.ReplaceAll(err.Error(), ErrConsoleExceptions.Error(), "")),
+				),
+			)
+		}
+
 		return fmt.Errorf("convert to PDF: %w", err)
 	}
 
@@ -554,7 +416,18 @@ func convertUrl(ctx *api.Context, chromium Api, engine gotenberg.PdfEngine, url
 		convertOutputPath := ctx.GeneratePath(".pdf")
 
 		err = engine.Convert(ctx, ctx.Log(), pdfFormats, convertInputPath, convertOutputPath)
+
 		if err != nil {
+			if errors.Is(err, gotenberg.ErrPdfFormatNotSupported) {
+				return api.WrapError(
+					fmt.Errorf("convert PDF: %w", err),
+					api.NewSentinelHttpError(
+						http.StatusBadRequest,
+						fmt.Sprintf("At least one PDF engine does not handle one of the PDF format in '%+v', while other have failed to convert for other reasons", pdfFormats),
+					),
+				)
+			}
+
 			return fmt.Errorf("convert PDF: %w", err)
 		}
 
@@ -569,66 +442,3 @@ func convertUrl(ctx *api.Context, chromium Api, engine gotenberg.PdfEngine, url
 
 	return nil
 }
-
-func screenshotUrl(ctx *api.Context, chromium Api, url string, options ScreenshotOptions) error {
-	ext := fmt.Sprintf(".%s", options.Format)
-	outputPath := ctx.GeneratePath(ext)
-
-	err := chromium.Screenshot(ctx, ctx.Log(), url, outputPath, options)
-	err = handleChromiumError(err, options.Options)
-	if err != nil {
-		return fmt.Errorf("screenshot: %w", err)
-	}
-
-	err = ctx.AddOutputPaths(outputPath)
-	if err != nil {
-		return fmt.Errorf("add output path: %w", err)
-	}
-
-	return nil
-}
-
-func handleChromiumError(err error, options Options) error {
-	if err == nil {
-		return nil
-	}
-
-	if errors.Is(err, ErrInvalidEvaluationExpression) {
-		if options.WaitForExpression == "" {
-			// We do not expect the 'waitWindowStatus' form field to return
-			// an ErrInvalidEvaluationExpression error. In such a scenario,
-			// we return a 500.
-			return err
-		}
-
-		return api.WrapError(
-			err,
-			api.NewSentinelHttpError(
-				http.StatusBadRequest,
-				fmt.Sprintf("The expression '%s' (waitForExpression) returned an exception or undefined", options.WaitForExpression),
-			),
-		)
-	}
-
-	if errors.Is(err, ErrInvalidHttpStatusCode) {
-		return api.WrapError(
-			err,
-			api.NewSentinelHttpError(
-				http.StatusConflict,
-				fmt.Sprintf("Invalid HTTP status code from the main page: %s", strings.ReplaceAll(err.Error(), fmt.Sprintf(": %s", ErrInvalidHttpStatusCode.Error()), "")),
-			),
-		)
-	}
-
-	if errors.Is(err, ErrConsoleExceptions) {
-		return api.WrapError(
-			err,
-			api.NewSentinelHttpError(
-				http.StatusConflict,
-				fmt.Sprintf("Chromium console exceptions:\n %s", strings.ReplaceAll(err.Error(), ErrConsoleExceptions.Error(), "")),
-			),
-		)
-	}
-
-	return err
-}

pkg/modules/chromium/tasks.go

@@ -15,44 +15,24 @@ import (
 	"go.uber.org/zap"
 )
 
-func printToPdfActionFunc(logger *zap.Logger, outputPath string, options PdfOptions) chromedp.ActionFunc {
+func printToPdfActionFunc(logger *zap.Logger, outputPath string, options Options) chromedp.ActionFunc {
 	return func(ctx context.Context) error {
-		paperHeight := options.PaperHeight
-		pageRanges := options.PageRanges
-
-		if options.SinglePage {
-			logger.Debug("single page PDF")
-
-			_, _, _, _, _, cssContentSize, err := page.GetLayoutMetrics().Do(ctx)
-			if err != nil {
-				return fmt.Errorf("get layout metrics: %w", err)
-			}
-
-			// There are 96 CSS pixels per inch.
-			// See https://issues.chromium.org/issues/40267771#comment14.
-			paperHeight = cssContentSize.Height / 96
-			pageRanges = "1" // little dirty hack to avoid leftovers.
-		}
-
 		printToPdf := page.PrintToPDF().
 			WithTransferMode(page.PrintToPDFTransferModeReturnAsStream).
 			WithLandscape(options.Landscape).
 			WithPrintBackground(options.PrintBackground).
 			WithScale(options.Scale).
 			WithPaperWidth(options.PaperWidth).
-			WithPaperHeight(paperHeight).
+			WithPaperHeight(options.PaperHeight).
 			WithMarginTop(options.MarginTop).
 			WithMarginBottom(options.MarginBottom).
 			WithMarginLeft(options.MarginLeft).
 			WithMarginRight(options.MarginRight).
-			WithPageRanges(pageRanges).
-			WithPreferCSSPageSize(options.PreferCssPageSize).
-			// Does not seem to work.
-			// See https://github.com/gotenberg/gotenberg/issues/831.
-			WithGenerateTaggedPDF(false)
+			WithPageRanges(options.PageRanges).
+			WithPreferCSSPageSize(options.PreferCssPageSize)
 
-		hasCustomHeaderFooter := options.HeaderTemplate != DefaultPdfOptions().HeaderTemplate ||
-			options.FooterTemplate != DefaultPdfOptions().FooterTemplate
+		hasCustomHeaderFooter := options.HeaderTemplate != DefaultOptions().HeaderTemplate ||
+			options.FooterTemplate != DefaultOptions().FooterTemplate
 
 		if !hasCustomHeaderFooter {
 			logger.Debug("no custom header nor footer")
@@ -83,7 +63,7 @@ func printToPdfActionFunc(logger *zap.Logger, outputPath string, options PdfOpti
 		}
 
 		defer func() {
-			err = reader.Close()
+			err := reader.Close()
 			if err != nil {
 				logger.Error(fmt.Sprintf("close reader: %s", err))
 			}
@@ -95,7 +75,7 @@ func printToPdfActionFunc(logger *zap.Logger, outputPath string, options PdfOpti
 		}
 
 		defer func() {
-			err = file.Close()
+			err := file.Close()
 			if err != nil {
 				logger.Error(fmt.Sprintf("close output path: %s", err))
 			}
@@ -112,90 +92,12 @@ func printToPdfActionFunc(logger *zap.Logger, outputPath string, options PdfOpti
 	}
 }
 
-func captureScreenshotActionFunc(logger *zap.Logger, outputPath string, options ScreenshotOptions) chromedp.ActionFunc {
-	return func(ctx context.Context) error {
-		captureScreenshot := page.CaptureScreenshot().
-			WithCaptureBeyondViewport(true).
-			WithFromSurface(true).
-			WithOptimizeForSpeed(options.OptimizeForSpeed).
-			WithFormat(page.CaptureScreenshotFormat(options.Format))
-
-		if options.Format == "jpeg" {
-			captureScreenshot = captureScreenshot.
-				WithQuality(int64(options.Quality))
-		}
-
-		logger.Debug(fmt.Sprintf("capture screenshot with: %+v", captureScreenshot))
-
-		buffer, err := captureScreenshot.Do(ctx)
-		if err != nil {
-			return fmt.Errorf("capture screenshot: %w", err)
-		}
-
-		file, err := os.OpenFile(outputPath, os.O_CREATE|os.O_WRONLY, 0o600)
-		if err != nil {
-			return fmt.Errorf("open output path: %w", err)
-		}
-
-		defer func() {
-			err = file.Close()
-			if err != nil {
-				logger.Error(fmt.Sprintf("close output path: %s", err))
-			}
-		}()
-
-		_, err = file.Write(buffer)
-		if err != nil {
-			return fmt.Errorf("write result to output path: %w", err)
-		}
-
-		return nil
-	}
-}
-
-func clearCacheActionFunc(logger *zap.Logger, clear bool) chromedp.ActionFunc {
-	return func(ctx context.Context) error {
-		// See https://github.com/gotenberg/gotenberg/issues/753.
-		if !clear {
-			logger.Debug("cache not cleared")
-			return nil
-		}
-
-		logger.Debug("clear cache")
-
-		err := network.ClearBrowserCache().Do(ctx)
-		if err == nil {
-			return nil
-		}
-
-		return fmt.Errorf("clear cache: %w", err)
-	}
-}
-
-func clearCookiesActionFunc(logger *zap.Logger, clear bool) chromedp.ActionFunc {
-	return func(ctx context.Context) error {
-		// See https://github.com/gotenberg/gotenberg/issues/753.
-		if !clear {
-			logger.Debug("cookies not cleared")
-			return nil
-		}
-
-		logger.Debug("clear cookies")
-
-		err := network.ClearBrowserCookies().Do(ctx)
-		if err == nil {
-			return nil
-		}
-
-		return fmt.Errorf("clear cookies: %w", err)
-	}
-}
-
 func disableJavaScriptActionFunc(logger *zap.Logger, disable bool) chromedp.ActionFunc {
 	return func(ctx context.Context) error {
 		// See https://github.com/gotenberg/gotenberg/issues/175.
 		if !disable {
 			logger.Debug("JavaScript not disabled")
+
 			return nil
 		}
 
@@ -214,6 +116,7 @@ func extraHttpHeadersActionFunc(logger *zap.Logger, extraHttpHeaders map[string]
 	return func(ctx context.Context) error {
 		if len(extraHttpHeaders) == 0 {
 			logger.Debug("no extra HTTP headers")
+
 			return nil
 		}
 
@@ -233,7 +136,7 @@ func extraHttpHeadersActionFunc(logger *zap.Logger, extraHttpHeaders map[string]
 	}
 }
 
-func navigateActionFunc(logger *zap.Logger, url string, skipNetworkIdleEvent bool) chromedp.ActionFunc {
+func navigateActionFunc(logger *zap.Logger, url string) chromedp.ActionFunc {
 	return func(ctx context.Context) error {
 		logger.Debug(fmt.Sprintf("navigate to '%s'", url))
 
@@ -242,21 +145,12 @@ func navigateActionFunc(logger *zap.Logger, url string, skipNetworkIdleEvent boo
 			return fmt.Errorf("navigate to '%s': %w", url, err)
 		}
 
-		waitFunc := []func() error{
-			waitForEventDomContentEventFired(ctx, logger),
-			waitForEventLoadEventFired(ctx, logger),
-			waitForEventLoadingFinished(ctx, logger),
-		}
-
-		if !skipNetworkIdleEvent {
-			waitFunc = append(waitFunc, waitForEventNetworkIdle(ctx, logger))
-		} else {
-			logger.Debug("skipping network idle event")
-		}
-
 		err = runBatch(
 			ctx,
-			waitFunc...,
+			waitForEventDomContentEventFired(ctx, logger),
+			waitForEventLoadEventFired(ctx, logger),
+			waitForEventNetworkIdle(ctx, logger),
+			waitForEventLoadingFinished(ctx, logger),
 		)
 
 		if err == nil {
@@ -272,6 +166,7 @@ func hideDefaultWhiteBackgroundActionFunc(logger *zap.Logger, omitBackground, pr
 		// See https://github.com/gotenberg/gotenberg/issues/226.
 		if !omitBackground {
 			logger.Debug("default white background not hidden")
+
 			return nil
 		}
 
@@ -330,6 +225,7 @@ func emulateMediaTypeActionFunc(logger *zap.Logger, mediaType string) chromedp.A
 	return func(ctx context.Context) error {
 		if mediaType == "" {
 			logger.Debug("no emulated media type")
+
 			return nil
 		}
 
@@ -353,11 +249,13 @@ func waitDelayBeforePrintActionFunc(logger *zap.Logger, disableJavaScript bool,
 	return func(ctx context.Context) error {
 		if disableJavaScript {
 			logger.Debug("JavaScript disabled, skipping wait delay")
+
 			return nil
 		}
 
 		if delay <= 0 {
 			logger.Debug("no wait delay")
+
 			return nil
 		}
 
@@ -378,11 +276,13 @@ func waitForExpressionBeforePrintActionFunc(logger *zap.Logger, disableJavaScrip
 	return func(ctx context.Context) error {
 		if disableJavaScript {
 			logger.Debug("JavaScript disabled, skipping wait expression")
+
 			return nil
 		}
 
 		if expression == "" {
 			logger.Debug("no wait expression")
+
 			return nil
 		}
 

pkg/modules/libreoffice/api/api.go

@@ -12,8 +12,8 @@ import (
 	"go.uber.org/multierr"
 	"go.uber.org/zap"
 
-	"github.com/gotenberg/gotenberg/v8/pkg/gotenberg"
-	"github.com/gotenberg/gotenberg/v8/pkg/modules/api"
+	"github.com/gotenberg/gotenberg/v7/pkg/gotenberg"
+	"github.com/gotenberg/gotenberg/v7/pkg/modules/api"
 )
 
 func init() {
@@ -21,9 +21,9 @@ func init() {
 }
 
 var (
-	// ErrInvalidPdfFormats happens if the PDF formats option cannot be handled
+	// ErrInvalidPdfFormat happens if the PDF format option cannot be handled
 	// by LibreOffice.
-	ErrInvalidPdfFormats = errors.New("invalid PDF formats")
+	ErrInvalidPdfFormat = errors.New("invalid PDF format")
 
 	// ErrMalformedPageRanges happens if the page ranges option cannot be
 	// interpreted by LibreOffice.
@@ -47,6 +47,7 @@ type Options struct {
 	Landscape bool
 
 	// PageRanges allows to select the pages to convert.
+	// TODO: should prefer a method form PdfEngine.
 	// Optional.
 	PageRanges string
 
@@ -79,8 +80,22 @@ func (a *Api) Descriptor() gotenberg.ModuleDescriptor {
 		ID: "libreoffice-api",
 		FlagSet: func() *flag.FlagSet {
 			fs := flag.NewFlagSet("api", flag.ExitOnError)
+
+			// Deprecated flags.
+			fs.Duration("uno-listener-start-timeout", time.Duration(10)*time.Second, "Time limit for restarting the LibreOffice")
+			fs.Int64("uno-listener-restart-threshold", 10, "Conversions limit after which the LibreOffice listener is restarted - 0 means no restart")
+			fs.Bool("unoconv-disable-listener", false, "Do not start a long-running listener - save resources in detriment of unitary performance")
+
+			var err error
+			err = multierr.Append(err, fs.MarkDeprecated("uno-listener-start-timeout", "use the libreOffice-start-timeout property instead"))
+			err = multierr.Append(err, fs.MarkDeprecated("uno-listener-restart-threshold", "use the libreOffice-restart-after property instead"))
+			err = multierr.Append(err, fs.MarkDeprecated("unoconv-disable-listener", "use the libreOffice-auto-start property instead"))
+
+			if err != nil {
+				panic(fmt.Errorf("create deprecated flags for the LibreOffice module: %v", err))
+			}
+
 			fs.Int64("libreoffice-restart-after", 10, "Number of conversions after which LibreOffice will automatically restart. Set to 0 to disable this feature")
-			fs.Int64("libreoffice-max-queue-size", 0, "Maximum request queue size for LibreOffice. Set to 0 to disable this feature")
 			fs.Bool("libreoffice-auto-start", false, "Automatically launch LibreOffice upon initialization if set to true; otherwise, LibreOffice will start at the time of the first conversion")
 			fs.Duration("libreoffice-start-timeout", time.Duration(20)*time.Second, "Maximum duration to wait for LibreOffice to start or restart")
 
@@ -108,7 +123,7 @@ func (a *Api) Provision(ctx *gotenberg.Context) error {
 	a.args = libreOfficeArguments{
 		binPath:      libreOfficeBinPath,
 		unoBinPath:   unoBinPath,
-		startTimeout: flags.MustDuration("libreoffice-start-timeout"),
+		startTimeout: flags.MustDeprecatedDuration("uno-listener-start-timeout", "libreoffice-start-timeout"),
 	}
 
 	// Logger.
@@ -124,7 +139,7 @@ func (a *Api) Provision(ctx *gotenberg.Context) error {
 
 	// Process.
 	a.libreOffice = newLibreOfficeProcess(a.args)
-	a.supervisor = gotenberg.NewProcessSupervisor(a.logger, a.libreOffice, flags.MustInt64("libreoffice-restart-after"), flags.MustInt64("libreoffice-max-queue-size"))
+	a.supervisor = gotenberg.NewProcessSupervisor(a.logger, a.libreOffice, flags.MustDeprecatedInt64("uno-listener-restart-threshold", "libreoffice-restart-after"))
 
 	return nil
 }
@@ -189,6 +204,46 @@ func (a *Api) Stop(ctx context.Context) error {
 // Metrics returns the metrics.
 func (a *Api) Metrics() ([]gotenberg.Metric, error) {
 	return []gotenberg.Metric{
+		// TODO: remove deprecated.
+		{
+			Name:        "unoconv_active_instances_count",
+			Description: "Current number of active unoconv instances - deprecated.",
+			Read: func() float64 {
+				return 1
+			},
+		},
+		// TODO: remove deprecated.
+		{
+			Name:        "libreoffice_listener_active_instances_count",
+			Description: "Current number of active LibreOffice listener instances - deprecated.",
+			Read: func() float64 {
+				return 1
+			},
+		},
+		// TODO: remove deprecated.
+		{
+			Name:        "unoconv_listener_active_instances_count",
+			Description: "Current number of active unoconv listener instances- deprecated.",
+			Read: func() float64 {
+				return 1
+			},
+		},
+		// TODO: remove deprecated.
+		{
+			Name:        "libreoffice_listener_queue_length",
+			Description: "Current number of processes in the LibreOffice listener queue - deprecated, prefer libreoffice_requests_queue_size.",
+			Read: func() float64 {
+				return float64(a.supervisor.ReqQueueSize())
+			},
+		},
+		// TODO: remove deprecated.
+		{
+			Name:        "unoconv_listener_queue_length",
+			Description: "Current number of processes in the queue - deprecated, prefer libreoffice_requests_queue_size.",
+			Read: func() float64 {
+				return float64(a.supervisor.ReqQueueSize())
+			},
+		},
 		{
 			Name:        "libreoffice_requests_queue_size",
 			Description: "Current number of LibreOffice conversion requests waiting to be treated.",
@@ -267,86 +322,84 @@ func (a *Api) Pdf(ctx context.Context, logger *zap.Logger, inputPath, outputPath
 func (a *Api) Extensions() []string {
 	return []string{
 		".bib",
-		".bmp",
-		".csv",
-		".dbf",
-		".dif",
 		".doc",
+		".xml",
 		".docx",
-		".dotx",
-		".emf",
-		".eps",
-		".epub",
-		".fodg",
-		".fodp",
-		".fods",
 		".fodt",
-		".gif",
 		".html",
-		".jpeg",
-		".jpg",
-		".key",
 		".ltx",
-		".met",
-		".odd",
-		".odg",
-		".odp",
-		".ods",
+		".txt",
 		".odt",
-		".otg",
-		".ots",
 		".ott",
-		".pages",
-		".pbm",
-		".pct",
 		".pdb",
 		".pdf",
-		".pgm",
-		".png",
-		".pot",
-		".potm",
-		".ppm",
-		".pps",
-		".ppt",
-		".pptx",
 		".psw",
-		".pwp",
-		".pxl",
-		".ras",
 		".rtf",
-		".sda",
-		".sdc",
-		".sdd",
 		".sdw",
-		".slk",
-		".stc",
-		".std",
-		".sti",
 		".stw",
+		".sxw",
+		".uot",
+		".vor",
+		".wps",
+		".epub",
+		".png",
+		".bmp",
+		".emf",
+		".eps",
+		".fodg",
+		".gif",
+		".jpg",
+		".jpeg",
+		".met",
+		".odd",
+		".otg",
+		".pbm",
+		".pct",
+		".pgm",
+		".ppm",
+		".ras",
+		".std",
 		".svg",
 		".svm",
 		".swf",
-		".sxc",
 		".sxd",
-		".sxi",
-		".sxw",
 		".sxw",
 		".tif",
 		".tiff",
-		".txt",
-		".uop",
-		".uos",
-		".uot",
-		".vor",
-		".wmf",
-		".wps",
 		".xhtml",
-		".xls",
-		".xlsx",
-		".xlt",
-		".xltx",
-		".xml",
 		".xpm",
+		".odp",
+		".fodp",
+		".potm",
+		".pot",
+		".pptx",
+		".pps",
+		".ppt",
+		".pwp",
+		".sda",
+		".sdd",
+		".sti",
+		".sxi",
+		".uop",
+		".wmf",
+		".csv",
+		".dbf",
+		".dif",
+		".fods",
+		".ods",
+		".ots",
+		".pxl",
+		".sdc",
+		".slk",
+		".stc",
+		".sxc",
+		".uos",
+		".xls",
+		".xlt",
+		".xlsx",
+		".odg",
+		".dotx",
+		".xltx",
 	}
 }
 

pkg/modules/libreoffice/api/api_test.go

@@ -11,7 +11,7 @@ import (
 	"github.com/alexliesenfeld/health"
 	"go.uber.org/zap"
 
-	"github.com/gotenberg/gotenberg/v8/pkg/gotenberg"
+	"github.com/gotenberg/gotenberg/v7/pkg/gotenberg"
 )
 
 func TestApi_Descriptor(t *testing.T) {
@@ -284,16 +284,41 @@ func TestApi_Metrics(t *testing.T) {
 		t.Fatalf("expected no error but got: %v", err)
 	}
 
-	if len(metrics) != 2 {
-		t.Fatalf("expected %d metrics, but got %d", 2, len(metrics))
+	if len(metrics) != 7 {
+		t.Fatalf("expected %d metrics, but got %d", 7, len(metrics))
 	}
 
 	actual := metrics[0].Read()
+	if actual != float64(1) {
+		t.Errorf("expected %f for unoconv_active_instances_count, but got %f", float64(1), actual)
+	}
+
+	actual = metrics[1].Read()
+	if actual != float64(1) {
+		t.Errorf("expected %f for libreoffice_listener_active_instances_count, but got %f", float64(1), actual)
+	}
+
+	actual = metrics[2].Read()
+	if actual != float64(1) {
+		t.Errorf("expected %f for unoconv_listener_active_instances_count, but got %f", float64(1), actual)
+	}
+
+	actual = metrics[3].Read()
+	if actual != float64(10) {
+		t.Errorf("expected %f for libreoffice_listener_queue_length, but got %f", float64(10), actual)
+	}
+
+	actual = metrics[4].Read()
+	if actual != float64(10) {
+		t.Errorf("expected %f for unoconv_listener_queue_length, but got %f", float64(10), actual)
+	}
+
+	actual = metrics[5].Read()
 	if actual != float64(10) {
 		t.Errorf("expected %f for libreoffice_requests_queue_size, but got %f", float64(10), actual)
 	}
 
-	actual = metrics[1].Read()
+	actual = metrics[6].Read()
 	if actual != float64(0) {
 		t.Errorf("expected %f for libreoffice_restarts_count, but got %f", float64(0), actual)
 	}
@@ -450,7 +475,7 @@ func TestApi_Extensions(t *testing.T) {
 	extensions := a.Extensions()
 
 	actual := len(extensions)
-	expect := 81
+	expect := 79
 
 	if actual != expect {
 		t.Errorf("expected %d extensions, but got %d", expect, actual)

pkg/modules/libreoffice/api/libreoffice.go

@@ -15,7 +15,7 @@ import (
 	"github.com/google/uuid"
 	"go.uber.org/zap"
 
-	"github.com/gotenberg/gotenberg/v8/pkg/gotenberg"
+	"github.com/gotenberg/gotenberg/v7/pkg/gotenberg"
 )
 
 type libreOffice interface {
@@ -275,6 +275,9 @@ func (p *libreOfficeProcess) pdf(ctx context.Context, logger *zap.Logger, inputP
 
 	switch options.PdfFormats.PdfA {
 	case "":
+	case gotenberg.PdfA1a:
+		logger.Warn("PDF/A-1a is no more supported by LibreOffice (use PDF/A-1b instead)")
+		args = append(args, "--export", "SelectPdfVersion=1")
 	case gotenberg.PdfA1b:
 		args = append(args, "--export", "SelectPdfVersion=1")
 	case gotenberg.PdfA2b:
@@ -282,20 +285,14 @@ func (p *libreOfficeProcess) pdf(ctx context.Context, logger *zap.Logger, inputP
 	case gotenberg.PdfA3b:
 		args = append(args, "--export", "SelectPdfVersion=3")
 	default:
-		return ErrInvalidPdfFormats
+		return ErrInvalidPdfFormat
 	}
 
 	if options.PdfFormats.PdfUa {
 		args = append(
 			args,
-			"--export", "UseTaggedPDF=true",
 			"--export", "EnableTextAccessForAccessibilityTools=true",
-		)
-	} else {
-		args = append(
-			args,
-			"--export", "UseTaggedPDF=false",
-			"--export", "EnableTextAccessForAccessibilityTools=false",
+			"--export", "UseTaggedPDF=true",
 		)
 	}
 

pkg/modules/libreoffice/api/libreoffice_test.go

@@ -11,7 +11,7 @@ import (
 	"github.com/google/uuid"
 	"go.uber.org/zap"
 
-	"github.com/gotenberg/gotenberg/v8/pkg/gotenberg"
+	"github.com/gotenberg/gotenberg/v7/pkg/gotenberg"
 )
 
 func TestLibreOfficeProcess_Start(t *testing.T) {
@@ -235,7 +235,7 @@ func TestLibreOfficeProcess_pdf(t *testing.T) {
 			expectError:  true,
 		},
 		{
-			scenario: "ErrInvalidPdfFormats",
+			scenario: "ErrInvalidPdfFormat",
 			libreOffice: func() libreOffice {
 				p := new(libreOfficeProcess)
 				p.socketPort = 12345
@@ -247,7 +247,7 @@ func TestLibreOfficeProcess_pdf(t *testing.T) {
 			cancelledCtx:  false,
 			start:         false,
 			expectError:   true,
-			expectedError: ErrInvalidPdfFormats,
+			expectedError: ErrInvalidPdfFormat,
 		},
 		{
 			scenario: "ErrMalformedPageRanges",

pkg/modules/libreoffice/api/mocks.go

@@ -5,7 +5,7 @@ import (
 
 	"go.uber.org/zap"
 
-	"github.com/gotenberg/gotenberg/v8/pkg/gotenberg"
+	"github.com/gotenberg/gotenberg/v7/pkg/gotenberg"
 )
 
 // ApiMock is a mock for the [Uno] interface.

pkg/modules/libreoffice/libreoffice.go

@@ -5,9 +5,9 @@ import (
 
 	flag "github.com/spf13/pflag"
 
-	"github.com/gotenberg/gotenberg/v8/pkg/gotenberg"
-	"github.com/gotenberg/gotenberg/v8/pkg/modules/api"
-	libeofficeapi "github.com/gotenberg/gotenberg/v8/pkg/modules/libreoffice/api"
+	"github.com/gotenberg/gotenberg/v7/pkg/gotenberg"
+	"github.com/gotenberg/gotenberg/v7/pkg/modules/api"
+	libeofficeapi "github.com/gotenberg/gotenberg/v7/pkg/modules/libreoffice/api"
 )
 
 func init() {

pkg/modules/libreoffice/libreoffice_test.go

@@ -5,8 +5,8 @@ import (
 	"reflect"
 	"testing"
 
-	"github.com/gotenberg/gotenberg/v8/pkg/gotenberg"
-	libreofficeapi "github.com/gotenberg/gotenberg/v8/pkg/modules/libreoffice/api"
+	"github.com/gotenberg/gotenberg/v7/pkg/gotenberg"
+	libreofficeapi "github.com/gotenberg/gotenberg/v7/pkg/modules/libreoffice/api"
 )
 
 func TestLibreOffice_Descriptor(t *testing.T) {

pkg/modules/libreoffice/pdfengine/pdfengine.go

@@ -7,8 +7,8 @@ import (
 
 	"go.uber.org/zap"
 
-	"github.com/gotenberg/gotenberg/v8/pkg/gotenberg"
-	"github.com/gotenberg/gotenberg/v8/pkg/modules/libreoffice/api"
+	"github.com/gotenberg/gotenberg/v7/pkg/gotenberg"
+	"github.com/gotenberg/gotenberg/v7/pkg/modules/libreoffice/api"
 )
 
 func init() {
@@ -64,7 +64,7 @@ func (engine *LibreOfficePdfEngine) Convert(ctx context.Context, logger *zap.Log
 		return nil
 	}
 
-	if errors.Is(err, api.ErrInvalidPdfFormats) {
+	if errors.Is(err, api.ErrInvalidPdfFormat) {
 		return fmt.Errorf("convert PDF to '%+v' with LibreOffice: %w", formats, gotenberg.ErrPdfFormatNotSupported)
 	}
 

pkg/modules/libreoffice/pdfengine/pdfengine_test.go

@@ -8,8 +8,8 @@ import (
 
 	"go.uber.org/zap"
 
-	"github.com/gotenberg/gotenberg/v8/pkg/gotenberg"
-	"github.com/gotenberg/gotenberg/v8/pkg/modules/libreoffice/api"
+	"github.com/gotenberg/gotenberg/v7/pkg/gotenberg"
+	"github.com/gotenberg/gotenberg/v7/pkg/modules/libreoffice/api"
 )
 
 func TestLibreOfficePdfEngine_Descriptor(t *testing.T) {
@@ -137,7 +137,7 @@ func TestLibreOfficePdfEngine_Convert(t *testing.T) {
 			scenario: "invalid PDF format",
 			api: &api.ApiMock{
 				PdfMock: func(ctx context.Context, logger *zap.Logger, inputPath, outputPath string, options api.Options) error {
-					return api.ErrInvalidPdfFormats
+					return api.ErrInvalidPdfFormat
 				},
 			},
 			expectError: true,

pkg/modules/libreoffice/routes.go

@@ -7,9 +7,9 @@ import (
 
 	"github.com/labstack/echo/v4"
 
-	"github.com/gotenberg/gotenberg/v8/pkg/gotenberg"
-	"github.com/gotenberg/gotenberg/v8/pkg/modules/api"
-	libreofficeapi "github.com/gotenberg/gotenberg/v8/pkg/modules/libreoffice/api"
+	"github.com/gotenberg/gotenberg/v7/pkg/gotenberg"
+	"github.com/gotenberg/gotenberg/v7/pkg/modules/api"
+	libreofficeapi "github.com/gotenberg/gotenberg/v7/pkg/modules/libreoffice/api"
 )
 
 // convertRoute returns an [api.Route] which can convert LibreOffice documents
@@ -24,19 +24,25 @@ func convertRoute(libreOffice libreofficeapi.Uno, engine gotenberg.PdfEngine) ap
 
 			// Let's get the data from the form and validate them.
 			var (
-				inputPaths       []string
-				landscape        bool
-				nativePageRanges string
-				pdfa             string
-				pdfua            bool
-				nativePdfFormats bool
-				merge            bool
+				inputPaths         []string
+				landscape          bool
+				nativePageRanges   string
+				nativePdfA1aFormat bool
+				nativePdfFormat    string
+				pdfFormat          string
+				pdfa               string
+				pdfua              bool
+				nativePdfFormats   bool
+				merge              bool
 			)
 
 			err := ctx.FormData().
 				MandatoryPaths(libreOffice.Extensions(), &inputPaths).
 				Bool("landscape", &landscape, false).
 				String("nativePageRanges", &nativePageRanges, "").
+				Bool("nativePdfA1aFormat", &nativePdfA1aFormat, false).
+				String("nativePdfFormat", &nativePdfFormat, "").
+				String("pdfFormat", &pdfFormat, "").
 				String("pdfa", &pdfa, "").
 				Bool("pdfua", &pdfua, false).
 				Bool("nativePdfFormats", &nativePdfFormats, true).
@@ -46,8 +52,42 @@ func convertRoute(libreOffice libreofficeapi.Uno, engine gotenberg.PdfEngine) ap
 				return fmt.Errorf("validate form data: %w", err)
 			}
 
+			// FIXME: deprecated.
+			// pdfa > nativePdfFormat > pdfFormat > nativePdfA1aFormat.
+			var (
+				actualPdfArchive string
+				nativeFormats    bool
+			)
+
+			if nativePdfA1aFormat {
+				ctx.Log().Warn("'nativePdfA1aFormat' is deprecated; prefer the 'pdfa' form field instead")
+				actualPdfArchive = gotenberg.PdfA1a
+				nativeFormats = true
+			}
+
+			if pdfFormat != "" {
+				ctx.Log().Warn("'pdfFormat' is deprecated; prefer the 'pdfa' form field instead")
+				actualPdfArchive = pdfFormat
+				nativeFormats = false
+			}
+
+			if nativePdfFormat != "" {
+				ctx.Log().Warn("'nativePdfFormat' is deprecated; prefer the 'pdfa' form field instead")
+				actualPdfArchive = nativePdfFormat
+				nativeFormats = true
+			}
+
+			if pdfa != "" {
+				actualPdfArchive = pdfa
+				nativeFormats = nativePdfFormats
+			}
+
+			if pdfua {
+				nativeFormats = nativePdfFormats
+			}
+
 			pdfFormats := gotenberg.PdfFormats{
-				PdfA:  pdfa,
+				PdfA:  actualPdfArchive,
 				PdfUa: pdfua,
 			}
 
@@ -55,27 +95,18 @@ func convertRoute(libreOffice libreofficeapi.Uno, engine gotenberg.PdfEngine) ap
 			outputPaths := make([]string, len(inputPaths))
 			for i, inputPath := range inputPaths {
 				outputPaths[i] = ctx.GeneratePath(".pdf")
+
 				options := libreofficeapi.Options{
 					Landscape:  landscape,
 					PageRanges: nativePageRanges,
 				}
 
-				if nativePdfFormats {
+				if nativeFormats {
 					options.PdfFormats = pdfFormats
 				}
 
 				err = libreOffice.Pdf(ctx, ctx.Log(), inputPath, outputPaths[i], options)
 				if err != nil {
-					if errors.Is(err, libreofficeapi.ErrInvalidPdfFormats) {
-						return api.WrapError(
-							fmt.Errorf("convert to PDF: %w", err),
-							api.NewSentinelHttpError(
-								http.StatusBadRequest,
-								fmt.Sprintf("A PDF format in '%+v' is not supported", pdfFormats),
-							),
-						)
-					}
-
 					if errors.Is(err, libreofficeapi.ErrMalformedPageRanges) {
 						return api.WrapError(
 							fmt.Errorf("convert to PDF: %w", err),
@@ -89,6 +120,7 @@ func convertRoute(libreOffice libreofficeapi.Uno, engine gotenberg.PdfEngine) ap
 
 			// So far so good, let's check if we have to merge the PDFs. Quick
 			// win: if there is only one PDF, skip this step.
+
 			if len(outputPaths) > 1 && merge {
 				outputPath := ctx.GeneratePath(".pdf")
 
@@ -97,15 +129,25 @@ func convertRoute(libreOffice libreofficeapi.Uno, engine gotenberg.PdfEngine) ap
 					return fmt.Errorf("merge PDFs: %w", err)
 				}
 
-				// Now, let's check if the client want to convert this
-				// resulting PDF to specific PDF formats.
+				// Now, let's check if the client want to convert this result
+				// PDF to specific PDF formats.
 				zeroValued := gotenberg.PdfFormats{}
-				if !nativePdfFormats && pdfFormats != zeroValued {
+				if !nativeFormats && pdfFormats != zeroValued {
 					convertInputPath := outputPath
 					convertOutputPath := ctx.GeneratePath(".pdf")
 
 					err = engine.Convert(ctx, ctx.Log(), pdfFormats, convertInputPath, convertOutputPath)
 					if err != nil {
+						if errors.Is(err, gotenberg.ErrPdfFormatNotSupported) {
+							return api.WrapError(
+								fmt.Errorf("convert PDF: %w", err),
+								api.NewSentinelHttpError(
+									http.StatusBadRequest,
+									fmt.Sprintf("At least one PDF engine does not handle one of the PDF format in '%+v', while other have failed to convert for other reasons", pdfFormats),
+								),
+							)
+						}
+
 						return fmt.Errorf("convert PDF: %w", err)
 					}
 
@@ -114,7 +156,8 @@ func convertRoute(libreOffice libreofficeapi.Uno, engine gotenberg.PdfEngine) ap
 				}
 
 				// Last but not least, add the output path to the context so that
-				// the API is able to send it as a response to the client.
+				// the Uno is able to send it as a response to the client.
+
 				err = ctx.AddOutputPaths(outputPath)
 				if err != nil {
 					return fmt.Errorf("add output path: %w", err)
@@ -126,7 +169,7 @@ func convertRoute(libreOffice libreofficeapi.Uno, engine gotenberg.PdfEngine) ap
 			// Ok, we don't have to merge the PDFs. Let's check if the client
 			// want to convert each PDF to a specific PDF format.
 			zeroValued := gotenberg.PdfFormats{}
-			if !nativePdfFormats && pdfFormats != zeroValued {
+			if !nativeFormats && pdfFormats != zeroValued {
 				convertOutputPaths := make([]string, len(outputPaths))
 
 				for i, outputPath := range outputPaths {
@@ -135,30 +178,28 @@ func convertRoute(libreOffice libreofficeapi.Uno, engine gotenberg.PdfEngine) ap
 
 					err = engine.Convert(ctx, ctx.Log(), pdfFormats, convertInputPath, convertOutputPaths[i])
 					if err != nil {
+						if errors.Is(err, gotenberg.ErrPdfFormatNotSupported) {
+							return api.WrapError(
+								fmt.Errorf("convert PDF: %w", err),
+								api.NewSentinelHttpError(
+									http.StatusBadRequest,
+									fmt.Sprintf("At least one PDF engine does not handle one of the PDF format in '%+v', while other have failed to convert for other reasons", pdfFormats),
+								),
+							)
+						}
+
 						return fmt.Errorf("convert PDF: %w", err)
 					}
+
 				}
 
 				// Important: the output paths are now the converted files.
 				outputPaths = convertOutputPaths
 			}
 
-			if len(outputPaths) > 1 {
-				// If .zip archive, document.docx -> document.docx.pdf.
-				for i, inputPath := range inputPaths {
-					outputPath := fmt.Sprintf("%s.pdf", inputPath)
-
-					err = ctx.Rename(outputPaths[i], outputPath)
-					if err != nil {
-						return fmt.Errorf("rename output path: %w", err)
-					}
-
-					outputPaths[i] = outputPath
-				}
-			}
-
 			// Last but not least, add the output paths to the context so that
-			// the API is able to send them as a response to the client.
+			// the Uno is able to send them as a response to the client.
+
 			err = ctx.AddOutputPaths(outputPaths...)
 			if err != nil {
 				return fmt.Errorf("add output paths: %w", err)

pkg/modules/libreoffice/routes_test.go

@@ -4,15 +4,14 @@ import (
 	"context"
 	"errors"
 	"net/http"
-	"slices"
 	"testing"
 
 	"github.com/labstack/echo/v4"
 	"go.uber.org/zap"
 
-	"github.com/gotenberg/gotenberg/v8/pkg/gotenberg"
-	"github.com/gotenberg/gotenberg/v8/pkg/modules/api"
-	libreofficeapi "github.com/gotenberg/gotenberg/v8/pkg/modules/libreoffice/api"
+	"github.com/gotenberg/gotenberg/v7/pkg/gotenberg"
+	"github.com/gotenberg/gotenberg/v7/pkg/modules/api"
+	libreofficeapi "github.com/gotenberg/gotenberg/v7/pkg/modules/libreoffice/api"
 )
 
 func TestConvertRoute(t *testing.T) {
@@ -26,7 +25,6 @@ func TestConvertRoute(t *testing.T) {
 		expectHttpError        bool
 		expectHttpStatus       int
 		expectOutputPathsCount int
-		expectOutputPaths      []string
 	}{
 		{
 			scenario: "missing at least one mandatory file",
@@ -39,28 +37,6 @@ func TestConvertRoute(t *testing.T) {
 			expectHttpStatus:       http.StatusBadRequest,
 			expectOutputPathsCount: 0,
 		},
-		{
-			scenario: "ErrPdfFormatNotSupported (nativePdfFormats)",
-			ctx: func() *api.ContextMock {
-				ctx := &api.ContextMock{Context: new(api.Context)}
-				ctx.SetFiles(map[string]string{
-					"document.docx": "/document.docx",
-				})
-				return ctx
-			}(),
-			libreOffice: &libreofficeapi.ApiMock{
-				PdfMock: func(ctx context.Context, logger *zap.Logger, inputPath, outputPath string, options libreofficeapi.Options) error {
-					return libreofficeapi.ErrInvalidPdfFormats
-				},
-				ExtensionsMock: func() []string {
-					return []string{".docx"}
-				},
-			},
-			expectError:            true,
-			expectHttpError:        true,
-			expectHttpStatus:       http.StatusBadRequest,
-			expectOutputPathsCount: 0,
-		},
 		{
 			scenario: "ErrMalformedPageRanges",
 			ctx: func() *api.ContextMock {
@@ -68,11 +44,6 @@ func TestConvertRoute(t *testing.T) {
 				ctx.SetFiles(map[string]string{
 					"document.docx": "/document.docx",
 				})
-				ctx.SetValues(map[string][]string{
-					"pdfa": {
-						"foo",
-					},
-				})
 				return ctx
 			}(),
 			libreOffice: &libreofficeapi.ApiMock{
@@ -109,6 +80,41 @@ func TestConvertRoute(t *testing.T) {
 			expectHttpError:        false,
 			expectOutputPathsCount: 0,
 		},
+		{
+			scenario: "ErrPdfFormatNotSupported (single file)",
+			ctx: func() *api.ContextMock {
+				ctx := &api.ContextMock{Context: new(api.Context)}
+				ctx.SetFiles(map[string]string{
+					"document.docx": "/document.docx",
+				})
+				ctx.SetValues(map[string][]string{
+					"pdfa": {
+						"foo",
+					},
+					"nativePdfFormats": {
+						"false",
+					},
+				})
+				return ctx
+			}(),
+			libreOffice: &libreofficeapi.ApiMock{
+				PdfMock: func(ctx context.Context, logger *zap.Logger, inputPath, outputPath string, options libreofficeapi.Options) error {
+					return nil
+				},
+				ExtensionsMock: func() []string {
+					return []string{".docx"}
+				},
+			},
+			engine: &gotenberg.PdfEngineMock{
+				ConvertMock: func(ctx context.Context, logger *zap.Logger, formats gotenberg.PdfFormats, inputPath, outputPath string) error {
+					return gotenberg.ErrPdfFormatNotSupported
+				},
+			},
+			expectError:            true,
+			expectHttpError:        true,
+			expectHttpStatus:       http.StatusBadRequest,
+			expectOutputPathsCount: 0,
+		},
 		{
 			scenario: "PDF engine convert error (single file)",
 			ctx: func() *api.ContextMock {
@@ -186,32 +192,6 @@ func TestConvertRoute(t *testing.T) {
 			expectHttpError:        false,
 			expectOutputPathsCount: 1,
 		},
-		{
-			scenario: "cannot rename many files",
-			ctx: func() *api.ContextMock {
-				ctx := &api.ContextMock{Context: new(api.Context)}
-				ctx.SetFiles(map[string]string{
-					"document.docx":  "/document.docx",
-					"document2.docx": "/document2.docx",
-					"document2.doc":  "/document2.doc",
-				})
-				ctx.SetPathRename(&gotenberg.PathRenameMock{RenameMock: func(oldpath, newpath string) error {
-					return errors.New("cannot rename")
-				}})
-				return ctx
-			}(),
-			libreOffice: &libreofficeapi.ApiMock{
-				PdfMock: func(ctx context.Context, logger *zap.Logger, inputPath, outputPath string, options libreofficeapi.Options) error {
-					return nil
-				},
-				ExtensionsMock: func() []string {
-					return []string{".docx", ".doc"}
-				},
-			},
-			expectError:            true,
-			expectHttpError:        false,
-			expectOutputPathsCount: 0,
-		},
 		{
 			scenario: "success (many files)",
 			ctx: func() *api.ContextMock {
@@ -219,11 +199,7 @@ func TestConvertRoute(t *testing.T) {
 				ctx.SetFiles(map[string]string{
 					"document.docx":  "/document.docx",
 					"document2.docx": "/document2.docx",
-					"document2.doc":  "/document2.doc",
 				})
-				ctx.SetPathRename(&gotenberg.PathRenameMock{RenameMock: func(oldpath, newpath string) error {
-					return nil
-				}})
 				return ctx
 			}(),
 			libreOffice: &libreofficeapi.ApiMock{
@@ -231,21 +207,19 @@ func TestConvertRoute(t *testing.T) {
 					return nil
 				},
 				ExtensionsMock: func() []string {
-					return []string{".docx", ".doc"}
+					return []string{".docx"}
 				},
 			},
 			expectError:            false,
 			expectHttpError:        false,
-			expectOutputPathsCount: 3,
-			expectOutputPaths:      []string{"/document.docx.pdf", "/document2.docx.pdf", "/document2.doc.pdf"},
+			expectOutputPathsCount: 2,
 		},
 		{
-			scenario: "success with non-native PDF/A & PDF/UA (many files)",
+			scenario: "success with non-native PDF/A & PDF/UA (single file)",
 			ctx: func() *api.ContextMock {
 				ctx := &api.ContextMock{Context: new(api.Context)}
 				ctx.SetFiles(map[string]string{
-					"document.docx":  "/document.docx",
-					"document2.docx": "/document2.docx",
+					"document.docx": "/document.docx",
 				})
 				ctx.SetValues(map[string][]string{
 					"pdfa": {
@@ -258,9 +232,6 @@ func TestConvertRoute(t *testing.T) {
 						"false",
 					},
 				})
-				ctx.SetPathRename(&gotenberg.PathRenameMock{RenameMock: func(oldpath, newpath string) error {
-					return nil
-				}})
 				return ctx
 			}(),
 			libreOffice: &libreofficeapi.ApiMock{
@@ -278,28 +249,35 @@ func TestConvertRoute(t *testing.T) {
 			},
 			expectError:            false,
 			expectHttpError:        false,
-			expectOutputPathsCount: 2,
-			expectOutputPaths:      []string{"/document.docx.pdf", "/document2.docx.pdf"},
+			expectOutputPathsCount: 1,
 		},
 		{
-			scenario: "success with native PDF/A & PDF/UA (many files)",
+			scenario: "success with every non-native PDF/A & PDF/UA form fields (single file)",
 			ctx: func() *api.ContextMock {
 				ctx := &api.ContextMock{Context: new(api.Context)}
 				ctx.SetFiles(map[string]string{
-					"document.docx":  "/document.docx",
-					"document2.docx": "/document2.docx",
+					"document.docx": "/document.docx",
 				})
 				ctx.SetValues(map[string][]string{
+					"nativePdfA1aFormat": {
+						"true",
+					},
+					"pdfFormat": {
+						gotenberg.PdfA1b,
+					},
+					"nativePdfFormat": {
+						gotenberg.PdfA1b,
+					},
 					"pdfa": {
 						gotenberg.PdfA1b,
 					},
 					"pdfua": {
 						"true",
 					},
+					"nativePdfFormats": {
+						"false",
+					},
 				})
-				ctx.SetPathRename(&gotenberg.PathRenameMock{RenameMock: func(oldpath, newpath string) error {
-					return nil
-				}})
 				return ctx
 			}(),
 			libreOffice: &libreofficeapi.ApiMock{
@@ -317,8 +295,7 @@ func TestConvertRoute(t *testing.T) {
 			},
 			expectError:            false,
 			expectHttpError:        false,
-			expectOutputPathsCount: 2,
-			expectOutputPaths:      []string{"/document.docx.pdf", "/document2.docx.pdf"},
+			expectOutputPathsCount: 1,
 		},
 		{
 			scenario: "merge error",
@@ -352,6 +329,48 @@ func TestConvertRoute(t *testing.T) {
 			expectHttpError:        false,
 			expectOutputPathsCount: 0,
 		},
+		{
+			scenario: "ErrPdfFormatNotSupported (merge)",
+			ctx: func() *api.ContextMock {
+				ctx := &api.ContextMock{Context: new(api.Context)}
+				ctx.SetFiles(map[string]string{
+					"document.docx":  "/document.docx",
+					"document2.docx": "/document2.docx",
+				})
+				ctx.SetValues(map[string][]string{
+					"merge": {
+						"true",
+					},
+					"pdfa": {
+						"foo",
+					},
+					"nativePdfFormats": {
+						"false",
+					},
+				})
+				return ctx
+			}(),
+			libreOffice: &libreofficeapi.ApiMock{
+				PdfMock: func(ctx context.Context, logger *zap.Logger, inputPath, outputPath string, options libreofficeapi.Options) error {
+					return nil
+				},
+				ExtensionsMock: func() []string {
+					return []string{".docx"}
+				},
+			},
+			engine: &gotenberg.PdfEngineMock{
+				MergeMock: func(ctx context.Context, logger *zap.Logger, inputPaths []string, outputPath string) error {
+					return nil
+				},
+				ConvertMock: func(ctx context.Context, logger *zap.Logger, formats gotenberg.PdfFormats, inputPath, outputPath string) error {
+					return gotenberg.ErrPdfFormatNotSupported
+				},
+			},
+			expectError:            true,
+			expectHttpError:        true,
+			expectHttpStatus:       http.StatusBadRequest,
+			expectOutputPathsCount: 0,
+		},
 		{
 			scenario: "PDF engine convert error (merge)",
 			ctx: func() *api.ContextMock {
@@ -583,12 +602,6 @@ func TestConvertRoute(t *testing.T) {
 			if tc.expectOutputPathsCount != len(tc.ctx.OutputPaths()) {
 				t.Errorf("expected %d output paths but got %d", tc.expectOutputPathsCount, len(tc.ctx.OutputPaths()))
 			}
-
-			for _, path := range tc.expectOutputPaths {
-				if !slices.Contains(tc.ctx.OutputPaths(), path) {
-					t.Errorf("expected '%s' in output paths %v", path, tc.ctx.OutputPaths())
-				}
-			}
 		})
 	}
 }

pkg/modules/logging/logging.go

@@ -11,7 +11,7 @@ import (
 	"go.uber.org/zap/zapcore"
 	"golang.org/x/term"
 
-	"github.com/gotenberg/gotenberg/v8/pkg/gotenberg"
+	"github.com/gotenberg/gotenberg/v7/pkg/gotenberg"
 )
 
 func init() {

pkg/modules/logging/logging_test.go

@@ -9,7 +9,7 @@ import (
 	"go.uber.org/zap/zapcore"
 	"go.uber.org/zap/zaptest/observer"
 
-	"github.com/gotenberg/gotenberg/v8/pkg/gotenberg"
+	"github.com/gotenberg/gotenberg/v7/pkg/gotenberg"
 )
 
 func TestLogging_Descriptor(t *testing.T) {

pkg/modules/pdfcpu/pdfcpu.go

@@ -9,7 +9,7 @@ import (
 	pdfcpuConfig "github.com/pdfcpu/pdfcpu/pkg/pdfcpu/model"
 	"go.uber.org/zap"
 
-	"github.com/gotenberg/gotenberg/v8/pkg/gotenberg"
+	"github.com/gotenberg/gotenberg/v7/pkg/gotenberg"
 )
 
 func init() {

pkg/modules/pdfcpu/pdfcpu_test.go

@@ -9,7 +9,7 @@ import (
 
 	"go.uber.org/zap"
 
-	"github.com/gotenberg/gotenberg/v8/pkg/gotenberg"
+	"github.com/gotenberg/gotenberg/v7/pkg/gotenberg"
 )
 
 func TestPdfCpu_Descriptor(t *testing.T) {

pkg/modules/pdfengines/multi.go

@@ -7,7 +7,7 @@ import (
 	"go.uber.org/multierr"
 	"go.uber.org/zap"
 
-	"github.com/gotenberg/gotenberg/v8/pkg/gotenberg"
+	"github.com/gotenberg/gotenberg/v7/pkg/gotenberg"
 )
 
 type multiPdfEngines struct {

pkg/modules/pdfengines/multi_test.go

@@ -7,7 +7,7 @@ import (
 
 	"go.uber.org/zap"
 
-	"github.com/gotenberg/gotenberg/v8/pkg/gotenberg"
+	"github.com/gotenberg/gotenberg/v7/pkg/gotenberg"
 )
 
 func TestMultiPdfEngines_Merge(t *testing.T) {

pkg/modules/pdfengines/pdfengines.go

@@ -7,8 +7,8 @@ import (
 
 	flag "github.com/spf13/pflag"
 
-	"github.com/gotenberg/gotenberg/v8/pkg/gotenberg"
-	"github.com/gotenberg/gotenberg/v8/pkg/modules/api"
+	"github.com/gotenberg/gotenberg/v7/pkg/gotenberg"
+	"github.com/gotenberg/gotenberg/v7/pkg/modules/api"
 )
 
 func init() {
@@ -54,6 +54,18 @@ func (mod *PdfEngines) Provision(ctx *gotenberg.Context) error {
 	names := flags.MustStringSlice("pdfengines-engines")
 	mod.disableRoutes = flags.MustBool("pdfengines-disable-routes")
 
+	loggerProvider, err := ctx.Module(new(gotenberg.LoggerProvider))
+	if err != nil {
+		return fmt.Errorf("get logger provider: %w", err)
+	}
+
+	logger, err := loggerProvider.(gotenberg.LoggerProvider).Logger(mod)
+	if err != nil {
+		return fmt.Errorf("get logger: %w", err)
+	}
+
+	logger = logger.Named("pdfengines")
+
 	engines, err := ctx.Modules(new(gotenberg.PdfEngine))
 	if err != nil {
 		return fmt.Errorf("get PDF engines: %w", err)
@@ -69,13 +81,13 @@ func (mod *PdfEngines) Provision(ctx *gotenberg.Context) error {
 		// Selection from user.
 		mod.names = names
 
-		// Example in case of deprecated module name.
-		//for i, name := range names {
-		//	if name == "unoconv-pdfengine" || name == "uno-pdfengine" {
-		//		logger.Warn(fmt.Sprintf("%s is deprecated; prefer libreoffice-pdfengine instead", name))
-		//		mod.names[i] = "libreoffice-pdfengine"
-		//	}
-		//}
+		for i, name := range names {
+			// FIXME: deprecated.
+			if name == "unoconv-pdfengine" || name == "uno-pdfengine" {
+				logger.Warn(fmt.Sprintf("%s is deprecated; prefer libreoffice-pdfengine instead", name))
+				mod.names[i] = "libreoffice-pdfengine"
+			}
+		}
 
 		return nil
 	}

pkg/modules/pdfengines/pdfengines_test.go

@@ -6,7 +6,9 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/gotenberg/gotenberg/v8/pkg/gotenberg"
+	"go.uber.org/zap"
+
+	"github.com/gotenberg/gotenberg/v7/pkg/gotenberg"
 )
 
 func TestPdfEngines_Descriptor(t *testing.T) {
@@ -32,12 +34,16 @@ func TestPdfEngines_Provision(t *testing.T) {
 			ctx: func() *gotenberg.Context {
 				provider := &struct {
 					gotenberg.ModuleMock
+					gotenberg.LoggerProviderMock
 				}{}
 				provider.DescriptorMock = func() gotenberg.ModuleDescriptor {
 					return gotenberg.ModuleDescriptor{ID: "foo", New: func() gotenberg.Module {
 						return provider
 					}}
 				}
+				provider.LoggerMock = func(mod gotenberg.Module) (*zap.Logger, error) {
+					return zap.NewNop(), nil
+				}
 
 				engine := &struct {
 					gotenberg.ModuleMock
@@ -69,12 +75,17 @@ func TestPdfEngines_Provision(t *testing.T) {
 			ctx: func() *gotenberg.Context {
 				provider := &struct {
 					gotenberg.ModuleMock
+					gotenberg.LoggerProviderMock
 				}{}
 				provider.DescriptorMock = func() gotenberg.ModuleDescriptor {
 					return gotenberg.ModuleDescriptor{ID: "foo", New: func() gotenberg.Module {
 						return provider
 					}}
 				}
+				provider.LoggerMock = func(mod gotenberg.Module) (*zap.Logger, error) {
+					return zap.NewNop(), nil
+				}
+
 				engine1 := &struct {
 					gotenberg.ModuleMock
 					gotenberg.ValidatorMock
@@ -120,16 +131,107 @@ func TestPdfEngines_Provision(t *testing.T) {
 			expectError:        false,
 		},
 		{
-			scenario: "no valid PDF engine",
+			scenario: "user select deprecated unoconv-pdfengine",
 			ctx: func() *gotenberg.Context {
 				provider := &struct {
 					gotenberg.ModuleMock
+					gotenberg.LoggerProviderMock
 				}{}
 				provider.DescriptorMock = func() gotenberg.ModuleDescriptor {
 					return gotenberg.ModuleDescriptor{ID: "foo", New: func() gotenberg.Module {
 						return provider
 					}}
 				}
+				provider.LoggerMock = func(mod gotenberg.Module) (*zap.Logger, error) {
+					return zap.NewNop(), nil
+				}
+
+				engine := &struct {
+					gotenberg.ModuleMock
+					gotenberg.ValidatorMock
+					gotenberg.PdfEngineMock
+				}{}
+				engine.DescriptorMock = func() gotenberg.ModuleDescriptor {
+					return gotenberg.ModuleDescriptor{ID: "libreoffice-pdfengine", New: func() gotenberg.Module { return engine }}
+				}
+				engine.ValidateMock = func() error {
+					return nil
+				}
+
+				fs := new(PdfEngines).Descriptor().FlagSet
+				err := fs.Parse([]string{"--pdfengines-engines=unoconv-pdfengine"})
+				if err != nil {
+					t.Fatalf("expected no error but got: %v", err)
+				}
+
+				return gotenberg.NewContext(
+					gotenberg.ParsedFlags{
+						FlagSet: fs,
+					},
+					[]gotenberg.ModuleDescriptor{
+						provider.Descriptor(),
+						engine.Descriptor(),
+					},
+				)
+			}(),
+			expectedPdfEngines: []string{"libreoffice-pdfengine"},
+			expectError:        false,
+		},
+		{
+			scenario: "no logger provider",
+			ctx: func() *gotenberg.Context {
+				return gotenberg.NewContext(
+					gotenberg.ParsedFlags{
+						FlagSet: new(PdfEngines).Descriptor().FlagSet,
+					},
+					[]gotenberg.ModuleDescriptor{},
+				)
+			}(),
+			expectError: true,
+		},
+		{
+			scenario: "no logger from logger provider",
+			ctx: func() *gotenberg.Context {
+				provider := &struct {
+					gotenberg.ModuleMock
+					gotenberg.LoggerProviderMock
+				}{}
+				provider.DescriptorMock = func() gotenberg.ModuleDescriptor {
+					return gotenberg.ModuleDescriptor{ID: "foo", New: func() gotenberg.Module {
+						return provider
+					}}
+				}
+				provider.LoggerMock = func(mod gotenberg.Module) (*zap.Logger, error) {
+					return nil, errors.New("foo")
+				}
+
+				return gotenberg.NewContext(
+					gotenberg.ParsedFlags{
+						FlagSet: new(PdfEngines).Descriptor().FlagSet,
+					},
+					[]gotenberg.ModuleDescriptor{
+						provider.Descriptor(),
+					},
+				)
+			}(),
+			expectError: true,
+		},
+		{
+			scenario: "no valid PDF engine",
+			ctx: func() *gotenberg.Context {
+				provider := &struct {
+					gotenberg.ModuleMock
+					gotenberg.LoggerProviderMock
+				}{}
+				provider.DescriptorMock = func() gotenberg.ModuleDescriptor {
+					return gotenberg.ModuleDescriptor{ID: "foo", New: func() gotenberg.Module {
+						return provider
+					}}
+				}
+				provider.LoggerMock = func(mod gotenberg.Module) (*zap.Logger, error) {
+					return zap.NewNop(), nil
+				}
+
 				engine := &struct {
 					gotenberg.ModuleMock
 					gotenberg.ValidatorMock

pkg/modules/pdfengines/routes.go

@@ -7,8 +7,8 @@ import (
 
 	"github.com/labstack/echo/v4"
 
-	"github.com/gotenberg/gotenberg/v8/pkg/gotenberg"
-	"github.com/gotenberg/gotenberg/v8/pkg/modules/api"
+	"github.com/gotenberg/gotenberg/v7/pkg/gotenberg"
+	"github.com/gotenberg/gotenberg/v7/pkg/modules/api"
 )
 
 // mergeRoute returns an [api.Route] which can merge PDFs.
@@ -23,12 +23,14 @@ func mergeRoute(engine gotenberg.PdfEngine) api.Route {
 			// Let's get the data from the form and validate them.
 			var (
 				inputPaths []string
+				pdfFormat  string
 				pdfa       string
 				pdfua      bool
 			)
 
 			err := ctx.FormData().
 				MandatoryPaths([]string{".pdf"}, &inputPaths).
+				String("pdfFormat", &pdfFormat, "").
 				String("pdfa", &pdfa, "").
 				Bool("pdfua", &pdfua, false).
 				Validate()
@@ -36,12 +38,25 @@ func mergeRoute(engine gotenberg.PdfEngine) api.Route {
 				return fmt.Errorf("validate form data: %w", err)
 			}
 
+			var actualPdfArchive string
+
+			if pdfFormat != "" {
+				// FIXME: deprecated
+				ctx.Log().Warn("'pdfFormat' is deprecated; prefer the 'pdfa' form field instead")
+				actualPdfArchive = pdfFormat
+			}
+
+			if pdfa != "" {
+				actualPdfArchive = pdfa
+			}
+
 			pdfFormats := gotenberg.PdfFormats{
-				PdfA:  pdfa,
+				PdfA:  actualPdfArchive,
 				PdfUa: pdfua,
 			}
 
 			// Alright, let's merge the PDFs.
+
 			outputPath := ctx.GeneratePath(".pdf")
 
 			err = engine.Merge(ctx, ctx.Log(), inputPaths, outputPath)
@@ -58,7 +73,18 @@ func mergeRoute(engine gotenberg.PdfEngine) api.Route {
 				convertOutputPath := ctx.GeneratePath(".pdf")
 
 				err = engine.Convert(ctx, ctx.Log(), pdfFormats, convertInputPath, convertOutputPath)
+
 				if err != nil {
+					if errors.Is(err, gotenberg.ErrPdfFormatNotSupported) {
+						return api.WrapError(
+							fmt.Errorf("convert PDF: %w", err),
+							api.NewSentinelHttpError(
+								http.StatusBadRequest,
+								fmt.Sprintf("At least one PDF engine does not handle one of the PDF format in '%+v', while other have failed to convert for other reasons", pdfFormats),
+							),
+						)
+					}
+
 					return fmt.Errorf("convert PDF: %w", err)
 				}
 
@@ -68,6 +94,7 @@ func mergeRoute(engine gotenberg.PdfEngine) api.Route {
 
 			// Last but not least, add the output path to the context so that
 			// the API is able to send it as a response to the client.
+
 			err = ctx.AddOutputPaths(outputPath)
 			if err != nil {
 				return fmt.Errorf("add output path: %w", err)
@@ -91,12 +118,14 @@ func convertRoute(engine gotenberg.PdfEngine) api.Route {
 			// Let's get the data from the form and validate them.
 			var (
 				inputPaths []string
+				pdfFormat  string
 				pdfa       string
 				pdfua      bool
 			)
 
 			err := ctx.FormData().
 				MandatoryPaths([]string{".pdf"}, &inputPaths).
+				String("pdfFormat", &pdfFormat, "").
 				String("pdfa", &pdfa, "").
 				Bool("pdfua", &pdfua, false).
 				Validate()
@@ -104,8 +133,20 @@ func convertRoute(engine gotenberg.PdfEngine) api.Route {
 				return fmt.Errorf("validate form data: %w", err)
 			}
 
+			var actualPdfArchive string
+
+			if pdfFormat != "" {
+				// FIXME: deprecated.
+				ctx.Log().Warn("'pdfFormat' is deprecated; prefer the 'pdfa' form field instead")
+				actualPdfArchive = pdfFormat
+			}
+
+			if pdfa != "" {
+				actualPdfArchive = pdfa
+			}
+
 			pdfFormats := gotenberg.PdfFormats{
-				PdfA:  pdfa,
+				PdfA:  actualPdfArchive,
 				PdfUa: pdfua,
 			}
 
@@ -122,27 +163,30 @@ func convertRoute(engine gotenberg.PdfEngine) api.Route {
 
 			// Alright, let's convert the PDFs.
 			outputPaths := make([]string, len(inputPaths))
+
 			for i, inputPath := range inputPaths {
 				outputPaths[i] = ctx.GeneratePath(".pdf")
 
 				err = engine.Convert(ctx, ctx.Log(), pdfFormats, inputPath, outputPaths[i])
-				if err != nil {
-					return fmt.Errorf("convert PDF: %w", err)
-				}
 
-				if len(outputPaths) > 1 {
-					// If .zip archive, keep the original filename.
-					err = ctx.Rename(outputPaths[i], inputPath)
-					if err != nil {
-						return fmt.Errorf("rename output path: %w", err)
+				if err != nil {
+					if errors.Is(err, gotenberg.ErrPdfFormatNotSupported) {
+						return api.WrapError(
+							fmt.Errorf("convert PDF: %w", err),
+							api.NewSentinelHttpError(
+								http.StatusBadRequest,
+								fmt.Sprintf("At least one PDF engine does not handle one of the PDF format in '%+v', while other have failed to convert for other reasons", pdfFormats),
+							),
+						)
 					}
 
-					outputPaths[i] = inputPath
+					return fmt.Errorf("convert PDF: %w", err)
 				}
 			}
 
 			// Last but not least, add the output paths to the context so that
 			// the API is able to send them as a response to the client.
+
 			err = ctx.AddOutputPaths(outputPaths...)
 			if err != nil {
 				return fmt.Errorf("add output paths: %w", err)

pkg/modules/pdfengines/routes_test.go

@@ -4,14 +4,13 @@ import (
 	"context"
 	"errors"
 	"net/http"
-	"slices"
 	"testing"
 
 	"github.com/labstack/echo/v4"
 	"go.uber.org/zap"
 
-	"github.com/gotenberg/gotenberg/v8/pkg/gotenberg"
-	"github.com/gotenberg/gotenberg/v8/pkg/modules/api"
+	"github.com/gotenberg/gotenberg/v7/pkg/gotenberg"
+	"github.com/gotenberg/gotenberg/v7/pkg/modules/api"
 )
 
 func TestMergeHandler(t *testing.T) {
@@ -90,6 +89,34 @@ func TestMergeHandler(t *testing.T) {
 			expectHttpError:        false,
 			expectOutputPathsCount: 1,
 		},
+		{
+			scenario: "ErrPdfFormatNotSupported",
+			ctx: func() *api.ContextMock {
+				ctx := &api.ContextMock{Context: new(api.Context)}
+				ctx.SetFiles(map[string]string{
+					"file.pdf":  "/file.pdf",
+					"file2.pdf": "/file2.pdf",
+				})
+				ctx.SetValues(map[string][]string{
+					"pdfa": {
+						gotenberg.PdfA1b,
+					},
+				})
+				return ctx
+			}(),
+			engine: &gotenberg.PdfEngineMock{
+				MergeMock: func(ctx context.Context, logger *zap.Logger, inputPaths []string, outputPath string) error {
+					return nil
+				},
+				ConvertMock: func(ctx context.Context, logger *zap.Logger, formats gotenberg.PdfFormats, inputPath, outputPath string) error {
+					return gotenberg.ErrPdfFormatNotSupported
+				},
+			},
+			expectError:            true,
+			expectHttpError:        true,
+			expectHttpStatus:       http.StatusBadRequest,
+			expectOutputPathsCount: 0,
+		},
 		{
 			scenario: "error from PDF engine (convert)",
 			ctx: func() *api.ContextMock {
@@ -118,7 +145,7 @@ func TestMergeHandler(t *testing.T) {
 			expectOutputPathsCount: 0,
 		},
 		{
-			scenario: "success with PDF/A & PDF/UA form fields",
+			scenario: "success with every  PDF/A & PDF/UA form fields",
 			ctx: func() *api.ContextMock {
 				ctx := &api.ContextMock{Context: new(api.Context)}
 				ctx.SetFiles(map[string]string{
@@ -126,6 +153,9 @@ func TestMergeHandler(t *testing.T) {
 					"file2.pdf": "/file2.pdf",
 				})
 				ctx.SetValues(map[string][]string{
+					"pdfFormat": {
+						gotenberg.PdfA1a,
+					},
 					"pdfa": {
 						gotenberg.PdfA1b,
 					},
@@ -197,7 +227,6 @@ func TestConvertHandler(t *testing.T) {
 		expectHttpError        bool
 		expectHttpStatus       int
 		expectOutputPathsCount int
-		expectOutputPaths      []string
 	}{
 		{
 			scenario:               "missing at least one mandatory file",
@@ -221,6 +250,30 @@ func TestConvertHandler(t *testing.T) {
 			expectHttpStatus:       http.StatusBadRequest,
 			expectOutputPathsCount: 0,
 		},
+		{
+			scenario: "ErrPdfFormatNotSupported",
+			ctx: func() *api.ContextMock {
+				ctx := &api.ContextMock{Context: new(api.Context)}
+				ctx.SetFiles(map[string]string{
+					"file.pdf": "/file.pdf",
+				})
+				ctx.SetValues(map[string][]string{
+					"pdfa": {
+						gotenberg.PdfA1b,
+					},
+				})
+				return ctx
+			}(),
+			engine: &gotenberg.PdfEngineMock{
+				ConvertMock: func(ctx context.Context, logger *zap.Logger, formats gotenberg.PdfFormats, inputPath, outputPath string) error {
+					return gotenberg.ErrPdfFormatNotSupported
+				},
+			},
+			expectError:            true,
+			expectHttpError:        true,
+			expectHttpStatus:       http.StatusBadRequest,
+			expectOutputPathsCount: 0,
+		},
 		{
 			scenario: "error from PDF engine",
 			ctx: func() *api.ContextMock {
@@ -269,13 +322,16 @@ func TestConvertHandler(t *testing.T) {
 			expectOutputPathsCount: 0,
 		},
 		{
-			scenario: "success with PDF/A & PDF/UA form fields (single file)",
+			scenario: "success with every  PDF/A & PDF/UA form fields (single file)",
 			ctx: func() *api.ContextMock {
 				ctx := &api.ContextMock{Context: new(api.Context)}
 				ctx.SetFiles(map[string]string{
 					"file.pdf": "/file.pdf",
 				})
 				ctx.SetValues(map[string][]string{
+					"pdfFormat": {
+						gotenberg.PdfA1a,
+					},
 					"pdfa": {
 						gotenberg.PdfA1b,
 					},
@@ -295,7 +351,7 @@ func TestConvertHandler(t *testing.T) {
 			expectOutputPathsCount: 1,
 		},
 		{
-			scenario: "cannot rename many files",
+			scenario: "success with every  PDF/A & PDF/UA form fields (many files)",
 			ctx: func() *api.ContextMock {
 				ctx := &api.ContextMock{Context: new(api.Context)}
 				ctx.SetFiles(map[string]string{
@@ -303,6 +359,9 @@ func TestConvertHandler(t *testing.T) {
 					"file2.pdf": "/file2.pdf",
 				})
 				ctx.SetValues(map[string][]string{
+					"pdfFormat": {
+						gotenberg.PdfA1a,
+					},
 					"pdfa": {
 						gotenberg.PdfA1b,
 					},
@@ -310,39 +369,6 @@ func TestConvertHandler(t *testing.T) {
 						"true",
 					},
 				})
-				ctx.SetPathRename(&gotenberg.PathRenameMock{RenameMock: func(oldpath, newpath string) error {
-					return errors.New("cannot rename")
-				}})
-				return ctx
-			}(),
-			engine: &gotenberg.PdfEngineMock{
-				ConvertMock: func(ctx context.Context, logger *zap.Logger, formats gotenberg.PdfFormats, inputPath, outputPath string) error {
-					return nil
-				},
-			},
-			expectError:            true,
-			expectHttpError:        false,
-			expectOutputPathsCount: 0,
-		},
-		{
-			scenario: "success with PDF/A & PDF/UA form fields (many files)",
-			ctx: func() *api.ContextMock {
-				ctx := &api.ContextMock{Context: new(api.Context)}
-				ctx.SetFiles(map[string]string{
-					"file.pdf":  "/file.pdf",
-					"file2.pdf": "/file2.pdf",
-				})
-				ctx.SetValues(map[string][]string{
-					"pdfa": {
-						gotenberg.PdfA1b,
-					},
-					"pdfua": {
-						"true",
-					},
-				})
-				ctx.SetPathRename(&gotenberg.PathRenameMock{RenameMock: func(oldpath, newpath string) error {
-					return nil
-				}})
 				return ctx
 			}(),
 			engine: &gotenberg.PdfEngineMock{
@@ -353,7 +379,6 @@ func TestConvertHandler(t *testing.T) {
 			expectError:            false,
 			expectHttpError:        false,
 			expectOutputPathsCount: 2,
-			expectOutputPaths:      []string{"/file.pdf", "/file2.pdf"},
 		},
 	} {
 		t.Run(tc.scenario, func(t *testing.T) {
@@ -392,12 +417,6 @@ func TestConvertHandler(t *testing.T) {
 			if tc.expectOutputPathsCount != len(tc.ctx.OutputPaths()) {
 				t.Errorf("expected %d output paths but got %d", tc.expectOutputPathsCount, len(tc.ctx.OutputPaths()))
 			}
-
-			for _, path := range tc.expectOutputPaths {
-				if !slices.Contains(tc.ctx.OutputPaths(), path) {
-					t.Errorf("expected '%s' in output paths %v", path, tc.ctx.OutputPaths())
-				}
-			}
 		})
 	}
 }

pkg/modules/pdftk/pdftk.go

@@ -5,10 +5,11 @@ import (
 	"errors"
 	"fmt"
 	"os"
+	"sync"
 
 	"go.uber.org/zap"
 
-	"github.com/gotenberg/gotenberg/v8/pkg/gotenberg"
+	"github.com/gotenberg/gotenberg/v7/pkg/gotenberg"
 )
 
 func init() {
@@ -51,6 +52,23 @@ func (engine *PdfTk) Validate() error {
 	return nil
 }
 
+// Metrics returns the metrics.
+func (engine *PdfTk) Metrics() ([]gotenberg.Metric, error) {
+	// TODO: remove deprecated.
+	return []gotenberg.Metric{
+		{
+			Name:        "pdftk_active_instances_count",
+			Description: "Current number of active PDFtk instances - deprecated.",
+			Read: func() float64 {
+				activeInstancesCountMu.RLock()
+				defer activeInstancesCountMu.RUnlock()
+
+				return activeInstancesCount
+			},
+		},
+	}, nil
+}
+
 // Merge combines multiple PDFs into a single PDF.
 func (engine *PdfTk) Merge(ctx context.Context, logger *zap.Logger, inputPaths []string, outputPath string) error {
 	var args []string
@@ -62,7 +80,16 @@ func (engine *PdfTk) Merge(ctx context.Context, logger *zap.Logger, inputPaths [
 		return fmt.Errorf("create command: %w", err)
 	}
 
+	activeInstancesCountMu.Lock()
+	activeInstancesCount += 1
+	activeInstancesCountMu.Unlock()
+
 	_, err = cmd.Exec()
+
+	activeInstancesCountMu.Lock()
+	activeInstancesCount -= 1
+	activeInstancesCountMu.Unlock()
+
 	if err == nil {
 		return nil
 	}
@@ -75,10 +102,16 @@ func (engine *PdfTk) Convert(ctx context.Context, logger *zap.Logger, formats go
 	return fmt.Errorf("convert PDF to '%+v' with PDFtk: %w", formats, gotenberg.ErrPdfEngineMethodNotSupported)
 }
 
+var (
+	activeInstancesCount   float64
+	activeInstancesCountMu sync.RWMutex
+)
+
 // Interface guards.
 var (
-	_ gotenberg.Module      = (*PdfTk)(nil)
-	_ gotenberg.Provisioner = (*PdfTk)(nil)
-	_ gotenberg.Validator   = (*PdfTk)(nil)
-	_ gotenberg.PdfEngine   = (*PdfTk)(nil)
+	_ gotenberg.Module          = (*PdfTk)(nil)
+	_ gotenberg.Provisioner     = (*PdfTk)(nil)
+	_ gotenberg.Validator       = (*PdfTk)(nil)
+	_ gotenberg.MetricsProvider = (*PdfTk)(nil)
+	_ gotenberg.PdfEngine       = (*PdfTk)(nil)
 )

pkg/modules/pdftk/pdftk_test.go

@@ -9,7 +9,7 @@ import (
 
 	"go.uber.org/zap"
 
-	"github.com/gotenberg/gotenberg/v8/pkg/gotenberg"
+	"github.com/gotenberg/gotenberg/v7/pkg/gotenberg"
 )
 
 func TestPdfTk_Descriptor(t *testing.T) {
@@ -71,6 +71,22 @@ func TestPdfTk_Validate(t *testing.T) {
 	}
 }
 
+func TestPdfTk_Metrics(t *testing.T) {
+	metrics, err := new(PdfTk).Metrics()
+	if err != nil {
+		t.Fatalf("expected no error but got: %v", err)
+	}
+
+	if len(metrics) != 1 {
+		t.Fatalf("expected %d metrics, but got %d", 1, len(metrics))
+	}
+
+	actual := metrics[0].Read()
+	if actual != 0 {
+		t.Errorf("expected %d PDFtk instances, but got %f", 0, actual)
+	}
+}
+
 func TestPdfTk_Merge(t *testing.T) {
 	for _, tc := range []struct {
 		scenario    string

pkg/modules/prometheus/prometheus.go

@@ -12,8 +12,8 @@ import (
 	"github.com/prometheus/client_golang/prometheus/promhttp"
 	flag "github.com/spf13/pflag"
 
-	"github.com/gotenberg/gotenberg/v8/pkg/gotenberg"
-	"github.com/gotenberg/gotenberg/v8/pkg/modules/api"
+	"github.com/gotenberg/gotenberg/v7/pkg/gotenberg"
+	"github.com/gotenberg/gotenberg/v7/pkg/modules/api"
 )
 
 func init() {

pkg/modules/prometheus/prometheus_test.go

@@ -8,7 +8,7 @@ import (
 
 	"github.com/prometheus/client_golang/prometheus"
 
-	"github.com/gotenberg/gotenberg/v8/pkg/gotenberg"
+	"github.com/gotenberg/gotenberg/v7/pkg/gotenberg"
 )
 
 func TestPrometheus_Descriptor(t *testing.T) {

pkg/modules/qpdf/qpdf.go

@@ -5,10 +5,11 @@ import (
 	"errors"
 	"fmt"
 	"os"
+	"sync"
 
 	"go.uber.org/zap"
 
-	"github.com/gotenberg/gotenberg/v8/pkg/gotenberg"
+	"github.com/gotenberg/gotenberg/v7/pkg/gotenberg"
 )
 
 func init() {
@@ -51,6 +52,23 @@ func (engine *QPdf) Validate() error {
 	return nil
 }
 
+// Metrics returns the metrics.
+func (engine *QPdf) Metrics() ([]gotenberg.Metric, error) {
+	// TODO: remove deprecated.
+	return []gotenberg.Metric{
+		{
+			Name:        "qpdf_active_instances_count",
+			Description: "Current number of active QPDF instances - deprecated.",
+			Read: func() float64 {
+				activeInstancesCountMu.RLock()
+				defer activeInstancesCountMu.RUnlock()
+
+				return activeInstancesCount
+			},
+		},
+	}, nil
+}
+
 // Merge combines multiple PDFs into a single PDF.
 func (engine *QPdf) Merge(ctx context.Context, logger *zap.Logger, inputPaths []string, outputPath string) error {
 	var args []string
@@ -64,7 +82,16 @@ func (engine *QPdf) Merge(ctx context.Context, logger *zap.Logger, inputPaths []
 		return fmt.Errorf("create command: %w", err)
 	}
 
+	activeInstancesCountMu.Lock()
+	activeInstancesCount += 1
+	activeInstancesCountMu.Unlock()
+
 	_, err = cmd.Exec()
+
+	activeInstancesCountMu.Lock()
+	activeInstancesCount -= 1
+	activeInstancesCountMu.Unlock()
+
 	if err == nil {
 		return nil
 	}
@@ -78,8 +105,14 @@ func (engine *QPdf) Convert(ctx context.Context, logger *zap.Logger, formats got
 }
 
 var (
-	_ gotenberg.Module      = (*QPdf)(nil)
-	_ gotenberg.Provisioner = (*QPdf)(nil)
-	_ gotenberg.Validator   = (*QPdf)(nil)
-	_ gotenberg.PdfEngine   = (*QPdf)(nil)
+	activeInstancesCount   float64
+	activeInstancesCountMu sync.RWMutex
+)
+
+var (
+	_ gotenberg.Module          = (*QPdf)(nil)
+	_ gotenberg.Provisioner     = (*QPdf)(nil)
+	_ gotenberg.Validator       = (*QPdf)(nil)
+	_ gotenberg.MetricsProvider = (*QPdf)(nil)
+	_ gotenberg.PdfEngine       = (*QPdf)(nil)
 )

pkg/modules/qpdf/qpdf_test.go

@@ -9,7 +9,7 @@ import (
 
 	"go.uber.org/zap"
 
-	"github.com/gotenberg/gotenberg/v8/pkg/gotenberg"
+	"github.com/gotenberg/gotenberg/v7/pkg/gotenberg"
 )
 
 func TestQPdf_Descriptor(t *testing.T) {
@@ -71,6 +71,22 @@ func TestQPdf_Validate(t *testing.T) {
 	}
 }
 
+func TestQPdf_Metrics(t *testing.T) {
+	metrics, err := new(QPdf).Metrics()
+	if err != nil {
+		t.Errorf("expected no error but got: %v", err)
+	}
+
+	if len(metrics) != 1 {
+		t.Errorf("expected %d metrics, but got %d", 1, len(metrics))
+	}
+
+	actual := metrics[0].Read()
+	if actual != 0 {
+		t.Errorf("expected %d QPdf instances, but got %f", 0, actual)
+	}
+}
+
 func TestQPdf_Merge(t *testing.T) {
 	for _, tc := range []struct {
 		scenario    string

pkg/modules/webhook/middleware.go

@@ -9,6 +9,7 @@ import (
 	"fmt"
 	"net/http"
 	"os"
+	"regexp"
 	"strconv"
 	"strings"
 	"time"
@@ -16,8 +17,7 @@ import (
 	"github.com/hashicorp/go-retryablehttp"
 	"github.com/labstack/echo/v4"
 
-	"github.com/gotenberg/gotenberg/v8/pkg/gotenberg"
-	"github.com/gotenberg/gotenberg/v8/pkg/modules/api"
+	"github.com/gotenberg/gotenberg/v7/pkg/modules/api"
 )
 
 func webhookMiddleware(w *Webhook) api.Middleware {
@@ -44,19 +44,38 @@ func webhookMiddleware(w *Webhook) api.Middleware {
 						)
 					}
 
-					deadline, ok := ctx.Deadline()
-					if !ok {
-						return errors.New("context has no deadline")
-					}
-
 					// Let's check if the webhook URLs are acceptable according to our
 					// allowed/denied lists.
-					err := gotenberg.FilterDeadline(w.allowList, w.denyList, webhookUrl, deadline)
+					filter := func(URL, header string, allowList, denyList *regexp.Regexp) error {
+						if !allowList.MatchString(URL) {
+							return api.WrapError(
+								fmt.Errorf("'%s' does not match the expression from the allowed list", URL),
+								api.NewSentinelHttpError(
+									http.StatusForbidden,
+									fmt.Sprintf("Invalid '%s' header value: '%s' does not match the authorized URLs", header, URL),
+								),
+							)
+						}
+
+						if denyList.String() != "" && denyList.MatchString(URL) {
+							return api.WrapError(
+								fmt.Errorf("'%s' matches the expression from the denied list", URL),
+								api.NewSentinelHttpError(
+									http.StatusForbidden,
+									fmt.Sprintf("Invalid '%s' header value: '%s' does not match the authorized URLs", header, URL),
+								),
+							)
+						}
+
+						return nil
+					}
+
+					err := filter(webhookUrl, "Gotenberg-Webhook-Url", w.allowList, w.denyList)
 					if err != nil {
 						return fmt.Errorf("filter webhook URL: %w", err)
 					}
 
-					err = gotenberg.FilterDeadline(w.errorAllowList, w.errorDenyList, webhookErrorUrl, deadline)
+					err = filter(webhookErrorUrl, "Gotenberg-Webhook-Error-Url", w.errorAllowList, w.errorDenyList)
 					if err != nil {
 						return fmt.Errorf("filter webhook error URL: %w", err)
 					}

pkg/modules/webhook/middleware_test.go

@@ -11,15 +11,15 @@ import (
 	"mime/multipart"
 	"net/http"
 	"net/http/httptest"
+	"regexp"
 	"strings"
 	"testing"
 	"time"
 
-	"github.com/dlclark/regexp2"
 	"github.com/labstack/echo/v4"
 	"go.uber.org/zap"
 
-	"github.com/gotenberg/gotenberg/v8/pkg/modules/api"
+	"github.com/gotenberg/gotenberg/v7/pkg/modules/api"
 )
 
 func TestWebhookMiddlewareGuards(t *testing.T) {
@@ -47,10 +47,10 @@ func TestWebhookMiddlewareGuards(t *testing.T) {
 
 	buildWebhookModule := func() *Webhook {
 		return &Webhook{
-			allowList:      regexp2.MustCompile("", 0),
-			denyList:       regexp2.MustCompile("", 0),
-			errorAllowList: regexp2.MustCompile("", 0),
-			errorDenyList:  regexp2.MustCompile("", 0),
+			allowList:      regexp.MustCompile(""),
+			denyList:       regexp.MustCompile(""),
+			errorAllowList: regexp.MustCompile(""),
+			errorDenyList:  regexp.MustCompile(""),
 			maxRetry:       0,
 			retryMinWait:   0,
 			retryMaxWait:   0,
@@ -63,7 +63,6 @@ func TestWebhookMiddlewareGuards(t *testing.T) {
 		request          *http.Request
 		mod              *Webhook
 		next             echo.HandlerFunc
-		noDeadline       bool
 		expectError      bool
 		expectHttpError  bool
 		expectHttpStatus int
@@ -77,7 +76,6 @@ func TestWebhookMiddlewareGuards(t *testing.T) {
 					return nil
 				}
 			}(),
-			noDeadline:      false,
 			expectError:     false,
 			expectHttpError: false,
 		},
@@ -89,23 +87,10 @@ func TestWebhookMiddlewareGuards(t *testing.T) {
 				return req
 			}(),
 			mod:              buildWebhookModule(),
-			noDeadline:       false,
 			expectError:      true,
 			expectHttpError:  true,
 			expectHttpStatus: http.StatusBadRequest,
 		},
-		{
-			scenario: "context has no deadline",
-			request: func() *http.Request {
-				req := buildMultipartFormDataRequest()
-				req.Header.Set("Gotenberg-Webhook-Url", "foo")
-				req.Header.Set("Gotenberg-Webhook-Error-Url", "bar")
-				return req
-			}(),
-			mod:         buildWebhookModule(),
-			noDeadline:  true,
-			expectError: true,
-		},
 		{
 			scenario: "webhook URL is not allowed",
 			request: func() *http.Request {
@@ -116,11 +101,12 @@ func TestWebhookMiddlewareGuards(t *testing.T) {
 			}(),
 			mod: func() *Webhook {
 				mod := buildWebhookModule()
-				mod.allowList = regexp2.MustCompile("bar", 0)
+				mod.allowList = regexp.MustCompile("bar")
 				return mod
 			}(),
-			noDeadline:  false,
-			expectError: true,
+			expectError:      true,
+			expectHttpError:  true,
+			expectHttpStatus: http.StatusForbidden,
 		},
 		{
 			scenario: "webhook URL is denied",
@@ -132,11 +118,12 @@ func TestWebhookMiddlewareGuards(t *testing.T) {
 			}(),
 			mod: func() *Webhook {
 				mod := buildWebhookModule()
-				mod.denyList = regexp2.MustCompile("foo", 0)
+				mod.denyList = regexp.MustCompile("foo")
 				return mod
 			}(),
-			noDeadline:  false,
-			expectError: true,
+			expectError:      true,
+			expectHttpError:  true,
+			expectHttpStatus: http.StatusForbidden,
 		},
 		{
 			scenario: "webhook error URL is not allowed",
@@ -148,11 +135,12 @@ func TestWebhookMiddlewareGuards(t *testing.T) {
 			}(),
 			mod: func() *Webhook {
 				mod := buildWebhookModule()
-				mod.errorAllowList = regexp2.MustCompile("foo", 0)
+				mod.errorAllowList = regexp.MustCompile("foo")
 				return mod
 			}(),
-			noDeadline:  false,
-			expectError: true,
+			expectError:      true,
+			expectHttpError:  true,
+			expectHttpStatus: http.StatusForbidden,
 		},
 		{
 			scenario: "webhook error URL is denied",
@@ -164,11 +152,12 @@ func TestWebhookMiddlewareGuards(t *testing.T) {
 			}(),
 			mod: func() *Webhook {
 				mod := buildWebhookModule()
-				mod.errorDenyList = regexp2.MustCompile("bar", 0)
+				mod.errorDenyList = regexp.MustCompile("bar")
 				return mod
 			}(),
-			noDeadline:  false,
-			expectError: true,
+			expectError:      true,
+			expectHttpError:  true,
+			expectHttpStatus: http.StatusForbidden,
 		},
 		{
 			scenario: "invalid webhook method (GET)",
@@ -180,7 +169,6 @@ func TestWebhookMiddlewareGuards(t *testing.T) {
 				return req
 			}(),
 			mod:              buildWebhookModule(),
-			noDeadline:       false,
 			expectError:      true,
 			expectHttpError:  true,
 			expectHttpStatus: http.StatusBadRequest,
@@ -195,7 +183,6 @@ func TestWebhookMiddlewareGuards(t *testing.T) {
 				return req
 			}(),
 			mod:              buildWebhookModule(),
-			noDeadline:       false,
 			expectError:      true,
 			expectHttpError:  true,
 			expectHttpStatus: http.StatusBadRequest,
@@ -211,7 +198,6 @@ func TestWebhookMiddlewareGuards(t *testing.T) {
 				return req
 			}(),
 			mod:              buildWebhookModule(),
-			noDeadline:       false,
 			expectError:      true,
 			expectHttpError:  true,
 			expectHttpStatus: http.StatusBadRequest,
@@ -227,7 +213,6 @@ func TestWebhookMiddlewareGuards(t *testing.T) {
 				return req
 			}(),
 			mod:              buildWebhookModule(),
-			noDeadline:       false,
 			expectError:      true,
 			expectHttpError:  true,
 			expectHttpStatus: http.StatusBadRequest,
@@ -243,7 +228,6 @@ func TestWebhookMiddlewareGuards(t *testing.T) {
 				return req
 			}(),
 			mod:              buildWebhookModule(),
-			noDeadline:       false,
 			expectError:      true,
 			expectHttpError:  true,
 			expectHttpStatus: http.StatusBadRequest,
@@ -258,7 +242,6 @@ func TestWebhookMiddlewareGuards(t *testing.T) {
 				return req
 			}(),
 			mod:              buildWebhookModule(),
-			noDeadline:       false,
 			expectError:      true,
 			expectHttpError:  true,
 			expectHttpStatus: http.StatusBadRequest,
@@ -271,20 +254,15 @@ func TestWebhookMiddlewareGuards(t *testing.T) {
 
 			c := srv.NewContext(tc.request, httptest.NewRecorder())
 
-			if tc.noDeadline {
-				ctx := &api.ContextMock{Context: &api.Context{Context: context.Background()}}
-				ctx.SetEchoContext(c)
-				c.Set("context", ctx.Context)
-				c.Set("cancel", func() context.CancelFunc {
-					return nil
-				}())
-			} else {
-				timeoutCtx, cancel := context.WithTimeout(context.Background(), time.Duration(10)*time.Second)
-				ctx := &api.ContextMock{Context: &api.Context{Context: timeoutCtx}}
-				ctx.SetEchoContext(c)
-				c.Set("context", ctx.Context)
-				c.Set("cancel", cancel)
-			}
+			ctx := &api.ContextMock{Context: &api.Context{}}
+			ctx.SetEchoContext(c)
+
+			c.Set("context", ctx.Context)
+			c.Set("cancel", func() context.CancelFunc {
+				return func() {
+					return
+				}
+			}())
 
 			err := webhookMiddleware(tc.mod).Handler(tc.next)(c)
 
@@ -342,10 +320,10 @@ func TestWebhookMiddlewareAsynchronousProcess(t *testing.T) {
 
 	buildWebhookModule := func() *Webhook {
 		return &Webhook{
-			allowList:      regexp2.MustCompile("", 0),
-			denyList:       regexp2.MustCompile("", 0),
-			errorAllowList: regexp2.MustCompile("", 0),
-			errorDenyList:  regexp2.MustCompile("", 0),
+			allowList:      regexp.MustCompile(""),
+			denyList:       regexp.MustCompile(""),
+			errorAllowList: regexp.MustCompile(""),
+			errorDenyList:  regexp.MustCompile(""),
 			maxRetry:       0,
 			retryMinWait:   0,
 			retryMaxWait:   0,
@@ -448,17 +426,22 @@ func TestWebhookMiddlewareAsynchronousProcess(t *testing.T) {
 			c.Set("trace", "foo")
 			c.Set("startTime", time.Now())
 
-			timeoutCtx, cancel := context.WithTimeout(context.Background(), time.Duration(10)*time.Second)
-			ctx := &api.ContextMock{Context: &api.Context{Context: timeoutCtx}}
+			ctx := &api.ContextMock{Context: &api.Context{}}
 			ctx.SetLogger(zap.NewNop())
 			ctx.SetEchoContext(c)
 
 			c.Set("context", ctx.Context)
-			c.Set("cancel", cancel)
+			c.Set("cancel", func() context.CancelFunc {
+				return func() {
+					return
+				}
+			}())
 
 			webhook := echo.New()
 			webhook.HideBanner = true
 			webhook.HidePort = true
+
+			rand.Seed(time.Now().UnixNano())
 			webhookPort := rand.Intn(65535-1025+1) + 1025
 
 			c.Request().Header.Set("Gotenberg-Webhook-Url", fmt.Sprintf("http://localhost:%d/", webhookPort))

pkg/modules/webhook/webhook.go

@@ -1,13 +1,15 @@
 package webhook
 
 import (
+	"fmt"
+	"regexp"
 	"time"
 
-	"github.com/dlclark/regexp2"
 	flag "github.com/spf13/pflag"
+	"go.uber.org/multierr"
 
-	"github.com/gotenberg/gotenberg/v8/pkg/gotenberg"
-	"github.com/gotenberg/gotenberg/v8/pkg/modules/api"
+	"github.com/gotenberg/gotenberg/v7/pkg/gotenberg"
+	"github.com/gotenberg/gotenberg/v7/pkg/modules/api"
 )
 
 func init() {
@@ -17,10 +19,10 @@ func init() {
 // Webhook is a module which provides a middleware for uploading output files
 // to any destinations in an asynchronous fashion.
 type Webhook struct {
-	allowList      *regexp2.Regexp
-	denyList       *regexp2.Regexp
-	errorAllowList *regexp2.Regexp
-	errorDenyList  *regexp2.Regexp
+	allowList      *regexp.Regexp
+	denyList       *regexp.Regexp
+	errorAllowList *regexp.Regexp
+	errorDenyList  *regexp.Regexp
 	maxRetry       int
 	retryMinWait   time.Duration
 	retryMaxWait   time.Duration
@@ -34,6 +36,31 @@ func (w *Webhook) Descriptor() gotenberg.ModuleDescriptor {
 		ID: "webhook",
 		FlagSet: func() *flag.FlagSet {
 			fs := flag.NewFlagSet("webhook", flag.ExitOnError)
+			// Deprecated flags.
+			fs.String("api-webhook-allow-list", "", "Set the allowed URLs for the webhook feature using a regular expression")
+			fs.String("api-webhook-deny-list", "", "Set the denied URLs for the webhook feature using a regular expression")
+			fs.String("api-webhook-error-allow-list", "", "Set the allowed URLs in case of an error for the webhook feature using a regular expression")
+			fs.String("api-webhook-error-deny-list", "", "Set the denied URLs in case of an error for the webhook feature using a regular expression")
+			fs.Int("api-webhook-max-retry", 4, "Set the maximum number of retries for the webhook feature")
+			fs.Duration("api-webhook-retry-min-wait", time.Duration(1)*time.Second, "Set the minimum duration to wait before trying to call the webhook again")
+			fs.Duration("api-webhook-retry-max-wait", time.Duration(30)*time.Second, "Set the maximum duration to wait before trying to call the webhook again")
+			fs.Bool("api-disable-webhook", false, "Disable the webhook feature")
+
+			var err error
+			err = multierr.Append(err, fs.MarkDeprecated("api-webhook-allow-list", "use webhook-allow-list instead"))
+			err = multierr.Append(err, fs.MarkDeprecated("api-webhook-deny-list", "use webhook-deny-list instead"))
+			err = multierr.Append(err, fs.MarkDeprecated("api-webhook-error-allow-list", "use webhook-error-allow-list instead"))
+			err = multierr.Append(err, fs.MarkDeprecated("api-webhook-error-deny-list", "use webhook-error-deny-list instead"))
+			err = multierr.Append(err, fs.MarkDeprecated("api-webhook-max-retry", "use webhook-max-retry instead"))
+			err = multierr.Append(err, fs.MarkDeprecated("api-webhook-retry-min-wait", "use webhook-retry-min-wait instead"))
+			err = multierr.Append(err, fs.MarkDeprecated("api-webhook-retry-max-wait", "use webhook-retry-max-wait instead"))
+			err = multierr.Append(err, fs.MarkDeprecated("api-disable-webhook", "use webhook-disable instead"))
+
+			if err != nil {
+				panic(fmt.Errorf("create deprecated flags for the webhook module: %v", err))
+			}
+
+			// New flags.
 			fs.String("webhook-allow-list", "", "Set the allowed URLs for the webhook feature using a regular expression")
 			fs.String("webhook-deny-list", "", "Set the denied URLs for the webhook feature using a regular expression")
 			fs.String("webhook-error-allow-list", "", "Set the allowed URLs in case of an error for the webhook feature using a regular expression")
@@ -53,15 +80,15 @@ func (w *Webhook) Descriptor() gotenberg.ModuleDescriptor {
 // Provision sets the module properties.
 func (w *Webhook) Provision(ctx *gotenberg.Context) error {
 	flags := ctx.ParsedFlags()
-	w.allowList = flags.MustRegexp("webhook-allow-list")
-	w.denyList = flags.MustRegexp("webhook-deny-list")
-	w.errorAllowList = flags.MustRegexp("webhook-error-allow-list")
-	w.errorDenyList = flags.MustRegexp("webhook-error-deny-list")
-	w.maxRetry = flags.MustInt("webhook-max-retry")
-	w.retryMinWait = flags.MustDuration("webhook-retry-min-wait")
-	w.retryMaxWait = flags.MustDuration("webhook-retry-max-wait")
+	w.allowList = flags.MustDeprecatedRegexp("api-webhook-allow-list", "webhook-allow-list")
+	w.denyList = flags.MustDeprecatedRegexp("api-webhook-deny-list", "webhook-deny-list")
+	w.errorAllowList = flags.MustDeprecatedRegexp("api-webhook-error-allow-list", "webhook-error-allow-list")
+	w.errorDenyList = flags.MustDeprecatedRegexp("api-webhook-error-deny-list", "webhook-error-deny-list")
+	w.maxRetry = flags.MustDeprecatedInt("api-webhook-max-retry", "webhook-max-retry")
+	w.retryMinWait = flags.MustDeprecatedDuration("api-webhook-retry-min-wait", "webhook-retry-min-wait")
+	w.retryMaxWait = flags.MustDeprecatedDuration("api-webhook-retry-min-wait", "webhook-retry-max-wait")
 	w.clientTimeout = flags.MustDuration("webhook-client-timeout")
-	w.disable = flags.MustBool("webhook-disable")
+	w.disable = flags.MustDeprecatedBool("api-disable-webhook", "webhook-disable")
 
 	return nil
 }

pkg/modules/webhook/webhook_test.go

@@ -4,7 +4,7 @@ import (
 	"reflect"
 	"testing"
 
-	"github.com/gotenberg/gotenberg/v8/pkg/gotenberg"
+	"github.com/gotenberg/gotenberg/v7/pkg/gotenberg"
 )
 
 func TestWebhook_Descriptor(t *testing.T) {

pkg/standard/imports.go

@@ -2,16 +2,16 @@ package standard
 
 import (
 	// Standard Gotenberg modules.
-	_ "github.com/gotenberg/gotenberg/v8/pkg/modules/api"
-	_ "github.com/gotenberg/gotenberg/v8/pkg/modules/chromium"
-	_ "github.com/gotenberg/gotenberg/v8/pkg/modules/libreoffice"
-	_ "github.com/gotenberg/gotenberg/v8/pkg/modules/libreoffice/api"
-	_ "github.com/gotenberg/gotenberg/v8/pkg/modules/libreoffice/pdfengine"
-	_ "github.com/gotenberg/gotenberg/v8/pkg/modules/logging"
-	_ "github.com/gotenberg/gotenberg/v8/pkg/modules/pdfcpu"
-	_ "github.com/gotenberg/gotenberg/v8/pkg/modules/pdfengines"
-	_ "github.com/gotenberg/gotenberg/v8/pkg/modules/pdftk"
-	_ "github.com/gotenberg/gotenberg/v8/pkg/modules/prometheus"
-	_ "github.com/gotenberg/gotenberg/v8/pkg/modules/qpdf"
-	_ "github.com/gotenberg/gotenberg/v8/pkg/modules/webhook"
+	_ "github.com/gotenberg/gotenberg/v7/pkg/modules/api"
+	_ "github.com/gotenberg/gotenberg/v7/pkg/modules/chromium"
+	_ "github.com/gotenberg/gotenberg/v7/pkg/modules/libreoffice"
+	_ "github.com/gotenberg/gotenberg/v7/pkg/modules/libreoffice/api"
+	_ "github.com/gotenberg/gotenberg/v7/pkg/modules/libreoffice/pdfengine"
+	_ "github.com/gotenberg/gotenberg/v7/pkg/modules/logging"
+	_ "github.com/gotenberg/gotenberg/v7/pkg/modules/pdfcpu"
+	_ "github.com/gotenberg/gotenberg/v7/pkg/modules/pdfengines"
+	_ "github.com/gotenberg/gotenberg/v7/pkg/modules/pdftk"
+	_ "github.com/gotenberg/gotenberg/v7/pkg/modules/prometheus"
+	_ "github.com/gotenberg/gotenberg/v7/pkg/modules/qpdf"
+	_ "github.com/gotenberg/gotenberg/v7/pkg/modules/webhook"
 )

test/testdata/chromium/html/footer.html

@@ -2,8 +2,8 @@
 <head>
     <style>
         body {
-            font-size: 12px;
-            margin: auto 20px;
+            font-size: 30rem;
+            margin: 4rem auto;
         }
     </style>
 </head>

test/testdata/chromium/html/header.html

@@ -2,8 +2,8 @@
 <head>
     <style>
         body {
-            font-size: 12px;
-            margin: auto 20px;
+            font-size: 8rem;
+            margin: 4rem auto;
         }
     </style>
 </head>

test/testdata/chromium/html/index.html

@@ -59,14 +59,6 @@
     <p id="javascript" style="display: none">Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.</p>
 </div>
 
-<div class="page-break-after">
-    <h2>/etc/passwd</h2>
-    <iframe src="/etc/passwd"></iframe>
-
-    <h2>\\localhost/etc/passwd</h2>
-    <iframe src="\\localhost/etc/passwd"></iframe>
-</div>
-
 <script type="application/javascript">
     var globalVar = 'notReady'
 

test/testdata/chromium/markdown/footer.html

@@ -2,8 +2,8 @@
 <head>
     <style>
         body {
-            font-size: 12px;
-            margin: auto 20px;
+            font-size: 8rem;
+            margin: 4rem auto;
         }
     </style>
 </head>

test/testdata/chromium/markdown/header.html

@@ -2,8 +2,8 @@
 <head>
     <style>
         body {
-            font-size: 12px;
-            margin: auto 20px;
+            font-size: 8rem;
+            margin: 4rem auto;
         }
     </style>
 </head>