Skip to content

Commit

Permalink
2024-08-13 19:22:17: merge [master:b72fc78c81b5b88774c8df9cce0b749dc2…
Browse files Browse the repository at this point in the history
…714c4a];
  • Loading branch information
txix committed Aug 13, 2024
1 parent df311a8 commit 59edf49
Show file tree
Hide file tree
Showing 11 changed files with 12 additions and 11 deletions.
1 change: 1 addition & 0 deletions .version
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
3.2.0
2 changes: 1 addition & 1 deletion acceptance_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@ import (
"testing"
"time"

"github.com/coder/websocket"
"github.com/stretchr/testify/require"
"github.com/txix-open/etp/v3"
"github.com/txix-open/etp/v3/msg"
"nhooyr.io/websocket"
)

type CallHandler struct {
Expand Down
2 changes: 1 addition & 1 deletion client.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ import (
"fmt"
"sync"

"github.com/coder/websocket"
"github.com/txix-open/etp/v3/internal"
"nhooyr.io/websocket"
)

var (
Expand Down
2 changes: 1 addition & 1 deletion client_options.go
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package etp

import (
"nhooyr.io/websocket"
"github.com/coder/websocket"
)

type DialOptions = websocket.DialOptions
Expand Down
2 changes: 1 addition & 1 deletion client_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,11 @@ import (
"testing"
"time"

"github.com/coder/websocket"
"github.com/stretchr/testify/require"
"github.com/txix-open/etp/v3"
"github.com/txix-open/etp/v3/msg"
"github.com/txix-open/etp/v3/store"
"nhooyr.io/websocket"
)

func TestClient_OnDisconnect(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion close.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package etp
import (
"errors"

"nhooyr.io/websocket"
"github.com/coder/websocket"
)

func IsNormalClose(err error) bool {
Expand Down
2 changes: 1 addition & 1 deletion conn.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@ import (
"fmt"
"net/http"

"github.com/coder/websocket"
"github.com/txix-open/etp/v3/bpool"
"github.com/txix-open/etp/v3/internal"
"github.com/txix-open/etp/v3/msg"
"github.com/txix-open/etp/v3/store"
"nhooyr.io/websocket"
)

type Conn struct {
Expand Down
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ module github.com/txix-open/etp/v3

go 1.22

require nhooyr.io/websocket v1.8.11
require github.com/coder/websocket v1.8.12

require (
github.com/davecgh/go-spew v1.1.1 // indirect
Expand Down
4 changes: 2 additions & 2 deletions go.sum
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
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.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
Expand All @@ -8,5 +10,3 @@ gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
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.11 h1:f/qXNc2/3DpoSZkHt1DQu6rj4zGC8JmkkLkWss0MgN0=
nhooyr.io/websocket v1.8.11/go.mod h1:rN9OFWIUwuxg4fR5tELlYC04bXYowCP9GX47ivo2l+c=
2 changes: 1 addition & 1 deletion server.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ import (
"fmt"
"net/http"

"github.com/coder/websocket"
"github.com/txix-open/etp/v3/internal"
"nhooyr.io/websocket"
)

type Server struct {
Expand Down
2 changes: 1 addition & 1 deletion server_options.go
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package etp

import (
"nhooyr.io/websocket"
"github.com/coder/websocket"
)

const (
Expand Down

0 comments on commit 59edf49

Please sign in to comment.