mirror of
https://github.com/MHSanaei/3x-ui.git
synced 2026-07-09 14:16:07 +00:00
328d920e98
Map each mtproto client's totalGB and expiryTime onto mtg-multi's new
[secret-limits] (quota/expires): emit them into the generated config and
hot-apply through PUT /secrets so live connections survive. Quota is
written as an exact "<n>B" byte count that round-trips through both the
config and API parsers without the precision loss of a base-2 unit.
The sidecar's quota counter is not pruned when a secret is dropped, so a
panel-side traffic reset re-pushes the client's secret and then calls
POST /secrets/{name}/reset-quota (wired into every reset path) so a
renewed client is not immediately re-blocked.
Resolve the mtg-multi binary from the fork's latest release tag in
DockerInit.sh and release.yml instead of a hardcoded version pin, so the
panel no longer needs a manual bump per fork release.
158 lines
4.8 KiB
Go
158 lines
4.8 KiB
Go
package service
|
|
|
|
import (
|
|
"context"
|
|
|
|
"github.com/mhsanaei/3x-ui/v3/internal/database"
|
|
"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/xray"
|
|
)
|
|
|
|
// DesiredMtprotoInstances derives the mtg sidecar configs this panel should be
|
|
// running: one instance per enabled local mtproto inbound, serving only the
|
|
// secrets of clients that are both enabled in the inbound settings and not
|
|
// depletion-disabled in client_traffics. That is the same effective client set
|
|
// buildRuntimeInboundForAPI pushes on interactive edits, so the reconcile job
|
|
// and the push paths agree on one fingerprint — a disagreement would surface
|
|
// as a needless mtg restart, and a job that read only the raw settings would
|
|
// keep serving depleted clients until an unrelated restart. Inbounds whose
|
|
// every secret is filtered away are omitted so Reconcile stops their sidecar.
|
|
func (s *InboundService) DesiredMtprotoInstances() ([]mtproto.Instance, error) {
|
|
db := database.GetDB()
|
|
var inbounds []*model.Inbound
|
|
err := db.Model(model.Inbound{}).
|
|
Where("protocol = ? AND enable = ? AND node_id IS NULL", model.MTProto, true).
|
|
Find(&inbounds).Error
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
if len(inbounds) == 0 {
|
|
return nil, nil
|
|
}
|
|
|
|
ids := make([]int, 0, len(inbounds))
|
|
for _, ib := range inbounds {
|
|
ids = append(ids, ib.Id)
|
|
}
|
|
var disabledRows []xray.ClientTraffic
|
|
err = db.Model(xray.ClientTraffic{}).
|
|
Where("inbound_id IN ? AND enable = ?", ids, false).
|
|
Select("inbound_id", "email").
|
|
Find(&disabledRows).Error
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
disabled := make(map[int]map[string]struct{}, len(disabledRows))
|
|
for _, row := range disabledRows {
|
|
if disabled[row.InboundId] == nil {
|
|
disabled[row.InboundId] = map[string]struct{}{}
|
|
}
|
|
disabled[row.InboundId][row.Email] = struct{}{}
|
|
}
|
|
|
|
instances := make([]mtproto.Instance, 0, len(inbounds))
|
|
for _, ib := range inbounds {
|
|
inst, ok := mtproto.InstanceFromInbound(ib)
|
|
if !ok {
|
|
continue
|
|
}
|
|
if off := disabled[ib.Id]; len(off) > 0 {
|
|
kept := make([]mtproto.SecretEntry, 0, len(inst.Secrets))
|
|
for _, sec := range inst.Secrets {
|
|
if _, skip := off[sec.Name]; !skip {
|
|
kept = append(kept, sec)
|
|
}
|
|
}
|
|
inst.Secrets = kept
|
|
}
|
|
if len(inst.Secrets) == 0 {
|
|
continue
|
|
}
|
|
instances = append(instances, inst)
|
|
}
|
|
return instances, nil
|
|
}
|
|
|
|
// applyLocalMtproto pushes a single local mtproto inbound's current client set
|
|
// to its mtg sidecar right after a client edit commits, so an add, removal,
|
|
// re-key or enable-toggle takes effect immediately instead of waiting up to
|
|
// 10s for the reconcile job. With a reload-capable mtg the change is applied in
|
|
// place without dropping other clients; older binaries fall back to a restart
|
|
// inside the manager. It re-reads the inbound so it sees the committed settings,
|
|
// filters depleted clients exactly like the reconcile job, and is a no-op for
|
|
// node-owned or non-mtproto inbounds. Failures are logged and swallowed: the
|
|
// reconcile job is the backstop, and an xray restart cannot help the sidecar.
|
|
func (s *InboundService) applyLocalMtproto(inboundId int) {
|
|
inbound, err := s.GetInbound(inboundId)
|
|
if err != nil || inbound == nil || inbound.Protocol != model.MTProto || inbound.NodeID != nil {
|
|
return
|
|
}
|
|
rt, err := s.runtimeFor(inbound)
|
|
if err != nil {
|
|
return
|
|
}
|
|
payload := inbound
|
|
if inbound.Enable {
|
|
if built, bErr := s.buildRuntimeInboundForAPI(database.GetDB(), inbound); bErr == nil {
|
|
payload = built
|
|
}
|
|
}
|
|
if err := rt.UpdateInbound(context.Background(), inbound, payload); err != nil {
|
|
logger.Debug("mtproto: immediate client apply failed for inbound", inboundId, ":", err)
|
|
}
|
|
}
|
|
|
|
func (s *InboundService) resetMtprotoClientQuota(email string) {
|
|
mgr := mtproto.GetManager()
|
|
if !mgr.HasRunning() {
|
|
return
|
|
}
|
|
id, ok := s.localMtprotoInboundIdForEmail(email)
|
|
if !ok {
|
|
return
|
|
}
|
|
s.applyLocalMtproto(id)
|
|
mgr.ResetQuota(email)
|
|
}
|
|
|
|
func (s *InboundService) resetAllMtprotoQuotas() {
|
|
mgr := mtproto.GetManager()
|
|
if !mgr.HasRunning() {
|
|
return
|
|
}
|
|
desired, err := s.DesiredMtprotoInstances()
|
|
if err != nil {
|
|
return
|
|
}
|
|
mgr.Reconcile(desired)
|
|
for _, inst := range desired {
|
|
for _, sec := range inst.Secrets {
|
|
mgr.ResetQuota(sec.Name)
|
|
}
|
|
}
|
|
}
|
|
|
|
func (s *InboundService) localMtprotoInboundIdForEmail(email string) (int, bool) {
|
|
db := database.GetDB()
|
|
var inbounds []*model.Inbound
|
|
if err := db.Model(model.Inbound{}).
|
|
Where("protocol = ? AND node_id IS NULL", model.MTProto).
|
|
Find(&inbounds).Error; err != nil {
|
|
return 0, false
|
|
}
|
|
for _, ib := range inbounds {
|
|
inst, ok := mtproto.InstanceFromInbound(ib)
|
|
if !ok {
|
|
continue
|
|
}
|
|
for _, sec := range inst.Secrets {
|
|
if sec.Name == email {
|
|
return ib.Id, true
|
|
}
|
|
}
|
|
}
|
|
return 0, false
|
|
}
|