mirror of
https://github.com/MHSanaei/3x-ui.git
synced 2026-07-06 04:44:21 +00:00
82600936d6
* fix(flow): restore XTLS Vision when an inbound becomes flow-eligible clientWithInboundFlow strips Vision from a VLESS client whenever the target inbound is not flow-eligible at client-write time — e.g. an XHTTP inbound before its vlessenc (ML-KEM) encryption is set, or a client attached to such an inbound. Nothing restored the flow once the inbound later became eligible: an inbound edit stores its settings verbatim and never re-gates the clients. So enabling encryption on an existing XHTTP inbound left every client without flow, and the generated configs, share links and subscriptions silently dropped flow=xtls-rprx-vision — most visibly on node inbounds and on any inbound where encryption was turned on after the clients existed. Restore the flow at the two points where an inbound can become eligible: - UpdateInbound: after the new stream/settings are final, re-add Vision to clients that currently carry no flow but whose intended flow (their flow_override on a sibling inbound, via EffectiveFlowByEmail) is Vision — only when the inbound is now flow-eligible. - MigrationRestoreVisionFlow: a one-time, idempotent boot migration that applies the same repair to existing installs and refreshes flow_override via SyncInbound. The repair is conservative: it never invents a flow for a client that has none anywhere, never overwrites an explicit flow, and is a no-op on healthy installs. Adds EffectiveFlowByEmail and a unit test covering keep/skip/no-op cases. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com> * style(flow): serialize restored settings with MarshalIndent Match the indented JSON used by the adjacent timestamp block in UpdateInbound and the externalProxy migration, so a restored inbound's settings column keeps the same multi-line format as everything else (review nit on #5520). Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com> * perf(flow): batch the intended-flow lookup and run it on the active tx restoreVisionFlowForEligibleInbound resolved each empty-flow client's intended flow with EffectiveFlowByEmail, which issued two queries per client (GetRecordByEmail + EffectiveFlow). A client that genuinely uses no Vision keeps an empty flow forever, so it was re-queried on every UpdateInbound and every boot — O(clients) queries per save on a Reality/TCP or XHTTP+vlessenc inbound carrying many non-Vision clients, executed inside the serialized writer transaction. Replace it with EffectiveFlowsByEmails: collect every empty-flow email first and resolve them in a single batched join over client_inbounds + clients (lowest inbound_id wins, same rule as before), chunked for the SQLite bind-var limit. Also thread the active tx through restoreVisionFlowForEligibleInbound so the read runs on the writer's own connection while it holds the lock instead of a separate pooled connection (UpdateInbound passes its tx; the boot migration passes nil → GetDB() as before). Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com> --------- Co-authored-by: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
91 lines
2.8 KiB
Go
91 lines
2.8 KiB
Go
package service
|
|
|
|
import (
|
|
"encoding/json"
|
|
|
|
"github.com/mhsanaei/3x-ui/v3/internal/database/model"
|
|
|
|
"gorm.io/gorm"
|
|
)
|
|
|
|
const visionFlow = "xtls-rprx-vision"
|
|
|
|
// restoreVisionFlowForEligibleInbound re-adds the XTLS Vision flow to a VLESS
|
|
// inbound's clients that lost it earlier.
|
|
//
|
|
// clientWithInboundFlow strips Vision from a client whenever the target inbound
|
|
// is not flow-eligible at write time (e.g. an XHTTP inbound before its vlessenc
|
|
// encryption is set). Nothing restored the flow when the inbound later became
|
|
// eligible — an inbound edit stores its settings verbatim and never re-gates the
|
|
// clients — so enabling encryption on an existing XHTTP inbound left every
|
|
// client without flow, and the share links/subscriptions dropped it.
|
|
//
|
|
// This runs on the now-final inbound settings: when the inbound IS flow-eligible
|
|
// it sets flow=Vision on each client that currently has no flow but whose
|
|
// intended flow (its flow_override on a sibling inbound, via EffectiveFlowsByEmails)
|
|
// is Vision. It never invents a flow for a client that has none anywhere, and it
|
|
// never overwrites an explicit non-empty flow. Returns the rewritten settings
|
|
// JSON and whether anything changed.
|
|
func (s *InboundService) restoreVisionFlowForEligibleInbound(tx *gorm.DB, settings, streamSettings string, protocol model.Protocol) (string, bool) {
|
|
if protocol != model.VLESS {
|
|
return settings, false
|
|
}
|
|
if !inboundCanEnableTlsFlow(string(protocol), streamSettings, settings) {
|
|
return settings, false
|
|
}
|
|
var parsed map[string]any
|
|
if err := json.Unmarshal([]byte(settings), &parsed); err != nil {
|
|
return settings, false
|
|
}
|
|
clients, ok := parsed["clients"].([]any)
|
|
if !ok || len(clients) == 0 {
|
|
return settings, false
|
|
}
|
|
// Collect empty-flow clients, then resolve their intended flow in one query.
|
|
emails := make([]string, 0, len(clients))
|
|
for i := range clients {
|
|
cm, ok := clients[i].(map[string]any)
|
|
if !ok {
|
|
continue
|
|
}
|
|
if flow, _ := cm["flow"].(string); flow != "" {
|
|
continue // respect an explicit flow (Vision or otherwise)
|
|
}
|
|
if email, _ := cm["email"].(string); email != "" {
|
|
emails = append(emails, email)
|
|
}
|
|
}
|
|
if len(emails) == 0 {
|
|
return settings, false
|
|
}
|
|
intended, err := s.clientService.EffectiveFlowsByEmails(tx, emails)
|
|
if err != nil {
|
|
return settings, false
|
|
}
|
|
changed := false
|
|
for i := range clients {
|
|
cm, ok := clients[i].(map[string]any)
|
|
if !ok {
|
|
continue
|
|
}
|
|
if flow, _ := cm["flow"].(string); flow != "" {
|
|
continue
|
|
}
|
|
email, _ := cm["email"].(string)
|
|
if intended[email] != visionFlow {
|
|
continue
|
|
}
|
|
cm["flow"] = visionFlow
|
|
clients[i] = cm
|
|
changed = true
|
|
}
|
|
if !changed {
|
|
return settings, false
|
|
}
|
|
out, err := json.MarshalIndent(parsed, "", " ")
|
|
if err != nil {
|
|
return settings, false
|
|
}
|
|
return string(out), true
|
|
}
|