fix(handler): nil next

Author: darkweak

go.go

@@ -102,8 +102,10 @@ func NewWasmHandlerGo(modulepath string, moduleConfig any, poolConfiguration map
 	}
 
 	return NewWasmHandlerInstance(func(ctx context.Context, next Handler) Handler {
-		mw.NewHandler(ctx, wazemmesToHTTPHandler(next))
+		return HandlerFunc(func(rw http.ResponseWriter, req *http.Request) error {
+			mw.NewHandler(ctx, wazemmesToHTTPHandler(next)).ServeHTTP(rw, req)
 
-		return nil
+			return nil
+		})
 	}, poolConfiguration, logger)
 }

handler.go

@@ -57,10 +57,18 @@ func (w *WasmHandler) ServeHTTP(rw http.ResponseWriter, rq *http.Request, next H
 		return errors.New("impossible to cast the borrowed object into a WASM HTTP handler")
 	}
 
-	err = handler(rq.Context(), next).ServeHTTP(rw, rq)
+	result := handler(rq.Context(), next)
+	if result != nil {
+		err = result.ServeHTTP(rw, rq)
+	}
+
 	if err != nil {
 		return err
 	}
-	
-	return next.ServeHTTP(rw, rq)
+
+	if next != nil {
+		return next.ServeHTTP(rw, rq)
+	}
+
+	return nil
 }

php.go

@@ -32,7 +32,6 @@ func (h *phpWASMHandler) getScriptPath(urlPath string) string {
 }
 
 func (h *phpWASMHandler) ServeHTTP(rw http.ResponseWriter, r *http.Request) error {
-	fmt.Println("PHP ServeHTTP handler")
 	scriptPath := h.getScriptPath(r.URL.Path)
 
 	// Create a pipe to capture PHP output

writer.go

@@ -3,13 +3,15 @@ package wazemmes
 import (
 	"bytes"
 	"net/http"
+	"strings"
 )
 
 type writer struct {
-	status int
-	buf    *bytes.Buffer
-	res    http.ResponseWriter
-	req    *http.Request
+	written bool
+	status  int
+	buf     *bytes.Buffer
+	res     http.ResponseWriter
+	req     *http.Request
 }
 
 func BuildWriter(res http.ResponseWriter, req *http.Request) *writer {
@@ -26,6 +28,10 @@ func (w *writer) Header() http.Header {
 }
 
 func (w *writer) Write(b []byte) (int, error) {
+	if strings.HasPrefix(string(b), "module closed with exit_code") {
+		return len(b), nil
+	}
+
 	w.buf.Reset()
 
 	return w.buf.Write(b)
@@ -36,6 +42,11 @@ func (w *writer) WriteHeader(status int) {
 }
 
 func (w *writer) Flush() {
+	if w.written {
+		return
+	}
+
+	w.written = true
 	w.res.WriteHeader(w.status)
 	_, _ = w.res.Write(w.buf.Bytes())
 }