mirror of
https://github.com/MHSanaei/3x-ui.git
synced 2026-09-07 10:47:15 +00:00
Kuzz007
1aa81428b8
The Speed column showed "--" for AmneziaWG (and MTProto, which has the identical gap) even while cumulative traffic totals were correct. XrayTrafficJob drives live speed by querying xray-core's own stats API and broadcasting the delta over websocket -- but AmneziaWG/MTProto never run inside xray-core's own runtime inbounds, so they're invisible to that API. Their own jobs already compute the same per-poll delta shape (that's what keeps cumulative totals correct) but never broadcast it. Reusing the existing "traffics"/"clientTraffics" broadcast would have two real bugs: the frontend's existing scope/replace logic would let each side clobber the other's speed on its next unrelated tick, and the websocket hub's per-message-type throttle is keyed only by message type, not caller -- since both sidecar jobs run on identical "@every 10s" grids registered milliseconds apart, one would silently lose almost every broadcast if both protocols were ever configured together. Fixed with a small unthrottled broadcast path (both sidecar jobs are already self-rate-limited by their own cron cadence) and protocol- namespaced wire keys, tracked in their own frontend state and merged into the existing inboundSpeed/clientSpeed only at read time -- so every existing consumer needs zero changes. Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
90 lines
2.8 KiB
Go
90 lines
2.8 KiB
Go
package job
|
|
|
|
import (
|
|
"github.com/mhsanaei/3x-ui/v3/internal/database/model"
|
|
"github.com/mhsanaei/3x-ui/v3/internal/logger"
|
|
"github.com/mhsanaei/3x-ui/v3/internal/mtproto"
|
|
"github.com/mhsanaei/3x-ui/v3/internal/web/service"
|
|
"github.com/mhsanaei/3x-ui/v3/internal/xray"
|
|
)
|
|
|
|
// MtprotoJob reconciles the running mtg sidecar processes against the enabled
|
|
// mtproto inbounds in the database, restarts any that crashed, and folds the
|
|
// per-client traffic scraped from each mtg /stats endpoint into the usual client
|
|
// and inbound traffic accounting.
|
|
type MtprotoJob struct {
|
|
inboundService service.InboundService
|
|
}
|
|
|
|
// NewMtprotoJob creates a new mtproto reconcile/traffic job instance.
|
|
func NewMtprotoJob() *MtprotoJob {
|
|
return new(MtprotoJob)
|
|
}
|
|
|
|
// Run reconciles desired mtproto inbounds with running mtg processes and records
|
|
// per-client traffic deltas and online status.
|
|
func (j *MtprotoJob) Run() {
|
|
desired, err := j.inboundService.DesiredMtprotoInstances()
|
|
if err != nil {
|
|
logger.Warning("mtproto job: get desired instances failed:", err)
|
|
return
|
|
}
|
|
|
|
routedTags := make(map[string]bool)
|
|
activeTags := make([]string, 0, len(desired))
|
|
for _, inst := range desired {
|
|
activeTags = append(activeTags, inst.Tag)
|
|
if inst.RouteThroughXray {
|
|
routedTags[inst.Tag] = true
|
|
}
|
|
}
|
|
|
|
mgr := mtproto.GetManager()
|
|
mgr.Reconcile(desired)
|
|
|
|
deltas, onlineEmails := mgr.CollectTraffic()
|
|
|
|
// A routed inbound's total is already metered through the Xray bridge by
|
|
// xray_traffic_job, so only non-routed inbounds are rolled up here; per-client
|
|
// deltas are always kept, since the bridge cannot tell mtproto users apart.
|
|
clientTraffics := make([]*xray.ClientTraffic, 0, len(deltas))
|
|
inboundUp := make(map[string]int64)
|
|
inboundDown := make(map[string]int64)
|
|
for _, d := range deltas {
|
|
clientTraffics = append(clientTraffics, &xray.ClientTraffic{
|
|
Email: d.Email,
|
|
Up: d.Up,
|
|
Down: d.Down,
|
|
})
|
|
if !routedTags[d.Tag] {
|
|
inboundUp[d.Tag] += d.Up
|
|
inboundDown[d.Tag] += d.Down
|
|
}
|
|
}
|
|
|
|
traffics := make([]*xray.Traffic, 0, len(inboundUp))
|
|
for tag, up := range inboundUp {
|
|
traffics = append(traffics, &xray.Traffic{
|
|
IsInbound: true,
|
|
Tag: tag,
|
|
Up: up,
|
|
Down: inboundDown[tag],
|
|
})
|
|
}
|
|
|
|
if len(traffics) > 0 || len(clientTraffics) > 0 {
|
|
if _, _, err := j.inboundService.AddTraffic(traffics, clientTraffics); err != nil {
|
|
logger.Warning("mtproto job: add traffic failed:", err)
|
|
}
|
|
}
|
|
|
|
// Live speed: mtproto's mtg sidecar never runs inside xray-core, so
|
|
// XrayTrafficJob's own 5s broadcast never mentions these tags. traffics
|
|
// here already excludes routed-through-xray inbound tags (existing
|
|
// logic above, for cumulative-totals reasons) -- reused as-is, not
|
|
// recomputed. See sidecar_traffic.go.
|
|
broadcastSidecarTraffic(string(model.MTProto), traffics, clientTraffics)
|
|
|
|
j.inboundService.RefreshLocalOnlineClients(onlineEmails, activeTags)
|
|
}
|