Coracle/nostrlib
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

subscription must be deemed closed when receiving a CLOSED.

Browse Source
This commit is contained in:
fiatjaf
2024-10-15 18:27:19 -03:00
parent f9271a6802
commit 9e0a86d48e
2 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
relay.go
View File

@@ -269,7 +269,7 @@ func (r *Relay) ConnectWithTLS(ctx context.Context, tlsConfig *tls.Config) error
} }
case *ClosedEnvelope: case *ClosedEnvelope:
if subscription, ok := r.Subscriptions.Load(subIdToSerial(env.SubscriptionID)); ok { if subscription, ok := r.Subscriptions.Load(subIdToSerial(env.SubscriptionID)); ok {
subscription.dispatchClosed(env.Reason) subscription.handleClosed(env.Reason)
} }
case *CountEnvelope: case *CountEnvelope:
if subscription, ok := r.Subscriptions.Load(subIdToSerial(env.SubscriptionID)); ok && env.Count != nil && subscription.countResult != nil { if subscription, ok := r.Subscriptions.Load(subIdToSerial(env.SubscriptionID)); ok && env.Count != nil && subscription.countResult != nil {

13
subscription.go
View File

@@ -34,7 +34,6 @@ type Subscription struct {
match func(*Event) bool // this will be either Filters.Match or Filters.MatchIgnoringTimestampConstraints match func(*Event) bool // this will be either Filters.Match or Filters.MatchIgnoringTimestampConstraints
live atomic.Bool live atomic.Bool
eosed atomic.Bool eosed atomic.Bool
closed atomic.Bool
cancel context.CancelFunc cancel context.CancelFunc
// this keeps track of the events we've received before the EOSE that we must dispatch before // 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) { func (sub *Subscription) handleClosed(reason string) {
if sub.closed.CompareAndSwap(false, true) { go func() {
go func() { sub.ClosedReason <- reason
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. // Unsub closes the subscription, sending "CLOSE" to relay as in NIP-01.