Aug 9, 2024
diff --git a/coderd/healthcheck/websocket.go b/coderd/healthcheck/websocket.go
 "strconv"
 "time"

 "github.com/coder/websocket"
 "golang.org/x/xerrors"
 "nhooyr.io/websocket"

 "github.com/coder/coder/v2/coderd/healthcheck/health"
 "github.com/coder/coder/v2/codersdk/healthsdk"
diff --git a/coderd/httpapi/websocket.go b/coderd/httpapi/websocket.go
 "context"
 "time"

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

 "cdr.dev/slog"
 )
diff --git a/coderd/provisionerjobs.go b/coderd/provisionerjobs.go
 "sort"
 "strconv"

 "github.com/coder/websocket"
 "github.com/google/uuid"
 "golang.org/x/xerrors"
 "nhooyr.io/websocket"

 "cdr.dev/slog"

diff --git a/coderd/provisionerjobs_internal_test.go b/coderd/provisionerjobs_internal_test.go
 "testing"
 "time"

 "github.com/coder/websocket"
 "github.com/google/uuid"
 "github.com/stretchr/testify/assert"
 "github.com/stretchr/testify/require"
 "go.uber.org/mock/gomock"
 "nhooyr.io/websocket"

 "cdr.dev/slog/sloggers/slogtest"

diff --git a/coderd/workspaceagents.go b/coderd/workspaceagents.go
 "strings"
 "time"

 "github.com/coder/websocket"
 "github.com/google/uuid"
 "github.com/sqlc-dev/pqtype"
 "golang.org/x/exp/maps"
 "golang.org/x/exp/slices"
 "golang.org/x/sync/errgroup"
 "golang.org/x/xerrors"
 "nhooyr.io/websocket"
 "tailscale.com/tailcfg"

 "cdr.dev/slog"
diff --git a/coderd/workspaceagentsrpc.go b/coderd/workspaceagentsrpc.go
 "sync/atomic"
 "time"

 "github.com/coder/websocket"
 "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"
diff --git a/coderd/workspaceagentsrpc_internal_test.go b/coderd/workspaceagentsrpc_internal_test.go

 "github.com/coder/coder/v2/coderd/util/ptr"

 "github.com/coder/websocket"
 "github.com/google/uuid"
 "github.com/stretchr/testify/require"
 "go.uber.org/mock/gomock"
 "nhooyr.io/websocket"

 "cdr.dev/slog"
 "cdr.dev/slog/sloggers/slogtest"
diff --git a/coderd/workspaceapps/proxy.go b/coderd/workspaceapps/proxy.go
 "strings"
 "sync"

 "github.com/coder/websocket"
 "github.com/go-chi/chi/v5"
 "github.com/google/uuid"
 "go.opentelemetry.io/otel/trace"
 "nhooyr.io/websocket"

 "cdr.dev/slog"
 "github.com/coder/coder/v2/agent/agentssh"
diff --git a/codersdk/agentsdk/agentsdk.go b/codersdk/agentsdk/agentsdk.go
 "time"

 "cloud.google.com/go/compute/metadata"
 "github.com/coder/websocket"
 "github.com/google/uuid"
 "github.com/hashicorp/yamux"
 "golang.org/x/xerrors"
 "nhooyr.io/websocket"
 "storj.io/drpc"
 "tailscale.com/tailcfg"

diff --git a/codersdk/provisionerdaemons.go b/codersdk/provisionerdaemons.go
 "net/http/cookiejar"
 "time"

 "github.com/coder/websocket"
 "github.com/google/uuid"
 "github.com/hashicorp/yamux"
 "golang.org/x/xerrors"
 "nhooyr.io/websocket"

 "github.com/coder/coder/v2/buildinfo"
 "github.com/coder/coder/v2/codersdk/drpc"
diff --git a/codersdk/websocket.go b/codersdk/websocket.go
 "context"
 "net"

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

 // wsNetConn wraps net.Conn created by websocket.NetConn(). Cancel func
diff --git a/codersdk/websocket_test.go b/codersdk/websocket_test.go
 "net/http/httptest"
 "testing"

 "github.com/coder/websocket"
 "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"
diff --git a/codersdk/workspaceagents.go b/codersdk/workspaceagents.go
 "strings"
 "time"

 "github.com/coder/websocket"
 "github.com/google/uuid"
 "golang.org/x/xerrors"
 "nhooyr.io/websocket"

 "github.com/coder/coder/v2/coderd/tracing"
 )
