Skip to content
Permalink

Comparing changes

This is a direct comparison between two commits made in this repository or its related repositories. View the default comparison for this range or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: minekube/connect
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: ef11bc7b4edb8129ef9b59d6beb25924027d45cd
Choose a base ref
..
head repository: minekube/connect
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: bf2b57c9eb5520f4511b69cc72fcf6f43ff8b52b
Choose a head ref
Showing with 7 additions and 7 deletions.
  1. +1 −1 go.mod
  2. +2 −2 go.sum
  3. +1 −1 internal/wspb/wspb.go
  4. +1 −1 ws/client.go
  5. +1 −1 ws/dial.go
  6. +1 −1 ws/server.go
2 changes: 1 addition & 1 deletion go.mod
View file
Original file line number Diff line number Diff line change
@@ -4,11 +4,11 @@ go 1.21.1

require (
buf.build/gen/go/minekube/connect/protocolbuffers/go v1.32.0-20230517110945-04c17e7d2fd9.1
github.com/coder/websocket v1.8.12
github.com/stretchr/testify v1.8.1
google.golang.org/genproto/googleapis/rpc v0.0.0-20240814211410-ddb44dafa142
google.golang.org/grpc v1.67.1
google.golang.org/protobuf v1.34.2
nhooyr.io/websocket v1.8.10
)

require (
4 changes: 2 additions & 2 deletions go.sum
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
buf.build/gen/go/minekube/connect/protocolbuffers/go v1.32.0-20230517110945-04c17e7d2fd9.1 h1:+uYVRAyB2XYZ7hgREHRUY4XAAS5X4e6lY7/ZMDh4a+4=
buf.build/gen/go/minekube/connect/protocolbuffers/go v1.32.0-20230517110945-04c17e7d2fd9.1/go.mod h1:rxISByFKweLOwpKBVtkRWTvyGMp+oNxHwnitXXiboE0=
github.com/coder/websocket v1.8.12 h1:5bUXkEPPIbewrnkU8LTCLVaxi4N4J8ahufH2vlo4NAo=
github.com/coder/websocket v1.8.12/go.mod h1:LNVeNrXQZfe5qhS9ALED3uA+l5pPqvwXg3CKoDBB2gs=
github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
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=
@@ -62,5 +64,3 @@ gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI=
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.10 h1:mv4p+MnGrLDcPlBoWsvPP7XCzTYMXP9F9eIGoKbgx7Q=
nhooyr.io/websocket v1.8.10/go.mod h1:rN9OFWIUwuxg4fR5tELlYC04bXYowCP9GX47ivo2l+c=
2 changes: 1 addition & 1 deletion internal/wspb/wspb.go
View file
Original file line number Diff line number Diff line change
@@ -7,8 +7,8 @@ import (
"fmt"
"sync"

"github.com/coder/websocket"
"google.golang.org/protobuf/proto"
"nhooyr.io/websocket"
)

// Read reads a protobuf message from c into v.
2 changes: 1 addition & 1 deletion ws/client.go
View file
Original file line number Diff line number Diff line change
@@ -6,8 +6,8 @@ import (
"io"
"net/http"

"github.com/coder/websocket"
"go.minekube.com/connect/internal/wspb"
"nhooyr.io/websocket"

"go.minekube.com/connect"
"go.minekube.com/connect/internal/ctxutil"
2 changes: 1 addition & 1 deletion ws/dial.go
View file
Original file line number Diff line number Diff line change
@@ -6,8 +6,8 @@ import (
"fmt"
"net/http"

"github.com/coder/websocket"
"google.golang.org/grpc/metadata"
"nhooyr.io/websocket"
)

// DialErrorResponse returns the HTTP response from the WebSocket handshake error, if any.
2 changes: 1 addition & 1 deletion ws/server.go
View file
Original file line number Diff line number Diff line change
@@ -6,9 +6,9 @@ import (
"net/http"
"time"

"github.com/coder/websocket"
"go.minekube.com/connect/internal/wspb"
"google.golang.org/grpc/metadata"
"nhooyr.io/websocket"

"go.minekube.com/connect"
"go.minekube.com/connect/internal/ctxutil"