tyiu/damus
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix RelayPool connection race condition without time delays

Browse Source 
This improves upon a temporary fix we had for the RelayPool race
condition that would cause timeline staleness.

The root cause was that during app launch, the HomeModel would subscribe
to some filters, and the subscribe function would filter out any relays
not yet connected to avoid unnecessary waiting for EOSEs from disconnected relays.
However, that filtering would cause the subscribe request to not be
queued up or sent back to the relays once connected, causing the relays
to never receive those subscription requests and causing timeline
staleness.

This was fixed by separating the relay list used for the subcription
request from the relay list used for waiting for network EOSEs. This
allows other mechanisms to ensure the subscription will go through even
when the app is initializing and relays are not yet fully connected.

Fixes: 61eb833239
Signed-off-by: Daniel D’Aquino <daniel@daquino.me>
This commit is contained in:
Daniel D’Aquino
2025-10-06 15:10:57 -07:00
parent 7691b48fb6
commit 4f479d0280
2 changed files with 4 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
damus/Core/Networking/NostrNetworkManager/SubscriptionManager.swift
View File

@@ -198,13 +198,6 @@ extension NostrNetworkManager {
continue continue
} }
// FIXME: The delay below is to prevent race conditions when the RelayPool is initializing during the app start.
// Without this, occasionally there is a race condition that causes the subscribe call to be missed somehow
// despite mechanisms in place to queue up requests when relays are disconnected, as well as mechanisms to send subscribe requests when the relay is already connected.
// This is difficult to fix as it will require a big refactor in `RelayPool` to implement proper async/await mechanisms, instead of the current "fire and forget" interfaces.
// If this delay fixes the occasional timeline staleness when starting the app, it helps prove the hypothesis above.
try await Task.sleep(nanoseconds: 2_000_000_000)
do { do {
for await item in self.pool.subscribe(filters: filters, to: desiredRelays, id: id) { for await item in self.pool.subscribe(filters: filters, to: desiredRelays, id: id) {
// NO-OP. Notes will be automatically ingested by NostrDB // NO-OP. Notes will be automatically ingested by NostrDB

7
damus/Core/Nostr/RelayPool.swift
View File

@@ -259,7 +259,7 @@ class RelayPool {
/// - Returns: Returns an async stream that callers can easily consume via a for-loop /// - Returns: Returns an async stream that callers can easily consume via a for-loop
func subscribe(filters: [NostrFilter], to desiredRelays: [RelayURL]? = nil, eoseTimeout: Duration? = nil, id: UUID? = nil) -> AsyncStream<StreamItem> { func subscribe(filters: [NostrFilter], to desiredRelays: [RelayURL]? = nil, eoseTimeout: Duration? = nil, id: UUID? = nil) -> AsyncStream<StreamItem> {
let eoseTimeout = eoseTimeout ?? .seconds(5) let eoseTimeout = eoseTimeout ?? .seconds(5)
let desiredRelays = desiredRelays ?? self.relays.filter({ $0.connection.isConnected }).map({ $0.descriptor.url }) let desiredRelays = desiredRelays ?? self.relays.map({ $0.descriptor.url })
let startTime = CFAbsoluteTimeGetCurrent() let startTime = CFAbsoluteTimeGetCurrent()
return AsyncStream<StreamItem> { continuation in return AsyncStream<StreamItem> { continuation in
let id = id ?? UUID() let id = id ?? UUID()
@@ -284,8 +284,9 @@ class RelayPool {
break // We do not support handling these yet break // We do not support handling these yet
case .eose(_): case .eose(_):
relaysWhoFinishedInitialResults.insert(relayUrl) relaysWhoFinishedInitialResults.insert(relayUrl)
Log.debug("RelayPool subscription %s: EOSE from %s. EOSE count: %d/%d. Elapsed: %.2f seconds.", for: .networking, id.uuidString, relayUrl.absoluteString, relaysWhoFinishedInitialResults.count, Set(desiredRelays).count, CFAbsoluteTimeGetCurrent() - startTime) let desiredAndConnectedRelays = desiredRelays ?? self.relays.filter({ $0.connection.isConnected }).map({ $0.descriptor.url })
if relaysWhoFinishedInitialResults == Set(desiredRelays) { Log.debug("RelayPool subscription %s: EOSE from %s. EOSE count: %d/%d. Elapsed: %.2f seconds.", for: .networking, id.uuidString, relayUrl.absoluteString, relaysWhoFinishedInitialResults.count, Set(desiredAndConnectedRelays).count, CFAbsoluteTimeGetCurrent() - startTime)
if relaysWhoFinishedInitialResults == Set(desiredAndConnectedRelays) {
continuation.yield(with: .success(.eose)) continuation.yield(with: .success(.eose))
eoseSent = true eoseSent = true
} }