coder
diff --git a/‎coderd/healthcheck/websocket.go
Lines changed: 1 addition & 1 deletion b/‎coderd/healthcheck/websocket.go
Lines changed: 1 addition & 1 deletion
diff --git a/‎coderd/httpapi/httpapi.go
Lines changed: 1 addition & 1 deletion b/‎coderd/httpapi/httpapi.go
Lines changed: 1 addition & 1 deletion
diff --git a/‎coderd/httpapi/websocket.go
Lines changed: 1 addition & 1 deletion b/‎coderd/httpapi/websocket.go
Lines changed: 1 addition & 1 deletion
diff --git a/‎coderd/provisionerjobs.go
Lines changed: 2 additions & 3 deletions b/‎coderd/provisionerjobs.go
Lines changed: 2 additions & 3 deletions
diff --git a/‎coderd/provisionerjobs_internal_test.go
Lines changed: 1 addition & 1 deletion b/‎coderd/provisionerjobs_internal_test.go
Lines changed: 1 addition & 1 deletion
diff --git a/‎coderd/workspaceagents.go
Lines changed: 2 additions & 2 deletions b/‎coderd/workspaceagents.go
Lines changed: 2 additions & 2 deletions
diff --git a/‎coderd/workspaceagents_test.go
Lines changed: 1 addition & 1 deletion b/‎coderd/workspaceagents_test.go
Lines changed: 1 addition & 1 deletion
diff --git a/‎coderd/workspaceagentsrpc.go
Lines changed: 1 addition & 1 deletion b/‎coderd/workspaceagentsrpc.go
Lines changed: 1 addition & 1 deletion
diff --git a/‎coderd/workspaceagentsrpc_internal_test.go
Lines changed: 3 additions & 4 deletions b/‎coderd/workspaceagentsrpc_internal_test.go
Lines changed: 3 additions & 4 deletions
diff --git a/‎coderd/workspaceapps/proxy.go
Lines changed: 1 addition & 1 deletion b/‎coderd/workspaceapps/proxy.go
Lines changed: 1 addition & 1 deletion
diff --git a/‎codersdk/agentsdk/agentsdk.go
Lines changed: 1 addition & 1 deletion b/‎codersdk/agentsdk/agentsdk.go
Lines changed: 1 addition & 1 deletion
diff --git a/‎codersdk/provisionerdaemons.go
Lines changed: 1 addition & 1 deletion b/‎codersdk/provisionerdaemons.go
Lines changed: 1 addition & 1 deletion
diff --git a/‎codersdk/websocket.go
Lines changed: 1 addition & 1 deletion b/‎codersdk/websocket.go
Lines changed: 1 addition & 1 deletion
diff --git a/‎codersdk/websocket_test.go
Lines changed: 1 addition & 1 deletion b/‎codersdk/websocket_test.go
Lines changed: 1 addition & 1 deletion
diff --git a/‎codersdk/workspaceagents.go
Lines changed: 1 addition & 1 deletion b/‎codersdk/workspaceagents.go
Lines changed: 1 addition & 1 deletion
diff --git a/‎codersdk/workspacesdk/dialer.go
Lines changed: 1 addition & 1 deletion b/‎codersdk/workspacesdk/dialer.go
Lines changed: 1 addition & 1 deletion
diff --git a/‎codersdk/workspacesdk/dialer_test.go
Lines changed: 1 addition & 1 10000 deletion b/‎codersdk/workspacesdk/dialer_test.go
Lines changed: 1 addition & 1 10000 deletion
diff --git a/‎codersdk/workspacesdk/workspacesdk.go
Lines changed: 1 addition & 1 deletion b/‎codersdk/workspacesdk/workspacesdk.go
Lines changed: 1 addition & 1 deletion
diff --git a/‎codersdk/wsjson/decoder.go
Lines changed: 1 addition & 2 deletions b/‎codersdk/wsjson/decoder.go
Lines changed: 1 addition & 2 deletions
diff --git a/‎codersdk/wsjson/encoder.go
Lines changed: 2 additions & 1 deletion b/‎codersdk/wsjson/encoder.go
Lines changed: 2 additions & 1 deletion
diff --git a/‎enterprise/coderd/provisionerdaemons.go
Lines changed: 1 addition & 2 deletions b/‎enterprise/coderd/provisionerdaemons.go
Lines changed: 1 addition & 2 deletions
diff --git a/‎enterprise/coderd/workspaceproxycoordinate.go
Lines changed: 1 addition & 1 deletion b/‎enterprise/coderd/workspaceproxycoordinate.go
Lines changed: 1 addition & 1 deletion
diff --git a/‎enterprise/wsproxy/wsproxysdk/wsproxysdk.go
Lines changed: 1 addition & 1 deletion b/‎enterprise/wsproxy/wsproxysdk/wsproxysdk.go
Lines changed: 1 addition & 1 deletion
diff --git a/‎go.mod
Lines changed: 3 additions & 3 deletions b/‎go.mod
Lines changed: 3 additions & 3 deletions
@@ -10,10 +10,10 @@ import (
 	"time"
 
 	"golang.org/x/xerrors"
-	"nhooyr.io/websocket"
 
 	"github.com/coder/coder/v2/coderd/healthcheck/health"
 	"github.com/coder/coder/v2/codersdk/healthsdk"
+	"github.com/coder/websocket"
 )
 
 type WebsocketReport healthsdk.WebsocketReport
 
