♻️ Simplify, no more util package

internal/whutil/package.go

@@ -1,4 +0,0 @@
-// Package whutil stands for WASM HTTP utilities.
-//
-// It contains internal utilities for github.com/nlepage/go-wasm-http-server.
-package whutil

internal/whutil/promise.go

@@ -1,53 +0,0 @@
-package whutil
-
-import (
-	"syscall/js"
-)
-
-// Promise is JS Promise
-type Promise struct {
-	js.Value
-}
-
-type PromiseResolve func(...interface{}) js.Value
-
-type PromiseReject func(...interface{}) js.Value
-
-// NewPromise creates a new JS Promise
-func NewPromise(cb func(resolve PromiseResolve, reject PromiseReject)) Promise {
-	var cbFunc js.Func
-	cbFunc = js.FuncOf(func(_ js.Value, args []js.Value) interface{} {
-		defer cbFunc.Release()
-		cb(args[0].Invoke, args[1].Invoke)
-		return js.Undefined()
-	})
-	return Promise{js.Global().Get("Promise").New(cbFunc)}
-}
-
-// Await waits for the Promise to be resolved and returns the value
-func (p Promise) Await() (js.Value, error) {
-	resCh := make(chan js.Value)
-	var then js.Func
-	then = js.FuncOf(func(_ js.Value, args []js.Value) interface{} {
-		resCh <- args[0]
-		return nil
-	})
-	defer then.Release()
-
-	errCh := make(chan error)
-	var catch js.Func
-	catch = js.FuncOf(func(_ js.Value, args []js.Value) interface{} {
-		errCh <- js.Error{args[0]}
-		return nil
-	})
-	defer catch.Release()
-
-	p.Call("then", then).Call("catch", catch)
-
-	select {
-	case res := <-resCh:
-		return res, nil
-	case err := <-errCh:
-		return js.Undefined(), err
-	}
-}

internal/whutil/request.go

@@ -1,40 +0,0 @@
-package whutil
-
-import (
-	"bytes"
-	"net/http"
-	"syscall/js"
-)
-
-// Request is a JS Request
-type Request struct {
-	js.Value
-}
-
-// HTTPRequest builds and returns the equivalent http.Request
-func (r Request) HTTPRequest() (*http.Request, error) {
-	jsBody := js.Global().Get("Uint8Array").New(Promise{r.Call("arrayBuffer")}.Await())
-	body := make([]byte, jsBody.Get("length").Int())
-	js.CopyBytesToGo(body, jsBody)
-
-	req, err := http.NewRequest(
-		r.Get("method").String(),
-		r.Get("url").String(),
-		bytes.NewBuffer(body),
-	)
-	if err != nil {
-		return nil, err
-	}
-
-	headersIt := r.Get("headers").Call("entries")
-	for {
-		e := headersIt.Call("next")
-		if e.Get("done").Bool() {
-			break
-		}
-		v := e.Get("value")
-		req.Header.Set(v.Index(0).String(), v.Index(1).String())
-	}
-
-	return req, nil
-}

internal/whutil/response_writer.go

@@ -1,64 +0,0 @@
-package whutil
-
-import (
-	"bytes"
-	"net/http"
-	"syscall/js"
-)
-
-// ResponseWriter implements http.ResponseWriter
-type ResponseWriter struct {
-	header     http.Header
-	buf        *bytes.Buffer
-	statusCode int
-}
-
-// NewResponseWriter creates a new ResponseWriter
-func NewResponseWriter() ResponseWriter {
-	return ResponseWriter{
-		header:     http.Header{},
-		buf:        bytes.NewBuffer(nil),
-		statusCode: 0,
-	}
-}
-
-var _ http.ResponseWriter = ResponseWriter{}
-
-// Header implements http.ResponseWriter.Header
-func (rw ResponseWriter) Header() http.Header {
-	return rw.header
-}
-
-// Write implements http.ResponseWriter.Write
-func (rw ResponseWriter) Write(p []byte) (int, error) {
-	return rw.buf.Write(p)
-}
-
-// WriteHeader implements http.ResponseWriter.WriteHeader
-func (rw ResponseWriter) WriteHeader(statusCode int) {
-	rw.statusCode = statusCode
-}
-
-var _ js.Wrapper = ResponseWriter{}
-
-// JSValue builds and returns the equivalent JS Response (implementing js.Wrapper)
-func (rw ResponseWriter) JSValue() js.Value {
-	init := js.Global().Get("Object").New()
-
-	if rw.statusCode != 0 {
-		init.Set("status", rw.statusCode)
-	}
-
-	if len(rw.header) != 0 {
-		headers := make(map[string]interface{}, len(rw.header))
-		for k := range rw.header {
-			headers[k] = rw.header.Get(k)
-		}
-		init.Set("headers", headers)
-	}
-
-	jsBody := js.Global().Get("Uint8Array").New(rw.buf.Len())
-	js.CopyBytesToJS(jsBody, rw.buf.Bytes())
-
-	return js.Global().Get("Response").New(jsBody, init)
-}