feat: speed up image retrival (at a cost of compile time)

Author: Preloading

go.mod

@@ -18,6 +18,7 @@ require (
 	github.com/go-viper/mapstructure/v2 v2.3.0 // indirect
 	github.com/gofiber/template v1.8.3 // indirect
 	github.com/gofiber/utils v1.1.0 // indirect
+	github.com/h2non/bimg v1.1.9 // indirect
 	github.com/jackc/pgpassfile v1.0.0 // indirect
 	github.com/jackc/pgservicefile v0.0.0-20240606120523-5a60cdf6a761 // indirect
 	github.com/jackc/pgx/v5 v5.7.5 // indirect

go.sum

@@ -36,6 +36,8 @@ 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/h2non/bimg v1.1.9 h1:WH20Nxko9l/HFm4kZCA3Phbgu2cbHvYzxwxn9YROEGg=
+github.com/h2non/bimg v1.1.9/go.mod h1:R3+UiYwkK4rQl6KVFTOFJHitgLbZXBZNFh2cv3AEbp8=
 github.com/jackc/pgpassfile v1.0.0 h1:/6Hmqy13Ss2zCq62VdNG8tM1wchn8zjSGOBJ6icpsIM=
 github.com/jackc/pgpassfile v1.0.0/go.mod h1:CEx0iS5ambNFdcRtxPj5JhEz+xB6uRky5eyVu/W2HEg=
 github.com/jackc/pgservicefile v0.0.0-20240606120523-5a60cdf6a761 h1:iCEnooe7UlwOQYpKFhBabPMi4aNAfoODPEFNiAnClxo=

twitterv1/cdnproxy.go

@@ -2,10 +2,7 @@ package twitterv1
 
 import (
 	"fmt"
-	"image"
-	"image/gif"
-	"image/jpeg"
-	"image/png"
+	"io"
 	"net/http"
 	"net/url"
 	"path/filepath"
@@ -14,9 +11,11 @@ import (
 
 	blueskyapi "github.com/Preloading/TwitterAPIBridge/bluesky"
 	"github.com/gofiber/fiber/v2"
-	"github.com/nfnt/resize"
+	"github.com/h2non/bimg"
 )
 
+var httpClient = &http.Client{}
+
 func CDNDownscaler(c *fiber.Ctx) error {
 	imageURL := c.Query("url")
 	widthStr := c.Query("width")
@@ -101,19 +100,34 @@ func CDNDownscaler(c *fiber.Ctx) error {
 		height = 0
 	}
 
-	resp, err := http.Get(imageURL)
+	resp, err := httpClient.Get(imageURL)
 	if err != nil {
 		return c.Status(fiber.StatusInternalServerError).SendString("Failed to fetch image")
 	}
 	defer resp.Body.Close()
 
-	img, format, err := image.Decode(resp.Body)
+	if resizeOption == "none" || (width == 0 && height == 0) {
+		c.Response().Header.Set("Cache-Control", "public, max-age=1209600")
+		c.Response().Header.Set("Content-Type", resp.Header.Get("Content-Type"))
+		imgBytes, err := io.ReadAll(resp.Body)
+		if err != nil {
+			return c.Status(fiber.StatusInternalServerError).SendString("Failed to recieve image")
+		}
+		return c.Send(imgBytes)
+	}
+
+	imgBytes, err := io.ReadAll(resp.Body)
 	if err != nil {
-		return c.Status(fiber.StatusInternalServerError).SendString("Failed to decode image")
+		return c.Status(fiber.StatusInternalServerError).SendString("Failed to recieve image")
+	}
+
+	imgMetadata, err := bimg.Metadata(imgBytes)
+	if err != nil {
+		return c.Status(fiber.StatusInternalServerError).SendString("bad img")
 	}
 
 	if maintainAspect {
-		w, h := img.Bounds().Dx(), img.Bounds().Dy()
+		w, h := imgMetadata.Size.Width, imgMetadata.Size.Height
 		if w > h {
 			w = width
 			h = int(float64(width) * float64(h) / float64(w))
@@ -125,36 +139,44 @@ func CDNDownscaler(c *fiber.Ctx) error {
 		height = h
 	}
 
+	o := bimg.Options{}
+
 	if width > 0 || height > 0 {
 		switch resizeOption {
 		case "fit":
-			img = resize.Resize(uint(width), uint(height), img, resize.Lanczos3)
+			o = bimg.Options{
+				Height: height,
+				Width:  width,
+			}
 		case "crop":
-			img = resize.Thumbnail(uint(width), uint(height), img, resize.Lanczos3)
+			o = bimg.Options{
+				Height: height,
+				Width:  width,
+				Crop:   true,
+			}
 		case "none":
+			c.Set("Content-Type", "image/"+imgMetadata.Type)
+
+			c.Response().Header.Set("Cache-Control", "public, max-age=1209600")
+			return c.Send(imgBytes)
 			// Do nothing
 		default:
-			img = resize.Resize(uint(width), uint(height), img, resize.Lanczos3)
+			o = bimg.Options{
+				Height: height,
+				Width:  width,
+			}
 		}
 	}
 
-	c.Set("Content-Type", "image/"+format)
-	switch format {
-	case "jpeg":
-		err = jpeg.Encode(c.Response().BodyWriter(), img, nil)
-	case "png":
-		err = png.Encode(c.Response().BodyWriter(), img)
-	case "gif":
-		err = gif.Encode(c.Response().BodyWriter(), img, nil)
-	default:
-		return c.Status(fiber.StatusInternalServerError).SendString("Unsupported image format")
-	}
-
+	imgScaled, err := bimg.Resize(imgBytes, o)
 	if err != nil {
 		return c.Status(fiber.StatusInternalServerError).SendString("Failed to encode image")
 	}
+
+	c.Set("Content-Type", "image/"+imgMetadata.Type)
+
 	c.Response().Header.Set("Cache-Control", "public, max-age=1209600")
-	return nil
+	return c.Send(imgScaled)
 }
 
 func UserProfileImage(c *fiber.Ctx) error {