adding thorclient.Subscription.Unsubscribe errors

vechain · Dec 20, 2024 · 00b0597 · 00b0597
1 parent 3558bd5
commit 00b0597
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 4 deletions.
diff --git a/thorclient/common/common.go b/thorclient/common/common.go
@@ -29,5 +29,5 @@ type EventWrapper[T any] struct {
 // Subscription is used to handle the active subscription
 type Subscription[T any] struct {
 	EventChan   <-chan EventWrapper[T]
-	Unsubscribe func()
+	Unsubscribe func() error
 }
diff --git a/thorclient/wsclient/client.go b/thorclient/wsclient/client.go
@@ -183,10 +183,17 @@ func subscribe[T any](conn *websocket.Conn) *common.Subscription[*T] {
 
 	return &common.Subscription[*T]{
 		EventChan: eventChan,
-		Unsubscribe: func() {
+		Unsubscribe: func() error {
 			closed = true
-			conn.WriteMessage(websocket.CloseMessage, websocket.FormatCloseMessage(websocket.CloseNormalClosure, ""))
-			conn.Close()
+			err := conn.WriteMessage(websocket.CloseMessage, websocket.FormatCloseMessage(websocket.CloseNormalClosure, ""))
+			if err != nil {
+				return fmt.Errorf("failed to issue close message: %w", err)
+			}
+			err = conn.Close()
+			if err != nil {
+				return fmt.Errorf("failed to close connections: %w", err)
+			}
+			return nil
 		},
 	}
 }