diff --git a/codersdk/workspacesdk/connector.go b/codersdk/workspacesdk/connector.go
 "sync/atomic"
 "time"

 "github.com/coder/websocket"
 "github.com/google/uuid"
 "golang.org/x/xerrors"
 "nhooyr.io/websocket"
 "storj.io/drpc"
 "storj.io/drpc/drpcerr"
 "tailscale.com/tailcfg"
diff --git a/codersdk/workspacesdk/connector_internal_test.go b/codersdk/workspacesdk/connector_internal_test.go
 "testing"
 "time"

 "github.com/coder/websocket"
 "github.com/google/uuid"
 "github.com/hashicorp/yamux"
 "github.com/stretchr/testify/assert"
 "github.com/stretchr/testify/require"
 "golang.org/x/xerrors"
 "nhooyr.io/websocket"
 "storj.io/drpc"
 "storj.io/drpc/drpcerr"
 "tailscale.com/tailcfg"
diff --git a/codersdk/workspacesdk/workspacesdk.go b/codersdk/workspacesdk/workspacesdk.go
 "strconv"
 "strings"

 "github.com/coder/websocket"
 "github.com/google/uuid"
 "golang.org/x/xerrors"
 "nhooyr.io/websocket"
 "tailscale.com/tailcfg"
 "tailscale.com/wgengine/capture"

diff --git a/enterprise/coderd/provisionerdaemons.go b/enterprise/coderd/provisionerdaemons.go
 "strings"
 "time"

 "github.com/coder/websocket"
 "github.com/google/uuid"
 "github.com/hashicorp/yamux"
 "github.com/moby/moby/pkg/namesgenerator"
 "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"

diff --git a/enterprise/coderd/workspaceproxycoordinate.go b/enterprise/coderd/workspaceproxycoordinate.go
 import (
 "net/http"

 "github.com/coder/websocket"
 "github.com/google/uuid"
 "nhooyr.io/websocket"

 "github.com/coder/coder/v2/apiversion"
 "github.com/coder/coder/v2/coderd/httpapi"
diff --git a/enterprise/tailnet/workspaceproxy.go b/enterprise/tailnet/workspaceproxy.go
 return err
 }

 //nhooyr.io/websocket has a bugged implementation of deadlines on a websocket net.Conn.  What they are
 //github.com/coder/websocket has a bugged implementation of deadlines on a websocket net.Conn.  What they are
 // *supposed* to do is set a deadline for any subsequent writes to complete, otherwise the call to Write()
 // fails.  Whatnhooyr.io/websocket does is set a timer, after which it expires the websocket write context.
 // fails.  Whatgithub.com/coder/websocket does is set a timer, after which it expires the websocket write context.
 // If this timer fires, then the next write will fail *even if we set a new write deadline*.  So, after
 // our successful write, it is important that we reset the deadline before it fires.
 err = conn.SetWriteDeadline(time.Time{})
diff --git a/enterprise/wsproxy/wsproxysdk/wsproxysdk.go b/enterprise/wsproxy/wsproxysdk/wsproxysdk.go
 "net/url"
 "time"

 "github.com/coder/websocket"
 "github.com/google/uuid"
 "golang.org/x/xerrors"
 "nhooyr.io/websocket"
 "tailscale.com/tailcfg"

 "cdr.dev/slog"
diff --git a/enterprise/wsproxy/wsproxysdk/wsproxysdk_test.go b/enterprise/wsproxy/wsproxysdk/wsproxysdk_test.go
 "testing"
 "time"

 "github.com/coder/websocket"
 "github.com/go-chi/chi/v5"
 "github.com/google/uuid"
 "github.com/stretchr/testify/assert"
 "github.com/stretchr/testify/require"
 "go.uber.org/mock/gomock"
 "google.golang.org/protobuf/types/known/timestamppb"
 "nhooyr.io/websocket"
 "tailscale.com/tailcfg"
 "tailscale.com/types/key"

