mirror of
https://github.com/MHSanaei/3x-ui.git
synced 2026-06-28 00:24:19 +00:00
Rouzbeh†
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>
65 lines
2.2 KiB
Go
65 lines
2.2 KiB
Go
package service
|
|
|
|
import (
|
|
"path/filepath"
|
|
"testing"
|
|
|
|
"github.com/mhsanaei/3x-ui/v3/internal/database"
|
|
"github.com/mhsanaei/3x-ui/v3/internal/database/model"
|
|
)
|
|
|
|
// EffectiveFlowsByEmails resolves intended flow for many clients in one batched
|
|
// query, taking the flow_override of the lowest inbound_id and skipping emails
|
|
// with no non-empty flow anywhere.
|
|
func TestEffectiveFlowsByEmails(t *testing.T) {
|
|
dbDir := t.TempDir()
|
|
t.Setenv("XUI_DB_FOLDER", dbDir)
|
|
if err := database.InitDB(filepath.Join(dbDir, "x-ui.db")); err != nil {
|
|
t.Fatalf("InitDB: %v", err)
|
|
}
|
|
t.Cleanup(func() { _ = database.CloseDB() })
|
|
db := database.GetDB()
|
|
|
|
const vision = "xtls-rprx-vision"
|
|
|
|
// vis@x: attached to inbound 20 (empty flow) and 10 (Vision) — lowest
|
|
// inbound_id (10) wins, so the empty override on 20 must not mask it.
|
|
// plain@x: only an empty flow_override anywhere — absent from the result.
|
|
mkClient := func(id int, email string) {
|
|
if err := db.Create(&model.ClientRecord{Id: id, Email: email, Enable: true}).Error; err != nil {
|
|
t.Fatalf("create client %s: %v", email, err)
|
|
}
|
|
}
|
|
mkLink := func(clientID, inboundID int, flow string) {
|
|
if err := db.Create(&model.ClientInbound{ClientId: clientID, InboundId: inboundID, FlowOverride: flow}).Error; err != nil {
|
|
t.Fatalf("link %d/%d: %v", clientID, inboundID, err)
|
|
}
|
|
}
|
|
mkClient(1, "vis@x")
|
|
mkClient(2, "plain@x")
|
|
mkLink(1, 20, "") // higher inbound_id, empty
|
|
mkLink(1, 10, vision) // lower inbound_id, Vision
|
|
mkLink(2, 30, "") // only empty override
|
|
|
|
cs := &ClientService{}
|
|
got, err := cs.EffectiveFlowsByEmails(nil, []string{"vis@x", "plain@x", "missing@x"})
|
|
if err != nil {
|
|
t.Fatalf("EffectiveFlowsByEmails: %v", err)
|
|
}
|
|
|
|
if got["vis@x"] != vision {
|
|
t.Errorf("vis@x = %q, want %q (lowest inbound_id flow_override)", got["vis@x"], vision)
|
|
}
|
|
if v, ok := got["plain@x"]; ok {
|
|
t.Errorf("plain@x present (%q); want absent (no non-empty flow anywhere)", v)
|
|
}
|
|
if v, ok := got["missing@x"]; ok {
|
|
t.Errorf("missing@x present (%q); want absent (unknown client)", v)
|
|
}
|
|
|
|
// Empty input is a no-op (no query).
|
|
if m, err := cs.EffectiveFlowsByEmails(nil, nil); err != nil || len(m) != 0 {
|
|
t.Errorf("empty input: got %v err %v, want empty map", m, err)
|
|
}
|
|
}
|