chore: v2.0.4

fix: listen for ReadableStream cancellation
chore: v2.0.3
2026-01-12 01:59:14 +00:00 · 2024-11-27 22:33:50 +01:00 · 2024-11-27 22:32:19 +01:00 · 2024-10-17 01:12:34 +02:00 · 2024-10-17 01:11:41 +02:00 · 2024-10-16 14:01:11 +02:00
17 changed files with 136 additions and 55 deletions
--- a/README.md
+++ b/README.md
@@ -97,7 +97,7 @@ Create a ServiceWorker file with the following code:
 📄 `sw.js`
 ```js
 importScripts('https://cdn.jsdelivr.net/gh/golang/go@go1.18.4/misc/wasm/wasm_exec.js')
-importScripts('https://cdn.jsdelivr.net/gh/nlepage/go-wasm-http-server@v2.0.0/sw.js')
+importScripts('https://cdn.jsdelivr.net/gh/nlepage/go-wasm-http-server@v2.0.4/sw.js')

 registerWasmHTTPListener('path/to/server.wasm')
 ```
--- a/docs/hello-sse/api.wasm
+++ b/docs/hello-sse/api.wasm
--- a/docs/hello-sse/index.html
+++ b/docs/hello-sse/index.html
@@ -1,32 +1,57 @@
 <!DOCTYPE html>
 <html>
  <head>
-    <title>go-wasm-http-server hello demo</title>
+    <title>go-wasm-http-server hello sse demo</title>
    <script>
      navigator.serviceWorker.register('sw.js')
        .then(registration => {
          const serviceWorker = registration.installing ?? registration.waiting ?? registration.active
          if (serviceWorker.state === 'activated') {
-            startEventSource()
+            document.querySelector('#open-button').disabled = false
          } else {
            serviceWorker.addEventListener('statechange', e => {
-              if (e.target.state === 'activated') startEventSource()
+              if (e.target.state === 'activated') {
+                document.querySelector('#open-button').disabled = false
+              }
            })
          }
        })
      
