Feb 16, 2020 · Oct 15, 2019 · Oct 14, 2019 · Nov 12, 2019 · Nov 12, 2019 · Nov 12, 2019
diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md
diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
 <!--
 Please be as descriptive as possible.
 Reproducible examples are key to finding and fixing bugs.
 -->
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
diff --git a/README.md b/README.md

 See the gorilla/websocket comparison for more performance details.

 ## Contributing

 See [.github/CONTRIBUTING.md](.github/CONTRIBUTING.md).

 ## Users

 If your company or project is using this library, feel free to open an issue or PR to amend this list.
diff --git a/assert_test.go b/assert_test.go
 err = wsjson.Read(ctx, c, &act)
 assert.Success(t, err)

 assert.Equalf(t, exp, act, "unexpected JSON")
 assert.Equal(t, exp, act, "unexpected JSON")
 }

 func assertJSONRead(t *testing.T, ctx context.Context, c *websocket.Conn, exp interface{}) {
 err := wsjson.Read(ctx, c, &act)
 assert.Success(t, err)

 assert.Equalf(t, exp, act, "unexpected JSON")
 assert.Equal(t, exp, act, "unexpected JSON")
 }

 func randString(n int) string {
 typ2, p2, err := c.Read(ctx)
 assert.Success(t, err)

 assert.Equalf(t, typ, typ2, "unexpected data type")
 assert.Equalf(t, p, p2, "unexpected payload")
 assert.Equal(t, typ, typ2, "unexpected data type")
 assert.Equal(t, p, p2, "unexpected payload")
 }

 func assertSubprotocol(t *testing.T, c *websocket.Conn, exp string) {
 t.Helper()

 assert.Equalf(t, exp, c.Subprotocol(), "unexpected subprotocol")
 assert.Equal(t, exp, c.Subprotocol(), "unexpected subprotocol")
 }

 func assertCloseStatus(t *testing.T, exp websocket.StatusCode, err error) {
 t.Helper()

 assert.Equalf(t, exp, websocket.CloseStatus(err), "unexpected status code")
 assert.Equal(t, exp, websocket.CloseStatus(err), "unexpected status code")
 }
diff --git a/ci/test.mk b/ci/test.mk
 gotest:
 go test -covermode=count -coverprofile=ci/out/coverage.prof -coverpkg=./... $${GOTESTFLAGS-} ./...
 sed -i '/_stringer\.go/d' ci/out/coverage.prof
 sed -i '/wsecho\.go/d' ci/out/coverage.prof
 sed -i '/assert\.go/d' ci/out/coverage.prof
 sed -i '/wsgrace\.go/d' ci/out/coverage.prof
 sed -i '/assert/d' ci/out/coverage.prof
diff --git a/close.go b/close.go
 "errors"
 "fmt"
 "log"
 "nhooyr.io/websocket/internal/bufpool"
 "nhooyr.io/websocket/internal/bpool"
 "time"
 )

 }
 defer cr.mu.Unlock()

 b :=bufpool.Get()
 b :=bpool.Get()
 buf := b.Bytes()
 buf = buf[:cap(buf)]
 deferbufpool.Put(b)
 deferbpool.Put(b)

 for {
 // TODO
diff --git a/close_test.go b/close_test.go
 t.Run(tc.name, func(t *testing.T) {
 t.Parallel()

 assert.Equalf(t, tc.exp, CloseStatus(tc.in), "unexpected close status")
 assert.Equal(t, tc.exp, CloseStatus(tc.in), "unexpected close status")
 })
 }
 }
diff --git a/frame.go b/frame.go
 "encoding/binary"
 "math"
 "math/bits"
 "nhooyr.io/websocket/internal/errd"
 )

 // opcode represents a WebSocket opcode.
