Skip to content

Handle expected close errors #28

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

Merged
merged 1 commit into from
Nov 9, 2022
Merged

Handle expected close errors #28

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
13 changes: 10 additions & 3 deletions client.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -217,9 +217,16 @@ func (r *remoteProcess) listen(ctx context.Context) {

r.closeErr = r.conn.Close(websocket.StatusNormalClosure, "normal closure")
// If we were in r.conn.Read() we cancel the ctx, the websocket library closes
// the websocket before we have a chance to. This is a normal closure.
if r.closeErr != nil && strings.Contains(r.closeErr.Error(), "already wrote close") &&
r.readErr != nil && strings.Contains(r.readErr.Error(), "context canceled") {
// the websocket before we have a chance to. Unfortunately there is a race in the
// the websocket library, where sometimes close frame has already been written before
// we even call r.conn.Close(), and sometimes it gets written during our call to
// r.conn.Close(), so we need to handle both those cases in examining the error that comes
// back. This is a normal closure, so report nil for the error.
readCtxCanceled := r.readErr != nil && strings.Contains(r.readErr.Error(), "context canceled")
alreadyClosed := r.closeErr != nil &&
(strings.Contains(r.closeErr.Error(), "already wrote close") ||
strings.Contains(r.closeErr.Error(), "WebSocket closed"))
if alreadyClosed && readCtxCanceled {
r.closeErr = nil
}
close(r.done)
Expand Down