From c06fb6572eea7586aba761db901a85b2cb731b9d Mon Sep 17 00:00:00 2001 From: Mathias Fredriksson Date: Fri, 23 Oct 2026 13:57:31 +0000 Subject: [PATCH 1/2] docs: update remaining websocket repository links --- accept.go | 4 ++-- conn.go | 2 +- mask_asm.go | 2 +- netconn.go | 2 +- read.go | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/accept.go b/accept.go index bcfd38e8..25c1be7d 100644 --- a/accept.go +++ b/accept.go @@ -149,7 +149,7 @@ func accept(w http.ResponseWriter, r *http.Request, opts *AcceptOptions) (_ *Con } w.WriteHeader(http.StatusSwitchingProtocols) - // See https://github.com/nhooyr/websocket/issues/166 + // See https://github.com/coder/websocket/issues/166 if ginWriter, ok := w.(interface { WriteHeaderNow() }); ok { @@ -282,7 +282,7 @@ func selectDeflate(extensions []websocketExtension, mode CompressionMode) (*comp for _, ext := range extensions { switch ext.name { // We used to implement x-webkit-deflate-frame too for Safari but Safari has bugs... - // See https://github.com/nhooyr/websocket/issues/218 + // See https://github.com/coder/websocket/issues/218 case "permessage-deflate": copts, ok := acceptDeflate(ext, mode) if ok { diff --git a/conn.go b/conn.go index bfc78aaa..0569bd2c 100644 --- a/conn.go +++ b/conn.go @@ -39,7 +39,7 @@ const ( // with an appropriate reason. // // This applies to context expirations as well unfortunately. -// See https://github.com/nhooyr/websocket/issues/242#issuecomment-633182220 +// See https://github.com/coder/websocket/issues/242#issuecomment-633182220 type Conn struct { noCopy noCopy diff --git a/mask_asm.go b/mask_asm.go index f9484b5b..496f064e 100644 --- a/mask_asm.go +++ b/mask_asm.go @@ -19,7 +19,7 @@ func mask(b []byte, key uint32) uint32 { // For example, the arm64 implementation doesn't align memory like the amd64. // Or the amd64 implementation could use AVX512 instead of just AVX2. // The AVX2 code I had to disable anyway as it wasn't performing as expected. -// See https://github.com/nhooyr/websocket/pull/326#issuecomment-1771138049 +// See https://github.com/coder/websocket/pull/326#issuecomment-1771138049 // //go:noescape //lint:ignore U1000 disabled till v1.9.0 diff --git a/netconn.go b/netconn.go index 1f73b04b..a854faa4 100644 --- a/netconn.go +++ b/netconn.go @@ -15,7 +15,7 @@ import ( // It's for tunneling arbitrary protocols over WebSockets. // Few users of the library will need this but it's tricky to implement // correctly and so provided in the library. -// See https://github.com/nhooyr/websocket/issues/100. +// See https://github.com/coder/websocket/issues/100. // // Every Write to the net.Conn will correspond to a message write of // the given type on *websocket.Conn. diff --git a/read.go b/read.go index c19f41de..06672e10 100644 --- a/read.go +++ b/read.go @@ -30,7 +30,7 @@ import ( // // If you need a separate timeout on the Reader call and the Read itself, // use time.AfterFunc to cancel the context passed in. -// See https://github.com/nhooyr/websocket/issues/87#issue-451703332 +// See https://github.com/coder/websocket/issues/87#issue-451703332 // Most users should not need this. func (c *Conn) Reader(ctx context.Context) (MessageType, io.Reader, error) { return c.reader(ctx) From 4b6e4ee0639812d86026daf851defcb4d19b0ff3 Mon Sep 17 00:00:00 2001 From: Mathias Fredriksson Date: Fri, 23 Oct 2026 13:57:31 +0000 Subject: [PATCH 2/2] chore: update websocket coverage and benchmark paths The coverage filter still matched the former module path, leaving test\nhelpers in the report. Match the current module path and name the\nbenchmark for the library it measures. --- ci/test.sh | 29 ++++++++++++++--------------- internal/thirdparty/frame_test.go | 2 +- 2 files changed, 15 insertions(+), 16 deletions(-) diff --git a/ci/test.sh b/ci/test.sh index cc3c22d7..ce109778 100755 --- a/ci/test.sh +++ b/ci/test.sh @@ -3,31 +3,30 @@ set -eu cd -- "$(dirname "$0")/.." ( - cd ./internal/examples - go test "$@" ./... + cd ./internal/examples + go test "$@" ./... ) ( - cd ./internal/thirdparty - go test "$@" ./... + cd ./internal/thirdparty + go test "$@" ./... ) ( - GOARCH=arm64 go test -c -o ./ci/out/websocket-arm64.test "$@" . - if [ "$#" -eq 0 ]; then - if [ "${CI-}" ]; then - sudo apt-get update - sudo apt-get install -y qemu-user-static - ln -s /usr/bin/qemu-aarch64-static /usr/local/bin/qemu-aarch64 - fi - qemu-aarch64 ./ci/out/websocket-arm64.test -test.run=TestMask - fi + GOARCH=arm64 go test -c -o ./ci/out/websocket-arm64.test "$@" . + if [ "$#" -eq 0 ]; then + if [ "${CI-}" ]; then + sudo apt-get update + sudo apt-get install -y qemu-user-static + ln -s /usr/bin/qemu-aarch64-static /usr/local/bin/qemu-aarch64 + fi + qemu-aarch64 ./ci/out/websocket-arm64.test -test.run=TestMask + fi ) - go install github.com/agnivade/wasmbrowsertest@8be019f6c6dceae821467b4c589eb195c2b761ce go test --race --bench=. --timeout=1h --covermode=atomic --coverprofile=ci/out/coverage.prof --coverpkg=./... "$@" ./... sed -i.bak '/stringer\.go/d' ci/out/coverage.prof -sed -i.bak '/nhooyr.io\/websocket\/internal\/test/d' ci/out/coverage.prof +sed -i.bak '/github\.com\/coder\/websocket\/internal\/test\//d' ci/out/coverage.prof sed -i.bak '/examples/d' ci/out/coverage.prof # Last line is the total coverage. diff --git a/internal/thirdparty/frame_test.go b/internal/thirdparty/frame_test.go index 75b05291..8abb74a3 100644 --- a/internal/thirdparty/frame_test.go +++ b/internal/thirdparty/frame_test.go @@ -67,7 +67,7 @@ func benchmark_mask(b *testing.B) { }, { - name: "nhooyr-go", + name: "coder-go", fn: func(b *testing.B, key [4]byte, p []byte) { key32 := binary.LittleEndian.Uint32(key[:]) b.ResetTimer()