diff --git a/frame_test.go b/frame_test.go
 h2, err := readFrameHeader(r)
 assert.Success(t, err)

 assert.Equalf(t, h, h2, "written and read headers differ")
 assert.Equal(t, h, h2, "written and read headers differ")
 }

 func Test_mask(t *testing.T) {
 p := []byte{0xa, 0xb, 0xc, 0xf2, 0xc}
 gotKey32 := mask(key32, p)

 assert.Equalf(t, []byte{0, 0, 0, 0x0d, 0x6}, p, "unexpected mask")
 assert.Equalf(t, bits.RotateLeft32(key32, -8), gotKey32, "unexpected mask key")
 assert.Equal(t, []byte{0, 0, 0, 0x0d, 0x6}, p, "unexpected mask")
 assert.Equal(t, bits.RotateLeft32(key32, -8), gotKey32, "unexpected mask key")
 }

 func basicMask(maskKey [4]byte, pos int, b []byte) int {
diff --git a/go.mod b/go.mod
 github.com/gobwas/httphead v0.0.0-20180130184737-2c6c146eadee // indirect
 github.com/gobwas/pool v0.2.0 // indirect
 github.com/gobwas/ws v1.0.2
 github.com/golang/protobuf v1.3.2
 github.com/golang/protobuf v1.3.2 // indirect
 github.com/google/go-cmp v0.3.1
 github.com/gorilla/websocket v1.4.1
 github.com/kr/pretty v0.1.0 // indirect
 github.com/stretchr/testify v1.4.0 // indirect
 go.uber.org/atomic v1.4.0 // indirect
 go.uber.org/multierr v1.1.0
 go.uber.org/multierr v1.1.0 // indirect
 golang.org/x/time v0.0.0-20190308202827-9d24e82272b4
 gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 // indirect
 )
