mirror of
https://github.com/MHSanaei/3x-ui.git
synced 2026-07-25 13:56:10 +00:00
Sanaei
1ca5924a44
* feat(mtproto): add MTProto (FakeTLS) protocol via managed mtg sidecar Xray-core has no mtproto proxy, so mtproto inbounds run as standalone mtg (9seconds/mtg) sidecar processes managed by the panel — one per inbound — and are excluded from the generated Xray config entirely. - model: MTProto protocol constant, validator, and FakeTLS secret helpers (GenerateFakeTLSSecret/HealMtprotoSecret) - mtproto package: per-inbound mtg process manager with reconcile, graceful stop, and best-effort Prometheus traffic scraping - runtime: delegate mtproto inbounds to the mtg manager instead of the Xray gRPC API; skip mtproto when building the Xray config - web: boot reconcile + StopAll wiring, periodic reconcile/traffic job, port-conflict transport, secret healing on inbound add/update - sub: tg:// proxy share-link generation - frontend: protocol option, Zod schema, Protocol tab (FakeTLS domain + regenerable secret), info-modal link, and i18n - provisioning: fetch mtg v2.2.8 in install.sh, DockerInit.sh, and the Linux + Windows release workflows * fix * fix * fix: address Copilot review comments on mtproto PR - web/web.go: create NewMtprotoJob once and reuse for cron + initial run - mtproto/manager.go: StopAll cleans up per-inbound config files on shutdown - mtproto/manager.go: CollectTraffic releases mutex before HTTP scrapes to avoid blocking Ensure/Reconcile/Remove during network I/O - database/model/model.go: panic on crypto/rand failure in mtprotoRandomMiddle instead of silently producing a weak all-zero secret - install.sh: fix chmod to handle renamed bin/mtg-linux-arm on armv5/v6/v7
63 lines
1.6 KiB
Go
63 lines
1.6 KiB
Go
package job
|
|
|
|
import (
|
|
"github.com/mhsanaei/3x-ui/v3/database/model"
|
|
"github.com/mhsanaei/3x-ui/v3/logger"
|
|
"github.com/mhsanaei/3x-ui/v3/mtproto"
|
|
"github.com/mhsanaei/3x-ui/v3/web/service"
|
|
"github.com/mhsanaei/3x-ui/v3/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
|
|
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)
|
|
}
|
|
}
|
|
|
|
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 {
|
|
traffics = append(traffics, &xray.Traffic{
|
|
IsInbound: true,
|
|
Tag: d.Tag,
|
|
Up: d.Up,
|
|
Down: d.Down,
|
|
})
|
|
}
|
|
if _, _, err := j.inboundService.AddTraffic(traffics, nil); err != nil {
|
|
logger.Warning("mtproto job: add traffic failed:", err)
|
|
}
|
|
}
|