safe close

Author: HaraldNordgren

graphql/client.go

@@ -9,6 +9,7 @@ import (
 	"io"
 	"net/http"
 	"net/url"
+	"reflect"
 	"strings"
 
 	"github.com/vektah/gqlparser/v2/gqlerror"
@@ -370,3 +371,10 @@ func SafeSend[T any](dataChan_ chan T, wsResp T) {
 	}()
 	dataChan_ <- wsResp
 }
+
+func safeClose(interfaceChan any) {
+	defer func() {
+		_ = recover()
+	}()
+	reflect.ValueOf(interfaceChan).Close()
+}

graphql/subscription.go

@@ -37,8 +37,14 @@ func (s *subscriptionMap) Unsubscribe(subscriptionID string) error {
 	if !success {
 		return fmt.Errorf("tried to unsubscribe from unknown subscription with ID '%s'", subscriptionID)
 	}
+	hasBeenUnsubscribed := unsub.hasBeenUnsubscribed
 	unsub.hasBeenUnsubscribed = true
 	s.map_[subscriptionID] = unsub
+
+	if !hasBeenUnsubscribed {
+		safeClose(unsub.interfaceChan)
+	}
+
 	return nil
 }
 

graphql/websocket.go

@@ -146,6 +146,7 @@ func (w *webSocketClient) forwardWebSocketData(message []byte) error {
 	if sub == nil {
 		return nil
 	}
+
 	return sub.forwardDataFunc(sub.interfaceChan, wsMsg.Payload)
 }