Switch websocket library, net/x/websocket is deprecated in golang/go#18152

Author: whywaita

go.mod

@@ -4,12 +4,12 @@ go 1.24.0
 
 require (
 	entgo.io/ent v0.14.1
+	github.com/coder/websocket v1.8.12
 	github.com/go-sql-driver/mysql v1.8.1
 	github.com/golang-migrate/migrate/v4 v4.18.2
 	github.com/jinzhu/configor v1.2.2
 	github.com/labstack/echo/v4 v4.13.3
 	github.com/whywaita/poker-go v0.0.0-20240128181615-ff338443efbd
-	golang.org/x/net v0.35.0
 )
 
 require (
@@ -25,6 +25,7 @@ require (
 	github.com/valyala/fasttemplate v1.2.2 // indirect
 	go.uber.org/atomic v1.7.0 // indirect
 	golang.org/x/crypto v0.33.0 // indirect
+	golang.org/x/net v0.35.0 // indirect
 	golang.org/x/sys v0.30.0 // indirect
 	golang.org/x/text v0.22.0 // indirect
 	golang.org/x/time v0.8.0 // indirect

go.sum

@@ -10,6 +10,8 @@ github.com/DATA-DOG/go-sqlmock v1.5.0 h1:Shsta01QNfFxHCfpW6YH2STWB0MudeXXEWMr20O
 github.com/DATA-DOG/go-sqlmock v1.5.0/go.mod h1:f/Ixk793poVmq4qj/V1dPUg2JEAKC73Q5eFN3EC/SaM=
 github.com/Microsoft/go-winio v0.6.2 h1:F2VQgta7ecxGYO8k3ZZz3RS8fVIXVxONVUPlNERoyfY=
 github.com/Microsoft/go-winio v0.6.2/go.mod h1:yd8OoFMLzJbo9gZq8j5qaps8bJ9aShtEA8Ipt1oGCvU=
+github.com/coder/websocket v1.8.12 h1:5bUXkEPPIbewrnkU8LTCLVaxi4N4J8ahufH2vlo4NAo=
+github.com/coder/websocket v1.8.12/go.mod h1:LNVeNrXQZfe5qhS9ALED3uA+l5pPqvwXg3CKoDBB2gs=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=

pkg/server/server_ws.go

@@ -8,15 +8,14 @@ import (
 	"log"
 	"sort"
 
-	"github.com/whywaita/rfid-poker/pkg/store"
-
 	"github.com/whywaita/rfid-poker/pkg/query"
+	"github.com/whywaita/rfid-poker/pkg/store"
 
+	"github.com/coder/websocket"
 	"github.com/labstack/echo/v4"
-	"golang.org/x/net/websocket"
 )
 
-// Send is struct for SSE
+// Send is struct for WebSocket sending
 type Send struct {
 	Players []SendPlayer `json:"players"`
 	Board   []SendCard   `json:"board"`
@@ -35,23 +34,32 @@ type SendCard struct {
 
 func ws(c echo.Context, conn *sql.DB, notifyCh chan struct{}) error {
 	q := query.New(conn)
-	websocket.Handler(func(ws *websocket.Conn) {
-		defer ws.Close()
-		ctx := c.Request().Context()
 
-		if err := sendPlayer(ctx, q, ws); err != nil {
-			c.Logger().Errorf(err.Error())
-		}
+	wsConn, err := websocket.Accept(c.Response(), c.Request(), &websocket.AcceptOptions{
+		OriginPatterns: []string{"*"},
+	})
+	if err != nil {
+		return fmt.Errorf("failed to accept WebSocket: %w", err)
+	}
+	defer wsConn.Close(websocket.StatusNormalClosure, "")
 
-		for {
-			<-notifyCh
-			err := sendPlayer(ctx, q, ws)
+	ctx := c.Request().Context()
+
+	if err := sendPlayer(ctx, q, wsConn); err != nil {
+		c.Logger().Errorf(err.Error())
+	}
+
+	for {
+		select {
+		case <-ctx.Done():
+			return nil
+		case <-notifyCh:
+			err := sendPlayer(ctx, q, wsConn)
 			if err != nil {
 				c.Logger().Errorf(err.Error())
 			}
 		}
-	}).ServeHTTP(c.Response(), c.Request())
-	return nil
+	}
 }
 
 func sendPlayer(ctx context.Context, q *query.Queries, ws *websocket.Conn) error {
@@ -66,9 +74,10 @@ func sendPlayer(ctx context.Context, q *query.Queries, ws *websocket.Conn) error
 	}
 
 	log.Println("Send: ", string(b))
-	if err := websocket.Message.Send(ws, string(b)); err != nil {
-		return fmt.Errorf("websocket.Message.Send(): %w", err)
+	if err := ws.Write(ctx, websocket.MessageText, b); err != nil {
+		return fmt.Errorf("ws.Write(): %w", err)
 	}
+
 	return nil
 }