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

Switch to local relay model

Browse Source 
Changelog-Changed: Switched to the local relay model
Changelog-Added: Notes now load offline
Signed-off-by: Daniel D’Aquino <daniel@daquino.me>
This commit is contained in:
Daniel D’Aquino
2025-08-18 17:46:40 -07:00
parent 5f3ce30826
commit 8083269709
1 changed files with 13 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -32,17 +32,14 @@ extension NostrNetworkManager {
/// - Returns: An async stream of nostr data /// - Returns: An async stream of nostr data
func subscribe(filters: [NostrFilter], to desiredRelays: [RelayURL]? = nil) -> AsyncStream<StreamItem> { func subscribe(filters: [NostrFilter], to desiredRelays: [RelayURL]? = nil) -> AsyncStream<StreamItem> {
return AsyncStream<StreamItem> { continuation in return AsyncStream<StreamItem> { continuation in
let streamTask = Task { let ndbStreamTask = Task {
for await item in self.pool.subscribe(filters: filters, to: desiredRelays) { for await item in try self.ndb.subscribe(filters: try filters.map({ try NdbFilter(from: $0) })) {
switch item { switch item {
case .eose: continuation.yield(.eose) case .eose:
case .event(let nostrEvent): continuation.yield(.eose)
// At this point of the pipeline, if the note is valid it should have been processed and verified by NostrDB, case .event(let noteKey):
// in which case we should pull the note from NostrDB to ensure validity.
// However, NdbNotes are unowned, so we return a function where our callers can temporarily borrow the NostrDB note
let noteId = nostrEvent.id
let lender: NdbNoteLender = { lend in let lender: NdbNoteLender = { lend in
guard let ndbNoteTxn = self.ndb.lookup_note(noteId) else { guard let ndbNoteTxn = self.ndb.lookup_note_by_key(noteKey) else {
throw NdbNoteLenderError.errorLoadingNote throw NdbNoteLenderError.errorLoadingNote
} }
guard let unownedNote = UnownedNdbNote(ndbNoteTxn) else { guard let unownedNote = UnownedNdbNote(ndbNoteTxn) else {
@@ -54,8 +51,15 @@ extension NostrNetworkManager {
} }
} }
} }
let streamTask = Task {
for await _ in self.pool.subscribe(filters: filters, to: desiredRelays) {
// NO-OP. Notes will be automatically ingested by NostrDB
// TODO: Improve efficiency of subscriptions?
}
}
continuation.onTermination = { @Sendable _ in continuation.onTermination = { @Sendable _ in
streamTask.cancel() // Close the RelayPool stream when caller stops streaming streamTask.cancel() // Close the RelayPool stream when caller stops streaming
ndbStreamTask.cancel()
} }
} }
} }