mirror of
https://github.com/netbirdio/netbird.git
synced 2026-08-24 16:41:30 +02:00
[client] Materialise a hidden main webview for tray-driven login and tear it down after
The trigger-login event only has a listener in the main window's React app, so with lazily created windows every tray-driven login flow (Connect click, SSO auto-handoff, post-profile-switch login, session-extend dialog) silently died when the main window did not exist. The WindowManager now watches the event itself: if no ready main window is live it builds one hidden, queues a re-emit until the frontend has subscribed, and never shows it. Once the flow settles (Connected, LoginFailed, DaemonUnavailable, or the popup is cancelled) the headless window is closed after a short grace period, so the idle-memory win of lazy windows is kept. A window the user shows meanwhile is never torn down, and a new trigger cancels a pending teardown.
This commit is contained in:
@@ -34,6 +34,8 @@ const EventWindowPainted = "netbird:window-painted"
|
||||
|
||||
const paintedFallback = 2 * time.Second
|
||||
|
||||
const headlessTeardownDelay = 2 * time.Second
|
||||
|
||||
var WindowBackgroundColour = application.NewRGB(24, 26, 29) // bg-nb-gray-950
|
||||
|
||||
// WindowHeight is shared by the main and Settings windows.
|
||||
@@ -121,6 +123,8 @@ type WindowManager struct {
|
||||
pendingTab map[uint]string
|
||||
pendingEmits map[uint][]string
|
||||
fallbackTimers map[uint]*time.Timer
|
||||
headlessMain bool
|
||||
headlessTimer *time.Timer
|
||||
// recenterOnShow is set only on the minimal-WM/XEmbed path, where the WM neither centers nor
|
||||
// restores position; nil on full desktops so re-centering can't fight a user-moved window.
|
||||
recenterOnShow func() bool
|
||||
@@ -140,6 +144,7 @@ func NewWindowManager(app *application.App, mainWindow *application.WebviewWindo
|
||||
fallbackTimers: map[uint]*time.Timer{},
|
||||
}
|
||||
s.watchPainted()
|
||||
s.watchTriggerLogin()
|
||||
// Re-title live windows on language flip. Wired internally so the binding generator
|
||||
// doesn't try to expose the interface param.
|
||||
if sub, ok := prefs.(LanguageSubscriber); ok && sub != nil {
|
||||
@@ -553,6 +558,80 @@ func (s *WindowManager) watchPainted() {
|
||||
})
|
||||
}
|
||||
|
||||
func (s *WindowManager) watchTriggerLogin() {
|
||||
s.app.Event.On(EventTriggerLogin, func(_ *application.CustomEvent) {
|
||||
s.mu.Lock()
|
||||
if s.headlessTimer != nil {
|
||||
s.headlessTimer.Stop()
|
||||
s.headlessTimer = nil
|
||||
}
|
||||
w := s.mainWindow
|
||||
ready := w != nil && s.ready[w.ID()]
|
||||
s.mu.Unlock()
|
||||
if ready {
|
||||
return
|
||||
}
|
||||
|
||||
w, created := s.ensureMain("/")
|
||||
if w == nil {
|
||||
return
|
||||
}
|
||||
|
||||
s.mu.Lock()
|
||||
if created {
|
||||
s.headlessMain = true
|
||||
}
|
||||
pending := !s.ready[w.ID()]
|
||||
if pending {
|
||||
s.pendingEmits[w.ID()] = append(s.pendingEmits[w.ID()], EventTriggerLogin)
|
||||
}
|
||||
s.mu.Unlock()
|
||||
|
||||
if !pending {
|
||||
s.app.Event.Emit(EventTriggerLogin)
|
||||
}
|
||||
})
|
||||
|
||||
s.app.Event.On(EventBrowserLoginCancel, func(_ *application.CustomEvent) {
|
||||
s.scheduleHeadlessTeardown()
|
||||
})
|
||||
|
||||
s.app.Event.On(EventStatusSnapshot, func(e *application.CustomEvent) {
|
||||
st, ok := e.Data.(Status)
|
||||
if !ok {
|
||||
return
|
||||
}
|
||||
switch st.Status {
|
||||
case StatusConnected, StatusLoginFailed, StatusDaemonUnavailable:
|
||||
s.scheduleHeadlessTeardown()
|
||||
}
|
||||
})
|
||||
}
|
||||
|
||||
func (s *WindowManager) scheduleHeadlessTeardown() {
|
||||
s.mu.Lock()
|
||||
defer s.mu.Unlock()
|
||||
if !s.headlessMain || s.mainWindow == nil {
|
||||
return
|
||||
}
|
||||
if s.headlessTimer != nil {
|
||||
s.headlessTimer.Stop()
|
||||
}
|
||||
s.headlessTimer = time.AfterFunc(headlessTeardownDelay, s.closeHeadlessMain)
|
||||
}
|
||||
|
||||
func (s *WindowManager) closeHeadlessMain() {
|
||||
s.mu.Lock()
|
||||
w := s.mainWindow
|
||||
headless := s.headlessMain
|
||||
s.headlessTimer = nil
|
||||
s.mu.Unlock()
|
||||
if !headless || w == nil {
|
||||
return
|
||||
}
|
||||
w.Close()
|
||||
}
|
||||
|
||||
func (s *WindowManager) forgetWindowLocked(w *application.WebviewWindow) {
|
||||
if w == nil {
|
||||
return
|
||||
@@ -643,6 +722,15 @@ func (s *WindowManager) showWhenReady(w *application.WebviewWindow) {
|
||||
}
|
||||
|
||||
func (s *WindowManager) showNow(w *application.WebviewWindow) {
|
||||
s.mu.Lock()
|
||||
if w == s.mainWindow {
|
||||
s.headlessMain = false
|
||||
if s.headlessTimer != nil {
|
||||
s.headlessTimer.Stop()
|
||||
s.headlessTimer = nil
|
||||
}
|
||||
}
|
||||
s.mu.Unlock()
|
||||
w.Show()
|
||||
w.Focus()
|
||||
s.centerWhenReady(w)
|
||||
@@ -670,6 +758,11 @@ func (s *WindowManager) ForgetMain() {
|
||||
defer s.mu.Unlock()
|
||||
s.forgetWindowLocked(s.mainWindow)
|
||||
s.mainWindow = nil
|
||||
s.headlessMain = false
|
||||
if s.headlessTimer != nil {
|
||||
s.headlessTimer.Stop()
|
||||
s.headlessTimer = nil
|
||||
}
|
||||
}
|
||||
|
||||
// SetRecenterOnShow installs the recenterOnShow predicate (see the field).
|
||||
|
||||
@@ -517,7 +517,8 @@ func (t *Tray) handleConnect(upItem *application.MenuItem) {
|
||||
// NeedsLogin/SessionExpired/LoginFailed won't honor a plain Up RPC — they
|
||||
// need the Login → WaitSSOLogin → Up sequence. Emit EventTriggerLogin so
|
||||
// the React startLogin() (which owns the BrowserLogin popup) drives it;
|
||||
// the hidden main webview is alive and subscribed, so only the popup shows.
|
||||
// the WindowManager materialises a hidden main webview when none is live,
|
||||
// so only the popup shows.
|
||||
t.statusMu.Lock()
|
||||
needsLogin := strings.EqualFold(t.lastStatus, services.StatusNeedsLogin) ||
|
||||
strings.EqualFold(t.lastStatus, services.StatusSessionExpired) ||
|
||||
|
||||
Reference in New Issue
Block a user