diff --git a/internal/assert/assert.go b/internal/assert/assert.go
 package assert

 import (
 "reflect"
 "strings"
 "testing"

 "github.com/google/go-cmp/cmp"
 )

 // https://github.com/google/go-cmp/issues/40#issuecomment-328615283
 func cmpDiff(exp, act interface{}) string {
 return cmp.Diff(exp, act, deepAllowUnexported(exp, act))
 }

 func deepAllowUnexported(vs ...interface{}) cmp.Option {
 m := make(map[reflect.Type]struct{})
 for _, v := range vs {
 structTypes(reflect.ValueOf(v), m)
 }
 var typs []interface{}
 for t := range m {
 typs = append(typs, reflect.New(t).Elem().Interface())
 }
 return cmp.AllowUnexported(typs...)
 }

 func structTypes(v reflect.Value, m map[reflect.Type]struct{}) {
 if !v.IsValid() {
 return
 }
 switch v.Kind() {
 case reflect.Ptr:
 if !v.IsNil() {
 structTypes(v.Elem(), m)
 }
 case reflect.Interface:
 if !v.IsNil() {
 structTypes(v.Elem(), m)
 }
 case reflect.Slice, reflect.Array:
 for i := 0; i < v.Len(); i++ {
 structTypes(v.Index(i), m)
 }
 case reflect.Map:
 for _, k := range v.MapKeys() {
 structTypes(v.MapIndex(k), m)
 }
 case reflect.Struct:
 m[v.Type()] = struct{}{}
 for i := 0; i < v.NumField(); i++ {
 structTypes(v.Field(i), m)
 }
 }
 }

 func Equalf(t testing.TB, exp, act interface{}, f string, v ...interface{}) {
 func Equal(t testing.TB, exp, act interface{}, name string) {
 t.Helper()
 diff := cmpDiff(exp, act)
 if diff != "" {
 t.Fatalf(f+": %v",append(v, diff)...)
 t.Fatalf("unexpected %v: %v",name, diff)
 }
 }

 funcNotEqualf(t testing.TB, exp, act interface{},f string, v ...interface{}) {
 funcNotEqual(t testing.TB, exp, act interface{},name string) {
 t.Helper()
 diff := cmpDiff(exp, act)
 if diff == "" {
 t.Fatalf(f+": %v", append(v, diff)...)
 if cmpDiff(exp, act) == "" {
 t.Fatalf("expected different %v: %+v", name, act)
 }
 }

 func Success(t testing.TB, err error) {
 t.Helper()
 if err != nil {
 t.Fatalf("unexpected error: %+v", err)
 t.Fatalf("unexpected error: %+v", err)
 }
 }

 t.Fatalf("error string %q does not contain %q", errs, sub)
 }
 }

 func Panicf(t testing.TB, f string, v ...interface{}) {
 r := recover()
 if r == nil {
 t.Fatalf(f, v...)
 }
 }
diff --git a/internal/assert/cmp.go b/internal/assert/cmp.go
 package assert

 import (
 "github.com/google/go-cmp/cmp"
 "reflect"
 )

 // https://github.com/google/go-cmp/issues/40#issuecomment-328615283
 func cmpDiff(exp, act interface{}) string {
 return cmp.Diff(exp, act, deepAllowUnexported(exp, act))
 }

 func deepAllowUnexported(vs ...interface{}) cmp.Option {
 m := make(map[reflect.Type]struct{})
 for _, v := range vs {
 structTypes(reflect.ValueOf(v), m)
 }
 var typs []interface{}
 for t := range m {
 typs = append(typs, reflect.New(t).Elem().Interface())
 }
 return cmp.AllowUnexported(typs...)
 }

 func structTypes(v reflect.Value, m map[reflect.Type]struct{}) {
 if !v.IsValid() {
 return
 }
 switch v.Kind() {
 case reflect.Ptr:
 if !v.IsNil() {
 structTypes(v.Elem(), m)
 }
 case reflect.Interface:
 if !v.IsNil() {
 structTypes(v.Elem(), m)
 }
 case reflect.Slice, reflect.Array:
 for i := 0; i < v.Len(); i++ {
 structTypes(v.Index(i), m)
 }
 case reflect.Map:
 for _, k := range v.MapKeys() {
 structTypes(v.MapIndex(k), m)
 }
 case reflect.Struct:
 m[v.Type()] = struct{}{}
 for i := 0; i < v.NumField(); i++ {
 structTypes(v.Field(i), m)
 }
 }
 }
diff --git a/internal/bufpool/buf.go → internal/bpool/bpool.go b/internal/bufpool/buf.go → internal/bpool/bpool.go
 packagebufpool
 packagebpool

 import (
 "bytes"
 // Get returns a buffer from the pool or creates a new one if
 // the pool is empty.
 func Get() *bytes.Buffer {
 b, ok:= pool.Get().(*bytes.Buffer)
 if!ok {
 b = &bytes.Buffer{}
 b:= pool.Get()
 ifb == nil {
 return &bytes.Buffer{}
 }
 return b
 return b.(*bytes.Buffer)
 }

 // Put returns a buffer into the pool.
Original file line number	Diff line number	Diff line change
		@@ -1,4 +1,3 @@
		<!--
		Please be as descriptive as possible.
		Reproducible examples are key to finding and fixing bugs.
		-->
Original file line number	Diff line number	Diff line change
Expand Up		@@ -165,10 +165,6 @@ faster, the compression extensions are fully supported and as much as possible i

		See the gorilla/websocket comparison for more performance details.

		## Contributing

		See [.github/CONTRIBUTING.md](.github/CONTRIBUTING.md).

		## Users

		If your company or project is using this library, feel free to open an issue or PR to amend this list.
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -33,7 +33,7 @@ func assertJSONEcho(t testing.T, ctx context.Context, c websocket.Conn, n int)
		err = wsjson.Read(ctx, c, &act)
		assert.Success(t, err)

		assert.Equalf(t, exp, act, "unexpected JSON")
		assert.Equal(t, exp, act, "unexpected JSON")
		}

		func assertJSONRead(t testing.T, ctx context.Context, c websocket.Conn, exp interface{}) {
Expand All		@@ -43,7 +43,7 @@ func assertJSONRead(t testing.T, ctx context.Context, c websocket.Conn, exp in
		err := wsjson.Read(ctx, c, &act)
		assert.Success(t, err)

		assert.Equalf(t, exp, act, "unexpected JSON")
		assert.Equal(t, exp, act, "unexpected JSON")
		}

		func randString(n int) string {
Expand All		@@ -69,18 +69,18 @@ func assertEcho(t testing.T, ctx context.Context, c websocket.Conn, typ websoc
		typ2, p2, err := c.Read(ctx)
		assert.Success(t, err)

		assert.Equalf(t, typ, typ2, "unexpected data type")
		assert.Equalf(t, p, p2, "unexpected payload")
		assert.Equal(t, typ, typ2, "unexpected data type")
		assert.Equal(t, p, p2, "unexpected payload")
		}

		func assertSubprotocol(t testing.T, c websocket.Conn, exp string) {
		t.Helper()

		assert.Equalf(t, exp, c.Subprotocol(), "unexpected subprotocol")
		assert.Equal(t, exp, c.Subprotocol(), "unexpected subprotocol")
		}

		func assertCloseStatus(t *testing.T, exp websocket.StatusCode, err error) {
		t.Helper()

		assert.Equalf(t, exp, websocket.CloseStatus(err), "unexpected status code")
		assert.Equal(t, exp, websocket.CloseStatus(err), "unexpected status code")
		}
Original file line number	Diff line number	Diff line change
Expand Up		@@ -20,6 +20,4 @@ coveralls: gotest
		gotest:
		go test -covermode=count -coverprofile=ci/out/coverage.prof -coverpkg=./... $${GOTESTFLAGS-} ./...
		sed -i '/_stringer\.go/d' ci/out/coverage.prof
		sed -i '/wsecho\.go/d' ci/out/coverage.prof
		sed -i '/assert\.go/d' ci/out/coverage.prof
		sed -i '/wsgrace\.go/d' ci/out/coverage.prof
		sed -i '/assert/d' ci/out/coverage.prof
Original file line number	Diff line number	Diff line change
Expand Up		@@ -6,7 +6,7 @@ import (
		"errors"
		"fmt"
		"log"
		"nhooyr.io/websocket/internal/bufpool"
		"nhooyr.io/websocket/internal/bpool"
		"time"
		)

Expand DownExpand Up		@@ -146,10 +146,10 @@ func (cr *connReader) waitClose() error {
		}
		defer cr.mu.Unlock()

		b :=bufpool.Get()
		b :=bpool.Get()
		buf := b.Bytes()
		buf = buf[:cap(buf)]
		deferbufpool.Put(b)
		deferbpool.Put(b)

		for {
		// TODO
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -189,7 +189,7 @@ func TestCloseStatus(t *testing.T) {
		t.Run(tc.name, func(t *testing.T) {
		t.Parallel()

		assert.Equalf(t, tc.exp, CloseStatus(tc.in), "unexpected close status")
		assert.Equal(t, tc.exp, CloseStatus(tc.in), "unexpected close status")
		})
		}
		}
Original file line number	Diff line number	Diff line change
Expand Up		@@ -5,7 +5,6 @@ import (
		"encoding/binary"
		"math"
		"math/bits"
		"nhooyr.io/websocket/internal/errd"
		)

		// opcode represents a WebSocket opcode.
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -90,7 +90,7 @@ func testHeader(t *testing.T, h header) {
		h2, err := readFrameHeader(r)
		assert.Success(t, err)

		assert.Equalf(t, h, h2, "written and read headers differ")
		assert.Equal(t, h, h2, "written and read headers differ")
		}

		func Test_mask(t *testing.T) {
Expand All		@@ -101,8 +101,8 @@ func Test_mask(t *testing.T) {
		p := []byte{0xa, 0xb, 0xc, 0xf2, 0xc}
		gotKey32 := mask(key32, p)

		assert.Equalf(t, []byte{0, 0, 0, 0x0d, 0x6}, p, "unexpected mask")
		assert.Equalf(t, bits.RotateLeft32(key32, -8), gotKey32, "unexpected mask key")
		assert.Equal(t, []byte{0, 0, 0, 0x0d, 0x6}, p, "unexpected mask")
		assert.Equal(t, bits.RotateLeft32(key32, -8), gotKey32, "unexpected mask key")
		}

		func basicMask(maskKey [4]byte, pos int, b []byte) int {
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -7,13 +7,13 @@ require (
		github.com/gobwas/httphead v0.0.0-20180130184737-2c6c146eadee // indirect
		github.com/gobwas/pool v0.2.0 // indirect
		github.com/gobwas/ws v1.0.2
		github.com/golang/protobuf v1.3.2
		github.com/golang/protobuf v1.3.2 // indirect
		github.com/google/go-cmp v0.3.1
		github.com/gorilla/websocket v1.4.1
		github.com/kr/pretty v0.1.0 // indirect
		github.com/stretchr/testify v1.4.0 // indirect
		go.uber.org/atomic v1.4.0 // indirect
		go.uber.org/multierr v1.1.0
		go.uber.org/multierr v1.1.0 // indirect
		golang.org/x/time v0.0.0-20190308202827-9d24e82272b4
		gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 // indirect
		)
Original file line number	Diff line number	Diff line change
		@@ -1,79 +1,29 @@
		package assert

		import (
		"reflect"
		"strings"
		"testing"

		"github.com/google/go-cmp/cmp"
		)

		// https://github.com/google/go-cmp/issues/40#issuecomment-328615283
		func cmpDiff(exp, act interface{}) string {
		return cmp.Diff(exp, act, deepAllowUnexported(exp, act))
		}

		func deepAllowUnexported(vs ...interface{}) cmp.Option {
		m := make(map[reflect.Type]struct{})
		for _, v := range vs {
		structTypes(reflect.ValueOf(v), m)
		}
		var typs []interface{}
		for t := range m {
		typs = append(typs, reflect.New(t).Elem().Interface())
		}
		return cmp.AllowUnexported(typs...)
		}

		func structTypes(v reflect.Value, m map[reflect.Type]struct{}) {
		if !v.IsValid() {
		return
		}
		switch v.Kind() {
		case reflect.Ptr:
		if !v.IsNil() {
		structTypes(v.Elem(), m)
		}
		case reflect.Interface:
		if !v.IsNil() {
		structTypes(v.Elem(), m)
		}
		case reflect.Slice, reflect.Array:
		for i := 0; i < v.Len(); i++ {
		structTypes(v.Index(i), m)
		}
		case reflect.Map:
		for _, k := range v.MapKeys() {
		structTypes(v.MapIndex(k), m)
		}
		case reflect.Struct:
		m[v.Type()] = struct{}{}
		for i := 0; i < v.NumField(); i++ {
		structTypes(v.Field(i), m)
		}
		}
		}

		func Equalf(t testing.TB, exp, act interface{}, f string, v ...interface{}) {
		func Equal(t testing.TB, exp, act interface{}, name string) {
		t.Helper()
		diff := cmpDiff(exp, act)
		if diff != "" {
		t.Fatalf(f+": %v",append(v, diff)...)
		t.Fatalf("unexpected %v: %v",name, diff)
		}
		}

		funcNotEqualf(t testing.TB, exp, act interface{},f string, v ...interface{}) {
		funcNotEqual(t testing.TB, exp, act interface{},name string) {
		t.Helper()
		diff := cmpDiff(exp, act)
		if diff == "" {
		t.Fatalf(f+": %v", append(v, diff)...)
		if cmpDiff(exp, act) == "" {
		t.Fatalf("expected different %v: %+v", name, act)
		}
		}

		func Success(t testing.TB, err error) {
		t.Helper()
		if err != nil {
		t.Fatalf("unexpected error: %+v", err)
		t.Fatalf("unexpected error: %+v", err)
		}
		}

Expand All		@@ -92,10 +42,3 @@ func ErrorContains(t testing.TB, err error, sub string) {
		t.Fatalf("error string %q does not contain %q", errs, sub)
		}
		}

		func Panicf(t testing.TB, f string, v ...interface{}) {
		r := recover()
		if r == nil {
		t.Fatalf(f, v...)
		}
		}