diff --git a/cmd/daemon/api_server.go b/cmd/daemon/api_server.go index c2cad31..0ed4340 100644 --- a/cmd/daemon/api_server.go +++ b/cmd/daemon/api_server.go @@ -13,11 +13,11 @@ import ( "sync" "time" + "github.com/coder/websocket" + "github.com/coder/websocket/wsjson" librespot "github.com/devgianlu/go-librespot" metadatapb "github.com/devgianlu/go-librespot/proto/spotify/metadata" "github.com/rs/cors" - "nhooyr.io/websocket" - "nhooyr.io/websocket/wsjson" ) const timeout = 10 * time.Second diff --git a/dealer/dealer.go b/dealer/dealer.go index 649826c..c10cad4 100644 --- a/dealer/dealer.go +++ b/dealer/dealer.go @@ -10,8 +10,8 @@ import ( "time" "github.com/cenkalti/backoff/v4" + "github.com/coder/websocket" librespot "github.com/devgianlu/go-librespot" - "nhooyr.io/websocket" ) const ( @@ -84,7 +84,7 @@ func (d *Dealer) connect(ctx context.Context) error { return fmt.Errorf("failed obtaining dealer access token: %w", err) } - if conn, _, err := websocket.Dial(context.Background(), fmt.Sprintf("wss://%s/?access_token=%s", d.addr(ctx), accessToken), &websocket.DialOptions{ + if conn, _, err := websocket.Dial(ctx, fmt.Sprintf("wss://%s/?access_token=%s", d.addr(ctx), accessToken), &websocket.DialOptions{ HTTPClient: d.client, HTTPHeader: http.Header{ "User-Agent": []string{librespot.UserAgent()}, diff --git a/go.mod b/go.mod index 76aa06c..597c1f0 100644 --- a/go.mod +++ b/go.mod @@ -6,6 +6,7 @@ toolchain go1.25.5 require ( github.com/cenkalti/backoff/v4 v4.3.0 + github.com/coder/websocket v1.8.14 github.com/devgianlu/shannon v0.0.0-20230613115856-82ec90b7fa7e github.com/godbus/dbus/v5 v5.2.0 github.com/gofrs/flock v0.13.0 @@ -28,7 +29,6 @@ require ( golang.org/x/oauth2 v0.34.0 golang.org/x/sys v0.39.0 google.golang.org/protobuf v1.36.11 - nhooyr.io/websocket v1.8.17 ) require ( diff --git a/go.sum b/go.sum index 5f08e71..98d90eb 100644 --- a/go.sum +++ b/go.sum @@ -2,6 +2,8 @@ github.com/cenkalti/backoff v2.2.1+incompatible h1:tNowT99t7UNflLxfYYSlKYsBpXdEe github.com/cenkalti/backoff v2.2.1+incompatible/go.mod h1:90ReRw6GdpyfrHakVjL/QHaoyV4aDUVVkXQJJJ3NXXM= github.com/cenkalti/backoff/v4 v4.3.0 h1:MyRJ/UdXutAwSAT+s3wNd7MfTIcy71VQueUuFK343L8= github.com/cenkalti/backoff/v4 v4.3.0/go.mod h1:Y3VNntkOUPxTVeUxJ/G5vcM//AlwfmyYozVcomhLiZE= +github.com/coder/websocket v1.8.14 h1:9L0p0iKiNOibykf283eHkKUHHrpG7f65OE3BhhO7v9g= +github.com/coder/websocket v1.8.14/go.mod h1:NX3SzP+inril6yawo5CQXx8+fk145lPDC6pumgx0mVg= 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= @@ -107,5 +109,3 @@ gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EV gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= -nhooyr.io/websocket v1.8.17 h1:KEVeLJkUywCKVsnLIDlD/5gtayKp8VoCkksHCGGfT9Y= -nhooyr.io/websocket v1.8.17/go.mod h1:rN9OFWIUwuxg4fR5tELlYC04bXYowCP9GX47ivo2l+c=