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 遗留)
69 lines
1.7 KiB
Go
69 lines
1.7 KiB
Go
package service
|
|
|
|
import (
|
|
"context"
|
|
"testing"
|
|
"time"
|
|
|
|
"github.com/mhsanaei/3x-ui/v3/internal/database/model"
|
|
"github.com/mhsanaei/3x-ui/v3/internal/web/runtime"
|
|
)
|
|
|
|
type blockingResetRuntime struct {
|
|
fakeNodeRuntime
|
|
reached chan struct{}
|
|
release chan struct{}
|
|
}
|
|
|
|
func (b *blockingResetRuntime) ResetAllTraffics(context.Context) error {
|
|
close(b.reached)
|
|
<-b.release
|
|
return nil
|
|
}
|
|
|
|
func TestResetAllTrafficsDoesNotBlockWriterOnNodeCall(t *testing.T) {
|
|
db := initTrafficTestDB(t)
|
|
resetTrafficWriterForTest(t)
|
|
StartTrafficWriter()
|
|
|
|
mgr := runtime.NewManager()
|
|
runtime.SetManager(mgr)
|
|
t.Cleanup(func() { runtime.SetManager(nil) })
|
|
|
|
node := &model.Node{Name: "n1", Address: "127.0.0.1", Port: 2096, ApiToken: "tok", Enable: true, Status: "online"}
|
|
if err := db.Create(node).Error; err != nil {
|
|
t.Fatalf("create node: %v", err)
|
|
}
|
|
fake := &blockingResetRuntime{reached: make(chan struct{}), release: make(chan struct{})}
|
|
mgr.SetRuntimeOverride(node.Id, fake)
|
|
|
|
done := make(chan error, 1)
|
|
go func() { done <- (&InboundService{}).ResetAllTraffics() }()
|
|
|
|
select {
|
|
case <-fake.reached:
|
|
case <-time.After(3 * time.Second):
|
|
close(fake.release)
|
|
t.Fatal("node ResetAllTraffics was never reached")
|
|
}
|
|
|
|
writerFree := make(chan error, 1)
|
|
go func() { writerFree <- submitTrafficWrite(func() error { return nil }) }()
|
|
select {
|
|
case err := <-writerFree:
|
|
if err != nil {
|
|
close(fake.release)
|
|
t.Fatalf("concurrent writer submit failed: %v", err)
|
|
}
|
|
case <-time.After(2 * time.Second):
|
|
close(fake.release)
|
|
<-done
|
|
t.Fatal("the serial traffic writer was blocked by a node reset HTTP call")
|
|
}
|
|
|
|
close(fake.release)
|
|
if err := <-done; err != nil {
|
|
t.Fatalf("ResetAllTraffics: %v", err)
|
|
}
|
|
}
|