fix: LibreOffice newer versions stability (#697)

pkg/modules/webhook/client.go

@@ -62,7 +62,6 @@ func (c client) send(body io.Reader, headers map[string]string, erroed bool) err
 		// least it works.
 
 		bodySize, err := strconv.ParseInt(contentLength, 10, 64)
-
 		if err != nil {
 			return fmt.Errorf("parse content length entry: %w", err)
 		}

pkg/modules/webhook/middleware.go

@@ -14,9 +14,10 @@ import (
 	"strings"
 	"time"
 
-	"github.com/gotenberg/gotenberg/v7/pkg/modules/api"
 	"github.com/hashicorp/go-retryablehttp"
 	"github.com/labstack/echo/v4"
+
+	"github.com/gotenberg/gotenberg/v7/pkg/modules/api"
 )
 
 func webhookMiddleware(w Webhook) api.Middleware {
@@ -196,7 +197,6 @@ func webhookMiddleware(w Webhook) api.Middleware {
 
 						// Call the next middleware in the chain.
 						err := next(c)
-
 						if err != nil {
 							// The process failed for whatever reason. Let's send the
 							// details to the webhook.

pkg/modules/webhook/middleware_test.go

@@ -16,9 +16,10 @@ import (
 	"testing"
 	"time"
 
-	"github.com/gotenberg/gotenberg/v7/pkg/modules/api"
 	"github.com/labstack/echo/v4"
 	"go.uber.org/zap"
+
+	"github.com/gotenberg/gotenberg/v7/pkg/modules/api"
 )
 
 func TestWebhookMiddlewareGuards(t *testing.T) {
@@ -558,5 +559,4 @@ func TestWebhookMiddlewareAsynchronousProcess(t *testing.T) {
 			}
 		}()
 	}
-
 }

pkg/modules/webhook/webhook.go

@@ -5,10 +5,11 @@ import (
 	"regexp"
 	"time"
 
-	"github.com/gotenberg/gotenberg/v7/pkg/gotenberg"
-	"github.com/gotenberg/gotenberg/v7/pkg/modules/api"
 	flag "github.com/spf13/pflag"
 	"go.uber.org/multierr"
+
+	"github.com/gotenberg/gotenberg/v7/pkg/gotenberg"
+	"github.com/gotenberg/gotenberg/v7/pkg/modules/api"
 )
 
 func init() {
@@ -103,27 +104,9 @@ func (w Webhook) Middlewares() ([]api.Middleware, error) {
 	}, nil
 }
 
-// AddGraceDuration increases the grace duration provided by the API for the
-// garbage collector.
-func (w Webhook) AddGraceDuration() time.Duration {
-	var duration time.Duration
-
-	if w.disable {
-		return duration
-	}
-
-	for i := 0; i < w.maxRetry; i++ {
-		// Yep... Golang does not allow int * time.Duration.
-		duration += w.retryMaxWait
-	}
-
-	return duration
-}
-
 // Interface guards.
 var (
-	_ gotenberg.Module                             = (*Webhook)(nil)
-	_ gotenberg.Provisioner                        = (*Webhook)(nil)
-	_ api.MiddlewareProvider                       = (*Webhook)(nil)
-	_ api.GarbageCollectorGraceDurationIncrementer = (*Webhook)(nil)
+	_ gotenberg.Module       = (*Webhook)(nil)
+	_ gotenberg.Provisioner  = (*Webhook)(nil)
+	_ api.MiddlewareProvider = (*Webhook)(nil)
 )

pkg/modules/webhook/webhook_test.go

@@ -3,7 +3,6 @@ package webhook
 import (
 	"reflect"
 	"testing"
-	"time"
 
 	"github.com/gotenberg/gotenberg/v7/pkg/gotenberg"
 )
@@ -59,31 +58,3 @@ func TestWebhook_Middlewares(t *testing.T) {
 		}
 	}
 }
-
-func TestWebhook_AddGraceDuration(t *testing.T) {
-	for i, tc := range []struct {
-		maxRetry       int
-		retryMaxWait   time.Duration
-		expectDuration time.Duration
-		disable        bool
-	}{
-		{
-			maxRetry:       3,
-			retryMaxWait:   time.Duration(1) * time.Second,
-			expectDuration: time.Duration(3) * time.Second,
-		},
-		{
-			disable: true,
-		},
-	} {
-		mod := new(Webhook)
-		mod.maxRetry = tc.maxRetry
-		mod.retryMaxWait = tc.retryMaxWait
-		mod.disable = tc.disable
-
-		actual := mod.AddGraceDuration()
-		if actual != tc.expectDuration {
-			t.Errorf("test %d: expected '%s' but got '%s'", i, tc.expectDuration, actual)
-		}
-	}
-}