up

lxzan · lxzan · commit 7c1bb91cc48c · 2023-08-05T17:11:02.000+08:00
diff --git a/option.go b/option.go
@@ -97,7 +97,7 @@ type (
 
 		// WebSocket&#23376;&#21327;&#35758;, &#25569;&#25163;&#22833;&#36133;&#20250;&#26029;&#24320;&#36830;&#25509;
 		// WebSocket sub-protocol, handshake failure disconnects the connection
-		Subprotocols []string
+		SubProtocols []string
 
 		// &#39069;&#22806;&#30340;&#21709;&#24212;&#22836;(&#21487;&#33021;&#19981;&#21463;&#23458;&#25143;&#31471;&#25903;&#25345;)
 		// Additional response headers (may not be supported by the client)
diff --git a/option_test.go b/option_test.go
@@ -63,7 +63,7 @@ func TestDefaultUpgrader(t *testing.T) {
 	as.NotNil(updrader.option.ResponseHeader)
 	as.NotNil(updrader.option.Authorize)
 	as.NotNil(updrader.option.NewSessionStorage)
-	as.Nil(updrader.option.Subprotocols)
+	as.Nil(updrader.option.SubProtocols)
 	validateServerOption(as, updrader)
 }
 
diff --git a/updrader.go b/updrader.go
@@ -26,8 +26,8 @@ func NewUpgrader(eventHandler Event, option *ServerOption) *Upgrader {
 }
 
 func (c *Upgrader) connectHandshake(r *http.Request, responseHeader http.Header, conn net.Conn, websocketKey string) (subprotocol string, err error) {
-	if len(c.option.Subprotocols) > 0 {
-		subprotocol = internal.GetIntersectionElem(internal.Split(r.Header.Get(internal.SecWebSocketProtocol.Key), ","), c.option.Subprotocols)
+	if len(c.option.SubProtocols) > 0 {
+		subprotocol = internal.GetIntersectionElem(internal.Split(r.Header.Get(internal.SecWebSocketProtocol.Key), ","), c.option.SubProtocols)
 		if subprotocol == "" {
 			return "", ErrHandshake
 		}
diff --git a/upgrader_test.go b/upgrader_test.go
@@ -111,7 +111,7 @@ func TestAccept(t *testing.T) {
 
 	t.Run("ok", func(t *testing.T) {
 		upgrader.option.CompressEnabled = true
-		upgrader.option.Subprotocols = []string{"chat"}
+		upgrader.option.SubProtocols = []string{"chat"}
 		var request = &http.Request{
 			Header: http.Header{},
 			Method: http.MethodGet,
@@ -325,7 +325,7 @@ func TestBuiltinEventEngine(t *testing.T) {
 func TestSubprotocol(t *testing.T) {
 	t.Run("server close", func(t *testing.T) {
 		var addr = "127.0.0.1:" + nextPort()
-		app := NewServer(new(BuiltinEventHandler), &ServerOption{Subprotocols: []string{"chat"}})
+		app := NewServer(new(BuiltinEventHandler), &ServerOption{SubProtocols: []string{"chat"}})
 		go func() { app.Run(addr) }()
 
 		time.Sleep(100 * time.Millisecond)
@@ -350,7 +350,7 @@ func TestSubprotocol(t *testing.T) {
 
 	t.Run("ok", func(t *testing.T) {
 		var addr = "127.0.0.1:" + nextPort()
-		app := NewServer(new(BuiltinEventHandler), &ServerOption{Subprotocols: []string{"chat"}})
+		app := NewServer(new(BuiltinEventHandler), &ServerOption{SubProtocols: []string{"chat"}})
 		go func() { app.Run(addr) }()
 
 		time.Sleep(100 * time.Millisecond)

Original file line number	Diff line number	Diff line change
`@@ -63,7 +63,7 @@ func TestDefaultUpgrader(t *testing.T) {`
`63`	`63`	`as.NotNil(updrader.option.ResponseHeader)`
`64`	`64`	`as.NotNil(updrader.option.Authorize)`
`65`	`65`	`as.NotNil(updrader.option.NewSessionStorage)`
`66`		`- as.Nil(updrader.option.Subprotocols)`
	`66`	`+ as.Nil(updrader.option.SubProtocols)`
`67`	`67`	`validateServerOption(as, updrader)`
`68`	`68`	`}`
`69`	`69`
Original file line number	Diff line number	Diff line change
`@@ -26,8 +26,8 @@ func NewUpgrader(eventHandler Event, option ServerOption) Upgrader {`
`26`	`26`	`}`
`27`	`27`
`28`	`28`	`func (c Upgrader) connectHandshake(r http.Request, responseHeader http.Header, conn net.Conn, websocketKey string) (subprotocol string, err error) {`
`29`		`- if len(c.option.Subprotocols) > 0 {`
`30`		`- subprotocol = internal.GetIntersectionElem(internal.Split(r.Header.Get(internal.SecWebSocketProtocol.Key), ","), c.option.Subprotocols)`
	`29`	`+ if len(c.option.SubProtocols) > 0 {`
	`30`	`+ subprotocol = internal.GetIntersectionElem(internal.Split(r.Header.Get(internal.SecWebSocketProtocol.Key), ","), c.option.SubProtocols)`
`31`	`31`	`if subprotocol == "" {`
`32`	`32`	`return "", ErrHandshake`
`33`	`33`	`}`