Improve API brevity

Author: nhooyr

example_test.go

@@ -29,14 +29,14 @@ func ExampleAccept_echo() {
 			ctx, cancel := context.WithTimeout(ctx, time.Minute)
 			defer cancel()
 
-			typ, r, err := c.ReadMessage(ctx)
+			typ, r, err := c.Read(ctx)
 			if err != nil {
 				return err
 			}
 
 			r = io.LimitReader(r, 32768)
 
-			w := c.MessageWriter(ctx, typ)
+			w := c.Write(ctx, typ)
 			_, err = io.Copy(w, r)
 			if err != nil {
 				return err

header_test.go

@@ -19,7 +19,7 @@ func randBool() bool {
 
 func TestHeader(t *testing.T) {
 	t.Parallel()
-	
+
 	t.Run("negative", func(t *testing.T) {
 		t.Parallel()
 

json.go

@@ -10,7 +10,7 @@ import (
 
 // JSONConn wraps around a Conn with JSON helpers.
 type JSONConn struct {
-	Conn *Conn
+	*Conn
 }
 
 // Read reads a json message into v.
@@ -23,7 +23,7 @@ func (jc JSONConn) Read(ctx context.Context, v interface{}) error {
 }
 
 func (jc *JSONConn) read(ctx context.Context, v interface{}) error {
-	typ, r, err := jc.Conn.ReadMessage(ctx)
+	typ, r, err := jc.Conn.Read(ctx)
 	if err != nil {
 		return err
 	}
@@ -52,7 +52,7 @@ func (jc JSONConn) Write(ctx context.Context, v interface{}) error {
 }
 
 func (jc JSONConn) write(ctx context.Context, v interface{}) error {
-	w := jc.Conn.MessageWriter(ctx, DataText)
+	w := jc.Conn.Write(ctx, DataText)
 
 	e := json.NewEncoder(w)
 	err := e.Encode(v)

test.sh

@@ -10,6 +10,7 @@ function docker_run() {
 	local IMAGE
 	IMAGE="$(docker build -q "$DIR")"
 	docker run \
+		-it \
 		-v "${PWD}:/repo" \
 		-v "$(go env GOPATH):/go" \
 		-v "$(go env GOCACHE):/root/.cache/go-build" \

websocket.go

@@ -401,11 +401,11 @@ func (c *Conn) writeControl(ctx context.Context, opcode opcode, p []byte) error
 	}
 }
 
-// MessageWriter returns a writer bounded by the context that will write
+// Write returns a writer bounded by the context that will write
 // a WebSocket data frame of type dataType to the connection.
 // Ensure you close the messageWriter once you have written to entire message.
 // Concurrent calls to messageWriter are ok.
-func (c *Conn) MessageWriter(ctx context.Context, dataType DataType) io.WriteCloser {
+func (c *Conn) Write(ctx context.Context, dataType DataType) io.WriteCloser {
 	return &messageWriter{
 		c:        c,
 		ctx:      ctx,
@@ -487,7 +487,7 @@ func (w *messageWriter) Close() error {
 // Please use SetContext on the reader to bound the read operation.
 // Your application must keep reading messages for the Conn to automatically respond to ping
 // and close frames.
-func (c *Conn) ReadMessage(ctx context.Context) (DataType, io.Reader, error) {
+func (c *Conn) Read(ctx context.Context) (DataType, io.Reader, error) {
 	select {
 	case <-c.closed:
 		return 0, nil, xerrors.Errorf("failed to read message: %w", c.getCloseErr())

websocket_test.go

@@ -360,12 +360,12 @@ func echoLoop(ctx context.Context, c *websocket.Conn, t *testing.T) {
 		ctx, cancel := context.WithTimeout(ctx, time.Minute)
 		defer cancel()
 
-		typ, r, err := c.ReadMessage(ctx)
+		typ, r, err := c.Read(ctx)
 		if err != nil {
 			return err
 		}
 
-		w := c.MessageWriter(ctx, typ)
+		w := c.Write(ctx, typ)
 
 		_, err = io.Copy(w, r)
 		if err != nil {
@@ -447,7 +447,7 @@ func TestAutobahnClient(t *testing.T) {
 		}
 		defer c.Close(websocket.StatusInternalError, "")
 
-		_, r, err := c.ReadMessage(ctx)
+		_, r, err := c.Read(ctx)
 		if err != nil {
 			t.Fatal(err)
 		}