-      function startEventSource() {
-        const es = new EventSource('/api/events')
-        es.addEventListener('ping', (e) => {
-          const p = document.createElement('p')
-          p.textContent = `ping: data=${e.data}`
-          document.body.append(p)
+      window.addEventListener('DOMContentLoaded', () => {
+        let es;
+
+        document.querySelector('#open-button').addEventListener('click', () => {
+          if (es && es.readyState === es.OPEN) return
+          es = new EventSource('api/events')
+          es.addEventListener('ping', (e) => {
+            const li = document.createElement('li')
+            li.textContent = `ping: data=${e.data}`
+            document.querySelector('ul').append(li)
+          })
        })
+
+        document.querySelector('#close-button').addEventListener('click', () => {
+          if (!es) return
+          es.close() 
+        })
+
+        document.querySelector('#clear-button').addEventListener('click', () => {
+          document.querySelector('ul').innerHTML = ''
+        })
+
        window.addEventListener('unload', () => {
+          if (!es) return
          es.close()
        })
-      }
+      })
    </script>
  </head>
-  <body></body>
+  <body>
+    <p>
+      <button id="open-button" disabled>Open event source</button>
+      <button id="close-button">Close event source</button>
+      <button id="clear-button">Clear events</button>
+    </p>
+    <ul></ul>
+  </body>
 </html>
--- a/docs/hello-sse/sw.js
+++ b/docs/hello-sse/sw.js
@@ -1,12 +1,14 @@
 importScripts('https://cdn.jsdelivr.net/gh/golang/go@go1.23.1/misc/wasm/wasm_exec.js')
-importScripts('https://cdn.jsdelivr.net/gh/nlepage/go-wasm-http-server@v2.0.0/sw.js')
+importScripts('https://cdn.jsdelivr.net/gh/nlepage/go-wasm-http-server@v2.0.4/sw.js')
+
+const wasm = 'api.wasm'

 addEventListener('install', (event) => {
-  event.waitUntil(skipWaiting())
+  event.waitUntil(caches.open('examples').then((cache) => cache.add(wasm)))
 })

-addEventListener('activate', event => {
+addEventListener('activate', (event) => {
  event.waitUntil(clients.claim())
 })

-registerWasmHTTPListener('api.wasm', { base: 'api' })
+registerWasmHTTPListener(wasm, { base: 'api' })
--- a/docs/hello-state-keepalive/index.html
+++ b/docs/hello-state-keepalive/index.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html>
  <head>
-    <title>go-wasm-http-server hello with state demo</title>
+    <title>go-wasm-http-server hello with state and keepalive demo</title>
    <script>
      navigator.serviceWorker.register('sw.js').then(registration => {
        const sw = registration.active ?? registration.installing ?? registration.waiting
--- a/docs/hello-state-keepalive/sw.js
+++ b/docs/hello-state-keepalive/sw.js
@@ -1,8 +1,10 @@
 importScripts('https://cdn.jsdelivr.net/gh/golang/go@go1.23.1/misc/wasm/wasm_exec.js')
-importScripts('https://cdn.jsdelivr.net/gh/nlepage/go-wasm-http-server@v2.0.0/sw.js')
+importScripts('../sw.js')
+
+const wasm = '../hello-state/api.wasm'

 addEventListener('install', event => {
-  event.waitUntil(skipWaiting())
+  event.waitUntil(caches.open('hello-state').then((cache) => cache.add(wasm)))
 })
  
 addEventListener('activate', event => {
@@ -11,4 +13,4 @@ addEventListener('activate', event => {

 addEventListener('message', () => {})

-registerWasmHTTPListener('../hello-state/api.wasm', { base: 'api' })
+registerWasmHTTPListener(wasm, { base: 'api' })
--- a/docs/hello-state/api.wasm
+++ b/docs/hello-state/api.wasm
--- a/docs/hello-state/sw.js
+++ b/docs/hello-state/sw.js
@@ -1,12 +1,14 @@
 importScripts('https://cdn.jsdelivr.net/gh/golang/go@go1.23.1/misc/wasm/wasm_exec.js')
-importScripts('https://cdn.jsdelivr.net/gh/nlepage/go-wasm-http-server@v2.0.0/sw.js')
+importScripts('https://cdn.jsdelivr.net/gh/nlepage/go-wasm-http-server@v2.0.4/sw.js')
+
+const wasm = 'api.wasm'

 addEventListener('install', (event) => {
-  event.waitUntil(skipWaiting())
+  event.waitUntil(caches.open('examples').then((cache) => cache.add(wasm)))
 })
  
-addEventListener('activate', event => {
+addEventListener('activate', (event) => {
  event.waitUntil(clients.claim())
 })

-registerWasmHTTPListener('api.wasm', { base: 'api' })
+registerWasmHTTPListener(wasm, { base: 'api' })
--- a/docs/hello/api.wasm
+++ b/docs/hello/api.wasm
--- a/docs/hello/sw.js
+++ b/docs/hello/sw.js
@@ -1,12 +1,14 @@
 importScripts('https://cdn.jsdelivr.net/gh/golang/go@go1.23.1/misc/wasm/wasm_exec.js')
-importScripts('https://cdn.jsdelivr.net/gh/nlepage/go-wasm-http-server@v2.0.0/sw.js')
+importScripts('https://cdn.jsdelivr.net/gh/nlepage/go-wasm-http-server@v2.0.4/sw.js')
+
+const wasm = 'api.wasm'

 addEventListener('install', (event) => {
-  event.waitUntil(skipWaiting())
+  event.waitUntil(caches.open('examples').then((cache) => cache.add(wasm)))
 })

-addEventListener('activate', event => {
+addEventListener('activate', (event) => {
  event.waitUntil(clients.claim())
 })

-registerWasmHTTPListener('api.wasm', { base: 'api' })
+registerWasmHTTPListener(wasm, { base: 'api' })
--- a/example_json_test.go
+++ b/example_json_test.go
@@ -5,7 +5,7 @@ import (
 	"fmt"
 	"net/http"

-	wasmhttp "github.com/nlepage/go-wasm-http-server/v2/v2"
+	wasmhttp "github.com/nlepage/go-wasm-http-server/v2"
 )

 // Demonstrates a simple hello JSON service.
--- a/internal/readablestream/writer.go
+++ b/internal/readablestream/writer.go
@@ -12,6 +12,7 @@ type Writer struct {
 	Value      safejs.Value
 	controller safejs.Value
 	ctx        context.Context
+	cancelled  bool
 }

 var _ io.WriteCloser = (*Writer)(nil)
@@ -54,14 +55,25 @@ func NewWriter() (*Writer, error) {
 		return nil, err
 	}

-	return &Writer{
+	rs := &Writer{
 		Value:      value,
 		controller: controller,
 		ctx:        ctx,
-	}, nil
+	}
+
+	go func() {
+		<-ctx.Done()
+		rs.cancelled = true
+	}()
+
+	return rs, nil
 }

 func (rs *Writer) Write(b []byte) (int, error) {
+	if rs.cancelled {
+		return 0, nil
+	}
+
 	chunk, err := jstype.Uint8Array.New(len(b)) // FIXME reuse same Uint8Array?
 	if err != nil {
 		return 0, err
@@ -78,8 +90,12 @@ func (rs *Writer) Write(b []byte) (int, error) {
 }

 func (rs *Writer) Close() error {
-	rs.controller.Call("close")
-	return nil
+	if rs.cancelled {
+		return nil
+	}
+
+	_, err := rs.controller.Call("close")
+	return err
 }

 func (rs *Writer) Context() context.Context {
--- a/internal/safejs/value.go
+++ b/internal/safejs/value.go
@@ -73,6 +73,14 @@ func (v Value) IndexString(i int) (string, error) {
 	return safejs.Value(sv).String()
 }

+func (v Value) IsNull() bool {
+	return safejs.Value(v).IsNull()
+}
+
+func (v Value) IsUndefined() bool {
+	return safejs.Value(v).IsUndefined()
+}
+
 func (v Value) New(args ...any) (Value, error) {
 	args = toJSValue(args).([]any)
 	r, err := safejs.Value(v).New(args...)
--- a/request.go
+++ b/request.go
@@ -1,10 +1,12 @@
 package wasmhttp

 import (
+	"io"
 	"net/http"
 	"net/http/httptest"
 	"syscall/js"

+	promise "github.com/nlepage/go-js-promise"
 	"github.com/nlepage/go-wasm-http-server/v2/internal/readablestream"
 	"github.com/nlepage/go-wasm-http-server/v2/internal/safejs"
 )
@@ -13,16 +15,6 @@ import (
 func Request(uvalue js.Value) (*http.Request, error) {
 	value := safejs.Safe(uvalue)

-	body, err := value.Get("body")
-	if err != nil {
-		return nil, err
-	}
-
-	r, err := body.Call("getReader")
-	if err != nil {
-		return nil, err
-	}
-
 	method, err := value.GetString("method")
 	if err != nil {
 		return nil, err
@@ -33,10 +25,44 @@ func Request(uvalue js.Value) (*http.Request, error) {
 		return nil, err
 	}

+	body, err := value.Get("body")
+	if err != nil {
+		return nil, err
+	}
+
+	var bodyReader io.Reader
+
+	if !body.IsNull() {
+		// WORKAROUND: Firefox does not have request.body ReadableStream
+		if body.IsUndefined() {
+			blobp, err := value.Call("blob")
+			if err != nil {
+				return nil, err
+			}
+
+			blob, err := promise.Await(safejs.Unsafe(blobp))
+			if err != nil {
+				return nil, err
+			}
+
+			body, err = safejs.Safe(blob).Call("stream")
+			if err != nil {
+				return nil, err
+			}
+		}
+
+		r, err := body.Call("getReader")
+		if err != nil {
+			return nil, err
+		}
+
+		bodyReader = readablestream.NewReader(r)
+	}
+
 	req := httptest.NewRequest(
 		method,
 		url,
-		readablestream.NewReader(r),
+		bodyReader,
 	)

 	headers, err := value.Get("headers")
--- a/response.go
+++ b/response.go
@@ -88,7 +88,7 @@ func (r *response) WriteHeader(code int) {
 	checkWriteHeaderCode(code)

 	init, err := safejs.ValueOf(map[string]any{
-		"code":    code,
+		"status":  code,
 		"headers": r.headerValue(),
 	})
 	if err != nil {
@@ -136,6 +136,7 @@ func (r *response) Context() context.Context {
 func (r *response) WriteError(str string) {
 	slog.Error(str)
 	if !r.wroteHeader {
+		r.Header().Set("Content-Type", "text/plain")
 		r.WriteHeader(500)
 		_, _ = r.WriteString(str)
 	}
--- a/serve.go
+++ b/serve.go
@@ -57,19 +57,13 @@ func Serve(handler http.Handler) (func(), error) {

 			defer func() {
 				if r := recover(); r != nil {
-					var errStr string
-					if err, ok := r.(error); ok {
-						errStr = err.Error()
-					} else {
-						errStr = fmt.Sprintf("%s", r)
-					}
-					res.WriteError(errStr)
+					res.WriteError(fmt.Sprintf("%+v", r))
 				}
 			}()

 			req, err := Request(safejs.Unsafe(args[0]))
 			if err != nil {
-				res.WriteError(err.Error())
+				res.WriteError(fmt.Sprintf("%+v", err))
 				return
 			}

--- a/sw.js
+++ b/sw.js
@@ -1,4 +1,4 @@
-function registerWasmHTTPListener(wasm, { base, args = [] } = {}) {
+function registerWasmHTTPListener(wasm, { base, cacheName, args = [] } = {}) {
  let path = new URL(registration.scope).pathname
  if (base && base !== '') path = `${trimEnd(path, '/')}/${trimStart(base, '/')}`

@@ -11,7 +11,10 @@ function registerWasmHTTPListener(wasm, { base, args = [] } = {}) {

  const go = new Go()
  go.argv = [wasm, ...args]
-  WebAssembly.instantiateStreaming(fetch(wasm), go.importObject).then(({ instance }) => go.run(instance))
+  const source = cacheName
+    ? caches.open(cacheName).then((cache) => cache.match(wasm)).then((response) => response ?? fetch(wasm))
+    : caches.match(wasm).then(response => (response) ?? fetch(wasm))
+  WebAssembly.instantiateStreaming(source, go.importObject).then(({ instance }) => go.run(instance))

  addEventListener('fetch', e => {
    const { pathname } = new URL(e.request.url)
Author	SHA1	Message	Date
Nicolas Lepage	c94dcd965d	chore: v2.0.4	2024-11-27 22:33:50 +01:00
Nicolas Lepage	2d786bdb14	fix: listen for ReadableStream cancellation	2024-11-27 22:32:19 +01:00
Nicolas Lepage	c561826125	chore: v2.0.3	2024-10-17 01:12:34 +02:00
Nicolas Lepage	897626b7d1	fix: Firefox does not have request.body ReadableStream	2024-10-17 01:11:41 +02:00
Nicolas Lepage	c93d379f20	feat: improves examples	2024-10-16 14:01:11 +02:00
Nicolas Lepage	98257b470a	feat: allow using cache for wasm binary	2024-10-16 14:01:11 +02:00
Nicolas Lepage	b2bd8679fd	fix: error management in readablestream writer close method	2024-10-16 13:19:16 +02:00
Nicolas Lepage	770d49a106	chore: v2.0.2	2024-10-14 23:30:16 +02:00
Nicolas Lepage	e8555180f7	fix: improves error management	2024-10-14 23:28:35 +02:00
Nicolas Lepage	8abad8cb77	fix: crash when request has no body	2024-10-14 23:28:21 +02:00
Nicolas Lepage	74cbaf89b5	fix: wrongful import path in v2.0.0 example	2024-10-14 22:56:59 +02:00