Add WebSocket API

Closes #121

Author: nhooyr

accept.go

@@ -1,3 +1,5 @@
+// +build !js
+
 package websocket
 
 import (

accept_test.go

@@ -1,3 +1,5 @@
+// +build !js
+
 package websocket
 
 import (

ci/wasm.sh

@@ -6,6 +6,5 @@ cd "$(git rev-parse --show-toplevel)"
 
 GOOS=js GOARCH=wasm go vet ./...
 go install golang.org/x/lint/golint
-# Get passing later.
-#GOOS=js GOARCH=wasm golint -set_exit_status ./...
-GOOS=js GOARCH=wasm go test ./internal/wsjs
+GOOS=js GOARCH=wasm golint -set_exit_status ./...
+GOOS=js GOARCH=wasm go test -race ./internal/wsjs

dial.go

@@ -1,3 +1,5 @@
+// +build !js
+
 package websocket
 
 import (

dial_test.go

@@ -1,3 +1,5 @@
+// +build !js
+
 package websocket
 
 import (

doc.go

@@ -1,3 +1,5 @@
+// +build !js
+
 // Package websocket is a minimal and idiomatic implementation of the WebSocket protocol.
 //
 // https://tools.ietf.org/html/rfc6455

example_echo_test.go

@@ -1,3 +1,5 @@
+// +build !js
+
 package websocket_test
 
 import (

example_test.go

@@ -1,3 +1,5 @@
+// +build !js
+
 package websocket_test
 
 import (

export_test.go

@@ -1,3 +1,5 @@
+// +build !js
+
 package websocket
 
 import (

header.go

@@ -1,3 +1,5 @@
+// +build !js
+
 package websocket
 
 import (

header_test.go

@@ -1,3 +1,5 @@
+// +build !js
+
 package websocket
 
 import (

internal/wsjs/wsjs.go

@@ -26,17 +26,17 @@ func handleJSError(err *error, onErr func()) {
 	}
 }
 
-func New(ctx context.Context, url string, protocols []string) (c *WebSocket, err error) {
+func New(url string, protocols []string) (c WebSocket, err error) {
 	defer handleJSError(&err, func() {
-		c = nil
+		c = WebSocket{}
 	})
 
 	jsProtocols := make([]interface{}, len(protocols))
 	for i, p := range protocols {
 		jsProtocols[i] = p
 	}
 
-	c = &WebSocket{
+	c = WebSocket{
 		v: js.Global().Get("WebSocket").New(url, jsProtocols),
 	}
 
@@ -57,15 +57,15 @@ type WebSocket struct {
 	v js.Value
 }
 
-func (c *WebSocket) setBinaryType(typ string) {
+func (c WebSocket) setBinaryType(typ string) {
 	c.v.Set("binaryType", string(typ))
 }
 
-func (c *WebSocket) BufferedAmount() uint32 {
+func (c WebSocket) BufferedAmount() uint32 {
 	return uint32(c.v.Get("bufferedAmount").Int())
 }
 
-func (c *WebSocket) addEventListener(eventType string, fn func(e js.Value)) {
+func (c WebSocket) addEventListener(eventType string, fn func(e js.Value)) {
 	c.v.Call("addEventListener", eventType, js.FuncOf(func(this js.Value, args []js.Value) interface{} {
 		fn(args[0])
 		return nil
@@ -78,7 +78,7 @@ type CloseEvent struct {
 	WasClean bool
 }
 
-func (c *WebSocket) OnClose(fn func(CloseEvent)) {
+func (c WebSocket) OnClose(fn func(CloseEvent)) {
 	c.addEventListener("close", func(e js.Value) {
 		ce := CloseEvent{
 			Code:     uint16(e.Get("code").Int()),
@@ -89,7 +89,7 @@ func (c *WebSocket) OnClose(fn func(CloseEvent)) {
 	})
 }
 
-func (c *WebSocket) OnError(fn func(e js.Value)) {
+func (c WebSocket) OnError(fn func(e js.Value)) {
 	c.addEventListener("error", fn)
 }
 
@@ -99,7 +99,7 @@ type MessageEvent struct {
 	// See https://developer.mozilla.org/en-US/docs/Web/API/MessageEvent
 }
 
-func (c *WebSocket) OnMessage(fn func(m MessageEvent)) {
+func (c WebSocket) OnMessage(fn func(m MessageEvent)) {
 	c.addEventListener("message", func(e js.Value) {
 		var data []byte
 
@@ -119,23 +119,23 @@ func (c *WebSocket) OnMessage(fn func(m MessageEvent)) {
 	})
 }
 
-func (c *WebSocket) OnOpen(fn func(e js.Value)) {
+func (c WebSocket) OnOpen(fn func(e js.Value)) {
 	c.addEventListener("open", fn)
 }
 
-func (c *WebSocket) Close(code int, reason string) (err error) {
+func (c WebSocket) Close(code int, reason string) (err error) {
 	defer handleJSError(&err, nil)
 	c.v.Call("close", code, reason)
 	return err
 }
 
-func (c *WebSocket) SendText(v string) (err error) {
+func (c WebSocket) SendText(v string) (err error) {
 	defer handleJSError(&err, nil)
 	c.v.Call("send", v)
 	return err
 }
 
-func (c *WebSocket) SendBytes(v []byte) (err error) {
+func (c WebSocket) SendBytes(v []byte) (err error) {
 	defer handleJSError(&err, nil)
 	c.v.Call("send", uint8Array(v))
 	return err

netconn.go

@@ -1,3 +1,5 @@
+// +build !js
+
 package websocket
 
 import (

opcode.go

@@ -1,3 +1,5 @@
+// +build !js
+
 package websocket
 
 // opcode represents a WebSocket Opcode.

statuscode.go

@@ -1,3 +1,5 @@
+// +build !js
+
 package websocket
 
 import (

statuscode_test.go

@@ -1,3 +1,5 @@
+// +build !js
+
 package websocket
 
 import (

websocket.go

@@ -1,3 +1,5 @@
+// +build !js
+
 package websocket
 
 import (

websocket_autobahn_python_test.go

@@ -1,6 +1,7 @@
 // This file contains the old autobahn test suite tests that use the
-// python binary. The approach is very clunky and slow so new tests
+// python binary. The approach is clunky and slow so new tests
 // have been written in pure Go in websocket_test.go.
+// These have been kept for correctness purposes and are occasionally ran.
 // +build autobahn-python
 
 package websocket_test

websocket_bench_test.go

@@ -1,3 +1,5 @@
+// +build !js
+
 package websocket_test
 
 import (

websocket_js.go

@@ -0,0 +1,49 @@
+package websocket
+
+import (
+	"context"
+	"golang.org/x/xerrors"
+	"nhooyr.io/websocket/internal/wsjs"
+	"syscall/js"
+)
+
+type Conn struct {
+	closed *
+}
+
+func (c *Conn) Read(ctx context.Context) (MessageType, []byte, error) {
+	panic("TODO")
+}
+
+func (c *Conn) Write(ctx context.Context, typ MessageType, p []byte) error {
+	panic("TODO")
+}
+
+type StatusCode int
+
+func (c *Conn) Close(code StatusCode, reason string)  {
+
+}
+
+// DialOptions represents the options available to pass to Dial.
+type DialOptions struct {
+	// Subprotocols lists the subprotocols to negotiate with the server.
+	Subprotocols []string
+}
+
+func Dial(ctx context.Context, url string, opts *DialOptions) (*Conn, error){
+	ws, err := wsjs.New(url, opts.Subprotocols)
+	if err != nil {
+		return nil, xerrors.Errorf("failed to dial: %w", err)
+	}
+
+	ws.OnOpen(func(e js.Value) {
+
+	})
+
+	ws.OnError(func(e js.Value) {
+
+	})
+
+	<-
+}

websocket_test.go

@@ -1,3 +1,5 @@
+// +build !js
+
 package websocket_test
 
 import (

xor.go

@@ -1,3 +1,5 @@
+// +build !js
+
 package websocket
 
 import (

xor_test.go

@@ -1,3 +1,5 @@
+// +build !js
+
 package websocket
 
 import (