mirror of
https://github.com/coder/coder.git
synced 2026-09-24 15:04:27 +08:00
chore: migrate to coder/websocket 1.8.12 (#15898)
Migrates us to `coder/websocket` v1.8.12 rather than `nhooyr/websocket` on an older version. Works around https://github.com/coder/websocket/issues/504 by adding an explicit test for `xerrors.Is(err, io.EOF)` where we were previously getting `io.EOF` from the netConn.
This commit is contained in:
@@ -20,7 +20,6 @@ import (
|
||||
"golang.org/x/exp/slices"
|
||||
"golang.org/x/sync/errgroup"
|
||||
"golang.org/x/xerrors"
|
||||
"nhooyr.io/websocket"
|
||||
"tailscale.com/tailcfg"
|
||||
|
||||
"cdr.dev/slog"
|
||||
@@ -42,6 +41,7 @@ import (
|
||||
"github.com/coder/coder/v2/codersdk/wsjson"
|
||||
"github.com/coder/coder/v2/tailnet"
|
||||
"github.com/coder/coder/v2/tailnet/proto"
|
||||
"github.com/coder/websocket"
|
||||
)
|
||||
|
||||
// @Summary Get workspace agent by ID
|
||||
@@ -378,7 +378,7 @@ func (api *API) workspaceAgentLogs(rw http.ResponseWriter, r *http.Request) {
|
||||
|
||||
// Allow client to request no compression. This is useful for buggy
|
||||
// clients or if there's a client/server incompatibility. This is
|
||||
// needed with e.g. nhooyr/websocket and Safari (confirmed in 16.5).
|
||||
// needed with e.g. coder/websocket and Safari (confirmed in 16.5).
|
||||
//
|
||||
// See:
|
||||
// * https://github.com/nhooyr/websocket/issues/218
|
||||
|
||||
Reference in New Issue
Block a user