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

Add missing timeout task to advanced stream

Browse Source 
Changelog-Fixed: Fixed an issue that could cause certain networking operations to hang indefinitely
Signed-off-by: Daniel D’Aquino <daniel@daquino.me>
This commit is contained in:
Daniel D’Aquino
2026-01-17 11:29:38 -08:00
parent d8f4dbb2aa
commit 89a56eebcd
1 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -115,6 +115,13 @@ extension NostrNetworkManager {
let id = id ?? UUID() let id = id ?? UUID()
let streamMode = streamMode ?? defaultStreamMode() let streamMode = streamMode ?? defaultStreamMode()
return AsyncStream<StreamItem> { continuation in return AsyncStream<StreamItem> { continuation in
let timeoutTask = Task {
guard let timeout else { return }
try? await Task.sleep(for: timeout)
Self.logger.debug("Subscription \(id.uuidString, privacy: .public): Timed out!")
continuation.finish()
}
let startTime = CFAbsoluteTimeGetCurrent() let startTime = CFAbsoluteTimeGetCurrent()
Self.logger.debug("Session subscription \(id.uuidString, privacy: .public): Started") Self.logger.debug("Session subscription \(id.uuidString, privacy: .public): Started")
var ndbEOSEIssued = false var ndbEOSEIssued = false
@@ -213,6 +220,7 @@ extension NostrNetworkManager {
} }
continuation.onTermination = { @Sendable _ in continuation.onTermination = { @Sendable _ in
timeoutTask.cancel()
networkStreamTask?.cancel() networkStreamTask?.cancel()
ndbStreamTask.cancel() ndbStreamTask.cancel()
} }