diff --git a/go.mod b/go.mod
 github.com/coder/quartz v0.1.0
 github.com/coder/retry v1.5.1
 github.com/coder/terraform-provider-coder v0.23.0
 github.com/coder/websocket v1.8.12
 github.com/coder/wgtunnel v0.1.13-0.20240522110300-ade90dfb2da0
 github.com/coreos/go-oidc/v3 v3.11.0
 github.com/coreos/go-systemd v0.0.0-20191104093116-d3cd4ed1dbcf
 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
 )
 github.com/pion/transport/v2 v2.0.0 // indirect
 github.com/tdewolff/test v1.0.11-0.20240106005702-7de5f7df4739 // indirect
 go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.53.0 // indirect
 nhooyr.io/websocket v1.8.7 // indirect
 )

 require (
diff --git a/go.sum b/go.sum
 github.com/coder/tailscale v1.1.1-0.20240702054557-aa558fbe5374/go.mod h1:rp6BIJxCp127/hvvDWNkHC9MxAlKvQfoOtBr8s5sCqo=
 github.com/coder/terraform-provider-coder v0.23.0 h1:DuNLWxhnGlXyG0g+OCAZRI6xd8+bJjIEnE4F3hYgA4E=
 github.com/coder/terraform-provider-coder v0.23.0/go.mod h1:wMun9UZ9HT2CzF6qPPBup1odzBpVUc0/xSFoXgdI3tk=
 github.com/coder/websocket v1.8.12 h1:5bUXkEPPIbewrnkU8LTCLVaxi4N4J8ahufH2vlo4NAo=
 github.com/coder/websocket v1.8.12/go.mod h1:LNVeNrXQZfe5qhS9ALED3uA+l5pPqvwXg3CKoDBB2gs=
 github.com/coder/wgtunnel v0.1.13-0.20240522110300-ade90dfb2da0 h1:C2/eCr+r0a5Auuw3YOiSyLNHkdMtyCZHPFBx7syN4rk=
 github.com/coder/wgtunnel v0.1.13-0.20240522110300-ade90dfb2da0/go.mod h1:qANbdpqyAGlo2bg+4gQKPj24H1ZWa3bQU2Q5/bV5B3Y=
 github.com/coder/wireguard-go v0.0.0-20240522052547-769cdd7f7818 h1:bNhUTaKl3q0bFn78bBRq7iIwo72kNTvUD9Ll5TTzDDk=
diff --git a/scaletest/workspacetraffic/conn.go b/scaletest/workspacetraffic/conn.go
 "sync"
 "time"

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

 "github.com/coder/coder/v2/codersdk"
 "github.com/coder/coder/v2/codersdk/workspacesdk"
diff --git a/scaletest/workspacetraffic/countreadwriter.go b/scaletest/workspacetraffic/countreadwriter.go

 "golang.org/x/xerrors"

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

 // countReadWriteCloser wraps an io.ReadWriteCloser and counts the number of bytes read and written.
diff --git a/scaletest/workspacetraffic/run.go b/scaletest/workspacetraffic/run.go
 "sync"
 "time"

 "github.com/coder/websocket"
 "github.com/google/uuid"
 "golang.org/x/xerrors"
 "nhooyr.io/websocket"

 "cdr.dev/slog"
 "cdr.dev/slog/sloggers/sloghuman"
diff --git a/scaletest/workspacetraffic/run_test.go b/scaletest/workspacetraffic/run_test.go
 "testing"
 "time"

 "github.com/coder/websocket"
 "golang.org/x/exp/slices"
 "nhooyr.io/websocket"

 "github.com/coder/coder/v2/agent/agenttest"
 "github.com/coder/coder/v2/coderd/coderdtest"
diff --git a/tailnet/coordinator.go b/tailnet/coordinator.go
 "sync"
 "time"

 "github.com/coder/websocket"
 "github.com/google/uuid"
 "golang.org/x/xerrors"
 "nhooyr.io/websocket"
 "tailscale.com/tailcfg"
 "tailscale.com/types/key"

diff --git a/tailnet/coordinator_test.go b/tailnet/coordinator_test.go
 "testing"
 "time"

 "github.com/coder/websocket"
 "github.com/google/uuid"
 "github.com/stretchr/testify/assert"
 "github.com/stretchr/testify/require"
 "go.uber.org/mock/gomock"
 "nhooyr.io/websocket"
 "tailscale.com/tailcfg"
 "tailscale.com/types/key"

diff --git a/tailnet/derp.go b/tailnet/derp.go
 "strings"
 "sync"

 "nhooyr.io/websocket"
 "github.com/coder/websocket"
 "tailscale.com/derp"
 "tailscale.com/net/wsconn"
 )
 c.Close(websocket.StatusPolicyViolation, "client must speak the derp subprotocol")
 return
 }
 wc := wsconn.NetConn(ctx, c, websocket.MessageBinary)
 brw := bufio.NewReadWriter(bufio.NewReader(wc), bufio.NewWriter(wc))
 s.Accept(ctx, wc, brw, r.RemoteAddr)
 }), func() {
diff --git a/tailnet/test/integration/integration.go b/tailnet/test/integration/integration.go
 "testing"
 "time"

 "github.com/coder/websocket"
 "github.com/go-chi/chi/v5"
 "github.com/google/uuid"
 "github.com/stretchr/testify/require"
 "golang.org/x/xerrors"
 "nhooyr.io/websocket"
 "tailscale.com/derp"
 "tailscale.com/derp/derphttp"
 "tailscale.com/tailcfg"
diff --git a/tailnet/trackedconn.go b/tailnet/trackedconn.go
 }
 t.logger.Debug(t.ctx, "wrote nodes", slog.F("nodes", string(data)))

 //nhooyr.io/websocket has a bugged implementation of deadlines on a websocket net.Conn.  What they are
 //github.com/coder/websocket has a bugged implementation of deadlines on a websocket net.Conn.  What they are
 // *supposed* to do is set a deadline for any subsequent writes to complete, otherwise the call to Write()
 // fails.  Whatnhooyr.io/websocket does is set a timer, after which it expires the websocket write context.
 // fails.  Whatgithub.com/coder/websocket does is set a timer, after which it expires the websocket write context.
 // If this timer fires, then the next write will fail *even if we set a new write deadline*.  So, after
 // our successful write, it is important that we reset the deadline before it fires.
 err = t.conn.SetWriteDeadline(time.Time{})
