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

Fix race condition on app swap that would cause ndb to remain closed

Browse Source 
Signed-off-by: Daniel D’Aquino <daniel@daquino.me>
This commit is contained in:
Daniel D’Aquino
2025-09-03 15:32:09 -07:00
parent d766029f2b
commit 9fb7ed741e
1 changed files with 29 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
damus/ContentView.swift
View File

@@ -135,6 +135,7 @@ struct ContentView: View {
@StateObject var navigationCoordinator: NavigationCoordinator = NavigationCoordinator() @StateObject var navigationCoordinator: NavigationCoordinator = NavigationCoordinator()
@AppStorage("has_seen_suggested_users") private var hasSeenOnboardingSuggestions = false @AppStorage("has_seen_suggested_users") private var hasSeenOnboardingSuggestions = false
let sub_id = UUID().description let sub_id = UUID().description
@State var damusClosingTask: Task<Void, Never>? = nil
// connect retry timer // connect retry timer
let timer = Timer.publish(every: 1, on: .main, in: .common).autoconnect() let timer = Timer.publish(every: 1, on: .main, in: .common).autoconnect()
@@ -478,6 +479,8 @@ struct ContentView: View {
} }
.onReceive(NotificationCenter.default.publisher(for: UIApplication.willEnterForegroundNotification)) { obj in .onReceive(NotificationCenter.default.publisher(for: UIApplication.willEnterForegroundNotification)) { obj in
print("txn: 📙 DAMUS ACTIVE NOTIFY") print("txn: 📙 DAMUS ACTIVE NOTIFY")
Task {
await damusClosingTask?.value // Wait for the closing task to finish before reopening things, to avoid race conditions
if damus_state.ndb.reopen() { if damus_state.ndb.reopen() {
print("txn: NOSTRDB REOPENED") print("txn: NOSTRDB REOPENED")
} else { } else {
@@ -502,7 +505,6 @@ struct ContentView: View {
} }
} }
} }
Task {
await damus_state.purple.check_and_send_app_notifications_if_needed(handler: home.handle_damus_app_notification) await damus_state.purple.check_and_send_app_notifications_if_needed(handler: home.handle_damus_app_notification)
} }
} }
@@ -511,7 +513,7 @@ struct ContentView: View {
switch phase { switch phase {
case .background: case .background:
print("txn: 📙 DAMUS BACKGROUNDED") print("txn: 📙 DAMUS BACKGROUNDED")
Task { @MainActor in damusClosingTask = Task { @MainActor in
await damus_state.nostrNetwork.close() // Close ndb streaming tasks before closing ndb to avoid memory errors await damus_state.nostrNetwork.close() // Close ndb streaming tasks before closing ndb to avoid memory errors
damus_state.ndb.close() damus_state.ndb.close()
} }
@@ -521,8 +523,11 @@ struct ContentView: View {
break break
case .active: case .active:
print("txn: 📙 DAMUS ACTIVE") print("txn: 📙 DAMUS ACTIVE")
Task {
await damusClosingTask?.value // Wait for the closing task to finish before reopening things, to avoid race conditions
damus_state.nostrNetwork.connect() damus_state.nostrNetwork.connect()
damus_state.nostrNetwork.ping() damus_state.nostrNetwork.ping()
}
@unknown default: @unknown default:
break break
} }