mirror of
https://github.com/netbirdio/netbird.git
synced 2026-04-30 22:26:42 +00:00
88a2bf582d
Adds a SubscribeStatus gRPC RPC that pushes a fresh FullStatus snapshot on every peer-recorder state change, replacing the Wails UI's 2-second Status poll. The daemon's notifier already triggers on Connected / Disconnected / Connecting / management or signal flip / address change / peers-list change; we now coalesce those into ticks on a buffered chan and stream the resulting snapshots over gRPC. - Status recorder gains SubscribeToStateChanges / UnsubscribeFromStateChanges + a non-blocking notifyStateChange that drops ticks when a subscriber's 1-slot buffer is full (next snapshot the consumer pulls already reflects everything). - Server.Status handler split: the snapshot composition is shared with the new SubscribeStatus stream handler so unary and stream paths return identical bytes. - UI peers service: pollLoop replaced by statusStreamLoop. The local name of the existing SubscribeEvents loop is now toastStreamLoop so the two streams are easy to tell apart — the underlying RPC name is unchanged. - Tray applyStatus skips the icon refresh when connected/lastStatus hasn't changed; rapid SubscribeStatus bursts during health probes no longer churn Shell_NotifyIcon or the log.
58 lines
1.7 KiB
Go
58 lines
1.7 KiB
Go
package server
|
|
|
|
import (
|
|
log "github.com/sirupsen/logrus"
|
|
|
|
"github.com/netbirdio/netbird/client/proto"
|
|
)
|
|
|
|
// SubscribeStatus pushes a fresh StatusResponse on every connection state
|
|
// change. The first message is the current snapshot, so a re-subscribing
|
|
// client doesn't need to also call Status. Subsequent messages fire when
|
|
// the peer recorder reports any of: connected/disconnected/connecting,
|
|
// management or signal flip, address change, or peers list change.
|
|
//
|
|
// The change channel coalesces bursts to a single tick. If the consumer
|
|
// is slow the daemon drops extras (not blocks), and the next snapshot
|
|
// the consumer pulls already reflects everything.
|
|
func (s *Server) SubscribeStatus(req *proto.StatusRequest, stream proto.DaemonService_SubscribeStatusServer) error {
|
|
subID, ch := s.statusRecorder.SubscribeToStateChanges()
|
|
defer func() {
|
|
s.statusRecorder.UnsubscribeFromStateChanges(subID)
|
|
log.Debug("client unsubscribed from status updates")
|
|
}()
|
|
|
|
log.Debug("client subscribed to status updates")
|
|
|
|
if err := s.sendStatusSnapshot(req, stream); err != nil {
|
|
return err
|
|
}
|
|
|
|
for {
|
|
select {
|
|
case _, ok := <-ch:
|
|
if !ok {
|
|
return nil
|
|
}
|
|
if err := s.sendStatusSnapshot(req, stream); err != nil {
|
|
return err
|
|
}
|
|
case <-stream.Context().Done():
|
|
return nil
|
|
}
|
|
}
|
|
}
|
|
|
|
func (s *Server) sendStatusSnapshot(req *proto.StatusRequest, stream proto.DaemonService_SubscribeStatusServer) error {
|
|
resp, err := s.buildStatusResponse(req)
|
|
if err != nil {
|
|
log.Warnf("build status snapshot for stream: %v", err)
|
|
return err
|
|
}
|
|
if err := stream.Send(resp); err != nil {
|
|
log.Warnf("send status snapshot to stream: %v", err)
|
|
return err
|
|
}
|
|
return nil
|
|
}
|