Skip to content

fix: recover interrupted paykit sessions #796

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ben-kaufman wants to merge 6 commits into
base: master
Choose a base branch
from
Open

fix: recover interrupted paykit sessions #796

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
af281ba
fix: recover paykit after clock changes
ben-kaufman Sep 24, 2026
182657a
fix: isolate pubky cache when identity changes
ben-kaufman Sep 24, 2026
797a528
fix: retry saved paykit sessions after connection loss
ben-kaufman Sep 25, 2026
a4b4d35
chore: format paykit recovery code
ben-kaufman Sep 25, 2026
d4dd1ce
fix: keep paykit recovery available
ben-kaufman Sep 25, 2026
003030e
fix: cancel abandoned Ring authorization
ben-kaufman Sep 25, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions Bitkit/AppScene.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -945,9 +945,11 @@ struct AppScene: View {
}
if wallet.walletExists == true {
Task {
async let sessionRecovery: Void = network.isConnected ? pubkyProfile.restoreSessionIfNeeded() : ()

@jvsena42 jvsena42 Sep 25, 2026

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Low severity. While restoration keeps failing, "Profile Disconnected" now fires on every foreground and every reconnect. The saved session is now kept on failure, so hasStoredIdentity() stays true. Each retry sets sessionRestorationFailed from false back to true (:228 → :262), and the onChange at :470 toasts each time. Steps: a Ring identity whose grant was revoked, or a wrong clock, where "session has expired" is also misleading. On reconnect it stacks with "Connection restored". Before this PR it fired once per launch.

Fix: announce only from startup or manual retries, e.g. an announceFailure: Bool that is false from restoreSessionIfNeeded.

@ben-kaufman ben-kaufman Sep 25, 2026

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Automatic foreground and reconnect retries no longer set sessionRestorationFailed, so they do not repeat the Profile Disconnected notification. Startup and manual retries still report restoration failures.

await clearDeliveredNotifications()
await LightningService.shared.reconnectPeers()
try? await wallet.sync()
await sessionRecovery
await retryPendingPaykitEndpointRemoval()
await wallet.refreshPublicPaykitEndpointsOnForeground()
if PaykitFeatureFlags.isUIEnabled {
Expand Down Expand Up @@ -1371,7 +1373,9 @@ struct AppScene: View {
// Refresh currency rates when network is restored - critical for UI
// to display balances (MoneyText returns "0" if rates are nil)
Task {
async let sessionRecovery: Void = pubkyProfile.restoreSessionIfNeeded()
await currency.refresh()
await sessionRecovery
if scenePhase == .active {
await PubkyService.republishIdentityIfNeeded(publicKey: pubkyProfile.publicKey)
}
Expand Down
2 changes: 1 addition & 1 deletion Bitkit/Components/Header.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ struct Header: View {
return
}

if pubkyProfile.isAuthenticated || pubkyProfile.cachedName != nil {
if pubkyProfile.isAuthenticated {
navigation.navigate(.profile)
} else if pubkyProfile.initializationErrorMessage != nil {
navigation.navigate(.profile)
Expand Down
Loading
Loading