Better Export params and UA handle

webp-sh · Mar 17, 2024 · 1ba0c8f · 1ba0c8f
1 parent f9485a2
commit 1ba0c8f
Show file tree

Hide file tree

Showing 5 changed files with 28 additions and 14 deletions.
diff --git a/encoder/encoder.go b/encoder/encoder.go
@@ -153,14 +153,18 @@ func jxlEncoder(img *vips.ImageRef, rawPath string, optimizedPath string) error
 	// If quality >= 100, we use lossless mode
 	if quality >= 100 {
 		buf, _, err = img.ExportJxl(&vips.JxlExportParams{
-			Effort:   2,
+			Effort:   1,
+			Tier:     4,
 			Lossless: true,
+			Distance: 1.0,
 		})
 	} else {
 		buf, _, err = img.ExportJxl(&vips.JxlExportParams{
-			Effort:   2,
+			Effort:   1,
+			Tier:     4,
 			Quality:  quality,
 			Lossless: false,
+			Distance: 1.0,
 		})
 	}
 

diff --git a/handler/router.go b/handler/router.go
@@ -1,6 +1,7 @@
 package handler
 
 import (
+	"fmt"
 	"net/http"
 	"net/url"
 	"regexp"
@@ -137,6 +138,7 @@ func Convert(c *fiber.Ctx) error {
 	}
 
 	supportedFormats := helper.GuessSupportedFormat(reqHeader)
+	fmt.Println("Supported formats:", supportedFormats)
 	// resize itself and return if only one format(raw) is supported
 	if len(supportedFormats) == 1 {
 		dest := path.Join(config.Config.ExhaustPath, targetHostName, metadata.Id)

diff --git a/handler/router_test.go b/handler/router_test.go
@@ -18,14 +18,14 @@ import (
 )
 
 var (
-	chromeUA = "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/86.0.4240.183 Safari/537.36"
-	safariUA = "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_4) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/13.1 Safari/605.1.15"
-	curlUA   = "curl/7.64.1"
+	chromeUA   = "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/86.0.4240.183 Safari/537.36"
+	safariUA   = "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_4) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/13.1 Safari/605.1.15"
+	safari17UA = "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/17.3.1 Safari/605.1.15" // <- Mac with Safari 17
+	curlUA     = "curl/7.64.1"
 
 	acceptWebP   = "image/webp,image/apng,image/*,*/*;q=0.8"
 	acceptAvif   = "image/avif,image/*,*/*;q=0.8"
 	acceptLegacy = "image/jpeg,image/png"
-	acceptJxl    = "image/jxl"
 )
 
 func setupParam() {

diff --git a/helper/helper.go b/helper/helper.go
@@ -140,9 +140,6 @@ func GuessSupportedFormat(header *fasthttp.RequestHeader) []string {
 	if strings.Contains(accept, "image/avif") {
 		supported["avif"] = true
 	}
-	if strings.Contains(accept, "image/jxl") {
-		supported["jxl"] = true
-	}
 
 	supportedWebPs := []string{"iPhone OS 14", "CPU OS 14", "iPhone OS 15", "CPU OS 15", "iPhone OS 16", "CPU OS 16", "iPhone OS 17", "CPU OS 17"}
 	for _, version := range supportedWebPs {
@@ -160,11 +157,16 @@ func GuessSupportedFormat(header *fasthttp.RequestHeader) []string {
 		}
 	}
 
-	supportedJXLs := []string{"iPhone OS 17", "CPU OS 17"}
-	for _, version := range supportedJXLs {
-		if strings.Contains(ua, version) {
-			supported["jxl"] = true
-			break
+	// Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/17.4 Safari/605.1.15 <- iPad
+	// Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/17.3.1 Safari/605.1.15 <- Mac
+	// Mozilla/5.0 (iPhone; CPU iPhone OS 17_4 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/17.4 Mobile/15E148 Safari/604.1 <- iPhone @ Safari
+	supportedJXLs := []string{"iPhone OS 17", "CPU OS 17", "Version/17"}
+	if strings.Contains(ua, "iPhone") || strings.Contains(ua, "Macintosh") {
+		for _, version := range supportedJXLs {
+			if strings.Contains(ua, version) {
+				supported["jxl"] = true
+				break
+			}
 		}
 	}
 

diff --git a/helper/helper_test.go b/helper/helper_test.go
@@ -55,6 +55,12 @@ func TestGuessSupportedFormat(t *testing.T) {
 		accept    string
 		expected  []string
 	}{
+		{
+			name:      "WebP/AVIF/JXL Supported",
+			userAgent: "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/17.4 Safari/605.1.15", // iPad
+			accept:    "image/webp, image/avif",
+			expected:  []string{"raw", "webp", "avif", "jxl"},
+		},
 		{
 			name:      "WebP/AVIF Supported",
 			userAgent: "iPhone OS 16",