- nodes: port node-type (traditional/agent) picker back from web-src into the embedded frontend; backend annotates NodeView.nodeType from agent_nodes bindings; fix agent-node update path (skip reachability probe and apiToken requirement for agent-managed nodes); restore i18n keys in all 13 locales; install command now uses the Gitea mirror - jobs: expire agent-bound nodes whose agent_nodes.last_seen is older than max(3x heartbeat interval, 120s) = 180s; last_seen=0 (never registered) is left untouched; transitions reuse UpdateHeartbeat + node event broadcast - config: GetBaseVersion honors ldflags-injected buildVersion; release builds inject 3.7.0-agent.1 so the panel no longer reports a phantom update against the Gitea release tag - logger/server: remove the three log viewers (panel/xray/amneziawg), their API endpoints and the 10240-entry in-memory log buffer; file logging via lumberjack unchanged; tests assert via a new optional logger hook instead of the removed buffer - server: remove system history and xray metrics modules end to end (endpoints, sampling appends in RefreshStatus, per-minute persist cron, gob snapshot/restore, XrayMetricsService); realtime status and per-node history are untouched - settings: subPort may be 0/unset - subscription links are generated without a port while the subscription service keeps binding the default 2096; the settings form declares the cleared state via onNumber's new onClear option instead of snapping back to 1
69 lines
2.1 KiB
Go
69 lines
2.1 KiB
Go
package service
|
|
|
|
import (
|
|
"strconv"
|
|
"strings"
|
|
"sync"
|
|
"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/logger"
|
|
"github.com/mhsanaei/3x-ui/v3/internal/web/runtime"
|
|
|
|
"github.com/op/go-logging"
|
|
)
|
|
|
|
// Removing a central inbound also drops its clients' traffic history, so the
|
|
// sweep must name what it removed — a silent drop is undiagnosable in the field.
|
|
// captureLogLines installs a logger hook collecting "LEVEL message" lines
|
|
// for the rest of the test. It replaces reads of the in-memory log buffer,
|
|
// which was removed together with the web log viewer.
|
|
func captureLogLines(t *testing.T) *[]string {
|
|
t.Helper()
|
|
var mu sync.Mutex
|
|
lines := &[]string{}
|
|
prev := logger.SetLogHook(func(level, msg string) {
|
|
mu.Lock()
|
|
defer mu.Unlock()
|
|
*lines = append(*lines, level+" "+msg)
|
|
})
|
|
t.Cleanup(func() { logger.SetLogHook(prev) })
|
|
return lines
|
|
}
|
|
|
|
func TestNodeSnapshotSweepLogsRemovedInbound(t *testing.T) {
|
|
logger.InitLogger(logging.WARNING)
|
|
logLines := captureLogLines(t)
|
|
setupBulkDB(t)
|
|
nodeID, _ := setupNodeRuntime(t)
|
|
|
|
gone := nodeInbound(t, nodeID, 31777, nil)
|
|
survivor := nodeInbound(t, nodeID, 31778, nil)
|
|
|
|
// The snapshot reports only the survivor, so the other row is swept.
|
|
snap := &runtime.TrafficSnapshot{Inbounds: []*model.Inbound{{
|
|
Tag: survivor.Tag, Port: survivor.Port, Protocol: model.VLESS, Enable: true,
|
|
Settings: survivor.Settings,
|
|
}}}
|
|
if _, err := (&InboundService{}).setRemoteTrafficLocked(nodeID, snap, false, false); err != nil {
|
|
t.Fatalf("setRemoteTrafficLocked: %v", err)
|
|
}
|
|
|
|
var remaining int64
|
|
if err := database.GetDB().Model(model.Inbound{}).Where("id = ?", gone.Id).Count(&remaining).Error; err != nil {
|
|
t.Fatalf("count swept inbound: %v", err)
|
|
}
|
|
if remaining != 0 {
|
|
t.Fatalf("fixture did not sweep inbound %d; the log assertion below would be meaningless", gone.Id)
|
|
}
|
|
|
|
want := strconv.Itoa(gone.Id)
|
|
for _, line := range *logLines {
|
|
if strings.Contains(line, gone.Tag) && strings.Contains(line, want) {
|
|
return
|
|
}
|
|
}
|
|
t.Fatalf("sweep removed inbound %q (id %d) without naming it in the log", gone.Tag, gone.Id)
|
|
}
|