sendnrw/netbird
2
0
Fork 0
mirror of https://github.com/netbirdio/netbird.git synced 2026-10-05 21:19:08 +02:00
Code Issues Packages Projects Releases Wiki Activity

[client] Extract peer status recorder into its own package

Browse Source 
Move the Status recorder and its state types out of the peer package
into client/internal/peer/status, split by struct across recorder.go,
peer_state.go, full_status.go, events.go, notifier.go and route.go
instead of one 1600-line file. Rename the type Status -> Recorder
(NewRecorder already implied it; avoids status.Status stutter). Split
conn_status.go: the ConnStatus type and its constants move to the status
package, connStatusInputs stays with the peer event loop.

The peer package references the status package directly; a transitional
status_alias.go re-exports the moved symbols for the ~50 external callers
still using peer.Status/State/ConnStatus, to be removed once they are
migrated.
This commit is contained in:
Zoltan Papp
2026-08-05 16:14:11 +02:00
committed by Zoltán Papp
parent 71519f1b5d
commit 9d92bc8abc
18 changed files with 429 additions and 362 deletions
Download Patch File Download Diff File Expand all files Collapse all files
client/internal/peer/conn.go
+16 -15
View File
@@ -22,6 +22,7 @@ import (
"github.com/netbirdio/netbird/client/internal/peer/guard"
icemaker "github.com/netbirdio/netbird/client/internal/peer/ice"
"github.com/netbirdio/netbird/client/internal/peer/id"
"github.com/netbirdio/netbird/client/internal/peer/status"
"github.com/netbirdio/netbird/client/internal/peer/worker"
"github.com/netbirdio/netbird/client/internal/portforward"
"github.com/netbirdio/netbird/client/internal/rosenpass"
@@ -47,7 +48,7 @@ type MetricsRecorder interface {
}
type ServiceDependencies struct {
StatusRecorder *Status
StatusRecorder *status.Recorder
Signaler *Signaler
IFaceDiscover stdnet.ExternalIFaceDiscover
RelayManager *relayClient.Manager
@@ -106,7 +107,7 @@ type Conn struct {
ctx context.Context
ctxCancel context.CancelFunc
config ConnConfig
statusRecorder *Status
statusRecorder *status.Recorder
signaler *Signaler
iFaceDiscover stdnet.ExternalIFaceDiscover
relayManager *relayClient.Manager
@@ -244,10 +245,10 @@ func (conn *Conn) open(engineCtx context.Context, firstPacket []byte) error {
conn.pendingFirstPacket = slices.Clone(firstPacket)
}
peerState := State{
peerState := status.State{
PubKey: conn.config.Key,
ConnStatusUpdate: time.Now(),
ConnStatus: StatusConnecting,
ConnStatus: status.StatusConnecting,
Mux: new(sync.RWMutex),
}
if err := conn.statusRecorder.UpdatePeerState(peerState); err != nil {
@@ -346,7 +347,7 @@ func (conn *Conn) WgConfig() WgConfig {
// IsConnected returns true if the peer is connected
func (conn *Conn) IsConnected() bool {
return conn.evalStatus() == StatusConnected
return conn.evalStatus() == status.StatusConnected
}
func (conn *Conn) GetKey() string {
@@ -473,7 +474,7 @@ func (conn *Conn) teardown(mb *mailbox, leftover []event, signalToRemote bool, d
conn.Log.Errorf("failed to remove wg endpoint: %v", err)
}
if conn.evalStatus() == StatusConnected && conn.onDisconnected != nil {
if conn.evalStatus() == status.StatusConnected && conn.onDisconnected != nil {
conn.onDisconnected(conn.config.WgConfig.RemoteKey)
}
@@ -716,7 +717,7 @@ func (conn *Conn) handleICEDisconnected(sessionChanged bool) {
conn.metricsStages.Disconnected()
}
peerState := State{
peerState := status.State{
PubKey: conn.config.Key,
ConnStatus: conn.evalStatus(),
Relayed: conn.isRelayed(),
@@ -824,7 +825,7 @@ func (conn *Conn) handleRelayDisconnected() {
conn.metricsStages.Disconnected()
}
peerState := State{
peerState := status.State{
PubKey: conn.config.Key,
ConnStatus: conn.evalStatus(),
Relayed: conn.isRelayed(),
@@ -957,7 +958,7 @@ func (conn *Conn) injectPendingFirstPacket(proxy wgproxy.Proxy, directConn net.C
}
func (conn *Conn) updateRelayStatus(relayServerAddr string, rosenpassPubKey []byte, updateTime time.Time) {
peerState := State{
peerState := status.State{
PubKey: conn.config.Key,
ConnStatusUpdate: updateTime,
ConnStatus: conn.evalStatus(),
@@ -973,7 +974,7 @@ func (conn *Conn) updateRelayStatus(relayServerAddr string, rosenpassPubKey []by
}
func (conn *Conn) updateIceState(iceConnInfo ICEConnInfo, updateTime time.Time) {
peerState := State{
peerState := status.State{
PubKey: conn.config.Key,
ConnStatusUpdate: updateTime,
ConnStatus: conn.evalStatus(),
@@ -996,9 +997,9 @@ func (conn *Conn) setStatusToDisconnected() {
conn.statusICE.SetDisconnected()
conn.currentConnPriority = conntype.None
peerState := State{
peerState := status.State{
PubKey: conn.config.Key,
ConnStatus: StatusIdle,
ConnStatus: status.StatusIdle,
ConnStatusUpdate: time.Now(),
Mux: new(sync.RWMutex),
}
@@ -1034,12 +1035,12 @@ func (conn *Conn) isRelayed() bool {
}
}
func (conn *Conn) evalStatus() ConnStatus {
func (conn *Conn) evalStatus() status.ConnStatus {
if conn.statusRelay.Get() == worker.StatusConnected || conn.statusICE.Get() == worker.StatusConnected {
return StatusConnected
return status.StatusConnected
}
return StatusConnecting
return status.StatusConnecting
}
// isConnectedOnAllWay evaluates the overall connection status based on ICE and Relay transports.