From 9e0a86d48e44843a52d92b5322b6893ebcd5b42d Mon Sep 17 00:00:00 2001
From: fiatjaf <fiatjaf@gmail.com>
Date: Tue, 15 Oct 2024 18:27:19 -0300
Subject: [PATCH] subscription must be deemed closed when receiving a CLOSED.

---
 relay.go        |  2 +-
 subscription.go | 13 ++++++-------
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/relay.go b/relay.go
index 4f6cb4b..0ffe042 100644
--- a/relay.go
+++ b/relay.go
@@ -269,7 +269,7 @@ func (r *Relay) ConnectWithTLS(ctx context.Context, tlsConfig *tls.Config) error
 				}
 			case *ClosedEnvelope:
 				if subscription, ok := r.Subscriptions.Load(subIdToSerial(env.SubscriptionID)); ok {
-					subscription.dispatchClosed(env.Reason)
+					subscription.handleClosed(env.Reason)
 				}
 			case *CountEnvelope:
 				if subscription, ok := r.Subscriptions.Load(subIdToSerial(env.SubscriptionID)); ok && env.Count != nil && subscription.countResult != nil {
diff --git a/subscription.go b/subscription.go
index 3995137..211e89e 100644
--- a/subscription.go
+++ b/subscription.go
@@ -34,7 +34,6 @@ type Subscription struct {
 	match  func(*Event) bool // this will be either Filters.Match or Filters.MatchIgnoringTimestampConstraints
 	live   atomic.Bool
 	eosed  atomic.Bool
-	closed atomic.Bool
 	cancel context.CancelFunc
 
 	// this keeps track of the events we've received before the EOSE that we must dispatch before
@@ -108,12 +107,12 @@ func (sub *Subscription) dispatchEose() {
 	}
 }
 
-func (sub *Subscription) dispatchClosed(reason string) {
-	if sub.closed.CompareAndSwap(false, true) {
-		go func() {
-			sub.ClosedReason <- reason
-		}()
-	}
+func (sub *Subscription) handleClosed(reason string) {
+	go func() {
+		sub.ClosedReason <- reason
+	}()
+	sub.live.Store(false) // set this so we don't send an unnecessary CLOSE to the relay
+	sub.Unsub()
 }
 
 // Unsub closes the subscription, sending "CLOSE" to relay as in NIP-01.