chore: remove usage of wsconn in favor of websocket

Emyrk · Emyrk · commit 2c47de026755 · 2024-12-18T14:03:11.000-06:00
diff --git a/tailnet/derp.go b/tailnet/derp.go
@@ -10,7 +10,6 @@ import (
 
 	"nhooyr.io/websocket"
 	"tailscale.com/derp"
-	"tailscale.com/net/wsconn"
 )
 
 // WithWebsocketSupport returns an http.Handler that upgrades
@@ -60,7 +59,7 @@ func WithWebsocketSupport(s *derp.Server, base http.Handler) (http.Handler, func
 				c.Close(websocket.StatusPolicyViolation, "client must speak the derp subprotocol")
 				return
 			}
-			wc := wsconn.NetConn(ctx, c, websocket.MessageBinary)
+			wc := websocket.NetConn(ctx, c, websocket.MessageBinary)
 			brw := bufio.NewReadWriter(bufio.NewReader(wc), bufio.NewWriter(wc))
 			s.Accept(ctx, wc, brw, r.RemoteAddr)
 		}), func() {

Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,6 @@ import (`
`10`	`10`
`11`	`11`	`"nhooyr.io/websocket"`
`12`	`12`	`"tailscale.com/derp"`
`13`		`- "tailscale.com/net/wsconn"`
`14`	`13`	`)`
`15`	`14`
`16`	`15`	`// WithWebsocketSupport returns an http.Handler that upgrades`
`@@ -60,7 +59,7 @@ func WithWebsocketSupport(s *derp.Server, base http.Handler) (http.Handler, func`
`60`	`59`	`c.Close(websocket.StatusPolicyViolation, "client must speak the derp subprotocol")`
`61`	`60`	`return`
`62`	`61`	`}`
`63`		`- wc := wsconn.NetConn(ctx, c, websocket.MessageBinary)`
	`62`	`+ wc := websocket.NetConn(ctx, c, websocket.MessageBinary)`
`64`	`63`	`brw := bufio.NewReadWriter(bufio.NewReader(wc), bufio.NewWriter(wc))`
`65`	`64`	`s.Accept(ctx, wc, brw, r.RemoteAddr)`
`66`	`65`	`}), func() {`