Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore(x): return io.EOF on WS disconnect #364

Merged
merged 6 commits into from
Jan 30, 2025
Merged

chore(x): return io.EOF on WS disconnect #364

Changes from 2 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
72643a6
chore(x): expose a `WrapConn` to wrap a Gorilla conn
sbruens Jan 30, 2025
3ef7f3e
Correctly handle WebSocket disconnections by returning `io.EOF`
sbruens Jan 30, 2025
64cda6d
Revert "chore(x): expose a `WrapConn` to wrap a Gorilla conn"
sbruens Jan 30, 2025
d6670c1
Use `errors.As()`.
sbruens Jan 30, 2025
b672b86
Check for `CloseNormalClosure`.
sbruens Jan 30, 2025
1a94683
Merge branch 'main' into sbruens/gorilla-conn
sbruens Jan 30, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions x/websocket/endpoint.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,6 +106,12 @@ func newEndpoint[ConnType net.Conn](urlStr string, sd transport.StreamDialer, ws
}, nil
}

// WrapConn wraps a [websocket.Conn] from the Gorilla library into a
// [transport.StreamConn].
func WrapConn(wsConn *websocket.Conn) transport.StreamConn {
sbruens marked this conversation as resolved.
Show resolved Hide resolved
return &gorillaConn{wsConn: wsConn}
}

type gorillaConn struct {
wsConn *websocket.Conn
writeErr error
Expand Down Expand Up @@ -155,6 +161,9 @@ func (c *gorillaConn) Read(buf []byte) (int, error) {
return 0, c.readErr
}
if err != nil {
if _, ok := err.(*websocket.CloseError); ok {
sbruens marked this conversation as resolved.
Show resolved Hide resolved
return 0, io.EOF
}
return 0, err
}
if msgType != websocket.BinaryMessage {
Expand Down