Skip to content

[FIX] Handle nil channel when closing WebSocketProxy #1

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
sudiptadeb merged 1 commit into from
Aug 16, 2023
Merged

[FIX] Handle nil channel when closing WebSocketProxy #1

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
19 changes: 16 additions & 3 deletions websocketproxy.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
package websocketproxy

import (
"errors"
"fmt"
"io"
"log"
Expand All @@ -23,6 +24,8 @@ var (

// DefaultDialer is a dialer with all fields set to the default zero values.
DefaultDialer = websocket.DefaultDialer

errNilChannelClose = errors.New("trying to close nil channel")
)

// WebsocketProxy is an HTTP Handler that takes an incoming WebSocket
Expand Down Expand Up @@ -70,9 +73,19 @@ func NewProxy(target *url.URL) *WebsocketProxy {
}

// Stop websocket proxy on demand
func (w *WebsocketProxy) CloseProxy() {
close(w.stopBackendChan)
close(w.stopClientChan)
func (w *WebsocketProxy) CloseProxy() (err error) {
err = nil
if w.stopBackendChan != nil {
close(w.stopBackendChan)
} else {
err = errNilChannelClose
}
if w.stopClientChan != nil {
close(w.stopClientChan)
} else {
err = errNilChannelClose
}
return err
}

// ServeHTTP implements the http.Handler that proxies WebSocket connections.
Expand Down