mirror of
https://github.com/MHSanaei/3x-ui.git
synced 2026-07-14 08:36:07 +00:00
MHSanaei
5eec178483
Add a per-inbound "Route through Xray" toggle (off by default) plus an optional outbound picker on MTProto inbounds. mtg only supports a SOCKS5 upstream, so when enabled the panel injects a loopback SOCKS bridge into the generated Xray config — tagged with the inbound's own tag — and mtg dials Telegram through it via a [network] proxies upstream. The router then governs Telegram egress: matchable in the Routing tab, or forced to a chosen outbound/balancer via the picker. - mtproto: Instance carries RouteThroughXray + XrayRoutePort (in the fingerprint); InstanceFromInbound parses them; renderConfig emits the socks5 [network] upstream; freeLocalPort exported as FreeLocalPort. - xray.go: injectMtprotoEgress appends the loopback SOCKS bridge and prepends an optional inboundTag->outbound/balancer rule, hot-appliable like injectPanelEgress. - inbound.go: backend-owned egress port persisted in settings, allocated once and carried across edits (stored value wins); stripped with the inert outboundTag when routing is off; allocation failure fails the save; routed add/update/del force a config regen. - mtproto_job: skip folding mtg metrics for routed inbounds (the bridge, carrying the inbound tag, is metered by xray_traffic_job) to avoid double-counting. - frontend: toggle + outbound/balancer Select (useOutboundTags) on the MTProto form; i18n keys for all locales.
76 lines
2.1 KiB
Go
76 lines
2.1 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-inbound traffic scraped from each mtg metrics endpoint into the usual
|
|
// 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 traffic deltas.
|
|
func (j *MtprotoJob) Run() {
|
|
inbounds, err := j.inboundService.GetAllInbounds()
|
|
if err != nil {
|
|
logger.Warning("mtproto job: get inbounds failed:", err)
|
|
return
|
|
}
|
|
|
|
var desired []mtproto.Instance
|
|
routedTags := make(map[string]bool)
|
|
for _, ib := range inbounds {
|
|
if ib.Protocol != model.MTProto || !ib.Enable || ib.NodeID != nil {
|
|
continue
|
|
}
|
|
if inst, ok := mtproto.InstanceFromInbound(ib); ok {
|
|
desired = append(desired, inst)
|
|
if inst.RouteThroughXray {
|
|
routedTags[inst.Tag] = true
|
|
}
|
|
}
|
|
}
|
|
|
|
mgr := mtproto.GetManager()
|
|
mgr.Reconcile(desired)
|
|
|
|
deltas := mgr.CollectTraffic()
|
|
if len(deltas) == 0 {
|
|
return
|
|
}
|
|
traffics := make([]*xray.Traffic, 0, len(deltas))
|
|
for _, d := range deltas {
|
|
// Routed inbounds egress through the Xray SOCKS bridge, which carries the
|
|
// inbound's tag and is metered by xray_traffic_job. Folding mtg's own
|
|
// metrics in too would double-count, so skip them here.
|
|
if routedTags[d.Tag] {
|
|
continue
|
|
}
|
|
traffics = append(traffics, &xray.Traffic{
|
|
IsInbound: true,
|
|
Tag: d.Tag,
|
|
Up: d.Up,
|
|
Down: d.Down,
|
|
})
|
|
}
|
|
if len(traffics) == 0 {
|
|
return
|
|
}
|
|
if _, _, err := j.inboundService.AddTraffic(traffics, nil); err != nil {
|
|
logger.Warning("mtproto job: add traffic failed:", err)
|
|
}
|
|
}
|