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

53
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,31 +479,32 @@ 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")
if damus_state.ndb.reopen() { Task {
print("txn: NOSTRDB REOPENED") await damusClosingTask?.value // Wait for the closing task to finish before reopening things, to avoid race conditions
} else { if damus_state.ndb.reopen() {
print("txn: NOSTRDB FAILED TO REOPEN closed:\(damus_state.ndb.is_closed)") print("txn: NOSTRDB REOPENED")
} } else {
if damus_state.purple.checkout_ids_in_progress.count > 0 { print("txn: NOSTRDB FAILED TO REOPEN closed:\(damus_state.ndb.is_closed)")
// For extra assurance, run this after one second, to avoid race conditions if the app is also handling a damus purple welcome url. }
DispatchQueue.main.asyncAfter(deadline: .now() + 1) { if damus_state.purple.checkout_ids_in_progress.count > 0 {
Task { // For extra assurance, run this after one second, to avoid race conditions if the app is also handling a damus purple welcome url.
let freshly_completed_checkout_ids = try? await damus_state.purple.check_status_of_checkouts_in_progress() DispatchQueue.main.asyncAfter(deadline: .now() + 1) {
let there_is_a_completed_checkout: Bool = (freshly_completed_checkout_ids?.count ?? 0) > 0 Task {
let account_info = try await damus_state.purple.fetch_account(pubkey: self.keypair.pubkey) let freshly_completed_checkout_ids = try? await damus_state.purple.check_status_of_checkouts_in_progress()
if there_is_a_completed_checkout == true && account_info?.active == true { let there_is_a_completed_checkout: Bool = (freshly_completed_checkout_ids?.count ?? 0) > 0
if damus_state.purple.onboarding_status.user_has_never_seen_the_onboarding_before() { let account_info = try await damus_state.purple.fetch_account(pubkey: self.keypair.pubkey)
// Show welcome sheet if there_is_a_completed_checkout == true && account_info?.active == true {
self.active_sheet = .purple_onboarding if damus_state.purple.onboarding_status.user_has_never_seen_the_onboarding_before() {
} // Show welcome sheet
else { self.active_sheet = .purple_onboarding
self.active_sheet = .purple(DamusPurpleURL.init(is_staging: damus_state.purple.environment == .staging, variant: .landing)) }
else {
self.active_sheet = .purple(DamusPurpleURL.init(is_staging: damus_state.purple.environment == .staging, variant: .landing))
}
} }
} }
} }
} }
}
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")
damus_state.nostrNetwork.connect() Task {
damus_state.nostrNetwork.ping() await damusClosingTask?.value // Wait for the closing task to finish before reopening things, to avoid race conditions
damus_state.nostrNetwork.connect()
damus_state.nostrNetwork.ping()
}
@unknown default: @unknown default:
break break
} }