From 9137dc1dccd833844904b417eadddb5b70bea44d Mon Sep 17 00:00:00 2001
From: syumai <syumai@gmail.com>
Date: Sun, 21 Apr 2024 03:32:55 +0900
Subject: [PATCH 1/5] simplify closeCh wait

---
 handler.go | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/handler.go b/handler.go
index 61930e1..cc4998d 100644
--- a/handler.go
+++ b/handler.go
@@ -90,7 +90,5 @@ func Serve(handler http.Handler) {
 	}
 	httpHandler = handler
 	ready()
-	select {
-	case <-closeCh:
-	}
+	<-closeCh
 }

From 5e18504eb9e058f5461d13d19109bb20d9cbbd69 Mon Sep 17 00:00:00 2001
From: syumai <syumai@gmail.com>
Date: Sun, 21 Apr 2024 03:37:14 +0900
Subject: [PATCH 2/5] add jsutil.Error / jsutil.Errorf

---
 internal/jsutil/jsutil.go | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/internal/jsutil/jsutil.go b/internal/jsutil/jsutil.go
index 1175029..e93a0af 100644
--- a/internal/jsutil/jsutil.go
+++ b/internal/jsutil/jsutil.go
@@ -34,6 +34,14 @@ func NewPromise(fn js.Func) js.Value {
 	return PromiseClass.New(fn)
 }
 
+func Error(msg string) js.Value {
+	return ErrorClass.New(msg)
+}
+
+func Errorf(format string, args ...any) js.Value {
+	return ErrorClass.New(fmt.Sprintf(format, args...))
+}
+
 // ArrayFrom calls Array.from to given argument and returns result Array.
 func ArrayFrom(v js.Value) js.Value {
 	return ArrayClass.Call("from", v)

From ed6b2493ff22b44c87f843111d5f05af0b6dd4aa Mon Sep 17 00:00:00 2001
From: syumai <syumai@gmail.com>
Date: Sun, 21 Apr 2024 03:38:10 +0900
Subject: [PATCH 3/5] use jsutil.Error

---
 internal/jsutil/stream.go | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/internal/jsutil/stream.go b/internal/jsutil/stream.go
index ed4b4b0..36ec9bd 100644
--- a/internal/jsutil/stream.go
+++ b/internal/jsutil/stream.go
@@ -134,8 +134,7 @@ func (rs *readerToReadableStream) Pull(controller js.Value) error {
 		return nil
 	}
 	if err != nil {
-		jsErr := ErrorClass.New(err.Error())
-		controller.Call("error", jsErr)
+		controller.Call("error", Error(err.Error()))
 		if err := rs.reader.Close(); err != nil {
 			return err
 		}
@@ -170,7 +169,7 @@ func ConvertReaderToReadableStream(reader io.ReadCloser) js.Value {
 			go func() {
 				err := stream.Pull(controller)
 				if err != nil {
-					reject.Invoke(ErrorClass.New(err.Error()))
+					reject.Invoke(Error(err.Error()))
 					return
 				}
 				resolve.Invoke()

From 0713696d4afb66294f5c916a790a7a8a18066c93 Mon Sep 17 00:00:00 2001
From: syumai <syumai@gmail.com>
Date: Sun, 21 Apr 2024 03:40:44 +0900
Subject: [PATCH 4/5] reduced panic

---
 handler.go | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/handler.go b/handler.go
index cc4998d..446fb18 100644
--- a/handler.go
+++ b/handler.go
@@ -20,18 +20,21 @@ var (
 func init() {
 	var handleRequestCallback js.Func
 	handleRequestCallback = js.FuncOf(func(this js.Value, args []js.Value) any {
-		if len(args) > 1 {
-			panic(fmt.Errorf("too many args given to handleRequest: %d", len(args)))
-		}
 		reqObj := args[0]
 		var cb js.Func
 		cb = js.FuncOf(func(_ js.Value, pArgs []js.Value) any {
 			defer cb.Release()
 			resolve := pArgs[0]
+			reject := pArgs[1]
 			go func() {
+				if len(args) > 1 {
+					reject.Invoke(jsutil.Errorf("too many args given to handleRequest: %d", len(args)))
+					return
+				}
 				res, err := handleRequest(reqObj)
 				if err != nil {
-					panic(err)
+					reject.Invoke(jsutil.Error(err.Error()))
+					return
 				}
 				resolve.Invoke(res)
 			}()
@@ -58,7 +61,7 @@ func handleRequest(reqObj js.Value) (js.Value, error) {
 	}
 	req, err := jshttp.ToRequest(reqObj)
 	if err != nil {
-		panic(err)
+		return js.Value{}, err
 	}
 	ctx := runtimecontext.New(context.Background(), reqObj)
 	req = req.WithContext(ctx)

From 1b359b90d930d2c9060d7c1993b7425afaecccb0 Mon Sep 17 00:00:00 2001
From: syumai <syumai@gmail.com>
Date: Sun, 21 Apr 2024 03:47:19 +0900
Subject: [PATCH 5/5] reduce panic in stream canceling

---
 internal/jsutil/stream.go | 21 ++++++++++++++++-----
 1 file changed, 16 insertions(+), 5 deletions(-)

diff --git a/internal/jsutil/stream.go b/internal/jsutil/stream.go
index 36ec9bd..79f5e51 100644
--- a/internal/jsutil/stream.go
+++ b/internal/jsutil/stream.go
@@ -179,11 +179,22 @@ func ConvertReaderToReadableStream(reader io.ReadCloser) js.Value {
 		return NewPromise(cb)
 	}))
 	rsInit.Set("cancel", js.FuncOf(func(js.Value, []js.Value) any {
-		err := stream.Cancel()
-		if err != nil {
-			panic(err)
-		}
-		return js.Undefined()
+		var cb js.Func
+		cb = js.FuncOf(func(this js.Value, pArgs []js.Value) any {
+			defer cb.Release()
+			resolve := pArgs[0]
+			reject := pArgs[1]
+			go func() {
+				err := stream.Cancel()
+				if err != nil {
+					reject.Invoke(Error(err.Error()))
+					return
+				}
+				resolve.Invoke()
+			}()
+			return js.Undefined()
+		})
+		return NewPromise(cb)
 	}))
 	return ReadableStreamClass.New(rsInit)
 }