@@ -268,7 +268,7 @@ const websocketCloseMaxLen = 123
 func WebsocketCloseSprintf(format string, vars ...any) string {
 	msg := fmt.Sprintf(format, vars...)
 
-	// Cap msg length at 123 bytes. nhooyr/websocket only allows close messages
+	// Cap msg length at 123 bytes. coder/websocket only allows close messages
 	// of this length.
 	if len(msg) > websocketCloseMaxLen {
 		// Trim the string to 123 bytes. If we accidentally cut in the middle of
 
@@ -6,9 +6,9 @@ import (
 	"time"
 
 	"golang.org/x/xerrors"
-	"nhooyr.io/websocket"
 
 	"cdr.dev/slog"
+	"github.com/coder/websocket"
 )
 
 // Heartbeat loops to ping a WebSocket to keep it alive.
 
@@ -12,18 +12,17 @@ import (
 
 	"github.com/google/uuid"
 	"golang.org/x/xerrors"
-	"nhooyr.io/websocket"
 
 	"cdr.dev/slog"
-	"github.com/coder/coder/v2/codersdk/wsjson"
-
 	"github.com/coder/coder/v2/coderd/database"
 	"github.com/coder/coder/v2/coderd/database/db2sdk"
 	"github.com/coder/coder/v2/coderd/database/dbauthz"
 	"github.com/coder/coder/v2/coderd/database/pubsub"
 	"github.com/coder/coder/v2/coderd/httpapi"
 	"github.com/coder/coder/v2/codersdk"
+	"github.com/coder/coder/v2/codersdk/wsjson"
 	"github.com/coder/coder/v2/provisionersdk"
+	"github.com/coder/websocket"
 )
 
 // Returns provisioner logs based on query parameters.
 
@@ -14,7 +14,6 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 	"go.uber.org/mock/gomock"
-	"nhooyr.io/websocket"
 
 	"github.com/coder/coder/v2/coderd/database"
 	"github.com/coder/coder/v2/coderd/database/dbmock"
@@ -23,6 +22,7 @@ import (
 	"github.com/coder/coder/v2/codersdk"
 	"github.com/coder/coder/v2/provisionersdk"
 	"github.com/coder/coder/v2/testutil"
+	"github.com/coder/websocket"
 )
 
 func TestConvertProvisionerJob_Unit(t *testing.T) {
 
@@ -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
 
@@ -20,7 +20,6 @@ import (
 	"github.com/stretchr/testify/require"
 	"golang.org/x/xerrors"
 	"google.golang.org/protobuf/types/known/timestamppb"
-	"nhooyr.io/websocket"
 	"tailscale.com/tailcfg"
 
 	"cdr.dev/slog"
@@ -50,6 +49,7 @@ import (
 	"github.com/coder/coder/v2/tailnet/tailnettest"
 	"github.com/coder/coder/v2/testutil"
 	"github.com/coder/quartz"
+	"github.com/coder/websocket"
 )
 
 func TestWorkspaceAgent(t *testing.T) {
 
@@ -14,7 +14,6 @@ import (
 	"github.com/google/uuid"
 	"github.com/hashicorp/yamux"
 	"golang.org/x/xerrors"
-	"nhooyr.io/websocket"
 
 	"cdr.dev/slog"
 	"github.com/coder/coder/v2/agent/proto"
@@ -30,6 +29,7 @@ import (
 	"github.com/coder/coder/v2/codersdk"
 	"github.com/coder/coder/v2/tailnet"
 	tailnetproto "github.com/coder/coder/v2/tailnet/proto"
+	"github.com/coder/websocket"
 )
 
 // @Summary Workspace agent RPC API
 
@@ -8,18 +8,17 @@ import (
 	"testing"
 	"time"
 
-	"github.com/coder/coder/v2/coderd/util/ptr"
-	"github.com/coder/coder/v2/coderd/wspubsub"
-
 	"github.com/google/uuid"
 	"github.com/stretchr/testify/require"
 	"go.uber.org/mock/gomock"
-	"nhooyr.io/websocket"
 
 	"github.com/coder/coder/v2/coderd/database"
 	"github.com/coder/coder/v2/coderd/database/dbmock"
 	"github.com/coder/coder/v2/coderd/database/dbtime"
+	"github.com/coder/coder/v2/coderd/util/ptr"
+	"github.com/coder/coder/v2/coderd/wspubsub"
 	"github.com/coder/coder/v2/testutil"
+	"github.com/coder/websocket"
 )
 
 func TestAgentConnectionMonitor_ContextCancel(t *testing.T) {
 
@@ -17,7 +17,6 @@ import (
 	"github.com/go-jose/go-jose/v4/jwt"
 	"github.com/google/uuid"
 	"go.opentelemetry.io/otel/trace"
-	"nhooyr.io/websocket"
 
 	"cdr.dev/slog"
 	"github.com/coder/coder/v2/agent/agentssh"
@@ -32,6 +31,7 @@ import (
 	"github.com/coder/coder/v2/codersdk"
 	"github.com/coder/coder/v2/codersdk/workspacesdk"
 	"github.com/coder/coder/v2/site"
+	"github.com/coder/websocket"
 )
 
 const (
 
@@ -15,7 +15,6 @@ import (
 	"github.com/google/uuid"
 	"github.com/hashicorp/yamux"
 	"golang.org/x/xerrors"
-	"nhooyr.io/websocket"
 	"storj.io/drpc"
 	"tailscale.com/tailcfg"
 
@@ -25,6 +24,7 @@ import (
 	"github.com/coder/coder/v2/codersdk"
 	drpcsdk "github.com/coder/coder/v2/codersdk/drpc"
 	tailnetproto "github.com/coder/coder/v2/tailnet/proto"
+	"github.com/coder/websocket"
 )
 
 // ExternalLogSourceID is the statically-defined ID of a log-source that
 
@@ -15,13 +15,13 @@ import (
 	"golang.org/x/exp/maps"
 	"golang.org/x/exp/slices"
 	"golang.org/x/xerrors"
-	"nhooyr.io/websocket"
 
 	"github.com/coder/coder/v2/buildinfo"
 	"github.com/coder/coder/v2/codersdk/drpc"
 	"github.com/coder/coder/v2/codersdk/wsjson"
 	"github.com/coder/coder/v2/provisionerd/proto"
 	"github.com/coder/coder/v2/provisionerd/runner"
+	"github.com/coder/websocket"
 )
 
 type LogSource string
 
@@ -4,7 +4,7 @@ import (
 	"context"
 	"net"
 
-	"nhooyr.io/websocket"
+	"github.com/coder/websocket"
 )
 
 // wsNetConn wraps net.Conn created by websocket.NetConn(). Cancel func
 
@@ -8,10 +8,10 @@ import (
 
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
-	"nhooyr.io/websocket"
 
 	"github.com/coder/coder/v2/codersdk"
 	"github.com/coder/coder/v2/testutil"
+	"github.com/coder/websocket"
 )
 
 // TestWebsocketNetConn_LargeWrites tests that we can write large amounts of data thru the netconn
 
@@ -12,10 +12,10 @@ import (
 
 	"github.com/google/uuid"
 	"golang.org/x/xerrors"
-	"nhooyr.io/websocket"
 
 	"github.com/coder/coder/v2/coderd/tracing"
 	"github.com/coder/coder/v2/codersdk/wsjson"
+	"github.com/coder/websocket"
 )
 
 type WorkspaceAgentStatus string
 
@@ -9,13 +9,13 @@ import (
 	"slices"
 
 	"golang.org/x/xerrors"
-	"nhooyr.io/websocket"
 
 	"cdr.dev/slog"
 	"github.com/coder/coder/v2/buildinfo"
 	"github.com/coder/coder/v2/codersdk"
 	"github.com/coder/coder/v2/tailnet"
 	"github.com/coder/coder/v2/tailnet/proto"
+	"github.com/coder/websocket"
 )
 
 var permanentErrorStatuses = []int{
 
@@ -13,7 +13,6 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 	"go.uber.org/mock/gomock"
-	"nhooyr.io/websocket"
 	"tailscale.com/tailcfg"
 
 	"cdr.dev/slog"
@@ -26,6 +25,7 @@ import (
 	tailnetproto "github.com/coder/coder/v2/tailnet/proto"
 	"github.com/coder/coder/v2/tailnet/tailnettest"
 	"github.com/coder/coder/v2/testutil"
+	"github.com/coder/websocket"
 )
 
 func TestWebsocketDialer_TokenController(t *testing.T) {
 
@@ -14,7 +14,6 @@ import (
 
 	"github.com/google/uuid"
 	"golang.org/x/xerrors"
-	"nhooyr.io/websocket"
 	"tailscale.com/tailcfg"
 	"tailscale.com/wgengine/capture"
 
@@ -23,6 +22,7 @@ import (
 	"github.com/coder/coder/v2/tailnet"
 	"github.com/coder/coder/v2/tailnet/proto"
 	"github.com/coder/quartz"
+	"github.com/coder/websocket"
 )
 
 var ErrSkipClose = xerrors.New("skip tailnet close")
 
@@ -5,9 +5,8 @@ import (
 	"encoding/json"
 	"sync/atomic"
 
-	"nhooyr.io/websocket"
-
 	"cdr.dev/slog"
+	"github.com/coder/websocket"
 )
 
 type Decoder[T any] struct {
 
@@ -5,7 +5,8 @@ import (
 	"encoding/json"
 
 	"golang.org/x/xerrors"
-	"nhooyr.io/websocket"
+
+	"github.com/coder/websocket"
 )
 
 type Encoder[T any] struct {
 
@@ -15,12 +15,10 @@ import (
 	"go.opentelemetry.io/otel/trace"
 	"golang.org/x/exp/maps"
 	"golang.org/x/xerrors"
-	"nhooyr.io/websocket"
 	"storj.io/drpc/drpcmux"
 	"storj.io/drpc/drpcserver"
 
 	"cdr.dev/slog"
-
 	"github.com/coder/coder/v2/coderd/database"
 	"github.com/coder/coder/v2/coderd/database/db2sdk"
 	"github.com/coder/coder/v2/coderd/database/dbauthz"
@@ -35,6 +33,7 @@ import (
 	"github.com/coder/coder/v2/codersdk"
 	"github.com/coder/coder/v2/provisionerd/proto"
 	"github.com/coder/coder/v2/provisionersdk"
+	"github.com/coder/websocket"
 )
 
 func (api *API) provisionerDaemonsEnabledMW(next http.Handler) http.Handler {
 
@@ -4,12 +4,12 @@ import (
 	"net/http"
 
 	"github.com/google/uuid"
-	"nhooyr.io/websocket"
 
 	"github.com/coder/coder/v2/apiversion"
 	"github.com/coder/coder/v2/coderd/httpapi"
 	"github.com/coder/coder/v2/codersdk"
 	"github.com/coder/coder/v2/tailnet/proto"
+	"github.com/coder/websocket"
 )
 
 // @Summary Workspace Proxy Coordinate
 
@@ -10,7 +10,6 @@ import (
 
 	"github.com/google/uuid"
 	"golang.org/x/xerrors"
-	"nhooyr.io/websocket"
 	"tailscale.com/tailcfg"
 
 	"cdr.dev/slog"
@@ -19,6 +18,7 @@ import (
 	"github.com/coder/coder/v2/codersdk"
 	"github.com/coder/coder/v2/codersdk/workspacesdk"
 	agpl "github.com/coder/coder/v2/tailnet"
+	"github.com/coder/websocket"
 )
 
 // Client is a HTTP client for a subset of Coder API routes that external
 
@@ -39,7 +39,7 @@ replace github.com/dlclark/regexp2 => github.com/dlclark/regexp2 v1.7.0
 
 // There are a few minor changes we make to Tailscale that we're slowly upstreaming. Compare here:
 // https://github.com/tailscale/tailscale/compare/main...coder:tailscale:main
-replace tailscale.com => github.com/coder/tailscale v1.1.1-0.20241003034647-02286e537fc2
+replace tailscale.com => github.com/coder/tailscale v1.1.1-0.20241218201526-b53d914d625f
 
 // This is replaced to include
 // 1. a fix for a data race: c.f. https://github.com/tailscale/wireguard-go/pull/25
@@ -177,7 +177,7 @@ require (
 	golang.org/x/crypto v0.31.0
 	golang.org/x/exp v0.0.0-20240808152545-0cdaa3abc0fa
 	golang.org/x/mod v0.22.0
-	golang.org/x/net v0.31.0
+	golang.org/x/net v0.32.0
 	golang.org/x/oauth2 v0.24.0
 	golang.org/x/sync v0.10.0
 	golang.org/x/sys v0.28.0
@@ -192,7 +192,6 @@ require (
 	gopkg.in/natefinch/lumberjack.v2 v2.2.1
 	gopkg.in/yaml.v3 v3.0.1
 	gvisor.dev/gvisor v0.0.0-20240509041132-65b30f7869dc
-	nhooyr.io/websocket v1.8.7
 	storj.io/drpc v0.0.33
 	tailscale.com v1.46.1
 )
@@ -205,6 +204,7 @@ require (
 	github.com/charmbracelet/bubbletea v1.2.1
 	github.com/charmbracelet/lipgloss v1.0.0
 	github.com/coder/serpent v0.10.0
+	github.com/coder/websocket v1.8.12
 	github.com/emersion/go-sasl v0.0.0-20200509203442-7bfe0ed36a21
 	github.com/emersion/go-smtp v0.21.2
 	github.com/go-jose/go-jose/v4 v4.0.2