- 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 遗留)
48 lines
1.5 KiB
Go
48 lines
1.5 KiB
Go
package job
|
|
|
|
import (
|
|
"github.com/mhsanaei/3x-ui/v3/internal/logger"
|
|
"github.com/mhsanaei/3x-ui/v3/internal/web/service"
|
|
"github.com/mhsanaei/3x-ui/v3/internal/web/websocket"
|
|
)
|
|
|
|
// OutboundSubscriptionJob periodically re-fetches enabled outbound subscriptions,
|
|
// updates the stored outbounds (with stable tags), and signals that xray
|
|
// should be reloaded so the new outbounds take effect.
|
|
type OutboundSubscriptionJob struct {
|
|
subService *service.OutboundSubscriptionService
|
|
xraySvc *service.XrayService
|
|
}
|
|
|
|
// NewOutboundSubscriptionJob creates the job (zero-value services are populated
|
|
// on first Run via method calls, same pattern as other jobs).
|
|
func NewOutboundSubscriptionJob() *OutboundSubscriptionJob {
|
|
return &OutboundSubscriptionJob{
|
|
subService: &service.OutboundSubscriptionService{},
|
|
xraySvc: &service.XrayService{},
|
|
}
|
|
}
|
|
|
|
// Run is invoked by the cron scheduler.
|
|
func (j *OutboundSubscriptionJob) Run() {
|
|
if j.subService == nil {
|
|
j.subService = &service.OutboundSubscriptionService{}
|
|
}
|
|
if j.xraySvc == nil {
|
|
j.xraySvc = &service.XrayService{}
|
|
}
|
|
|
|
count, err := j.subService.RefreshAllEnabled()
|
|
if err != nil {
|
|
logger.Warning("outbound subscription auto-update error:", err)
|
|
return
|
|
}
|
|
if count > 0 {
|
|
logger.Infof("Refreshed %d outbound subscription(s)", count)
|
|
// Ask the xray manager to restart/reload on the next 30s check.
|
|
// Also broadcast an invalidate so the UI can refresh the xray setting
|
|
// view (new outbounds will be visible after the reload cycle).
|
|
websocket.BroadcastInvalidate(websocket.MessageTypeOutbounds)
|
|
}
|
|
}
|