sneak
fece3b69c9
check / check (push) Canceled after 0s
The new package internal/imagerequest holds the request type, its two parts Source and Transform, the Format and Fit types, the dimension and fit checks, the /v1/image/ path parsing and the variant key; it imports no other package of pixa. imgcache.ParsedURL, imgcache.ImageRequest, signature.Request, imageprocessor.Request, the second Size, format and fit types and the conversions between them are gone. The image processor takes a Transform only. encurl keeps a private struct with the token's CBOR field names, so tokens made before still decode. VariantKey moves with the function that makes it. Tests follow the moved and renamed code; the tests of the removed conversions go with them. Model: opus-5-5
74 lines
2.0 KiB
Go
74 lines
2.0 KiB
Go
package handlers
|
|
|
|
import (
|
|
"log/slog"
|
|
"net/http"
|
|
"testing"
|
|
|
|
"github.com/davidbyttow/govips/v2/vips"
|
|
|
|
"sneak.berlin/go/pixa/internal/imagerequest"
|
|
)
|
|
|
|
// jxlType is the content type of JPEG XL.
|
|
const jxlType = "image/jxl"
|
|
|
|
// TestFormatForAccept_JPEGXL verifies that the format auto chooses JPEG XL
|
|
// when Accept names image/jxl, ahead of AVIF whatever their q, and AVIF when
|
|
// Accept refuses JPEG XL with q=0.
|
|
func TestFormatForAccept_JPEGXL(t *testing.T) {
|
|
t.Parallel()
|
|
|
|
tests := []struct {
|
|
name string
|
|
accept string
|
|
want imagerequest.Format
|
|
}{
|
|
{"JPEG XL-capable browser",
|
|
"image/jxl,image/avif,image/webp,image/*,*/*;q=0.8", imagerequest.FormatJXL},
|
|
{"JPEG XL only", jxlType, imagerequest.FormatJXL},
|
|
{"JPEG XL with a lower q than AVIF", "image/avif,image/jxl;q=0.5",
|
|
imagerequest.FormatJXL},
|
|
{"q=0 on JPEG XL", "image/jxl;q=0,image/avif,*/*", imagerequest.FormatAVIF},
|
|
}
|
|
|
|
for _, tt := range tests {
|
|
t.Run(tt.name, func(t *testing.T) {
|
|
t.Parallel()
|
|
|
|
got, err := formatForAccept(tt.accept)
|
|
if got != tt.want || err != nil {
|
|
t.Errorf("formatForAccept(%q) = %q, %v, want %q",
|
|
tt.accept, got, err, tt.want)
|
|
}
|
|
})
|
|
}
|
|
}
|
|
|
|
// TestFormatAuto_JPEGXL requests an auto URL on each image route with an
|
|
// Accept header that names image/jxl, and checks that the answer is a JPEG XL
|
|
// image.
|
|
func TestFormatAuto_JPEGXL(t *testing.T) {
|
|
t.Parallel()
|
|
|
|
h, srv := newSignedHostServer(t, slog.New(slog.DiscardHandler))
|
|
signedURL, encryptedURL := autoPhotoURLs(t, h)
|
|
|
|
for _, target := range []string{signedURL, encryptedURL} {
|
|
rec := requestImage(t, srv, http.MethodGet, target,
|
|
"image/jxl,image/avif,image/webp,*/*;q=0.8")
|
|
gotType := rec.Header().Get("Content-Type")
|
|
|
|
if rec.Code != http.StatusOK || gotType != jxlType {
|
|
t.Errorf("%s: %d %s, want 200 %s; body %s",
|
|
target, rec.Code, gotType, jxlType, rec.Body)
|
|
|
|
continue
|
|
}
|
|
|
|
if got := vips.DetermineImageType(rec.Body.Bytes()); got != vips.ImageTypeJXL {
|
|
t.Errorf("%s: body is %s, want jxl", target, vips.ImageTypes[got])
|
|
}
|
|
}
|
|
}
|