mirror of
https://github.com/MHSanaei/3x-ui.git
synced 2026-11-18 11:05:02 +03:00
feat(online): use xray online-stats API for onlines and access-log-free IP limit
Adopt xray-core's statsUserOnline policy and GetUsersStats RPC so online detection is connection-based and IP limiting no longer requires an access log. Falls back to the legacy traffic-delta onlines and access-log parsing when the running core lacks the RPCs (Unimplemented), probed lazily per process so a panel-driven version switch re-evaluates automatically. Backend: - xray/api.go: GetOnlineUsers (one GetUsersStats call returns all online users and their source IPs) and IsUnimplementedErr. - xray/process.go: per-process OnlineAPISupport tri-state capability cache. - service/xray.go: ensureStatsPolicy injects statsUserOnline into every policy level of the generated config; XrayService.GetOnlineUsers probes and falls back. - job/xray_traffic_job.go: union API onlines into the delta-derived active set; bump last_online for idle-but-connected clients. - job/check_client_ip_job.go: API-first IP source with shared enforcement; live observations bypass the 30-min stale cutoff; access-log path unchanged for older cores. - service/setting.go: GetIpLimitEnable always true; new accessLogEnable default for features that genuinely read the access log. Frontend: - Client form split into Basic and Config tabs; IP Limit and IP Log no longer gated on access log; compact Auto Renew next to Start After First Use; tabBasic/tabConfig added to all 13 locales. - Xray logs button on the dashboard now gated on accessLogEnable.
This commit is contained in:
@@ -54,6 +54,71 @@ func TestEnsureAPIServices(t *testing.T) {
|
||||
}
|
||||
}
|
||||
|
||||
func TestEnsureStatsPolicy(t *testing.T) {
|
||||
// default-template shape: level "0" exists with traffic flags — the online
|
||||
// flag is added and the siblings survive untouched
|
||||
out := ensureStatsPolicy(json_util.RawMessage(`{"levels":{"0":{"handshake":4,"statsUserUplink":true,"statsUserDownlink":true}},"system":{"statsInboundDownlink":true}}`))
|
||||
var parsed struct {
|
||||
Levels map[string]map[string]any `json:"levels"`
|
||||
System map[string]any `json:"system"`
|
||||
}
|
||||
if err := json.Unmarshal(out, &parsed); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
level0 := parsed.Levels["0"]
|
||||
if level0["statsUserOnline"] != true {
|
||||
t.Fatalf("statsUserOnline must be injected into level 0, got %v", level0)
|
||||
}
|
||||
if level0["statsUserUplink"] != true || level0["statsUserDownlink"] != true || level0["handshake"] != float64(4) {
|
||||
t.Fatalf("sibling keys must be preserved, got %v", level0)
|
||||
}
|
||||
if parsed.System["statsInboundDownlink"] != true {
|
||||
t.Fatalf("system block must be preserved, got %v", parsed.System)
|
||||
}
|
||||
|
||||
// missing levels block: level "0" is created with the flag
|
||||
out = ensureStatsPolicy(json_util.RawMessage(`{"system":{}}`))
|
||||
if err := json.Unmarshal(out, &parsed); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
if parsed.Levels["0"]["statsUserOnline"] != true {
|
||||
t.Fatalf("level 0 must be created with statsUserOnline, got %s", out)
|
||||
}
|
||||
|
||||
// every level gets the flag, an explicit false included — the flag is
|
||||
// panel infrastructure, like the api services
|
||||
out = ensureStatsPolicy(json_util.RawMessage(`{"levels":{"0":{"statsUserOnline":false},"1":{"connIdle":300}}}`))
|
||||
if err := json.Unmarshal(out, &parsed); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
for _, key := range []string{"0", "1"} {
|
||||
if parsed.Levels[key]["statsUserOnline"] != true {
|
||||
t.Fatalf("level %s must have statsUserOnline forced on, got %s", key, out)
|
||||
}
|
||||
}
|
||||
if parsed.Levels["1"]["connIdle"] != float64(300) {
|
||||
t.Fatalf("level 1 siblings must be preserved, got %s", out)
|
||||
}
|
||||
|
||||
// already-enabled input passes through byte-identical (no marshal churn,
|
||||
// no spurious restart)
|
||||
full := json_util.RawMessage(`{"levels":{"0":{"statsUserOnline":true}}}`)
|
||||
if got := ensureStatsPolicy(full); string(got) != string(full) {
|
||||
t.Fatalf("already-enabled policy must pass through untouched, got %s", got)
|
||||
}
|
||||
|
||||
// absent policy block stays absent
|
||||
if got := ensureStatsPolicy(nil); got != nil {
|
||||
t.Fatalf("nil policy must stay nil, got %s", got)
|
||||
}
|
||||
|
||||
// unparsable policy is left untouched
|
||||
bad := json_util.RawMessage(`{not json`)
|
||||
if got := ensureStatsPolicy(bad); string(got) != string(bad) {
|
||||
t.Fatalf("unparsable policy must be left untouched, got %s", got)
|
||||
}
|
||||
}
|
||||
|
||||
func egressTestConfig() *xray.Config {
|
||||
return &xray.Config{
|
||||
RouterConfig: json_util.RawMessage(`{"domainStrategy":"AsIs","rules":[{"type":"field","inboundTag":["api"],"outboundTag":"api"}]}`),
|
||||
|
||||
Reference in New Issue
Block a user