mirror of
https://github.com/netbirdio/netbird.git
synced 2026-08-02 04:28:40 -04:00
Wails v3 runs the full app teardown synchronously inside WM_ENDSESSION, overrunning the 5s end-session budget and triggering the "app is preventing shutdown" screen with a forced kill. Intercept WM_QUERYENDSESSION/WM_ENDSESSION and exit at once instead, and suppress error dialogs, toasts, and the hide-on-close hooks once shutdown or a tray quit has begun. ## Describe your changes ## Issue ticket number and link ## Stack <!-- branch-stack --> ### Checklist - [x] Is it a bug fix - [ ] Is a typo/documentation fix - [ ] Is a feature enhancement - [ ] It is a refactor - [ ] Created tests that fail without the change (if possible) - [ ] This change does **not** modify the public API, gRPC protocols, functionality behavior, CLI / service flags, or introduce a new feature — **OR** I have discussed it with the NetBird team beforehand (link the issue / Slack thread in the description). See [CONTRIBUTING.md](https://github.com/netbirdio/netbird/blob/main/CONTRIBUTING.md#discuss-changes-with-the-netbird-team-first). > By submitting this pull request, you confirm that you have read and agree to the terms of the [Contributor License Agreement](https://github.com/netbirdio/netbird/blob/main/CONTRIBUTOR_LICENSE_AGREEMENT.md). ## Documentation Select exactly one: - [ ] I added/updated documentation for this change - [x] Documentation is **not needed** for this change (explain why) ### Docs PR URL (required if "docs added" is checked) Paste the PR link from https://github.com/netbirdio/docs here: https://github.com/netbirdio/docs/pull/__ <!-- codesmith:footer --> --- <a href="https://app.blacksmith.sh/netbirdio/codesmith/netbird/pr/6878"><picture><source media="(prefers-color-scheme: dark)" srcset="https://pr-comments-assets.blacksmith.sh/codesmith/view-with-codesmith-dark-v2.svg"><source media="(prefers-color-scheme: light)" srcset="https://pr-comments-assets.blacksmith.sh/codesmith/view-with-codesmith-light-v2.svg"><img alt="View with [code]smith" src="https://pr-comments-assets.blacksmith.sh/codesmith/view-with-codesmith-dark-v2.svg"></picture></a> <a href="https://backend.blacksmith.sh/track/enable-autofix?expires=1787474408&installation_model_id=427504&pr_number=6878&repository=netbirdio%2Fnetbird&return_to=https%3A%2F%2Fgithub.com%2Fnetbirdio%2Fnetbird%2Fpull%2F6878&signature=f09980d83ad32e37b92aa30a7d4552c402a140dbd4e4662a3ca12d1868e9f04b"><picture><source media="(prefers-color-scheme: dark)" srcset="https://pr-comments-assets.blacksmith.sh/codesmith/autofix-with-codesmith-dark.svg"><source media="(prefers-color-scheme: light)" srcset="https://pr-comments-assets.blacksmith.sh/codesmith/autofix-with-codesmith-light.svg"><img alt="Autofix with [code]smith" src="https://pr-comments-assets.blacksmith.sh/codesmith/autofix-with-codesmith-dark.svg"></picture></a> <sup>Need help on this PR? Tag <code>@codesmith-bot</code> with what you need. Autofix is disabled.</sup> <!-- codesmith:autofix:disabled --> <!-- /codesmith:footer --> <!-- This is an auto-generated comment: release notes by coderabbit.ai --> ## Summary by CodeRabbit * **Bug Fixes** * Improved shutdown handling on Windows by properly responding to system end-session requests. * Prevented the main window, settings window, and error dialogs from reopening or interfering while the app is closing. * Updated tray “Quit” flow to begin shutdown immediately, ensuring active profile/connection operations complete cleanly. * Suppressed UI notifications during shutdown to avoid stray messages after exit starts. <!-- end of auto-generated comment: release notes by coderabbit.ai -->
62 lines
2.0 KiB
Go
62 lines
2.0 KiB
Go
//go:build !android && !ios && !freebsd && !js
|
|
|
|
package main
|
|
|
|
import (
|
|
"context"
|
|
|
|
log "github.com/sirupsen/logrus"
|
|
"github.com/wailsapp/wails/v3/pkg/services/notifications"
|
|
|
|
"github.com/netbirdio/netbird/client/ui/services"
|
|
)
|
|
|
|
const notifyIDDaemonOutdated = "netbird-daemon-outdated"
|
|
|
|
// sendFn fits both NotificationService.SendNotification and SendNotificationWithActions.
|
|
type sendFn func(notifications.NotificationOptions) error
|
|
|
|
// safeSendNotification sends a best-effort OS notification, swallowing errors and panics.
|
|
//
|
|
// The panic guard is load-bearing on Linux: when Wails' notifier fails to
|
|
// connect the session bus at startup (headless, unreachable
|
|
// DBUS_SESSION_BUS_ADDRESS) it stays registered with a nil *dbus.Conn, so the
|
|
// next send nil-derefs inside godbus. Because sends run on a Wails
|
|
// event-dispatch goroutine that panic is fatal process-wide; recover() turns
|
|
// it into a logged no-op.
|
|
func safeSendNotification(send sendFn, what string, opts notifications.NotificationOptions) (err error) {
|
|
if services.ShuttingDown() {
|
|
return nil
|
|
}
|
|
defer func() {
|
|
if r := recover(); r != nil {
|
|
log.Errorf("notify %s: recovered from panic (notification bus unavailable): %v", what, r)
|
|
err = nil
|
|
}
|
|
}()
|
|
if err := send(opts); err != nil {
|
|
log.Errorf("notify %s: %v", what, err)
|
|
return err
|
|
}
|
|
return nil
|
|
}
|
|
|
|
// notifyIfDaemonOutdated probes the daemon once and fires an OS toast when it
|
|
// is reachable but too old for this UI. A probe error means the daemon isn't
|
|
// reachable (not outdated), so it is left to the normal connection flow.
|
|
func notifyIfDaemonOutdated(compat *services.Compat, notifier *notifications.NotificationService, loc *Localizer) {
|
|
ready, err := compat.DaemonReady(context.Background())
|
|
if err != nil {
|
|
log.Debugf("daemon compatibility probe: %v", err)
|
|
return
|
|
}
|
|
if ready {
|
|
return
|
|
}
|
|
_ = safeSendNotification(notifier.SendNotification, "daemon-outdated", notifications.NotificationOptions{
|
|
ID: notifyIDDaemonOutdated,
|
|
Title: loc.T("notify.daemonOutdated.title"),
|
|
Body: loc.T("notify.daemonOutdated.body"),
|
|
})
|
|
}
|