Original file line number	Diff line number	Diff line change
Expand Up		@@ -9,8 +9,8 @@ import (
		"strconv"
		"time"

		"github.com/coder/websocket"
		"golang.org/x/xerrors"
		"nhooyr.io/websocket"

		"github.com/coder/coder/v2/coderd/healthcheck/health"
		"github.com/coder/coder/v2/codersdk/healthsdk"
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -4,7 +4,7 @@ import (
		"context"
		"time"

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

		"cdr.dev/slog"
		)
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -10,9 +10,9 @@ import (
		"sort"
		"strconv"

		"github.com/coder/websocket"
		"github.com/google/uuid"
		"golang.org/x/xerrors"
		"nhooyr.io/websocket"

		"cdr.dev/slog"

Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -10,11 +10,11 @@ import (
		"testing"
		"time"

		"github.com/coder/websocket"
		"github.com/google/uuid"
		"github.com/stretchr/testify/assert"
		"github.com/stretchr/testify/require"
		"go.uber.org/mock/gomock"
		"nhooyr.io/websocket"

		"cdr.dev/slog/sloggers/slogtest"

Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -14,13 +14,13 @@ import (
		"strings"
		"time"

		"github.com/coder/websocket"
		"github.com/google/uuid"
		"github.com/sqlc-dev/pqtype"
		"golang.org/x/exp/maps"
		"golang.org/x/exp/slices"
		"golang.org/x/sync/errgroup"
		"golang.org/x/xerrors"
		"nhooyr.io/websocket"
		"tailscale.com/tailcfg"

		"cdr.dev/slog"
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -11,10 +11,10 @@ import (
		"sync/atomic"
		"time"

		"github.com/coder/websocket"
		"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"
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -10,10 +10,10 @@ import (

		"github.com/coder/coder/v2/coderd/util/ptr"

		"github.com/coder/websocket"
		"github.com/google/uuid"
		"github.com/stretchr/testify/require"
		"go.uber.org/mock/gomock"
		"nhooyr.io/websocket"

		"cdr.dev/slog"
		"cdr.dev/slog/sloggers/slogtest"
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -12,10 +12,10 @@ import (
		"strings"
		"sync"

		"github.com/coder/websocket"
		"github.com/go-chi/chi/v5"
		"github.com/google/uuid"
		"go.opentelemetry.io/otel/trace"
		"nhooyr.io/websocket"

		"cdr.dev/slog"
		"github.com/coder/coder/v2/agent/agentssh"
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -9,10 +9,10 @@ import (
		"net/http/cookiejar"
		"time"

		"github.com/coder/websocket"
		"github.com/google/uuid"
		"github.com/hashicorp/yamux"
		"golang.org/x/xerrors"
		"nhooyr.io/websocket"

		"github.com/coder/coder/v2/buildinfo"
		"github.com/coder/coder/v2/codersdk/drpc"
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -6,9 +6,9 @@ import (
		"net/http/httptest"
		"testing"

		"github.com/coder/websocket"
		"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"
Expand Down