Muse
1035d00fe4
- service/xray.go 1741->573行: 只剩 agent 配置构建(GetXrayConfigForAgent/buildAgentXrayConfig=模板+节点入站+egress+转发编译); 删进程生命周期/状态机/RestartXray/StopXray/SetToNeedRestart/GetXrayTraffic/GetOnlineUsers/balancer/TestRoute 与 injectPanelEgress/injectNodeEgresses/injectMtproto/injectAmneziawg/mergeSubscriptionOutbounds
- controller: 43处 SetToNeedRestart 与各 RestartXray 调用清除; 删 balancerStatus/balancerOverride/routeTest/getXrayResult 路由与handler(纯本地核心操作); 前端删 RouteTester 页签与组件
- server service: GetConfigJson 改模板直读; 状态Xray块恒 stopped/空版本; Stop/RestartXrayService 改 no-op(DB导入/恢复流程保留形状)
- setting service: PanelEgressProxyURL/NodeEgressProxyURL 恒直连(桥在本地核心内,已不存在); NodeService.withOutboundBridge 恒直连回退
- runtime: Local 改为全 no-op 桩(DB即真源); NewManager() 去 LocalDeps(APIPort/SetNeedRestart)
- job: 删 XrayTrafficJob/CheckXrayRunningJob/CheckClientIpJob 三文件(共享声明 EventBus/IPWithTimestamp/clientStatsSnapshotMaxClients 迁 shared.go); web.go 不再调度 MtprotoJob/AmneziaWGJob, 删 OnCrash 接线与 stop() 的 sidecar StopAll
- MTProto/AmneziaWG 下线: AddInbound/UpdateInbound 对两协议直接拒绝(存量行保留可删); TG bot 的 restart 命令与在线查询按无本地核心收口
- 测试: GetXrayConfig 系列移植到 agent 构建(finalmask/clients/wireguard/scale); 删退役行为测试(lifecycle/restart/mtproto本地应用/client-ip job/inject系列); 共享测试helper迁 mtproto_test_helpers_test.go 与 job/integration_helpers_test.go
- 既有红(非本轮引入,已在 f6d6520 复现): TestGetXrayConfig_EnabledClientsStillEmitted、TestRouteRegistryContract(P6删 endpoints.ts 遗留)
76 lines
2.5 KiB
Go
76 lines
2.5 KiB
Go
package service
|
|
|
|
import (
|
|
"encoding/json"
|
|
"fmt"
|
|
"testing"
|
|
"time"
|
|
|
|
"github.com/mhsanaei/3x-ui/v3/internal/database"
|
|
"github.com/mhsanaei/3x-ui/v3/internal/database/model"
|
|
)
|
|
|
|
// TestGetXrayConfigScale measures building the full Xray config (the path
|
|
// every restart/reconcile takes) and, separately, how much of the per-inbound
|
|
// settings rebuild is spent on indented vs plain JSON marshaling.
|
|
func TestGetXrayConfigScale(t *testing.T) {
|
|
setupScaleDB(t)
|
|
svc := &XrayService{}
|
|
shapes := []struct {
|
|
name string
|
|
inbounds int
|
|
}{{"single", 1}, {"spread50", 50}}
|
|
|
|
for _, n := range scaleSizes(t, 10000, 100000) {
|
|
for _, shape := range shapes {
|
|
t.Run(fmt.Sprintf("N=%d_%s", n, shape.name), func(t *testing.T) {
|
|
ds := seedScaleDataset(t, n, shape.inbounds)
|
|
// Home the seeded inbounds on one agent node: the per-agent
|
|
// build is the only config build left in the lite master.
|
|
scaleNode := &model.Node{Name: "scale-node", Address: "10.0.0.7", Port: 2053, ApiToken: "t"}
|
|
if err := database.GetDB().Create(scaleNode).Error; err != nil {
|
|
t.Fatalf("create scale node: %v", err)
|
|
}
|
|
if err := database.GetDB().Model(&model.Inbound{}).Where("1 = 1").Update("node_id", scaleNode.Id).Error; err != nil {
|
|
t.Fatalf("home scale inbounds: %v", err)
|
|
}
|
|
|
|
const reps = 3
|
|
start := time.Now()
|
|
for range reps {
|
|
cfg, err := svc.GetXrayConfigForAgent(scaleNode.Id, "", "")
|
|
if err != nil {
|
|
t.Fatalf("GetXrayConfigForAgent: %v", err)
|
|
}
|
|
if len(cfg.InboundConfigs) < shape.inbounds {
|
|
t.Fatalf("config has %d inbounds, want >= %d", len(cfg.InboundConfigs), shape.inbounds)
|
|
}
|
|
}
|
|
t.Logf("N=%-7d shape=%-8s GetXrayConfigForAgent=%v/run",
|
|
n, shape.name, (time.Since(start) / reps).Round(time.Millisecond))
|
|
|
|
var ib model.Inbound
|
|
if err := database.GetDB().First(&ib, ds.inboundIds[0]).Error; err != nil {
|
|
t.Fatalf("load inbound: %v", err)
|
|
}
|
|
settings := map[string]any{}
|
|
if err := json.Unmarshal([]byte(ib.Settings), &settings); err != nil {
|
|
t.Fatalf("unmarshal settings: %v", err)
|
|
}
|
|
start = time.Now()
|
|
if _, err := json.Marshal(settings); err != nil {
|
|
t.Fatalf("marshal settings: %v", err)
|
|
}
|
|
plain := time.Since(start)
|
|
start = time.Now()
|
|
if _, err := json.MarshalIndent(settings, "", " "); err != nil {
|
|
t.Fatalf("marshal indent settings: %v", err)
|
|
}
|
|
indented := time.Since(start)
|
|
t.Logf("N=%-7d shape=%-8s settingsMarshal plain=%-9v indent=%v",
|
|
n, shape.name, plain.Round(time.Millisecond), indented.Round(time.Millisecond))
|
|
})
|
|
}
|
|
}
|
|
}
|