deps: updates wazero to 1.0.2

README.md

@@ -180,7 +180,7 @@ The following shows the techniqual details:
 |---|---|---|---|
 |wasmtime|:heavy_check_mark:|:heavy_check_mark:||
 |wamr(wasm-micro-runtime)|:heavy_check_mark:|:heavy_check_mark:||
-|wazero|:construction: (stdin unsupported)|:heavy_check_mark:|non-blocking stdin doesn't seem to work|
+|wazero|:heavy_check_mark:|:heavy_check_mark:||
 |wasmer|:construction: (stdin unsupported)|:heavy_check_mark:|non-blocking stdin doesn't seem to work|
 |wasmedge|:construction: (stdin unsupported)|:heavy_check_mark:|non-blocking stdin doesn't seem to work|
 

tests/wazero/go.mod

@@ -2,4 +2,4 @@ module github.com/ktock/container2wasm/examples/wazero
 
 go 1.19
 
-require github.com/tetratelabs/wazero v1.0.1
+require github.com/tetratelabs/wazero v1.0.2

tests/wazero/go.sum

@@ -1,2 +1,2 @@
-github.com/tetratelabs/wazero v1.0.1 h1:xyWBoGyMjYekG3mEQ/W7xm9E05S89kJ/at696d/9yuc=
-github.com/tetratelabs/wazero v1.0.1/go.mod h1:wYx2gNRg8/WihJfSDxA1TIL8H+GkfLYm+bIfbblu9VQ=
+github.com/tetratelabs/wazero v1.0.2 h1:lpwL5zczFHk2mxKur98035Gig+Z3vd9JURk6lUdZxXY=
+github.com/tetratelabs/wazero v1.0.2/go.mod h1:wYx2gNRg8/WihJfSDxA1TIL8H+GkfLYm+bIfbblu9VQ=

tests/wazero/main.go

@@ -1,11 +1,9 @@
 package main
 
 import (
-	"bytes"
 	"context"
 	crand "crypto/rand"
 	"flag"
-	"io"
 	"os"
 	"strings"
 
@@ -45,48 +43,9 @@ func main() {
 	}
 	// we forcibly enable non-blocking read of stdin.
 	_, err = r.InstantiateModule(ctx, compiled,
-		wazero.NewModuleConfig().WithSysWalltime().WithSysNanotime().WithSysNanosleep().WithRandSource(crand.Reader).WithStdout(os.Stdout).WithStderr(os.Stderr).WithStdin(newNonBlockReader(os.Stdin)).WithFSConfig(fsConfig).WithArgs(append([]string{"arg0"}, args[1:]...)...))
+		wazero.NewModuleConfig().WithSysWalltime().WithSysNanotime().WithSysNanosleep().WithRandSource(crand.Reader).WithStdout(os.Stdout).WithStderr(os.Stderr).WithStdin(os.Stdin).WithFSConfig(fsConfig).WithArgs(append([]string{"arg0"}, args[1:]...)...))
 	if err != nil {
 		panic(err)
 	}
 	return
 }
-
-type nonBlockReader struct {
-	buf    *bytes.Buffer
-	closed bool
-}
-
-func newNonBlockReader(r io.Reader) io.Reader {
-	buf := new(bytes.Buffer) // TODO: FIXME: handle the situation where written bytes exceed the buffer size
-	br := &nonBlockReader{buf: buf}
-	go func() {
-		defer func() {
-			br.closed = true
-		}()
-		var p [1]byte
-		for {
-			n, err := r.Read(p[:])
-			if err != nil {
-				if err == io.EOF {
-					return
-				}
-				return
-			}
-			if n > 0 {
-				buf.Write(p[:])
-			}
-
-		}
-	}()
-	return br
-}
-
-func (r *nonBlockReader) Read(p []byte) (int, error) {
-	n, err := r.buf.Read(p)
-	if err == io.EOF && !r.closed {
-		// TinyEMU requires n < -1 if the reader isn't closed yet
-		n, err = -1, nil
-	}
-	return n, err
-}