Introduce DefaultWriteTimeout for WebSocket operations, replace hardcoded timeouts, and upgrade version to v0.4.1.
Some checks failed
Go / build (push) Has been cancelled

This commit is contained in:
2025-09-11 16:29:43 +01:00
parent b45f0a2c51
commit d1316a5b7a
3 changed files with 18 additions and 8 deletions

View File

@@ -20,6 +20,7 @@ const (
DefaultPongWait = 60 * time.Second
DefaultPingWait = DefaultPongWait / 2
DefaultReadTimeout = 3 * time.Second // Read timeout to detect stalled connections
DefaultWriteTimeout = 3 * time.Second
DefaultMaxMessageSize = 1 * units.Mb
// CloseMessage denotes a close control message. The optional message
@@ -140,9 +141,15 @@ whitelist:
return
}
if typ == PingMessage {
if err = conn.Write(ctx, PongMessage, msg); chk.E(err) {
// Create a write context with timeout for pong response
writeCtx, writeCancel := context.WithTimeout(
ctx, DefaultWriteTimeout,
)
if err = conn.Write(writeCtx, PongMessage, msg); chk.E(err) {
writeCancel()
return
}
writeCancel()
continue
}
log.T.F("received message from %s: %s", remote, string(msg))
@@ -162,9 +169,13 @@ func (s *Server) Pinger(
for {
select {
case <-ticker.C:
if err = conn.Ping(ctx); chk.E(err) {
// Create a write context with timeout for ping operation
pingCtx, pingCancel := context.WithTimeout(ctx, DefaultWriteTimeout)
if err = conn.Ping(pingCtx); chk.E(err) {
pingCancel()
return
}
pingCancel()
case <-ctx.Done():
return
}

View File

@@ -3,15 +3,12 @@ package app
import (
"context"
"net/http"
"time"
"github.com/coder/websocket"
"lol.mleku.dev/chk"
"utils.orly/atomic"
)
const WriteTimeout = 10 * time.Second
type Listener struct {
*Server
conn *websocket.Conn
@@ -31,9 +28,11 @@ func (l *Listener) Ctx() context.Context {
func (l *Listener) Write(p []byte) (n int, err error) {
// Use a separate context with timeout for writes to prevent race conditions
// where the main connection context gets cancelled while writing events
writeCtx, cancel := context.WithTimeout(context.Background(), WriteTimeout)
writeCtx, cancel := context.WithTimeout(
context.Background(), DefaultWriteTimeout,
)
defer cancel()
if err = l.conn.Write(writeCtx, websocket.MessageText, p); chk.E(err) {
return
}