From 60635005e7325a18660ed364401e1c4fbac1faee Mon Sep 17 00:00:00 2001
From: minish <minish@riseup.net>
Date: Mon, 29 Dec 2025 21:40:10 -0500
Subject: [PATCH] feat: port to coder/websocket + fix conn

---
 go.mod              |  2 +-
 go.sum              |  4 ++--
 websocket/client.go | 26 ++++++++++++++------------
 3 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/go.mod b/go.mod
index 334a981..c7ffb1b 100644
--- a/go.mod
+++ b/go.mod
@@ -2,4 +2,4 @@ module git.min.rip/min/websocket-client-go
 
 go 1.23.6
 
-require golang.org/x/net v0.35.0
+require github.com/coder/websocket v1.8.14
diff --git a/go.sum b/go.sum
index f4761f9..c80e2f0 100644
--- a/go.sum
+++ b/go.sum
@@ -1,2 +1,2 @@
-golang.org/x/net v0.35.0 h1:T5GQRQb2y08kTAByq9L4/bz8cipCdA8FbRTXewonqY8=
-golang.org/x/net v0.35.0/go.mod h1:EglIi67kWsHKlRzzVMUD93VMSWGFOMSZgxFjparz1Qk=
+github.com/coder/websocket v1.8.14 h1:9L0p0iKiNOibykf283eHkKUHHrpG7f65OE3BhhO7v9g=
+github.com/coder/websocket v1.8.14/go.mod h1:NX3SzP+inril6yawo5CQXx8+fk145lPDC6pumgx0mVg=
diff --git a/websocket/client.go b/websocket/client.go
index d5cf2d8..8282a32 100644
--- a/websocket/client.go
+++ b/websocket/client.go
@@ -2,13 +2,15 @@ package websocket
 
 import (
 	"context"
-	"encoding/json"
+	"errors"
 	"fmt"
+	"net/http"
 	"net/url"
 	"sync"
 	"time"
 
-	"golang.org/x/net/websocket"
+	"github.com/coder/websocket"
+	"github.com/coder/websocket/wsjson"
 )
 
 type WebSocketClient struct {
@@ -42,8 +44,9 @@ func (ws *WebSocketClient) Connect(
 	attempts int,
 	interval time.Duration,
 ) (err error) {
-	ws.Disconnect()
-	ws.ctx, ws.cancel = context.WithCancel(context.Background())
+	if ws.conn != nil {
+		return errors.New("connection already open")
+	}
 
 	ws.URL, err = url.Parse(webSocketUrl)
 	if err != nil {
@@ -53,7 +56,9 @@ func (ws *WebSocketClient) Connect(
 	// attempt retry
 	for range attempts {
 		origin := ws.URL.Scheme + "://" + ws.URL.Host
-		ws.conn, err = websocket.Dial(ws.URL.String(), "", origin)
+		header := make(http.Header)
+		header.Add("Origin", origin)
+		ws.conn, _, err = websocket.Dial(ws.ctx, ws.URL.String(), &websocket.DialOptions{HTTPHeader: header})
 		if err == nil {
 			break
 		}
@@ -77,7 +82,8 @@ func (ws *WebSocketClient) Connect(
 				return
 			default:
 				var payload []byte
-				if err := websocket.Message.Receive(ws.conn, &payload); err != nil {
+				_, payload, err := ws.conn.Read(ws.ctx)
+				if err != nil {
 					if ws.onClose != nil {
 						ws.onClose(ws)
 					}
@@ -93,7 +99,7 @@ func (ws *WebSocketClient) Connect(
 
 func (ws *WebSocketClient) Disconnect() {
 	if ws.conn != nil {
-		ws.conn.Close()
+		ws.conn.CloseNow()
 	}
 
 	ws.cancel()
@@ -105,9 +111,5 @@ func (ws *WebSocketClient) Disconnect() {
 }
 
 func (ws *WebSocketClient) SendJSON(v any) error {
-	bytes, err := json.Marshal(v)
-	if err != nil {
-		return fmt.Errorf("failed to marshal json: %v", err)
-	}
-	return websocket.Message.Send(ws.conn, string(bytes))
+	return wsjson.Write(ws.ctx, ws.conn, v)
 }