- 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 遗留)
202 lines
4.3 KiB
Go
202 lines
4.3 KiB
Go
package runtime
|
|
|
|
import (
|
|
"errors"
|
|
"sync"
|
|
|
|
"github.com/mhsanaei/3x-ui/v3/internal/database"
|
|
"github.com/mhsanaei/3x-ui/v3/internal/database/model"
|
|
)
|
|
|
|
type NodeEgressResolver interface {
|
|
NodeEgressProxyURL(nodeID int) string
|
|
}
|
|
|
|
type Manager struct {
|
|
local Runtime
|
|
|
|
mu sync.RWMutex
|
|
remotes map[int]*Remote
|
|
overrides map[int]Runtime // test-only: forces RuntimeFor to return a stub
|
|
localOverride Runtime // test-only: forces RuntimeFor(nil) to return a stub
|
|
egressResolver NodeEgressResolver
|
|
}
|
|
|
|
func NewManager() *Manager {
|
|
return &Manager{
|
|
local: NewLocal(),
|
|
remotes: make(map[int]*Remote),
|
|
}
|
|
}
|
|
|
|
// SetRuntimeOverride makes RuntimeFor(nodeID) return rt instead of building a
|
|
// real Remote. Test seam for exercising node-dispatch paths without a network
|
|
// node; pass nil rt to clear.
|
|
func (m *Manager) SetRuntimeOverride(nodeID int, rt Runtime) {
|
|
m.mu.Lock()
|
|
defer m.mu.Unlock()
|
|
if rt == nil {
|
|
delete(m.overrides, nodeID)
|
|
return
|
|
}
|
|
if m.overrides == nil {
|
|
m.overrides = make(map[int]Runtime)
|
|
}
|
|
m.overrides[nodeID] = rt
|
|
}
|
|
|
|
// SetLocalRuntimeOverride makes RuntimeFor(nil) return rt instead of the real
|
|
// local runtime. Test seam for exercising the local dispatch path (MTProto
|
|
// sidecar, local Xray) without a running child process; pass nil rt to clear.
|
|
func (m *Manager) SetLocalRuntimeOverride(rt Runtime) {
|
|
m.mu.Lock()
|
|
defer m.mu.Unlock()
|
|
m.localOverride = rt
|
|
}
|
|
|
|
func (m *Manager) SetNodeEgressResolver(r NodeEgressResolver) {
|
|
m.mu.Lock()
|
|
defer m.mu.Unlock()
|
|
m.egressResolver = r
|
|
}
|
|
|
|
func (m *Manager) NodeEgressProxyURL(nodeID int) string {
|
|
m.mu.RLock()
|
|
defer m.mu.RUnlock()
|
|
if m.egressResolver == nil {
|
|
return ""
|
|
}
|
|
return m.egressResolver.NodeEgressProxyURL(nodeID)
|
|
}
|
|
|
|
func (m *Manager) RuntimeFor(nodeID *int) (Runtime, error) {
|
|
if nodeID == nil {
|
|
m.mu.RLock()
|
|
if m.localOverride != nil {
|
|
rt := m.localOverride
|
|
m.mu.RUnlock()
|
|
return rt, nil
|
|
}
|
|
m.mu.RUnlock()
|
|
return m.local, nil
|
|
}
|
|
m.mu.RLock()
|
|
if rt, ok := m.overrides[*nodeID]; ok {
|
|
m.mu.RUnlock()
|
|
return rt, nil
|
|
}
|
|
if rt, ok := m.remotes[*nodeID]; ok {
|
|
m.mu.RUnlock()
|
|
return rt, nil
|
|
}
|
|
m.mu.RUnlock()
|
|
|
|
m.mu.Lock()
|
|
defer m.mu.Unlock()
|
|
if rt, ok := m.remotes[*nodeID]; ok {
|
|
return rt, nil
|
|
}
|
|
n, err := loadNode(*nodeID)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
if !n.Enable {
|
|
return nil, errors.New("node " + n.Name + " is disabled")
|
|
}
|
|
rt := NewRemote(n, m.egressResolver)
|
|
m.remotes[*nodeID] = rt
|
|
return rt, nil
|
|
}
|
|
|
|
func (m *Manager) Local() Runtime { return m.local }
|
|
|
|
func (m *Manager) RemoteFor(node *model.Node) (*Remote, error) {
|
|
if node == nil {
|
|
return nil, errors.New("node is nil")
|
|
}
|
|
m.mu.RLock()
|
|
if rt, ok := m.remotes[node.Id]; ok {
|
|
if sameRemoteIdentity(rt.node, node) {
|
|
m.mu.RUnlock()
|
|
return rt, nil
|
|
}
|
|
m.mu.RUnlock()
|
|
} else {
|
|
m.mu.RUnlock()
|
|
}
|
|
|
|
m.mu.Lock()
|
|
defer m.mu.Unlock()
|
|
if rt, ok := m.remotes[node.Id]; ok {
|
|
if sameRemoteIdentity(rt.node, node) {
|
|
return rt, nil
|
|
}
|
|
} else {
|
|
rt := NewRemote(cloneRemoteNode(node), m.egressResolver)
|
|
m.remotes[node.Id] = rt
|
|
return rt, nil
|
|
}
|
|
rt := NewRemote(cloneRemoteNode(node), m.egressResolver)
|
|
m.remotes[node.Id] = rt
|
|
return rt, nil
|
|
}
|
|
|
|
func cloneRemoteNode(n *model.Node) *model.Node {
|
|
if n == nil {
|
|
return nil
|
|
}
|
|
clone := *n
|
|
if n.InboundTags != nil {
|
|
clone.InboundTags = append([]string(nil), n.InboundTags...)
|
|
}
|
|
return &clone
|
|
}
|
|
|
|
func sameRemoteIdentity(a, b *model.Node) bool {
|
|
if a == nil || b == nil {
|
|
return a == b
|
|
}
|
|
return a.Id == b.Id &&
|
|
a.Scheme == b.Scheme &&
|
|
a.Address == b.Address &&
|
|
a.Port == b.Port &&
|
|
a.BasePath == b.BasePath &&
|
|
a.ApiToken == b.ApiToken &&
|
|
a.AllowPrivateAddress == b.AllowPrivateAddress &&
|
|
a.TlsVerifyMode == b.TlsVerifyMode &&
|
|
a.PinnedCertSha256 == b.PinnedCertSha256 &&
|
|
a.OutboundTag == b.OutboundTag
|
|
}
|
|
|
|
func (m *Manager) InvalidateNode(nodeID int) {
|
|
m.mu.Lock()
|
|
defer m.mu.Unlock()
|
|
delete(m.remotes, nodeID)
|
|
}
|
|
|
|
func loadNode(id int) (*model.Node, error) {
|
|
db := database.GetDB()
|
|
n := &model.Node{}
|
|
if err := db.Model(model.Node{}).Where("id = ?", id).First(n).Error; err != nil {
|
|
return nil, err
|
|
}
|
|
return n, nil
|
|
}
|
|
|
|
var (
|
|
managerMu sync.RWMutex
|
|
manager *Manager
|
|
)
|
|
|
|
func SetManager(m *Manager) {
|
|
managerMu.Lock()
|
|
defer managerMu.Unlock()
|
|
manager = m
|
|
}
|
|
|
|
func GetManager() *Manager {
|
|
managerMu.RLock()
|
|
defer managerMu.RUnlock()
|
|
return manager
|
|
}
|