chore: apply various modernisations (#531)

Jacalz · web-flow · commit 91013c129147 · 2025-07-10T11:49:59.000+03:00
* Use any instead of interface{} given Go &gt; 1.18
* Minor tidies thanks to gofumpt
* Run "go fix ./..." on the codebase
* Apply a few modernisations suggested by gopls check
* Remove unused parameter suggested by gopls check
diff --git a/README.md b/README.md
@@ -68,7 +68,7 @@ http.HandlerFunc(func (w http.ResponseWriter, r *http.Request) {
 	ctx, cancel := context.WithTimeout(context.Background(), time.Second*10)
 	defer cancel()
 
-	var v interface{}
+	var v any
 	err = wsjson.Read(ctx, c, &v)
 	if err != nil {
 		// ...
diff --git a/accept.go b/accept.go
@@ -1,5 +1,4 @@
 //go:build !js
-// +build !js
 
 package websocket
 
diff --git a/accept_test.go b/accept_test.go
@@ -1,5 +1,4 @@
 //go:build !js
-// +build !js
 
 package websocket
 
diff --git a/autobahn_test.go b/autobahn_test.go
@@ -1,5 +1,4 @@
 //go:build !js
-// +build !js
 
 package websocket_test
 
@@ -130,7 +129,7 @@ func wstestServer(tb testing.TB, ctx context.Context) (url string, closeFn func(
 	url = "ws://" + serverAddr
 	const outDir = "ci/out/autobahn-report"
 
-	specFile, err := tempJSONFile(map[string]interface{}{
+	specFile, err := tempJSONFile(map[string]any{
 		"url":           url,
 		"outdir":        outDir,
 		"cases":         autobahnCases,
@@ -280,7 +279,7 @@ func unusedListenAddr() (_ string, err error) {
 	return l.Addr().String(), nil
 }
 
-func tempJSONFile(v interface{}) (string, error) {
+func tempJSONFile(v any) (string, error) {
 	f, err := os.CreateTemp("", "temp.json")
 	if err != nil {
 		return "", fmt.Errorf("temp file: %w", err)
diff --git a/close.go b/close.go
@@ -1,5 +1,4 @@
 //go:build !js
-// +build !js
 
 package websocket
 
diff --git a/close_test.go b/close_test.go
@@ -1,5 +1,4 @@
 //go:build !js
-// +build !js
 
 package websocket
 
diff --git a/compress.go b/compress.go
@@ -1,5 +1,4 @@
 //go:build !js
-// +build !js
 
 package websocket
 
@@ -168,8 +167,10 @@ type slidingWindow struct {
 	buf []byte
 }
 
-var swPoolMu sync.RWMutex
-var swPool = map[int]*sync.Pool{}
+var (
+	swPoolMu sync.RWMutex
+	swPool   = map[int]*sync.Pool{}
+)
 
 func slidingWindowPool(n int) *sync.Pool {
 	swPoolMu.RLock()
diff --git a/compress_test.go b/compress_test.go
@@ -1,5 +1,4 @@
 //go:build !js
-// +build !js
 
 package websocket
 
@@ -19,7 +18,7 @@ func Test_slidingWindow(t *testing.T) {
 
 	const testCount = 99
 	const maxWindow = 99999
-	for i := 0; i < testCount; i++ {
+	for range testCount {
 		t.Run("", func(t *testing.T) {
 			t.Parallel()
 
diff --git a/conn.go b/conn.go
@@ -1,5 +1,4 @@
 //go:build !js
-// +build !js
 
 package websocket
 
diff --git a/conn_test.go b/conn_test.go
@@ -36,7 +36,7 @@ func TestConn(t *testing.T) {
 			return websocket.CompressionMode(xrand.Int(int(websocket.CompressionContextTakeover) + 1))
 		}
 
-		for i := 0; i < 5; i++ {
+		for range 5 {
 			t.Run("", func(t *testing.T) {
 				tt, c1, c2 := newConnTest(t, &websocket.DialOptions{
 					CompressionMode:      compressionMode(),
@@ -50,7 +50,7 @@ func TestConn(t *testing.T) {
 
 				c1.SetReadLimit(131072)
 
-				for i := 0; i < 5; i++ {
+				for range 5 {
 					err := wstest.Echo(tt.ctx, c1, 131072)
 					assert.Success(t, err)
 				}
@@ -76,7 +76,7 @@ func TestConn(t *testing.T) {
 		c1.CloseRead(tt.ctx)
 		c2.CloseRead(tt.ctx)
 
-		for i := 0; i < 10; i++ {
+		for range 10 {
 			err := c1.Ping(tt.ctx)
 			assert.Success(t, err)
 		}
@@ -185,7 +185,7 @@ func TestConn(t *testing.T) {
 		const count = 100
 		errs := make(chan error, count)
 
-		for i := 0; i < count; i++ {
+		for range count {
 			go func() {
 				select {
 				case errs <- c1.Write(tt.ctx, websocket.MessageBinary, msg):
@@ -195,7 +195,7 @@ func TestConn(t *testing.T) {
 			}()
 		}
 
-		for i := 0; i < count; i++ {
+		for range count {
 			select {
 			case err := <-errs:
 				assert.Success(t, err)
@@ -341,7 +341,7 @@ func TestConn(t *testing.T) {
 			return wsjson.Write(tt.ctx, c1, exp)
 		})
 
-		var act interface{}
+		var act any
 		err := wsjson.Read(tt.ctx, c1, &act)
 		assert.Success(t, err)
 		assert.Equal(t, "read msg", exp, act)
@@ -372,7 +372,7 @@ func TestConn(t *testing.T) {
 			return wsjson.Write(tt.ctx, c1, exp)
 		})
 
-		var act interface{}
+		var act any
 		err := wsjson.Read(tt.ctx, c1, &act)
 		assert.Success(t, err)
 		assert.Equal(t, "read msg", exp, act)
@@ -408,7 +408,7 @@ func TestConn(t *testing.T) {
 
 		c1.SetReadLimit(131072)
 
-		for i := 0; i < 5; i++ {
+		for range 5 {
 			err := wstest.Echo(tt.ctx, c1, 131072)
 			assert.Success(t, err)
 		}
@@ -660,7 +660,7 @@ func assertEcho(tb testing.TB, ctx context.Context, c *websocket.Conn) {
 		return wsjson.Write(ctx, c, exp)
 	})
 
-	var act interface{}
+	var act any
 	c.SetReadLimit(1 << 30)
 	err := wsjson.Read(ctx, c, &act)
 	assert.Success(tb, err)
@@ -682,7 +682,7 @@ func assertClose(tb testing.TB, c *websocket.Conn) {
 
 func TestConcurrentClosePing(t *testing.T) {
 	t.Parallel()
-	for i := 0; i < 64; i++ {
+	for range 64 {
 		func() {
 			c1, c2 := wstest.Pipe(nil, nil)
 			defer c1.CloseNow()
diff --git a/dial.go b/dial.go
@@ -1,5 +1,4 @@
 //go:build !js
-// +build !js
 
 package websocket
 
diff --git a/dial_test.go b/dial_test.go
@@ -1,5 +1,4 @@
 //go:build !js
-// +build !js
 
 package websocket_test
 
@@ -8,6 +7,7 @@ import (
 	"context"
 	"crypto/rand"
 	"io"
+	"maps"
 	"net/http"
 	"net/http/httptest"
 	"net/url"
@@ -172,7 +172,6 @@ func Test_verifyHostOverride(t *testing.T) {
 			c.CloseNow()
 		})
 	}
-
 }
 
 type mockBody struct {
@@ -357,11 +356,10 @@ func (fc *forwardProxy) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 	}
 	defer resp.Body.Close()
 
-	for k, v := range resp.Header {
-		w.Header()[k] = v
-	}
+	maps.Copy(w.Header(), resp.Header)
 	w.Header().Set("PROXIED", "true")
 	w.WriteHeader(resp.StatusCode)
+
 	if resprw, ok := resp.Body.(io.ReadWriter); ok {
 		c, brw, err := w.(http.Hijacker).Hijack()
 		if err != nil {
diff --git a/doc.go b/doc.go
@@ -1,5 +1,4 @@
 //go:build !js
-// +build !js
 
 // Package websocket implements the RFC 6455 WebSocket protocol.
 //
diff --git a/example_test.go b/example_test.go
@@ -25,7 +25,7 @@ func ExampleAccept() {
 		ctx, cancel := context.WithTimeout(r.Context(), time.Second*10)
 		defer cancel()
 
-		var v interface{}
+		var v any
 		err = wsjson.Read(ctx, c, &v)
 		if err != nil {
 			log.Println(err)
@@ -150,7 +150,7 @@ func ExampleConn_Ping() {
 	// Required to read the Pongs from the server.
 	ctx = c.CloseRead(ctx)
 
-	for i := 0; i < 5; i++ {
+	for range 5 {
 		err = c.Ping(ctx)
 		if err != nil {
 			log.Fatal(err)
diff --git a/export_test.go b/export_test.go
@@ -1,5 +1,4 @@
 //go:build !js
-// +build !js
 
 package websocket
 
@@ -30,9 +29,11 @@ func (c *Conn) RecordBytesRead() *int {
 
 var ErrClosed = net.ErrClosed
 
-var ExportedDial = dial
-var SecWebSocketAccept = secWebSocketAccept
-var SecWebSocketKey = secWebSocketKey
-var VerifyServerResponse = verifyServerResponse
+var (
+	ExportedDial         = dial
+	SecWebSocketAccept   = secWebSocketAccept
+	SecWebSocketKey      = secWebSocketKey
+	VerifyServerResponse = verifyServerResponse
+)
 
 var CompressionModeOpts = CompressionMode.opts
diff --git a/frame_test.go b/frame_test.go
@@ -1,5 +1,4 @@
 //go:build !js
-// +build !js
 
 package websocket
 
@@ -54,7 +53,7 @@ func TestHeader(t *testing.T) {
 			return r.Intn(2) == 0
 		}
 
-		for i := 0; i < 10000; i++ {
+		for range 10000 {
 			h := header{
 				fin:    randBool(),
 				rsv1:   randBool(),
diff --git a/internal/errd/wrap.go b/internal/errd/wrap.go
@@ -7,7 +7,7 @@ import (
 // Wrap wraps err with fmt.Errorf if err is non nil.
 // Intended for use with defer and a named error return.
 // Inspired by https://github.com/golang/go/issues/32676.
-func Wrap(err *error, f string, v ...interface{}) {
+func Wrap(err *error, f string, v ...any) {
 	if *err != nil {
 		*err = fmt.Errorf(f+": %w", append(v, *err)...)
 	}
diff --git a/internal/examples/chat/chat.go b/internal/examples/chat/chat.go
@@ -31,7 +31,7 @@ type chatServer struct {
 
 	// logf controls where logs are sent.
 	// Defaults to log.Printf.
-	logf func(f string, v ...interface{})
+	logf func(f string, v ...any)
 
 	// serveMux routes the various endpoints to the appropriate handler.
 	serveMux http.ServeMux
diff --git a/internal/examples/echo/server.go b/internal/examples/echo/server.go
@@ -17,7 +17,7 @@ import (
 // only allows one message every 100ms with a 10 message burst.
 type echoServer struct {
 	// logf controls where logs are sent.
-	logf func(f string, v ...interface{})
+	logf func(f string, v ...any)
 }
 
 func (s echoServer) ServeHTTP(w http.ResponseWriter, r *http.Request) {
diff --git a/internal/test/assert/assert.go b/internal/test/assert/assert.go
@@ -9,7 +9,7 @@ import (
 )
 
 // Equal asserts exp == act.
-func Equal(t testing.TB, name string, exp, got interface{}) {
+func Equal(t testing.TB, name string, exp, got any) {
 	t.Helper()
 
 	if !reflect.DeepEqual(exp, got) {
@@ -36,7 +36,7 @@ func Error(t testing.TB, err error) {
 }
 
 // Contains asserts the fmt.Sprint(v) contains sub.
-func Contains(t testing.TB, v interface{}, sub string) {
+func Contains(t testing.TB, v any, sub string) {
 	t.Helper()
 
 	s := fmt.Sprint(v)
diff --git a/internal/test/wstest/pipe.go b/internal/test/wstest/pipe.go
@@ -1,5 +1,4 @@
 //go:build !js
-// +build !js
 
 package wstest
 
diff --git a/internal/thirdparty/gin_test.go b/internal/thirdparty/gin_test.go
@@ -42,7 +42,7 @@ func TestGin(t *testing.T) {
 	err = wsjson.Write(ctx, c, "hello")
 	assert.Success(t, err)
 
-	var v interface{}
+	var v any
 	err = wsjson.Read(ctx, c, &v)
 	assert.Success(t, err)
 	assert.Equal(t, "read msg", "hello", v)
diff --git a/internal/wsjs/wsjs_js.go b/internal/wsjs/wsjs_js.go
@@ -33,7 +33,7 @@ func New(url string, protocols []string) (c WebSocket, err error) {
 		c = WebSocket{}
 	})
 
-	jsProtocols := make([]interface{}, len(protocols))
+	jsProtocols := make([]any, len(protocols))
 	for i, p := range protocols {
 		jsProtocols[i] = p
 	}
@@ -57,7 +57,7 @@ func (c WebSocket) setBinaryType(typ string) {
 }
 
 func (c WebSocket) addEventListener(eventType string, fn func(e js.Value)) func() {
-	f := js.FuncOf(func(this js.Value, args []js.Value) interface{} {
+	f := js.FuncOf(func(this js.Value, args []js.Value) any {
 		fn(args[0])
 		return nil
 	})
@@ -97,7 +97,7 @@ func (c WebSocket) OnError(fn func(e js.Value)) (remove func()) {
 // MessageEvent is the type passed to a message handler.
 type MessageEvent struct {
 	// string or []byte.
-	Data interface{}
+	Data any
 
 	// There are more fields to the interface but we don't use them.
 	// See https://developer.mozilla.org/en-US/docs/Web/API/MessageEvent
@@ -106,7 +106,7 @@ type MessageEvent struct {
 // OnMessage registers a function to be called when the WebSocket receives a message.
 func (c WebSocket) OnMessage(fn func(m MessageEvent)) (remove func()) {
 	return c.addEventListener("message", func(e js.Value) {
-		var data interface{}
+		var data any
 
 		arrayBuffer := e.Get("data")
 		if arrayBuffer.Type() == js.TypeString {
diff --git a/mask_test.go b/mask_test.go
@@ -40,7 +40,7 @@ func TestMask(t *testing.T) {
 func testMask(t *testing.T, name string, fn func(b []byte, key uint32) uint32) {
 	t.Run(name, func(t *testing.T) {
 		t.Parallel()
-		for i := 0; i < 9999; i++ {
+		for range 9999 {
 			keyb := make([]byte, 4)
 			_, err := rand.Read(keyb)
 			assert.Success(t, err)
diff --git a/netconn.go b/netconn.go
diff --git a/netconn_notjs.go b/netconn_notjs.go
diff --git a/read.go b/read.go
diff --git a/write.go b/write.go
diff --git a/ws_js.go b/ws_js.go
diff --git a/ws_js_test.go b/ws_js_test.go
diff --git a/wsjson/wsjson.go b/wsjson/wsjson.go

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`	`1`	`//go:build !js`
`2`		`-// +build !js`
`3`	`2`
`4`	`3`	`package websocket`
`5`	`4`