feat: handling more ErrMaximumQueueSizeExceeded scenarios

pkg/modules/chromium/chromium.go

@@ -280,6 +280,7 @@ func (mod *Chromium) Descriptor() gotenberg.ModuleDescriptor {
 		FlagSet: func() *flag.FlagSet {
 			fs := flag.NewFlagSet("chromium", flag.ExitOnError)
 			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")
@@ -295,7 +296,6 @@ func (mod *Chromium) Descriptor() gotenberg.ModuleDescriptor {
 			fs.Bool("chromium-clear-cookies", false, "Clear Chromium cookies between each conversion")
 			fs.Bool("chromium-disable-javascript", false, "Disable JavaScript")
 			fs.Bool("chromium-disable-routes", false, "Disable the routes")
-			fs.Int64("chromium-max-queue-size", 0, "Maximum request queue size for chromium. Set to 0 to disable this feature")
 
 			return fs
 		}(),

pkg/modules/chromium/routes.go

@@ -512,7 +512,7 @@ func convertUrl(ctx *api.Context, chromium Api, engine gotenberg.PdfEngine, url
 	if err != nil {
 		if errors.Is(err, ErrOmitBackgroundWithoutPrintBackground) {
 			return api.WrapError(
-				err,
+				fmt.Errorf("convert to PDF: %w", err),
 				api.NewSentinelHttpError(
 					http.StatusBadRequest,
 					"omitBackground requires printBackground set to true",
@@ -540,16 +540,6 @@ func convertUrl(ctx *api.Context, chromium Api, engine gotenberg.PdfEngine, url
 			)
 		}
 
-		if errors.Is(err, gotenberg.ErrMaximumQueueSizeExceeded) {
-			return api.WrapError(
-				fmt.Errorf("convert to PDF: %w", err),
-				api.NewSentinelHttpError(
-					http.StatusTooManyRequests,
-					"The maximum queue size has been reached",
-				),
-			)
-		}
-
 		return fmt.Errorf("convert to PDF: %w", err)
 	}
 
@@ -563,6 +553,16 @@ func convertUrl(ctx *api.Context, chromium Api, engine gotenberg.PdfEngine, url
 
 		err = engine.Convert(ctx, ctx.Log(), pdfFormats, convertInputPath, convertOutputPath)
 		if err != nil {
+			if errors.Is(err, gotenberg.ErrMaximumQueueSizeExceeded) {
+				return api.WrapError(
+					fmt.Errorf("convert PDF: %w", err),
+					api.NewSentinelHttpError(
+						http.StatusTooManyRequests,
+						"The maximum queue size has been reached",
+					),
+				)
+			}
+
 			if errors.Is(err, gotenberg.ErrPdfFormatNotSupported) {
 				return api.WrapError(
 					fmt.Errorf("convert PDF: %w", err),
@@ -611,6 +611,16 @@ func handleChromiumError(err error, url string, options Options) error {
 		return nil
 	}
 
+	if errors.Is(err, gotenberg.ErrMaximumQueueSizeExceeded) {
+		return api.WrapError(
+			err,
+			api.NewSentinelHttpError(
+				http.StatusTooManyRequests,
+				"The maximum queue size has been reached",
+			),
+		)
+	}
+
 	if errors.Is(err, ErrUrlNotAuthorized) {
 		return api.WrapError(
 			err,

pkg/modules/chromium/routes_test.go

@@ -1230,6 +1230,18 @@ func TestConvertUrl(t *testing.T) {
 		expectHttpStatus       int
 		expectOutputPathsCount int
 	}{
+		{
+			scenario: "ErrMaximumQueueSizeExceeded",
+			ctx:      &api.ContextMock{Context: new(api.Context)},
+			api: &ApiMock{PdfMock: func(ctx context.Context, logger *zap.Logger, url, outputPath string, options PdfOptions) error {
+				return gotenberg.ErrMaximumQueueSizeExceeded
+			}},
+			options:                DefaultPdfOptions(),
+			expectError:            true,
+			expectHttpError:        true,
+			expectHttpStatus:       http.StatusTooManyRequests,
+			expectOutputPathsCount: 0,
+		},
 		{
 			scenario: "ErrUrlNotAuthorized",
 			ctx:      &api.ContextMock{Context: new(api.Context)},
@@ -1341,6 +1353,22 @@ func TestConvertUrl(t *testing.T) {
 			expectHttpError:        false,
 			expectOutputPathsCount: 0,
 		},
+		{
+			scenario: "ErrMaximumQueueSizeExceeded (PDF engine)",
+			ctx:      &api.ContextMock{Context: new(api.Context)},
+			api: &ApiMock{PdfMock: func(ctx context.Context, logger *zap.Logger, url, outputPath string, options PdfOptions) error {
+				return nil
+			}},
+			engine: &gotenberg.PdfEngineMock{ConvertMock: func(ctx context.Context, logger *zap.Logger, formats gotenberg.PdfFormats, inputPath, outputPath string) error {
+				return gotenberg.ErrMaximumQueueSizeExceeded
+			}},
+			pdfFormats:             gotenberg.PdfFormats{PdfA: "foo"},
+			options:                DefaultPdfOptions(),
+			expectError:            true,
+			expectHttpError:        true,
+			expectHttpStatus:       http.StatusTooManyRequests,
+			expectOutputPathsCount: 0,
+		},
 		{
 			scenario: "ErrPdfFormatNotSupported",
 			ctx:      &api.ContextMock{Context: new(api.Context)},
@@ -1462,6 +1490,18 @@ func TestScreenshotUrl(t *testing.T) {
 		expectHttpStatus       int
 		expectOutputPathsCount int
 	}{
+		{
+			scenario: "ErrMaximumQueueSizeExceeded",
+			ctx:      &api.ContextMock{Context: new(api.Context)},
+			api: &ApiMock{ScreenshotMock: func(ctx context.Context, logger *zap.Logger, url, outputPath string, options ScreenshotOptions) error {
+				return gotenberg.ErrMaximumQueueSizeExceeded
+			}},
+			options:                DefaultScreenshotOptions(),
+			expectError:            true,
+			expectHttpError:        true,
+			expectHttpStatus:       http.StatusTooManyRequests,
+			expectOutputPathsCount: 0,
+		},
 		{
 			scenario: "ErrUrlNotAuthorized",
 			ctx:      &api.ContextMock{Context: new(api.Context)},