[FEATURE] Use ReadableStream for Response (#15)

* feat: uses ReadableStream for Response * chore: rebuilds other examples
nlepage · Oct 14, 2024 · 5ec4a8d · 5ec4a8d
1 parent 163b497
commit 5ec4a8d
Show file tree

Hide file tree

Showing 21 changed files with 634 additions and 83 deletions.
diff --git a/docs/hello-sse/api.go b/docs/hello-sse/api.go
@@ -0,0 +1,34 @@
+package main
+
+import (
+	"net/http"
+	"time"
+
+	"github.com/tmaxmax/go-sse"
+
+	wasmhttp "github.com/nlepage/go-wasm-http-server"
+)
+
+func main() {
+	s := &sse.Server{}
+	t, _ := sse.NewType("ping")
+
+	go func() {
+		m := &sse.Message{
+			Type: t,
+		}
+		m.AppendData("Hello world")
+
+		for range time.Tick(time.Second) {
+			_ = s.Publish(m)
+		}
+	}()
+
+	http.Handle("/events", s)
+
+	if _, err := wasmhttp.Serve(nil); err != nil {
+		panic(err)
+	}
+
+	select {}
+}
diff --git a/docs/hello-sse/api.wasm b/docs/hello-sse/api.wasm
diff --git a/docs/hello-sse/index.html b/docs/hello-sse/index.html
@@ -0,0 +1,32 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <title>go-wasm-http-server hello demo</title>
+    <script>
+      navigator.serviceWorker.register('sw.js')
+        .then(registration => {
+          const serviceWorker = registration.installing ?? registration.waiting ?? registration.active
+          if (serviceWorker.state === 'activated') {
+            startEventSource()
+          } else {
+            serviceWorker.addEventListener('statechange', e => {
+              if (e.target.state === 'activated') startEventSource()
+            })
+          }
+        })
+
+      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('unload', () => {
+          es.close()
+        })
+      }
+    </script>
+  </head>
+  <body></body>
+</html>
diff --git a/docs/hello-sse/sw.js b/docs/hello-sse/sw.js
@@ -0,0 +1,12 @@
+importScripts('https://cdn.jsdelivr.net/gh/golang/[email protected]/misc/wasm/wasm_exec.js')
+importScripts('https://cdn.jsdelivr.net/gh/nlepage/[email protected]/sw.js')
+
+addEventListener('install', (event) => {
+  event.waitUntil(skipWaiting())
+})
+
+addEventListener('activate', event => {
+  event.waitUntil(clients.claim())
+})
+
+registerWasmHTTPListener('api.wasm', { base: 'api' })
diff --git a/docs/hello-state/api.wasm b/docs/hello-state/api.wasm
diff --git a/docs/hello-state/sw.js b/docs/hello-state/sw.js
@@ -1,4 +1,4 @@
-importScripts('https://cdn.jsdelivr.net/gh/golang/go@go1.18.4/misc/wasm/wasm_exec.js')
+importScripts('https://cdn.jsdelivr.net/gh/golang/go@go1.23.1/misc/wasm/wasm_exec.js')
 importScripts('https://cdn.jsdelivr.net/gh/nlepage/[email protected]/sw.js')
 
 addEventListener('install', (event) => {

diff --git a/docs/hello/api.wasm b/docs/hello/api.wasm
diff --git a/docs/hello/sw.js b/docs/hello/sw.js
@@ -1,4 +1,4 @@
-importScripts('https://cdn.jsdelivr.net/gh/golang/go@go1.18.4/misc/wasm/wasm_exec.js')
+importScripts('https://cdn.jsdelivr.net/gh/golang/go@go1.23.1/misc/wasm/wasm_exec.js')
 importScripts('https://cdn.jsdelivr.net/gh/nlepage/[email protected]/sw.js')
 
 addEventListener('install', (event) => {

diff --git a/example_json_test.go b/example_json_test.go
@@ -23,7 +23,11 @@ func Example_json() {
 		}
 	})
 
-	defer wasmhttp.Serve(nil)()
+	release, err := wasmhttp.Serve(nil)
+	if err != nil {
+		panic(err)
+	}
+	defer release()
 
 	// Wait for webpage event or use empty select{}
 }
diff --git a/go.mod b/go.mod
@@ -1,5 +1,9 @@
 module github.com/nlepage/go-wasm-http-server
 
-go 1.13
+go 1.18
 
-require github.com/nlepage/go-js-promise v1.0.0
+require (
+	github.com/hack-pad/safejs v0.1.1
+	github.com/nlepage/go-js-promise v1.0.0
+	github.com/tmaxmax/go-sse v0.8.0
+)
diff --git a/go.sum b/go.sum
@@ -1,2 +1,6 @@
+github.com/hack-pad/safejs v0.1.1 h1:d5qPO0iQ7h2oVtpzGnLExE+Wn9AtytxIfltcS2b9KD8=
+github.com/hack-pad/safejs v0.1.1/go.mod h1:HdS+bKF1NrE72VoXZeWzxFOVQVUSqZJAG0xNCnb+Tio=
 github.com/nlepage/go-js-promise v1.0.0 h1:K7OmJ3+0BgWJ2LfXchg2sI6RDr7AW/KWR8182epFwGQ=
 github.com/nlepage/go-js-promise v1.0.0/go.mod h1:bdOP0wObXu34euibyK39K1hoBCtlgTKXGc56AGflaRo=
+github.com/tmaxmax/go-sse v0.8.0 h1:pPpTgyyi1r7vG2o6icebnpGEh3ebcnBXqDWkb7aTofs=
+github.com/tmaxmax/go-sse v0.8.0/go.mod h1:HLoxqxdH+7oSUItjtnpxjzJedfr/+Rrm/dNWBcTxJFM=
diff --git a/internal/jstype/types.go b/internal/jstype/types.go
@@ -0,0 +1,13 @@
+package jstype
+
+import (
+	"syscall/js"
+
+	"github.com/nlepage/go-wasm-http-server/internal/safejs"
+)
+
+var (
+	ReadableStream = safejs.Safe(js.Global().Get("ReadableStream"))
+	Response       = safejs.Safe(js.Global().Get("Response"))
+	Uint8Array     = safejs.Safe(js.Global().Get("Uint8Array"))
+)
diff --git a/internal/readablestream/readable_stream.go b/internal/readablestream/readable_stream.go
@@ -0,0 +1,87 @@
+package readablestream
+
+import (
+	"context"
+	"io"
+
+	"github.com/nlepage/go-wasm-http-server/internal/jstype"
+	"github.com/nlepage/go-wasm-http-server/internal/safejs"
+)
+
+type Writer struct {
+	Value      safejs.Value
+	controller safejs.Value
+	ctx        context.Context
+}
+
+var _ io.WriteCloser = (*Writer)(nil)
+
+func NewWriter() (*Writer, error) {
+	var start safejs.Func
+	var controller safejs.Value
+
+	start, err := safejs.FuncOf(func(_ safejs.Value, args []safejs.Value) any {
+		defer start.Release()
+		controller = args[0]
+		return nil
+	})
+	if err != nil {
+		return nil, err
+	}
+
+	var cancel safejs.Func
+	ctx, cancelCtx := context.WithCancel(context.Background())
+
+	cancel, err = safejs.FuncOf(func(_ safejs.Value, _ []safejs.Value) any {
+		defer cancel.Release()
+		cancelCtx()
+		return nil
+	})
+	if err != nil {
+		return nil, err
+	}
+
+	source, err := safejs.ValueOf(map[string]any{
+		"start":  safejs.Unsafe(start.Value()),
+		"cancel": safejs.Unsafe(cancel.Value()),
+	})
+	if err != nil {
+		return nil, err
+	}
+
+	value, err := jstype.ReadableStream.New(source)
+	if err != nil {
+		return nil, err
+	}
+
+	return &Writer{
+		Value:      value,
+		controller: controller,
+		ctx:        ctx,
+	}, nil
+}
+
+func (rs *Writer) Write(b []byte) (int, error) {
+	chunk, err := jstype.Uint8Array.New(len(b)) // FIXME reuse same Uint8Array?
+	if err != nil {
+		return 0, err
+	}
+
+	n, err := safejs.CopyBytesToJS(chunk, b)
+	if err != nil {
+		return 0, err
+	}
+
+	_, err = rs.controller.Call("enqueue", chunk)
+
+	return n, err
+}
+
+func (rs *Writer) Close() error {
+	rs.controller.Call("close")
+	return nil
+}
+
+func (rs *Writer) Context() context.Context {
+	return rs.ctx
+}
diff --git a/internal/safejs/bytes.go b/internal/safejs/bytes.go
@@ -0,0 +1,11 @@
+package safejs
+
+import "github.com/hack-pad/safejs"
+
+func CopyBytesToGo(dst []byte, src Value) (int, error) {
+	return safejs.CopyBytesToGo(dst, safejs.Value(src))
+}
+
+func CopyBytesToJS(dst Value, src []byte) (int, error) {
+	return safejs.CopyBytesToJS(safejs.Value(dst), src)
+}
diff --git a/internal/safejs/func.go b/internal/safejs/func.go
@@ -0,0 +1,26 @@
+package safejs
+
+import (
+	"github.com/hack-pad/safejs"
+)
+
+type Func safejs.Func
+
+func FuncOf(fn func(this Value, args []Value) any) (Func, error) {
+	r, err := safejs.FuncOf(func(this safejs.Value, args []safejs.Value) any {
+		args2 := make([]Value, len(args))
+		for i, v := range args {
+			args2[i] = Value(v)
+		}
+		return fn(Value(this), []Value(args2))
+	})
+	return Func(r), err
+}
+
+func (f Func) Release() {
+	safejs.Func(f).Release()
+}
+
+func (f Func) Value() Value {
+	return Value(safejs.Func(f).Value())
+}
diff --git a/internal/safejs/value.go b/internal/safejs/value.go
@@ -0,0 +1,103 @@
+package safejs
+
+import (
+	"syscall/js"
+
+	"github.com/hack-pad/safejs"
+)
+
+type Value safejs.Value
+
+func Safe(v js.Value) Value {
+	return Value(safejs.Safe(v))
+}
+
+func Unsafe(v Value) js.Value {
+	return safejs.Unsafe(safejs.Value(v))
+}
+
+func ValueOf(value any) (Value, error) {
+	v, err := safejs.ValueOf(value)
+	return Value(v), err
+}
+
+func (v Value) Call(m string, args ...any) (Value, error) {
+	args = toJSValue(args).([]any)
+	r, err := safejs.Value(v).Call(m, args...)
+	return Value(r), err
+}
+
+func (v Value) Get(p string) (Value, error) {
+	r, err := safejs.Value(v).Get(p)
+	return Value(r), err
+}
+
+func (v Value) GetBool(p string) (bool, error) {
+	bv, err := v.Get(p)
+	if err != nil {
+		return false, err
+	}
+
+	return safejs.Value(bv).Bool()
+}
+
+func (v Value) GetInt(p string) (int, error) {
+	iv, err := v.Get(p)
+	if err != nil {
+		return 0, err
+	}
+
+	return safejs.Value(iv).Int()
+}
+
+func (v Value) GetString(p string) (string, error) {
+	sv, err := v.Get(p)
+	if err != nil {
+		return "", err
+	}
+
+	return safejs.Value(sv).String()
+}
+
+func (v Value) Index(i int) (Value, error) {
+	r, err := safejs.Value(v).Index(i)
+	return Value(r), err
+}
+
+func (v Value) IndexString(i int) (string, error) {
+	sv, err := v.Index(i)
+	if err != nil {
+		return "", err
+	}
+
+	return safejs.Value(sv).String()
+}
+
+func (v Value) New(args ...any) (Value, error) {
+	args = toJSValue(args).([]any)
+	r, err := safejs.Value(v).New(args...)
+	return Value(r), err
+}
+
+func toJSValue(jsValue any) any {
+	switch value := jsValue.(type) {
+	case Value:
+		return safejs.Value(value)
+	case Func:
+		return safejs.Func(value)
+	case map[string]any:
+		newValue := make(map[string]any)
+		for mapKey, mapValue := range value {
+			newValue[mapKey] = toJSValue(mapValue)
+		}
+		return newValue
+	case []any:
+		newValue := make([]any, len(value))
+		for i, arg := range value {
+			newValue[i] = toJSValue(arg)
+		}
+		return newValue
+	default:
+		return jsValue
+	}
+}
diff --git a/package.go b/package.go
@@ -1,4 +1,2 @@
 // Package wasmhttp (github.com/nlepage/go-wasm-http-server) allows to create a WebAssembly Go HTTP Server embedded in a ServiceWorker.
-//
-// It is a subset of the full solution, a full usage is available on the github repository: https://github.com/nlepage/go-wasm-http-server
 package wasmhttp