mirror of
https://github.com/MHSanaei/3x-ui.git
synced 2026-01-11 00:11:27 +00:00
* feat: add support for trusted X-Forwarded-For and testseed parameters in VLESS settings * chore: update Xray Core version to 25.12.8 in release workflow * chore: update Xray Core version to 25.12.8 in Docker initialization script * chore: bump version to 2.8.6 and add watcher for security changes in inbound modal * refactor: remove default and random seed buttons from outbound form * refactor: update VLESS form to rename 'Test Seed' to 'Vision Seed' and change button functionality for seed generation * refactor: enhance TLS settings form layout with improved button styling and spacing * feat: integrate WebSocket support for real-time updates on inbounds and Xray service status * chore: downgrade version to 2.8.5 * refactor: translate comments to English * fix: ensure testseed is initialized correctly for VLESS protocol and improve client handling in inbound modal * refactor: simplify VLESS divider condition by removing unnecessary flow checks * fix: add fallback date formatting for cases when IntlUtil is not available * refactor: simplify WebSocket message handling by removing batching and ensuring individual message delivery * refactor: disable WebSocket notifications in inbound and index HTML files * refactor: enhance VLESS testseed initialization and button functionality in inbound modal * fix: * refactor: ensure proper WebSocket URL construction by normalizing basePath * fix: * fix: * fix: * refactor: update testseed methods for improved reactivity and binding in VLESS form * logger info to debug --------- Co-authored-by: lolka1333 <test123@gmail.com>
93 lines
3.1 KiB
Go
93 lines
3.1 KiB
Go
package job
|
|
|
|
import (
|
|
"encoding/json"
|
|
|
|
"github.com/mhsanaei/3x-ui/v2/logger"
|
|
"github.com/mhsanaei/3x-ui/v2/web/service"
|
|
"github.com/mhsanaei/3x-ui/v2/web/websocket"
|
|
"github.com/mhsanaei/3x-ui/v2/xray"
|
|
|
|
"github.com/valyala/fasthttp"
|
|
)
|
|
|
|
// XrayTrafficJob collects and processes traffic statistics from Xray, updating the database and optionally informing external APIs.
|
|
type XrayTrafficJob struct {
|
|
settingService service.SettingService
|
|
xrayService service.XrayService
|
|
inboundService service.InboundService
|
|
outboundService service.OutboundService
|
|
}
|
|
|
|
// NewXrayTrafficJob creates a new traffic collection job instance.
|
|
func NewXrayTrafficJob() *XrayTrafficJob {
|
|
return new(XrayTrafficJob)
|
|
}
|
|
|
|
// Run collects traffic statistics from Xray and updates the database, triggering restart if needed.
|
|
func (j *XrayTrafficJob) Run() {
|
|
if !j.xrayService.IsXrayRunning() {
|
|
return
|
|
}
|
|
traffics, clientTraffics, err := j.xrayService.GetXrayTraffic()
|
|
if err != nil {
|
|
return
|
|
}
|
|
err, needRestart0 := j.inboundService.AddTraffic(traffics, clientTraffics)
|
|
if err != nil {
|
|
logger.Warning("add inbound traffic failed:", err)
|
|
}
|
|
err, needRestart1 := j.outboundService.AddTraffic(traffics, clientTraffics)
|
|
if err != nil {
|
|
logger.Warning("add outbound traffic failed:", err)
|
|
}
|
|
if ExternalTrafficInformEnable, err := j.settingService.GetExternalTrafficInformEnable(); ExternalTrafficInformEnable {
|
|
j.informTrafficToExternalAPI(traffics, clientTraffics)
|
|
} else if err != nil {
|
|
logger.Warning("get ExternalTrafficInformEnable failed:", err)
|
|
}
|
|
if needRestart0 || needRestart1 {
|
|
j.xrayService.SetToNeedRestart()
|
|
}
|
|
|
|
// Get online clients and last online map for real-time status updates
|
|
onlineClients := j.inboundService.GetOnlineClients()
|
|
lastOnlineMap, err := j.inboundService.GetClientsLastOnline()
|
|
if err != nil {
|
|
logger.Warning("get clients last online failed:", err)
|
|
lastOnlineMap = make(map[string]int64)
|
|
}
|
|
|
|
// Broadcast traffic update via WebSocket
|
|
trafficUpdate := map[string]interface{}{
|
|
"traffics": traffics,
|
|
"clientTraffics": clientTraffics,
|
|
"onlineClients": onlineClients,
|
|
"lastOnlineMap": lastOnlineMap,
|
|
}
|
|
websocket.BroadcastTraffic(trafficUpdate)
|
|
}
|
|
|
|
func (j *XrayTrafficJob) informTrafficToExternalAPI(inboundTraffics []*xray.Traffic, clientTraffics []*xray.ClientTraffic) {
|
|
informURL, err := j.settingService.GetExternalTrafficInformURI()
|
|
if err != nil {
|
|
logger.Warning("get ExternalTrafficInformURI failed:", err)
|
|
return
|
|
}
|
|
requestBody, err := json.Marshal(map[string]any{"clientTraffics": clientTraffics, "inboundTraffics": inboundTraffics})
|
|
if err != nil {
|
|
logger.Warning("parse client/inbound traffic failed:", err)
|
|
return
|
|
}
|
|
request := fasthttp.AcquireRequest()
|
|
defer fasthttp.ReleaseRequest(request)
|
|
request.Header.SetMethod("POST")
|
|
request.Header.SetContentType("application/json; charset=UTF-8")
|
|
request.SetBody([]byte(requestBody))
|
|
request.SetRequestURI(informURL)
|
|
response := fasthttp.AcquireResponse()
|
|
defer fasthttp.ReleaseResponse(response)
|
|
if err := fasthttp.Do(request, response); err != nil {
|
|
logger.Warning("POST ExternalTrafficInformURI failed:", err)
|
|
}
|
|
}
|