deps: updates wazero to 1.0.0-pre.4 (#49)

This updates [wazero](https://wazero.io/) to [1.0.0-pre.4](https://github.com/tetratelabs/wazero/releases/tag/v1.0.0-pre.4).

Notably, v1.0.0-pre.4:
* improves module initialization speed
* supports listeners in the compiler engine
* supports WASI `fd_pread`, `fd_readdir` and `path_filestat_get`
* breaks GoModuleFunc API

Signed-off-by: Adrian Cole <[email protected]>

Author: codefromthecrypt

go.mod

@@ -2,4 +2,4 @@ module github.com/http-wasm/http-wasm-host-go
 
 go 1.18
 
-require github.com/tetratelabs/wazero v1.0.0-pre.3
+require github.com/tetratelabs/wazero v1.0.0-pre.4

go.sum

@@ -1,2 +1,2 @@
-github.com/tetratelabs/wazero v1.0.0-pre.3 h1:Z5fbogMUGcERzaQb9mQU8+yJSy0bVvv2ce3dfR4wcZg=
-github.com/tetratelabs/wazero v1.0.0-pre.3/go.mod h1:M8UDNECGm/HVjOfq0EOe4QfCY9Les1eq54IChMLETbc=
+github.com/tetratelabs/wazero v1.0.0-pre.4 h1:RBJQT5OzmORkSp6MmZDWoFEr0zXjk4pmvMKAdeUnsaI=
+github.com/tetratelabs/wazero v1.0.0-pre.4/go.mod h1:u8wrFmpdrykiFK0DFPiFm5a4+0RzsdmXYVtijBKqUVo=

handler/middleware.go

@@ -234,8 +234,8 @@ func (g *guest) handleResponse(ctx context.Context, reqCtx uint32, err error) er
 }
 
 // enableFeatures implements the WebAssembly host function handler.FuncEnableFeatures.
-func (m *middleware) enableFeatures(ctx context.Context, params []uint64) []uint64 {
-	features := handler.Features(params[0])
+func (m *middleware) enableFeatures(ctx context.Context, stack []uint64) {
+	features := handler.Features(stack[0])
 
 	var enabled handler.Features
 	if s, ok := ctx.Value(requestStateKey{}).(*requestState); ok {
@@ -246,35 +246,31 @@ func (m *middleware) enableFeatures(ctx context.Context, params []uint64) []uint
 		enabled = m.features
 	}
 
-	return []uint64{uint64(enabled)}
+	stack[0] = uint64(enabled)
 }
 
 // getConfig implements the WebAssembly host function handler.FuncGetConfig.
-func (m *middleware) getConfig(ctx context.Context, mod wazeroapi.Module, params []uint64) []uint64 {
-	buf := uint32(params[0])
-	bufLimit := handler.BufLimit(params[1])
+func (m *middleware) getConfig(ctx context.Context, mod wazeroapi.Module, stack []uint64) {
+	buf := uint32(stack[0])
+	bufLimit := handler.BufLimit(stack[1])
 
 	configLen := writeIfUnderLimit(ctx, mod, buf, bufLimit, m.guestConfig)
 
-	return []uint64{uint64(configLen)}
+	stack[0] = uint64(configLen)
 }
 
-var (
-	resultTrue  = []uint64{1}
-	resultFalse = []uint64{0}
-)
-
 // log implements the WebAssembly host function handler.FuncLogEnabled.
-func (m *middleware) logEnabled(_ context.Context, params []uint64) []uint64 {
-	level := api.LogLevel(params[0])
+func (m *middleware) logEnabled(_ context.Context, stack []uint64) {
+	level := api.LogLevel(stack[0])
 	if m.logger.IsEnabled(level) {
-		return resultTrue
+		stack[0] = 1 // true
+	} else {
+		stack[0] = 0 // false
 	}
-	return resultFalse
 }
 
 // log implements the WebAssembly host function handler.FuncLog.
-func (m *middleware) log(ctx context.Context, mod wazeroapi.Module, params []uint64) (_ []uint64) {
+func (m *middleware) log(ctx context.Context, mod wazeroapi.Module, params []uint64) {
 	level := api.LogLevel(params[0])
 	message := uint32(params[1])
 	messageLen := uint32(params[2])
@@ -287,22 +283,21 @@ func (m *middleware) log(ctx context.Context, mod wazeroapi.Module, params []uin
 		msg = mustReadString(ctx, mod.Memory(), "message", message, messageLen)
 	}
 	m.logger.Log(ctx, level, msg)
-	return
 }
 
 // getMethod implements the WebAssembly host function handler.FuncGetMethod.
-func (m *middleware) getMethod(ctx context.Context, mod wazeroapi.Module, params []uint64) []uint64 {
-	buf := uint32(params[0])
-	bufLimit := handler.BufLimit(params[1])
+func (m *middleware) getMethod(ctx context.Context, mod wazeroapi.Module, stack []uint64) {
+	buf := uint32(stack[0])
+	bufLimit := handler.BufLimit(stack[1])
 
 	method := m.host.GetMethod(ctx)
 	methodLen := writeStringIfUnderLimit(ctx, mod, buf, bufLimit, method)
 
-	return []uint64{uint64(methodLen)}
+	stack[0] = uint64(methodLen)
 }
 
 // getHeader implements the WebAssembly host function handler.FuncSetMethod.
-func (m *middleware) setMethod(ctx context.Context, mod wazeroapi.Module, params []uint64) (_ []uint64) {
+func (m *middleware) setMethod(ctx context.Context, mod wazeroapi.Module, params []uint64) {
 	method := uint32(params[0])
 	methodLen := uint32(params[1])
 
@@ -314,23 +309,21 @@ func (m *middleware) setMethod(ctx context.Context, mod wazeroapi.Module, params
 	}
 	p = mustReadString(ctx, mod.Memory(), "method", method, methodLen)
 	m.host.SetMethod(ctx, p)
-
-	return
 }
 
 // getURI implements the WebAssembly host function handler.FuncGetURI.
-func (m *middleware) getURI(ctx context.Context, mod wazeroapi.Module, params []uint64) []uint64 {
-	buf := uint32(params[0])
-	bufLimit := handler.BufLimit(params[1])
+func (m *middleware) getURI(ctx context.Context, mod wazeroapi.Module, stack []uint64) {
+	buf := uint32(stack[0])
+	bufLimit := handler.BufLimit(stack[1])
 
 	uri := m.host.GetURI(ctx)
 	uriLen := writeStringIfUnderLimit(ctx, mod, buf, bufLimit, uri)
 
-	return []uint64{uint64(uriLen)}
+	stack[0] = uint64(uriLen)
 }
 
 // setURI implements the WebAssembly host function handler.FuncSetURI.
-func (m *middleware) setURI(ctx context.Context, mod wazeroapi.Module, params []uint64) (_ []uint64) {
+func (m *middleware) setURI(ctx context.Context, mod wazeroapi.Module, params []uint64) {
 	uri := uint32(params[0])
 	uriLen := uint32(params[1])
 
@@ -339,31 +332,29 @@ func (m *middleware) setURI(ctx context.Context, mod wazeroapi.Module, params []
 		p = mustReadString(ctx, mod.Memory(), "uri", uri, uriLen)
 	}
 	m.host.SetURI(ctx, p)
-
-	return
 }
 
 // getProtocolVersion implements the WebAssembly host function
 // handler.FuncGetProtocolVersion.
-func (m *middleware) getProtocolVersion(ctx context.Context, mod wazeroapi.Module, params []uint64) []uint64 {
-	buf := uint32(params[0])
-	bufLimit := handler.BufLimit(params[1])
+func (m *middleware) getProtocolVersion(ctx context.Context, mod wazeroapi.Module, stack []uint64) {
+	buf := uint32(stack[0])
+	bufLimit := handler.BufLimit(stack[1])
 
 	protocolVersion := m.host.GetProtocolVersion(ctx)
 	if len(protocolVersion) == 0 {
 		panic("HTTP protocol version cannot be empty")
 	}
 	protocolVersionLen := writeStringIfUnderLimit(ctx, mod, buf, bufLimit, protocolVersion)
 
-	return []uint64{uint64(protocolVersionLen)}
+	stack[0] = uint64(protocolVersionLen)
 }
 
 // getHeaderNames implements the WebAssembly host function
 // handler.FuncGetHeaderNames.
-func (m *middleware) getHeaderNames(ctx context.Context, mod wazeroapi.Module, params []uint64) []uint64 {
-	kind := handler.HeaderKind(params[0])
-	buf := uint32(params[1])
-	bufLimit := handler.BufLimit(params[2])
+func (m *middleware) getHeaderNames(ctx context.Context, mod wazeroapi.Module, stack []uint64) {
+	kind := handler.HeaderKind(stack[0])
+	buf := uint32(stack[1])
+	bufLimit := handler.BufLimit(stack[2])
 
 	var names []string
 	switch kind {
@@ -380,17 +371,17 @@ func (m *middleware) getHeaderNames(ctx context.Context, mod wazeroapi.Module, p
 	}
 	countLen := writeNULTerminated(ctx, mod.Memory(), buf, bufLimit, names)
 
-	return []uint64{countLen}
+	stack[0] = countLen
 }
 
 // getHeaderValues implements the WebAssembly host function
 // handler.FuncGetHeaderValues.
-func (m *middleware) getHeaderValues(ctx context.Context, mod wazeroapi.Module, params []uint64) []uint64 {
-	kind := handler.HeaderKind(params[0])
-	name := uint32(params[1])
-	nameLen := uint32(params[2])
-	buf := uint32(params[3])
-	bufLimit := handler.BufLimit(params[4])
+func (m *middleware) getHeaderValues(ctx context.Context, mod wazeroapi.Module, stack []uint64) {
+	kind := handler.HeaderKind(stack[0])
+	name := uint32(stack[1])
+	nameLen := uint32(stack[2])
+	buf := uint32(stack[3])
+	bufLimit := handler.BufLimit(stack[4])
 
 	if nameLen == 0 {
 		panic("HTTP header name cannot be empty")
@@ -412,12 +403,12 @@ func (m *middleware) getHeaderValues(ctx context.Context, mod wazeroapi.Module,
 	}
 	countLen := writeNULTerminated(ctx, mod.Memory(), buf, bufLimit, values)
 
-	return []uint64{countLen}
+	stack[0] = countLen
 }
 
 // setHeaderValue implements the WebAssembly host function
 // handler.FuncSetHeaderValue.
-func (m *middleware) setHeaderValue(ctx context.Context, mod wazeroapi.Module, params []uint64) (_ []uint64) {
+func (m *middleware) setHeaderValue(ctx context.Context, mod wazeroapi.Module, params []uint64) {
 	kind := handler.HeaderKind(params[0])
 	name := uint32(params[1])
 	nameLen := uint32(params[2])
@@ -443,13 +434,11 @@ func (m *middleware) setHeaderValue(ctx context.Context, mod wazeroapi.Module, p
 	default:
 		panic("unsupported header kind: " + strconv.Itoa(int(kind)))
 	}
-
-	return
 }
 
 // addHeaderValue implements the WebAssembly host function
 // handler.FuncAddHeaderValue.
-func (m *middleware) addHeaderValue(ctx context.Context, mod wazeroapi.Module, params []uint64) (_ []uint64) {
+func (m *middleware) addHeaderValue(ctx context.Context, mod wazeroapi.Module, params []uint64) {
 	kind := handler.HeaderKind(params[0])
 	name := uint32(params[1])
 	nameLen := uint32(params[2])
@@ -475,13 +464,11 @@ func (m *middleware) addHeaderValue(ctx context.Context, mod wazeroapi.Module, p
 	default:
 		panic("unsupported header kind: " + strconv.Itoa(int(kind)))
 	}
-
-	return
 }
 
 // removeHeader implements the WebAssembly host function
 // handler.FuncRemoveHeader.
-func (m *middleware) removeHeader(ctx context.Context, mod wazeroapi.Module, params []uint64) (_ []uint64) {
+func (m *middleware) removeHeader(ctx context.Context, mod wazeroapi.Module, params []uint64) {
 	kind := handler.HeaderKind(params[0])
 	name := uint32(params[1])
 	nameLen := uint32(params[2])
@@ -504,15 +491,13 @@ func (m *middleware) removeHeader(ctx context.Context, mod wazeroapi.Module, par
 	default:
 		panic("unsupported header kind: " + strconv.Itoa(int(kind)))
 	}
-
-	return
 }
 
 // readBody implements the WebAssembly host function handler.FuncReadBody.
-func (m *middleware) readBody(ctx context.Context, mod wazeroapi.Module, params []uint64) []uint64 {
-	kind := handler.BodyKind(params[0])
-	buf := uint32(params[1])
-	bufLimit := handler.BufLimit(params[2])
+func (m *middleware) readBody(ctx context.Context, mod wazeroapi.Module, stack []uint64) {
+	kind := handler.BodyKind(stack[0])
+	buf := uint32(stack[1])
+	bufLimit := handler.BufLimit(stack[2])
 
 	var r io.ReadCloser
 	switch kind {
@@ -538,11 +523,11 @@ func (m *middleware) readBody(ctx context.Context, mod wazeroapi.Module, params
 
 	eofLen := readBody(ctx, mod, buf, bufLimit, r)
 
-	return []uint64{eofLen}
+	stack[0] = eofLen
 }
 
 // writeBody implements the WebAssembly host function handler.FuncWriteBody.
-func (m *middleware) writeBody(ctx context.Context, mod wazeroapi.Module, params []uint64) (_ []uint64) {
+func (m *middleware) writeBody(ctx context.Context, mod wazeroapi.Module, params []uint64) {
 	kind := handler.BodyKind(params[0])
 	buf := uint32(params[1])
 	bufLen := uint32(params[2])
@@ -570,8 +555,6 @@ func (m *middleware) writeBody(ctx context.Context, mod wazeroapi.Module, params
 	}
 
 	writeBody(ctx, mod, buf, bufLen, w)
-
-	return
 }
 
 func writeBody(ctx context.Context, mod wazeroapi.Module, buf, bufLen uint32, w io.Writer) {
@@ -587,24 +570,22 @@ func writeBody(ctx context.Context, mod wazeroapi.Module, buf, bufLen uint32, w
 
 // getStatusCode implements the WebAssembly host function
 // handler.FuncGetStatusCode.
-func (m *middleware) getStatusCode(ctx context.Context, _ []uint64) []uint64 {
+func (m *middleware) getStatusCode(ctx context.Context, results []uint64) {
 	_ = mustBeforeNextOrFeature(ctx, handler.FeatureBufferResponse, "get", "status code")
 
 	statusCode := m.host.GetStatusCode(ctx)
 
-	return []uint64{uint64(statusCode)}
+	results[0] = uint64(statusCode)
 }
 
 // setStatusCode implements the WebAssembly host function
 // handler.FuncSetStatusCode.
-func (m *middleware) setStatusCode(ctx context.Context, params []uint64) (_ []uint64) {
+func (m *middleware) setStatusCode(ctx context.Context, params []uint64) {
 	statusCode := uint32(params[0])
 
 	_ = mustBeforeNextOrFeature(ctx, handler.FeatureBufferResponse, "set", "status code")
 
 	m.host.SetStatusCode(ctx, statusCode)
-
-	return
 }
 
 func readBody(ctx context.Context, mod wazeroapi.Module, buf uint32, bufLimit handler.BufLimit, r io.Reader) (eofLen uint64) {