mirror of
https://github.com/MHSanaei/3x-ui.git
synced 2026-09-16 15:17:14 +00:00
Sanaei
a84bbeab2e
What the master derives from a node's reports (online clients, active inbounds, learned sub-nodes) must live only while that node is still synced; ClearNodeOnlineClients states it: a downed node must not keep its clients listed as online. Only a failed snapshot fetch cleared the online set, and only a failed probe cleared sub-nodes. A disabled node (both jobs skip it), a node marked offline before the sync tick reached it, a deleted node, and a node whose snapshot fetched but failed to merge all kept their clients online in onlineClients, onlineByGuid and activeInbounds, which the dashboard and a parent master's /clients/onlines read. Disabled and deleted nodes also kept their sub-nodes on the Nodes page until the panel restarted. The traffic sync now keeps online sets only for enabled, online nodes in its list, the heartbeat keeps sub-nodes only for enabled listed nodes, both before the empty-list return, and a failed merge clears like a failed fetch. The sync job's one-line call has no job-level test: that package cannot install the xray process, so RetainSyncedNodeOnlineClients carries the tested rule.
70 lines
2.3 KiB
Go
70 lines
2.3 KiB
Go
package service
|
|
|
|
import (
|
|
"fmt"
|
|
"reflect"
|
|
"testing"
|
|
|
|
"github.com/mhsanaei/3x-ui/v3/internal/database"
|
|
"github.com/mhsanaei/3x-ui/v3/internal/database/model"
|
|
"github.com/mhsanaei/3x-ui/v3/internal/web/runtime"
|
|
"github.com/mhsanaei/3x-ui/v3/internal/xray"
|
|
)
|
|
|
|
func useOnlineTestProcess(t *testing.T) *xray.Process {
|
|
t.Helper()
|
|
previousProcess, previousResult := xrayState.snapshot()
|
|
process := xray.NewTestProcess(nil, "")
|
|
xrayState.replace(process)
|
|
t.Cleanup(func() {
|
|
xrayState.mu.Lock()
|
|
xrayState.process = previousProcess
|
|
xrayState.result = previousResult
|
|
xrayState.mu.Unlock()
|
|
})
|
|
return process
|
|
}
|
|
|
|
// Only a failed snapshot fetch used to clear a node's online set, so a node the
|
|
// sync stopped reaching (disabled, marked offline, deleted) kept its clients online.
|
|
func TestRetainSyncedNodeOnlineClientsDropsUnsyncedNodes(t *testing.T) {
|
|
setupConflictDB(t)
|
|
process := useOnlineTestProcess(t)
|
|
svc := InboundService{}
|
|
for id := 1; id <= 4; id++ {
|
|
guid := fmt.Sprintf("g%d", id)
|
|
svc.SetNodeOnlineTree(id, map[string][]string{guid: {guid + "@x"}})
|
|
process.SetNodeActiveInboundTree(id, map[string][]string{guid: {"in-" + guid}})
|
|
}
|
|
|
|
svc.RetainSyncedNodeOnlineClients([]*model.Node{
|
|
{Id: 1, Enable: true, Status: "online"},
|
|
{Id: 2, Enable: false, Status: "online"},
|
|
{Id: 3, Enable: true, Status: "offline"},
|
|
})
|
|
|
|
if got, want := svc.GetOnlineClientsByGuid(), map[string][]string{"g1": {"g1@x"}}; !reflect.DeepEqual(got, want) {
|
|
t.Errorf("online by guid = %v, want %v", got, want)
|
|
}
|
|
if got, want := svc.GetActiveInboundsByGuid(), map[string][]string{"g1": {"in-g1"}}; !reflect.DeepEqual(got, want) {
|
|
t.Errorf("active inbounds by guid = %v, want %v", got, want)
|
|
}
|
|
}
|
|
|
|
func TestSetRemoteTrafficFailureClearsNodeOnlineClients(t *testing.T) {
|
|
setupConflictDB(t)
|
|
useOnlineTestProcess(t)
|
|
svc := InboundService{}
|
|
svc.SetNodeOnlineTree(7, map[string][]string{"g7": {"a@x"}})
|
|
if err := database.GetDB().Exec("DROP TABLE inbounds").Error; err != nil {
|
|
t.Fatalf("drop inbounds: %v", err)
|
|
}
|
|
|
|
if _, err := svc.SetRemoteTraffic(7, &runtime.TrafficSnapshot{}, false, false); err == nil {
|
|
t.Fatal("SetRemoteTraffic succeeded without an inbounds table")
|
|
}
|
|
if got := svc.GetOnlineClientsByGuid(); len(got) != 0 {
|
|
t.Errorf("online by guid after a failed merge = %v, want none", got)
|
|
}
|
|
}
|