highperfocused/go-nostr
1
0
Fork 0
mirror of https://github.com/nbd-wtf/go-nostr.git synced 2025-07-01 02:51:24 +02:00
Code Issues Packages Projects Releases Wiki Activity

guard against closed channels in subscriptions.

Browse Source
This commit is contained in:
fiatjaf
2023-03-16 15:53:24 -03:00
parent ec34d4eb10
commit c982ad0ab1
1 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
relay.go
View File

@ -261,6 +261,11 @@ func (r *Relay) Publish(ctx context.Context, event Event) (Status, error) {
for { for {
select { select {
case receivedEvent := <-sub.Events: case receivedEvent := <-sub.Events:
if receivedEvent == nil {
// channel is closed
return status, err
}
if receivedEvent.ID == event.ID { if receivedEvent.ID == event.ID {
// we got a success, so update our status and proceed to return // we got a success, so update our status and proceed to return
mu.Lock() mu.Lock()
@ -364,6 +369,10 @@ func (r *Relay) QuerySync(ctx context.Context, filter Filter) []*Event {
for { for {
select { select {
case evt := <-sub.Events: case evt := <-sub.Events:
if evt == nil {
// channel is closed
return events
}
events = append(events, evt) events = append(events, evt)
case <-sub.EndOfStoredEvents: case <-sub.EndOfStoredEvents:
return events return events