Merge pull request #231 from BennyFranciscus/fix/echo-compression-middleware

fix(echo): use built-in compression middleware instead of manual gzip/deflate

Author: MDA2AV

frameworks/echo/go.mod

@@ -27,6 +27,7 @@ require (
 	golang.org/x/sync v0.19.0 // indirect
 	golang.org/x/sys v0.39.0 // indirect
 	golang.org/x/text v0.32.0 // indirect
+	golang.org/x/time v0.14.0 // indirect
 	modernc.org/libc v1.67.6 // indirect
 	modernc.org/mathutil v1.7.1 // indirect
 	modernc.org/memory v1.11.0 // indirect

frameworks/echo/go.sum

@@ -55,6 +55,8 @@ golang.org/x/sys v0.39.0 h1:CvCKL8MeisomCi6qNZ+wbb0DN9E5AATixKsvNtMoMFk=
 golang.org/x/sys v0.39.0/go.mod h1:OgkHotnGiDImocRcuBABYBEXf8A9a87e/uXjp9XT3ks=
 golang.org/x/text v0.32.0 h1:ZD01bjUt1FQ9WJ0ClOL5vxgxOI/sVCNgX1YtKwcY0mU=
 golang.org/x/text v0.32.0/go.mod h1:o/rUWzghvpD5TXrTIBuJU77MTaN0ljMWE47kxGJQ7jY=
+golang.org/x/time v0.14.0 h1:MRx4UaLrDotUKUdCIqzPC48t1Y9hANFKIRpNx+Te8PI=
+golang.org/x/time v0.14.0/go.mod h1:eL/Oa2bBBK0TkX57Fyni+NgnyQQN4LitPmob2Hjnqw4=
 golang.org/x/tools v0.39.0 h1:ik4ho21kwuQln40uelmciQPp9SipgNDdrafrYA4TmQQ=
 golang.org/x/tools v0.39.0/go.mod h1:JnefbkDPyD8UU2kI5fuf8ZX4/yUeh9W877ZeBONxUqQ=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=

frameworks/echo/main.go

@@ -1,8 +1,6 @@
 package main
 
 import (
-	"compress/flate"
-	"compress/gzip"
 	"context"
 	"database/sql"
 	"encoding/json"
@@ -18,6 +16,7 @@ import (
 
 	"github.com/jackc/pgx/v5/pgxpool"
 	"github.com/labstack/echo/v4"
+	"github.com/labstack/echo/v4/middleware"
 	_ "modernc.org/sqlite"
 )
 
@@ -172,6 +171,10 @@ func main() {
 	e.HideBanner = true
 	e.HidePort = true
 
+	gzipMiddleware := middleware.GzipWithConfig(middleware.GzipConfig{
+		Level: 1,
+	})
+
 	e.GET("/pipeline", func(c echo.Context) error {
 		c.Response().Header().Set("Server", "echo")
 		return c.String(http.StatusOK, "ok")
@@ -214,30 +217,8 @@ func main() {
 
 	e.GET("/compression", func(c echo.Context) error {
 		c.Response().Header().Set("Server", "echo")
-		ae := c.Request().Header.Get("Accept-Encoding")
-		if strings.Contains(ae, "deflate") {
-			c.Response().Header().Set("Content-Type", "application/json")
-			c.Response().Header().Set("Content-Encoding", "deflate")
-			c.Response().WriteHeader(http.StatusOK)
-			w, err := flate.NewWriter(c.Response(), flate.BestSpeed)
-			if err == nil {
-				w.Write(jsonLargeResponse)
-				w.Close()
-			}
-			return nil
-		} else if strings.Contains(ae, "gzip") {
-			c.Response().Header().Set("Content-Type", "application/json")
-			c.Response().Header().Set("Content-Encoding", "gzip")
-			c.Response().WriteHeader(http.StatusOK)
-			w, err := gzip.NewWriterLevel(c.Response(), gzip.BestSpeed)
-			if err == nil {
-				w.Write(jsonLargeResponse)
-				w.Close()
-			}
-			return nil
-		}
 		return c.Blob(http.StatusOK, "application/json", jsonLargeResponse)
-	})
+	}, gzipMiddleware)
 
 	e.POST("/upload", func(c echo.Context) error {
 		size, _ := io.Copy(io.Discard, c.Request().Body)