Decode

Author: bep

common/hugo/hugo.go

@@ -310,13 +310,12 @@ func GetDependencyList() []string {
 
 // GetDependencyListNonGo returns a list of non-Go dependencies.
 func GetDependencyListNonGo() []string {
-	var deps []string
+	deps := []string{formatDep("github.com/webmproject/libwebp", "v1.6.0")} // via WASM.}
 
 	if IsExtended {
 		deps = append(
 			deps,
 			formatDep("github.com/sass/libsass", "3.6.6"),
-			formatDep("github.com/webmproject/libwebp", "v1.3.2"),
 		)
 	}
 

go.mod

@@ -24,7 +24,6 @@ require (
 	github.com/bep/simplecobra v0.6.1
 	github.com/bep/textandbinaryreader v0.0.0-20251206192711-c7bc3fa7f114
 	github.com/bep/tmc v0.5.1
-	github.com/bep/webptemp v0.0.0-20251203095454-9ec7e7749338
 	github.com/bits-and-blooms/bitset v1.24.4
 	github.com/cespare/xxhash/v2 v2.3.0
 	github.com/clbanning/mxj/v2 v2.7.0
@@ -127,6 +126,7 @@ require (
 	github.com/aws/aws-sdk-go-v2/service/sts v1.34.0 // indirect
 	github.com/aws/smithy-go v1.24.0 // indirect
 	github.com/aymerick/douceur v0.2.0 // indirect
+	github.com/bep/webptemp v0.0.0-20251203095454-9ec7e7749338 // indirect
 	github.com/clipperhouse/displaywidth v0.6.0 // indirect
 	github.com/clipperhouse/stringish v0.1.1 // indirect
 	github.com/clipperhouse/uax29/v2 v2.3.0 // indirect
@@ -200,8 +200,6 @@ require (
 
 go 1.24.0
 
-replace github.com/bep/webptemp => /Users/bep/dev/go/bep/webptemp
-
 replace github.com/bep/gowebpw => /Users/bep/dev/go/bep/gowebpw
 
 replace github.com/bep/textandbinaryreader => /Users/bep/dev/go/bep/textandbinaryreader

go.sum

@@ -178,6 +178,8 @@ github.com/bep/simplecobra v0.6.1 h1:ORBAC5CSar99/NPZ5fCthCx/uvlm7ry58wwDsZ23a20
 github.com/bep/simplecobra v0.6.1/go.mod h1:hmtjyHv6xwD637ScIRP++0NKkR5szrHuMw5BxMUH66s=
 github.com/bep/tmc v0.5.1 h1:CsQnSC6MsomH64gw0cT5f+EwQDcvZz4AazKunFwTpuI=
 github.com/bep/tmc v0.5.1/go.mod h1:tGYHN8fS85aJPhDLgXETVKp+PR382OvFi2+q2GkGsq0=
+github.com/bep/webptemp v0.0.0-20251203095454-9ec7e7749338 h1:cFaJIvnMaH0LcwfrxMD96tFUdhVo6tqA/q27xmxVTSc=
+github.com/bep/webptemp v0.0.0-20251203095454-9ec7e7749338/go.mod h1:GYVQBekB+ttPTrAWlNum7pJwhLpTbOYl42n/9uFU+/s=
 github.com/bep/workers v1.0.0 h1:U+H8YmEaBCEaFZBst7GcRVEoqeRC9dzH2dWOwGmOchg=
 github.com/bep/workers v1.0.0/go.mod h1:7kIESOB86HfR2379pwoMWNy8B50D7r99fRLUyPSNyCs=
 github.com/bits-and-blooms/bitset v1.24.4 h1:95H15Og1clikBrKr/DuzMXkQzECs1M6hhoGXLwLQOZE=

internal/warpc/warpc.go

@@ -198,10 +198,11 @@ func (p *dispatcherPool[Q, R]) Execute(ctx context.Context, q Message[Q]) (Messa
 }
 
 func (d *dispatcher[Q, R]) newCall(q Message[Q]) (*call[Q, R], error) {
-	responseCountdown := 1 // Default is JSON response only.
+	responseCountdown := &atomic.Int32{}
+	responseCountdown.Add(1) // Default is JSON response only.
 	if _, ok := any(d.zeroQ.Data).(DestinationProvider); ok {
 		// Expecting JSON followed by binary blob.
-		responseCountdown++
+		responseCountdown.Add(1)
 	}
 	call := &call[Q, R]{
 		donec:             make(chan *call[Q, R], 1),
@@ -262,14 +263,15 @@ func (d *dispatcher[Q, R]) inputBlobs() {
 			inputErr = err
 			break
 		}
-		hdebug.Printf("=== === === Read blob header %d %d", id, length)
+
 		lr := &io.LimitedReader{
 			R: d.inOut.stdoutBinary,
 			N: int64(length),
 		}
 
 		call := d.pendingCall(id)
-		call.responseCountdown--
+
+		hdebug.Printf("START === === === Read blob header id: %d len: %d countdown: %d", id, length, call.responseCountdown.Load())
 
 		if err := call.handleBlob(lr); err != nil {
 			inputErr = err
@@ -279,12 +281,14 @@ func (d *dispatcher[Q, R]) inputBlobs() {
 			inputErr = fmt.Errorf("blob %d: expected to read %d more bytes", id, lr.N)
 			break
 		}
-		if call.responseCountdown <= 0 {
+		call.responseCountdown.Add(-1)
+		if call.responseCountdown.Load() <= 0 {
 			d.mu.Lock()
 			delete(d.pending, id)
 			d.mu.Unlock()
 			call.done()
 		}
+		hdebug.Printf("END === === === Read blob header id: %d len: %d countdown: %d", id, length, call.responseCountdown.Load())
 	}
 
 	if inputErr != nil && inputErr != io.EOF && inputErr != io.ErrClosedPipe {
@@ -304,17 +308,17 @@ func (d *dispatcher[Q, R]) inputJSON() {
 
 		call := d.pendingCall(r.GetID())
 
-		call.responseCountdown--
-		if call.responseCountdown < 0 {
-			call.err = fmt.Errorf("protocol error: JSON response must be sent first.")
-		}
+		hdebug.Printf("END === === === get JSON id: %d  countdown: %d", r.GetID(), call.responseCountdown.Load())
+
+		call.responseCountdown.Add(-1)
 		call.response = r
-		if call.responseCountdown == 0 {
+		if call.responseCountdown.Load() <= 0 || r.Header.Err != "" {
 			d.mu.Lock()
 			delete(d.pending, r.GetID())
 			d.mu.Unlock()
-			call.done()
+			call.done() // TODO1 check that this can be called multiple times safely.
 		}
+		hdebug.Printf("END === === === get JSON id: %d  countdown: %d", r.GetID(), call.responseCountdown.Load())
 
 	}
 
@@ -352,13 +356,12 @@ func (d *dispatcher[Q, R]) pendingCall(id uint32) *call[Q, R] {
 type call[Q, R any] struct {
 	request           Message[Q]
 	response          Message[R]
-	responseCountdown int
+	responseCountdown *atomic.Int32
 	err               error
 	donec             chan *call[Q, R]
 }
 
 func (c *call[Q, R]) handleBlob(r io.Reader) error {
-	hdebug.Printf("call ====> handleBlob")
 	dest := any(c.request.Data).(DestinationProvider).GetDestination()
 	if dest == nil {
 		panic("blob destination is not set")
@@ -522,29 +525,29 @@ func newDispatcher[Q, R any](opts Options) (*dispatcherPool[Q, R], error) {
 
 	inOuts := make([]*inOut, opts.PoolSize)
 	for i := range opts.PoolSize {
-		var stdin, stdoutBinary hugio.ReadWriteCloser
+		var stdinPipe, stdoutBinary hugio.ReadWriteCloser
 		var stdout io.WriteCloser
 		var jsonr io.Reader
 
-		stdin = hugio.NewPipeReadWriteCloser()
-		stdoutRwc := hugio.NewPipeReadWriteCloser()
-		stdout = stdoutRwc
+		stdinPipe = hugio.NewPipeReadWriteCloser()
+		stdoutPipe := hugio.NewPipeReadWriteCloser()
+		stdout = stdoutPipe
 
 		var zero Q
 		if _, ok := any(zero).(DestinationProvider); ok {
 			stdoutBinary = hugio.NewPipeReadWriteCloser()
-			jsonr = stdoutRwc
+			jsonr = stdoutPipe
 			stdout = textandbinaryreader.NewWriter(stdout, stdoutBinary)
 		} else {
-			jsonr = stdoutRwc
+			jsonr = stdoutPipe
 		}
 
 		inOuts[i] = &inOut{
-			stdin:        stdin,
+			stdin:        stdinPipe,
 			stdout:       stdout,
 			stdoutBinary: stdoutBinary,
 			dec:          json.NewDecoder(jsonr),
-			enc:          json.NewEncoder(stdin),
+			enc:          json.NewEncoder(stdinPipe),
 		}
 	}
 
@@ -748,8 +751,13 @@ func AllDispatchers(opts Options) *Dispatchers {
 	_, err = data.ReadFrom(r)
 	webOpts.Main = Binary{Name: "webp", Data: data.Bytes()}
 
-	return &Dispatchers{
+	dispatchers := &Dispatchers{
 		katex: &lazyDispatcher[KatexInput, KatexOutput]{opts: katexOpts},
 		webp:  &lazyDispatcher[WebpInput, WebpOutput]{opts: webOpts},
 	}
+
+	// TODO1 better way to do this?
+	// image.RegisterFormat("webp", "RIFF????WEBPVP8", dispatchers.DecodeWebp, dispatchers.DecodeWebpConfig)
+
+	return dispatchers
 }

internal/warpc/webp.go

@@ -16,6 +16,7 @@ package warpc
 import (
 	"bytes"
 	"context"
+	"fmt"
 	"image"
 	"io"
 	"time"
@@ -30,13 +31,18 @@ var (
 	_ DestinationProvider = WebpInput{}
 )
 
+type CommonImageProcessingOptions struct {
+	Width  int `json:"width,omitempty"`
+	Height int `json:"height,omitempty"`
+	Stride int `json:"stride,omitempty"`
+}
+
 type WebpInput struct {
-	Source       io.Reader `json:"-"` // Will be sent in a separate stream.
-	SourceLength uint32    `json:"-"`
-	Destination  io.Writer `json:"-"` // Will be used to write the result to.
-	Width        int       `json:"width"`
-	Height       int       `json:"height"`
-	Stride       int       `json:"stride"`
+	Source       io.Reader      `json:"-"` // Will be sent in a separate stream.
+	SourceLength uint32         `json:"-"`
+	Destination  io.Writer      `json:"-"` // Will be used to write the result to.
+	Options      map[string]any `json:"options"`
+
 	// TODO1 config options.
 }
 
@@ -52,23 +58,85 @@ func (w WebpInput) GetDestination() io.Writer {
 	return w.Destination
 }
 
-type WebpOutput struct{}
+type WebpOutput struct {
+	Options CommonImageProcessingOptions
+}
 
 func (d *Dispatchers) stopClock(what string, start time.Time) {
 	hdebug.Printf("%s took %s", what, time.Since(start))
 }
 
+// Decode reads a WEBP image from r and returns it as an image.Image.
+func (d *Dispatchers) DecodeWebp(r io.Reader) (image.Image, error) {
+	var enabled bool
+	if !enabled {
+		return webp.Decode(r)
+	}
+	dd, err := d.Webp()
+	if err != nil {
+		return nil, err
+	}
+	b, err := io.ReadAll(r) // TODO1: stream
+	if err != nil {
+		return nil, err
+	}
+
+	var imageBytesBuf bytes.Buffer
+
+	// Commands:
+	// encodeNRGBA
+	// encodeGray
+	// decode
+	// config
+	message := Message[WebpInput]{
+		Header: Header{
+			Version: 1,
+			ID:      d.id.Add(1),
+			Command: "decode",
+		},
+
+		Data: WebpInput{
+			Source:       bytes.NewReader(b),
+			SourceLength: uint32(len(b)),
+			Destination:  &imageBytesBuf,
+			Options:      map[string]any{
+				// TODO1
+			},
+		},
+	}
+
+	out, err := dd.Execute(context.Background(), message)
+	if err != nil {
+		return nil, err
+	}
+	hdebug.Printf("GOT %d/%d %d stride: %d", out.Data.Options.Width, out.Data.Options.Height, len(imageBytesBuf.Bytes()), out.Data.Options.Stride)
+
+	img := &image.RGBA{
+		Pix:    imageBytesBuf.Bytes(),
+		Stride: out.Data.Options.Stride,
+		Rect:   image.Rect(0, 0, out.Data.Options.Width, out.Data.Options.Height),
+	}
+
+	offset := img.PixOffset(100, 100)
+	hdebug.Printf("Offset 100/100: %d", offset)
+	if offset+4 > len(img.Pix) {
+		return nil, fmt.Errorf("error")
+	}
+
+	return img, nil
+}
+
+func (d *Dispatchers) DecodeWebpConfig(r io.Reader) (image.Config, error) {
+	panic("DecodeWebpConfig: not implemented")
+}
+
 func (d *Dispatchers) EncodeWebp(w io.Writer, src image.Image) error {
+	hdebug.Printf("EncodeWebp %T", src)
 	d.Webp() // TODO1 remove. Just to get the timer below comparable.
 	start := time.Now()
 	defer d.stopClock("EncodeWebp", start)
 	if false {
-		return webp.Encode(w, src)
-	}
-	// 2.8 vs 3.4 ms... hmm...
-	// TODO1 all of this is just temporary.
-	if d == nil {
-		panic("warpc Dispatchers is nil")
+		// return webp.Encode(w, src)
 	}
 
 	dd, err := d.Webp()
@@ -96,6 +164,8 @@ func (d *Dispatchers) EncodeWebp(w io.Writer, src image.Image) error {
 	// Commands:
 	// encodeNRGBA
 	// encodeGray
+	// decode
+	// config
 	message := Message[WebpInput]{
 		Header: Header{
 			Version: 1,
@@ -107,16 +177,17 @@ func (d *Dispatchers) EncodeWebp(w io.Writer, src image.Image) error {
 			Source:       bytes.NewReader(imageBytes),
 			SourceLength: uint32(len(imageBytes)),
 			Destination:  ww,
-			Width:        bounds.Max.X,
-			Height:       bounds.Max.Y,
-			Stride:       stride,
+			Options: map[string]any{
+				"width":  bounds.Max.X,
+				"height": bounds.Max.Y,
+				"stride": stride,
+			},
 		},
 	}
 
 	_, err = dd.Execute(context.Background(), message)
 	if err != nil {
 		return err
 	}
-	hdebug.Printf("== == == ==DONE! == == == ==")
 	return nil
 }

resources/image.go

@@ -40,9 +40,6 @@ import (
 	"github.com/gohugoio/hugo/resources/resource"
 
 	"github.com/gohugoio/hugo/resources/images"
-
-	// Blind import for image.Decode
-	_ "github.com/bep/webptemp"
 )
 
 var (

resources/image_extended_test.go

@@ -25,9 +25,9 @@ func TestImageResizeWebP(t *testing.T) {
 sourcefilename: testdata/sunrise.webp
 -- layouts/home.html --
 {{ $image := resources.Get "sunrise.webp" }}
-{{ $resized := $image.Resize "123x" }}
+{{ $resized := $image.Resize "123x456" }}
 Original Width/Height: {{ $image.Width }}/{{ $image.Height }}|
-Resized Width: {{ $resized.Width }}|
+Resized Width:/Height {{ $resized.Width }}/{{ $resized.Height }}|
 Resized RelPermalink: {{ $resized.RelPermalink }}|
 `
 
@@ -37,7 +37,7 @@ Resized RelPermalink: {{ $resized.RelPermalink }}|
 
 	b.AssertFileContent("public/index.html",
 		"Original Width/Height: 1024/640|",
-		"Resized Width: 123|",
-		"Resized RelPermalink: /sunrise_hu_94448e81dce95acf.webp|",
+		"Resized Width:/Height 123/456|",
+		"Resized RelPermalink: /sunrise_hu_6095509b5348ba46.webp|",
 	)
 }

tpl/images/images.go

@@ -34,9 +34,6 @@ import (
 	_ "image/jpeg"
 	_ "image/png"
 
-	// Import webp codec
-	_ "github.com/bep/webptemp"
-
 	"github.com/gohugoio/hugo/deps"
 	"github.com/spf13/afero"
 	"github.com/spf13/cast"