laantungir/nak
1
0
Fork 0
mirror of https://github.com/fiatjaf/nak.git synced 2026-07-22 07:48:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

sync: wake up Receive when the relay answers NEG-ERR, it was blocked on the messages channel forever since the error was only checked before blocking.

Browse Source
This commit is contained in:
Yasuhiro Matsumoto
2026-07-15 09:18:02 +09:00
parent 61b20c6e7a
commit e1e8b11001
1 changed files with 30 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
sync.go
View File

@@ -124,9 +124,27 @@ func getBoundKey(b negentropy.Bound) boundKey {
type RelayThirdPartyRemote struct { type RelayThirdPartyRemote struct {
relay *nostr.Relay relay *nostr.Relay
messages chan string messages chan string
mu sync.Mutex
err error err error
} }
// fail records the error and closes the messages channel so a Receive()
// that is already blocked on it wakes up instead of hanging forever.
func (rtpr *RelayThirdPartyRemote) fail(err error) {
rtpr.mu.Lock()
if rtpr.err == nil {
rtpr.err = err
close(rtpr.messages)
}
rtpr.mu.Unlock()
}
func (rtpr *RelayThirdPartyRemote) getErr() error {
rtpr.mu.Lock()
defer rtpr.mu.Unlock()
return rtpr.err
}
func NewRelayThirdPartyRemote(ctx context.Context, url string) (*RelayThirdPartyRemote, error) { func NewRelayThirdPartyRemote(ctx context.Context, url string) (*RelayThirdPartyRemote, error) {
rtpr := &RelayThirdPartyRemote{ rtpr := &RelayThirdPartyRemote{
messages: make(chan string, 3), messages: make(chan string, 3),
@@ -141,13 +159,18 @@ func NewRelayThirdPartyRemote(ctx context.Context, url string) (*RelayThirdParty
} }
switch env := envelope.(type) { switch env := envelope.(type) {
case *nip77.OpenEnvelope, *nip77.CloseEnvelope: case *nip77.OpenEnvelope, *nip77.CloseEnvelope:
rtpr.err = fmt.Errorf("unexpected %s received from relay", env.Label()) rtpr.fail(fmt.Errorf("unexpected %s received from relay", env.Label()))
return return
case *nip77.ErrorEnvelope: case *nip77.ErrorEnvelope:
rtpr.err = fmt.Errorf("relay returned a %s: %s", env.Label(), env.Reason) rtpr.fail(fmt.Errorf("relay returned a %s: %s", env.Label(), env.Reason))
return return
case *nip77.MessageEnvelope: case *nip77.MessageEnvelope:
rtpr.messages <- env.Message rtpr.mu.Lock()
failed := rtpr.err != nil
rtpr.mu.Unlock()
if !failed {
rtpr.messages <- env.Message
}
} }
}, },
}) })
@@ -185,12 +208,13 @@ func (rtpr *RelayThirdPartyRemote) SendClose() error {
var thirdPartyRemoteEndOfMessages = errors.New("the-end") var thirdPartyRemoteEndOfMessages = errors.New("the-end")
func (rtpr *RelayThirdPartyRemote) Receive() (string, error) { func (rtpr *RelayThirdPartyRemote) Receive() (string, error) {
if rtpr.err != nil {
return "", rtpr.err
}
if msg, ok := <-rtpr.messages; ok { if msg, ok := <-rtpr.messages; ok {
return msg, nil return msg, nil
} }
// channel closed by fail()
if err := rtpr.getErr(); err != nil {
return "", err
}
return "", thirdPartyRemoteEndOfMessages return "", thirdPartyRemoteEndOfMessages
} }