Fix CI

Hopefully this time things work.

Author: nhooyr

.github/lib.sh

@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-set -euxo pipefail
+set -euxo pipefail || exit 1
 
 export GO111MODULE=on
 export PAGER=cat

accept.go

@@ -22,25 +22,25 @@ type acceptSubprotocols []string
 
 func (o acceptSubprotocols) acceptOption() {}
 
-// AcceptProtocols lists the websocket protocols that Accept will negotiate with a client.
-// The empty protocol will always be negotiated as per RFC 6455. If you would like to
+// AcceptSubprotocols lists the websocket subprotocols that Accept will negotiate with a client.
+// The empty subprotocol will always be negotiated as per RFC 6455. If you would like to
 // reject it, close the connection if c.Subprotocol() == "".
-func AcceptProtocols(subprotocols ...string) AcceptOption {
-	return acceptSubprotocols(subprotocols)
+func AcceptSubprotocols(protocols ...string) AcceptOption {
+	return acceptSubprotocols(protocols)
 }
 
 type acceptOrigins []string
 
 func (o acceptOrigins) acceptOption() {}
 
 // AcceptOrigins lists the origins that Accept will accept.
-// Accept will always accept r.Host as the origin so you do not need to
-// specify that with this option.
+// Accept will always accept r.Host as the origin. Use this
+// option when you want to accept an origin with a different domain
+// than the one the WebSocket server is running on.
 //
 // Use this option with caution to avoid exposing your WebSocket
 // server to a CSRF attack.
 // See https://stackoverflow.com/a/37837709/4283659
-// You can use a * for wildcards.
 func AcceptOrigins(origins ...string) AcceptOption {
 	return acceptOrigins(origins)
 }

websocket.go

@@ -70,7 +70,7 @@ func (c *Conn) close(err error) {
 
 // Subprotocol returns the negotiated subprotocol.
 // An empty string means the default protocol.
-func (c *Conn) Protocol() string {
+func (c *Conn) Subprotocol() string {
 	return c.subprotocol
 }
 

websocket_test.go

@@ -34,7 +34,7 @@ func TestHandshake(t *testing.T) {
 		{
 			name: "handshake",
 			server: func(w http.ResponseWriter, r *http.Request) error {
-				c, err := websocket.Accept(w, r, websocket.AcceptProtocols("myproto"))
+				c, err := websocket.Accept(w, r, websocket.AcceptSubprotocols("myproto"))
 				if err != nil {
 					return err
 				}
@@ -74,8 +74,8 @@ func TestHandshake(t *testing.T) {
 				}
 				defer c.Close(websocket.StatusInternalError, "")
 
-				if c.Protocol() != "" {
-					return xerrors.Errorf("unexpected subprotocol: %v", c.Protocol())
+				if c.Subprotocol() != "" {
+					return xerrors.Errorf("unexpected subprotocol: %v", c.Subprotocol())
 				}
 				return nil
 			},
@@ -86,23 +86,23 @@ func TestHandshake(t *testing.T) {
 				}
 				defer c.Close(websocket.StatusInternalError, "")
 
-				if c.Protocol() != "" {
-					return xerrors.Errorf("unexpected subprotocol: %v", c.Protocol())
+				if c.Subprotocol() != "" {
+					return xerrors.Errorf("unexpected subprotocol: %v", c.Subprotocol())
 				}
 				return nil
 			},
 		},
 		{
 			name: "subprotocol",
 			server: func(w http.ResponseWriter, r *http.Request) error {
-				c, err := websocket.Accept(w, r, websocket.AcceptProtocols("echo", "lar"))
+				c, err := websocket.Accept(w, r, websocket.AcceptSubprotocols("echo", "lar"))
 				if err != nil {
 					return err
 				}
 				defer c.Close(websocket.StatusInternalError, "")
 
-				if c.Protocol() != "echo" {
-					return xerrors.Errorf("unexpected subprotocol: %q", c.Protocol())
+				if c.Subprotocol() != "echo" {
+					return xerrors.Errorf("unexpected subprotocol: %q", c.Subprotocol())
 				}
 				return nil
 			},
@@ -113,8 +113,8 @@ func TestHandshake(t *testing.T) {
 				}
 				defer c.Close(websocket.StatusInternalError, "")
 
-				if c.Protocol() != "echo" {
-					return xerrors.Errorf("unexpected subprotocol: %q", c.Protocol())
+				if c.Subprotocol() != "echo" {
+					return xerrors.Errorf("unexpected subprotocol: %q", c.Subprotocol())
 				}
 				return nil
 			},
@@ -266,7 +266,7 @@ func TestAutobahnServer(t *testing.T) {
 
 	s := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
 		c, err := websocket.Accept(w, r,
-			websocket.AcceptProtocols("echo"),
+			websocket.AcceptSubprotocols("echo"),
 		)
 		if err != nil {
 			t.Logf("server handshake failed: %+v", err)