Merge pull request #126 from ksysoev/improve_ws_backend

Fix internal server error when dialing websocket connection
ksysoev · Oct 1, 2024 · a46a8b5 · a46a8b5
2 parents 1ad9c3b + 15d05d3
commit a46a8b5
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 0 deletions.
diff --git a/backend/ws.go b/backend/ws.go
@@ -79,6 +79,7 @@ func (b *WSBackend) getConnection(conn wasabi.Connection) (*websocket.Conn, erro
 	uws, err, _ := b.group.Do(conn.ID(), func() (interface{}, error) {
 		c, err := b.dialer(conn.Context(), b.URL)
 		if err != nil {
+			_ = conn.Close(websocket.StatusInternalError, "Internal Server Error")
 			return nil, err
 		}
 

diff --git a/backend/ws_test.go b/backend/ws_test.go
@@ -130,6 +130,7 @@ func TestGetConnectionDialError(t *testing.T) {
 	conn := mocks.NewMockConnection(t)
 	conn.EXPECT().ID().Return("connection1")
 	conn.EXPECT().Context().Return(context.Background())
+	conn.EXPECT().Close(websocket.StatusInternalError, "Internal Server Error").Return(nil)
 
 	_, err := b.getConnection(conn)
 	if err == nil {
@@ -182,6 +183,7 @@ func TestWSBackend_Handle_FailToConnect(t *testing.T) {
 	conn := mocks.NewMockConnection(t)
 	conn.EXPECT().ID().Return("connection1")
 	conn.EXPECT().Context().Return(context.Background())
+	conn.EXPECT().Close(websocket.StatusInternalError, "Internal Server Error").Return(nil)
 
 	r := mocks.NewMockRequest(t)