mirror of
https://github.com/MHSanaei/3x-ui.git
synced 2026-06-28 00:24:19 +00:00
41645255f1
* refactor(service): split client.go into focused files
client.go had grown to 4455 lines mixing ~10 responsibilities. Split it
verbatim into cohesive same-package files (no behavior change):
client.go foundation: ClientService, ClientWithAttachments,
ClientCreatePayload, ErrClientNotInInbound, sqlInChunk
client_locks.go inbound mutation locks, delete tombstones, compactOrphans
client_lookup.go read-only lookups (GetByID, List, EffectiveFlow, ...)
client_link.go inbound association sync (SyncInbound, DetachInbound, ...)
client_crud.go single-client CRUD + validation + protocol defaults
client_inbound_apply.go low-level inbound-settings mutators + by-email setters
client_bulk.go bulk attach/detach/adjust/delete/create + DelDepleted
client_traffic.go traffic-reset paths
client_groups.go client group management
client_paging.go paged listing, filtering, sorting, summary
Every declaration moved unchanged (verified: identical func/type/const/var
signature set before vs after). Imports redistributed per file via goimports.
go build ./..., go vet, and go test ./web/service/... all pass.
* refactor(service): split inbound.go into focused files
inbound.go was 4100 lines. Split it verbatim into cohesive same-package
files (no behavior change):
inbound.go core inbound CRUD + InboundService (keeps pkg doc)
inbound_protocol.go protocol / stream capability helpers
inbound_node.go node/runtime/remote coordination + online tracking
inbound_traffic.go traffic accounting, reset, client stats
inbound_client_ips.go per-client IP tracking
inbound_clients.go client lookups within inbounds + copy-clients
inbound_disable.go auto-disable invalid inbounds/clients
inbound_migration.go DB migrations
inbound_sublink.go subscription link providers
inbound_util.go generic slice/string helpers
Identical func/type/const/var signature set before vs after; package doc
comment preserved on inbound.go. Imports redistributed via goimports.
Build, vet, and go test ./web/service/... all pass.
* refactor(service): split tgbot.go into focused files
tgbot.go was 3738 lines dominated by a 1246-line answerCallback. Split it
verbatim into cohesive same-package files (no behavior change):
tgbot.go lifecycle, bot setup, caches, small utils
tgbot_router.go incoming update / command / callback dispatch
tgbot_send.go outbound messaging primitives
tgbot_client.go client views, actions, subscription links
tgbot_inbound.go inbound listing / pickers
tgbot_report.go server usage, exhausted, online, backups, notifications
Identical func/type/const/var signature set before vs after. Imports
redistributed via goimports. Build, vet, and go test ./web/service/... pass.
* refactor(client): dedupe single-field by-email setters
ResetClientIpLimitByEmail, ResetClientExpiryTimeByEmail, and
ResetClientTrafficLimitByEmail shared an identical ~50-line body that
resolves the inbound by email, confirms the client exists, rewrites a
single-client settings payload, and delegates to UpdateInboundClient.
Extract that into applyClientFieldByEmail(inboundSvc, email, mutate) and
reduce each setter to a 3-line wrapper. Behavior is unchanged: same checks
and error strings, same single-client payload contract, same totalGB guard.
SetClientTelegramUserID (resolves by traffic id, different error text) and
ToggleClientEnableByEmail/SetClientEnableByEmail (different return shape and
a pre-read of the old state) intentionally keep their own bodies.
* refactor(service): extract panel/ subpackage
Move the panel-administration leaf services out of the flat service
package into web/service/panel/ (package panel):
user.go UserService (auth / 2FA / LDAP)
panel.go PanelService (restart / self-update) + version helpers
panel_other.go non-unix RestartPanel
panel_unix.go unix RestartPanel
api_token.go ApiTokenService
websocket.go WebSocketService
panel_test.go version/shellQuote unit tests
These are leaves: they depend on core (SettingService, Release) but no
core file references them, so the extraction creates no import cycle.
Core references are now qualified (service.SettingService, service.Release);
callers in main.go, web/web.go, and web/controller/* updated to panel.*.
Build, vet, and go test ./web/... pass.
* refactor(service): extract integration/ subpackage
Move the external-provider integration leaves into web/service/integration/
(package integration):
warp.go WarpService (Cloudflare WARP)
nord.go NordService (NordVPN)
custom_geo.go CustomGeoService (custom geo asset management)
*_test.go custom_geo / panel-proxy tests
These depend on core (SettingService, ServerService, XraySettingService) but
no core file references them. xray_setting.go stays in core because it calls
the unexported SettingService.saveSetting. The shared isBlockedIP SSRF helper
(used by core url_safety.go and by custom_geo) now has a small copy in each
package rather than being exported. Core references qualified; callers in
web/web.go, web/job/*, and web/controller/* updated to integration.*.
Build, vet, and go test ./web/... pass.
* refactor(service): extract tgbot/ subpackage
Move the Telegram bot (6 files + test) into web/service/tgbot/ (package
tgbot). It is a leaf: it embeds five core services (Inbound/Client/Setting/
Server/Xray) and the core never references it, so no import cycle.
To support the package boundary without changing behavior:
- core exposes XrayProcess() *xray.Process so tgbot keeps calling the
exact same running-process methods it used via the package-level `p`;
- three core methods tgbot calls are exported: ClientService.checkIs-
EnabledByEmail -> CheckIsEnabledByEmail, InboundService.getAllEmails ->
GetAllEmails (callers updated in-package);
- tgbot's embedded-field types and the few core type refs (Status,
ClientCreatePayload, SanitizePublicHTTPURL) are now service-qualified.
Callers in main.go, web/web.go, web/job/*, and web/controller/* updated to
tgbot.*. Build, vet, and go test ./web/... pass.
* refactor(service): extract outbound/ subpackage
OutboundService (outbound.go) imports only neutral packages (config,
database, model, xray) and its production code is referenced by no core or
sibling service file — only by web/controller/xray_setting.go and
web/job/xray_traffic_job.go. Move it to web/service/outbound/ (package
outbound); no core qualification needed inside. Callers updated to outbound.*.
The one coupling was a tiny pure test helper, outboundsContainTag, used by
both outbound.go and the core outbound_subscription_test.go; it now has a
small copy in that test file rather than being shared across the boundary.
Build, vet, and go test ./web/... pass.
* refactor(util): move wireguard into its own subpackage
util/wireguard.go was the lone file of the root `util` package (24 lines,
one exported func GenerateWireguardKeypair), while every other util concern
lives in a focused subpackage (util/common, util/crypto, util/netsafe, ...).
Move it to util/wireguard/ (package wireguard) for consistency; its only
importer, web/service/integration/warp.go, is updated. The root `util`
package no longer exists.
* refactor(sub): drop redundant sub prefix from filenames
Inside package sub the subXxx.go prefix just repeats the package name
(like client_*.go did inside service). Rename for consistency; content and
type names are unchanged:
subController.go -> controller.go
subService.go -> service.go
subClashService.go -> clash_service.go
subJsonService.go -> json_service.go
(+ matching _test.go files)
* refactor(controller): rename xui.go -> spa.go
XUIController serves the panel's single-page-app shell; spa.go names that
role plainly (the other controller files are domain-named). File rename only
— the type stays XUIController. api_docs_test.go keys route base paths by
filename, so its "xui.go" case is updated to "spa.go".
* refactor: move backend packages under internal/
Adopt the idiomatic Go application layout: the backend packages now live
under internal/ (a boundary the toolchain enforces), signalling private
implementation instead of a library-style flat root. No runtime behavior
changes — only import paths and a few build/config paths move.
Moved: config, database, logger, mtproto, sub, util, web, xray -> internal/.
main.go stays at the repo root and tools/openapigen stays under tools/ (both
still import internal/* because the internal rule keys off the module root).
The module path github.com/mhsanaei/3x-ui/v3 is unchanged; 149 .go files had
their import prefix rewritten to .../internal/<pkg>.
Couplings the Go compiler can't see, updated to the new layout:
- frontend i18n imports of web/translation (react.ts, setup.components.ts)
- vite outDir + eslint/tsconfig ignore globs -> internal/web/dist
- Dockerfile COPY paths for web/dist and web/translation
- locale.go os.DirFS("web") disk fallback -> "internal/web"
- .gitignore and ci.yml go:embed stub for internal/web/dist
- api_docs_test.go repo-root relative walk (one level deeper)
- tools/openapigen filesystem package paths; ApiTokenView repointed to the
web/service/panel subpackage and codegen regenerated (clears a stale
type the ci.yml codegen check was failing on)
Verified: go build/vet/test (all packages), and frontend typecheck, lint,
vitest (478 tests), and production build into internal/web/dist.
* fix(config): keep test runs from writing logs into the source tree
GetLogFolder() returns a CWD-relative "./log" on Windows. Under `go test`
the working directory is each package's own folder, so InitLogger (called by
tests in web/job, web/service, xray, web/websocket) created stray log/
directories scattered through the source tree (e.g. internal/web/job/log/).
Redirect to a shared temp folder when testing.Testing() reports a test run.
Production behavior is unchanged: Windows still uses ./log next to the binary
and Linux /var/log/x-ui. The log files were always gitignored (*.log) and
never committed; this just stops the noise at the source.
* docs: move subscription-template guide out of root into docs/
sub_templates/ was a top-level folder holding only a README and no actual
templates (3x-ui ships none by design), referenced nowhere and unlinked from
any doc — it read like an empty placeholder cluttering the repo root.
Move the guide to docs/custom-subscription-templates.md (a proper docs home),
reword its intro to read as documentation rather than a folder note, link it
from the Features list in README.md, and drop the empty sub_templates/ folder.
* fix: update stale web/ path references after the internal/ move
The internal/ migration rewrote Go import paths but left some references to
the old top-level layout in docs, comments, and a few runtime disk paths.
Functional (dev-mode only): the disk-serving fallbacks that read the Vite
build from disk when running from source still pointed at web/dist/, which
moved to internal/web/dist/ — so `os.DirFS`/`os.Stat`/`os.ReadFile` in
internal/web/web.go and internal/sub/{sub,controller}.go are corrected.
Production was unaffected (it serves the embedded FS; verified by the Docker
build), but `go run` with a live frontend build silently fell back to embed.
Docs/comments: frontend/README.md, CONTRIBUTING.md, the claude-issue-bot and
release workflows, the openapigen -root help text, and assorted Go comments
now reference internal/web, internal/database, internal/sub, internal/xray,
etc. Package-name mentions (the "web" package), root paths (main.go,
frontend/, install scripts, /etc/x-ui), routes (/panel/api/xray), and the
historical "web/assets no longer exists" note were intentionally left as-is.
* refactor(web): remove the legacy /xui -> /panel redirect middleware
RedirectMiddleware existed only for backward compatibility with the old
`/xui` URL scheme (301-redirecting /xui and /xui/API to /panel and
/panel/api). That cutover was long ago, so drop the middleware, its
registration in initRouter, and the now-inaccurate "URL redirection"
mention in the middleware package doc. Old /xui URLs now 404 like any other
unknown path. HTTPS auto-redirect and auth redirects are unrelated and stay.
* build: fix .dockerignore for internal/ layout and exclude runtime dir
- web/dist -> internal/web/dist: the embedded frontend moved under internal/,
so the stale exclude no longer matched and the locally-built dist could be
sent to the build context (the frontend stage rebuilds it fresh anyway).
- exclude x-ui/: the local runtime directory (SQLite db, geo .dat files, xray
binaries, certs — ~150MB) was being shipped into the build context for no
reason. Verified the pattern excludes only the directory and still keeps
x-ui.sh, which the Dockerfile copies to /usr/bin/x-ui.
206 lines
6.9 KiB
Go
206 lines
6.9 KiB
Go
package service
|
|
|
|
import (
|
|
"encoding/json"
|
|
"strings"
|
|
"testing"
|
|
)
|
|
|
|
func TestUnwrapXrayTemplateConfig(t *testing.T) {
|
|
real := `{"log":{},"inbounds":[],"outbounds":[],"routing":{}}`
|
|
|
|
t.Run("passes through a clean config", func(t *testing.T) {
|
|
if got := UnwrapXrayTemplateConfig(real); got != real {
|
|
t.Fatalf("clean config was modified: %s", got)
|
|
}
|
|
})
|
|
|
|
t.Run("passes through invalid JSON unchanged", func(t *testing.T) {
|
|
in := "not json at all"
|
|
if got := UnwrapXrayTemplateConfig(in); got != in {
|
|
t.Fatalf("invalid input was modified: %s", got)
|
|
}
|
|
})
|
|
|
|
t.Run("unwraps one layer of response-shaped wrapper", func(t *testing.T) {
|
|
wrapper := `{"inboundTags":["tag"],"outboundTestUrl":"x","xraySetting":` + real + `}`
|
|
got := UnwrapXrayTemplateConfig(wrapper)
|
|
if !equalJSON(t, got, real) {
|
|
t.Fatalf("want %s, got %s", real, got)
|
|
}
|
|
})
|
|
|
|
t.Run("unwraps multiple stacked layers", func(t *testing.T) {
|
|
lvl1 := `{"xraySetting":` + real + `}`
|
|
lvl2 := `{"xraySetting":` + lvl1 + `}`
|
|
lvl3 := `{"xraySetting":` + lvl2 + `}`
|
|
got := UnwrapXrayTemplateConfig(lvl3)
|
|
if !equalJSON(t, got, real) {
|
|
t.Fatalf("want %s, got %s", real, got)
|
|
}
|
|
})
|
|
|
|
t.Run("handles an xraySetting stored as a JSON-encoded string", func(t *testing.T) {
|
|
encoded, _ := json.Marshal(real) // becomes a quoted string
|
|
wrapper := `{"xraySetting":` + string(encoded) + `}`
|
|
got := UnwrapXrayTemplateConfig(wrapper)
|
|
if !equalJSON(t, got, real) {
|
|
t.Fatalf("want %s, got %s", real, got)
|
|
}
|
|
})
|
|
|
|
t.Run("does not unwrap when top level already has real xray keys", func(t *testing.T) {
|
|
// Pathological but defensible: if a user's actual config somehow
|
|
// has both the real keys and an unrelated `xraySetting` key, we
|
|
// must not strip it.
|
|
in := `{"inbounds":[],"xraySetting":{"some":"thing"}}`
|
|
got := UnwrapXrayTemplateConfig(in)
|
|
if got != in {
|
|
t.Fatalf("should have left real config alone, got %s", got)
|
|
}
|
|
})
|
|
|
|
t.Run("stops at a reasonable depth", func(t *testing.T) {
|
|
// Build a deeper-than-maxDepth chain that ends at something
|
|
// non-wrapped, and confirm we end up at some valid JSON (we
|
|
// don't loop forever and we don't blow the stack).
|
|
s := real
|
|
for range 16 {
|
|
s = `{"xraySetting":` + s + `}`
|
|
}
|
|
got := UnwrapXrayTemplateConfig(s)
|
|
if !strings.Contains(got, `"inbounds"`) && !strings.Contains(got, `"xraySetting"`) {
|
|
t.Fatalf("unexpected tail: %s", got)
|
|
}
|
|
})
|
|
}
|
|
|
|
func equalJSON(t *testing.T, a, b string) bool {
|
|
t.Helper()
|
|
var va, vb any
|
|
if err := json.Unmarshal([]byte(a), &va); err != nil {
|
|
return false
|
|
}
|
|
if err := json.Unmarshal([]byte(b), &vb); err != nil {
|
|
return false
|
|
}
|
|
ja, _ := json.Marshal(va)
|
|
jb, _ := json.Marshal(vb)
|
|
return string(ja) == string(jb)
|
|
}
|
|
|
|
// firstRuleOutbound parses the (post-hoisted) config and returns
|
|
// routing.rules[0].outboundTag, or "" if anything is missing.
|
|
func firstRuleOutbound(t *testing.T, raw string) string {
|
|
t.Helper()
|
|
var cfg map[string]any
|
|
if err := json.Unmarshal([]byte(raw), &cfg); err != nil {
|
|
t.Fatalf("unmarshal cfg: %v", err)
|
|
}
|
|
routing, _ := cfg["routing"].(map[string]any)
|
|
rules, _ := routing["rules"].([]any)
|
|
if len(rules) == 0 {
|
|
return ""
|
|
}
|
|
first, _ := rules[0].(map[string]any)
|
|
tag, _ := first["outboundTag"].(string)
|
|
return tag
|
|
}
|
|
|
|
func TestEnsureStatsRouting_HoistsApiRuleFromMiddle(t *testing.T) {
|
|
// #4113 repro shape: admin added a cascade outbound and put a
|
|
// catch-all routing rule above the api rule. stats query path
|
|
// gets starved by the catch-all unless we hoist the api rule.
|
|
in := `{
|
|
"routing": {
|
|
"rules": [
|
|
{"type":"field","inboundTag":["inbound-vless"],"outboundTag":"vless-cascade"},
|
|
{"type":"field","inboundTag":["api"],"outboundTag":"api"},
|
|
{"type":"field","outboundTag":"blocked","ip":["geoip:private"]}
|
|
]
|
|
}
|
|
}`
|
|
out, err := EnsureStatsRouting(in)
|
|
if err != nil {
|
|
t.Fatalf("unexpected err: %v", err)
|
|
}
|
|
if got := firstRuleOutbound(t, out); got != "api" {
|
|
t.Fatalf("api rule should be at index 0 after hoist, got first outboundTag = %q\nfull: %s", got, out)
|
|
}
|
|
}
|
|
|
|
func TestEnsureStatsRouting_NoOpWhenAlreadyFirst(t *testing.T) {
|
|
// Don't churn the JSON when nothing needs fixing — same string in,
|
|
// same string out. Lets the diff in the panel UI stay quiet for
|
|
// well-formed configs.
|
|
in := `{"routing":{"rules":[{"type":"field","inboundTag":["api"],"outboundTag":"api"},{"type":"field","outboundTag":"blocked","ip":["geoip:private"]}]}}`
|
|
out, err := EnsureStatsRouting(in)
|
|
if err != nil {
|
|
t.Fatalf("unexpected err: %v", err)
|
|
}
|
|
if out != in {
|
|
t.Fatalf("expected unchanged input, got: %s", out)
|
|
}
|
|
}
|
|
|
|
func TestEnsureStatsRouting_InsertsDefaultWhenMissing(t *testing.T) {
|
|
// Some admins delete the api rule by accident. Re-add a default
|
|
// at the front so stats keep working after the next save.
|
|
in := `{"routing":{"rules":[{"type":"field","outboundTag":"vless-cascade","inboundTag":["inbound-vless"]}]}}`
|
|
out, err := EnsureStatsRouting(in)
|
|
if err != nil {
|
|
t.Fatalf("unexpected err: %v", err)
|
|
}
|
|
if got := firstRuleOutbound(t, out); got != "api" {
|
|
t.Fatalf("default api rule should be inserted at index 0, got %q\nfull: %s", got, out)
|
|
}
|
|
// The original rule should still be there, just shifted.
|
|
var cfg map[string]any
|
|
json.Unmarshal([]byte(out), &cfg)
|
|
rules := cfg["routing"].(map[string]any)["rules"].([]any)
|
|
if len(rules) != 2 {
|
|
t.Fatalf("expected 2 rules after insert, got %d: %v", len(rules), rules)
|
|
}
|
|
}
|
|
|
|
func TestEnsureStatsRouting_NoRoutingBlock(t *testing.T) {
|
|
// Pathological but possible: empty config or one without a routing
|
|
// section. Don't crash, and create the section with the api rule.
|
|
in := `{"log":{}}`
|
|
out, err := EnsureStatsRouting(in)
|
|
if err != nil {
|
|
t.Fatalf("unexpected err: %v", err)
|
|
}
|
|
if got := firstRuleOutbound(t, out); got != "api" {
|
|
t.Fatalf("api rule should be created when routing was missing, got %q\nfull: %s", got, out)
|
|
}
|
|
}
|
|
|
|
func TestEnsureStatsRouting_InvalidJsonReturnsAsIs(t *testing.T) {
|
|
// SaveXraySetting calls CheckXrayConfig before this helper, so
|
|
// invalid JSON shouldn't reach us in practice — but be defensive
|
|
// about garbage in (return same garbage out plus an error) so the
|
|
// caller can choose to skip the hoist instead of corrupting input.
|
|
in := "definitely not json"
|
|
out, err := EnsureStatsRouting(in)
|
|
if err == nil {
|
|
t.Fatalf("expected error for invalid json, got none")
|
|
}
|
|
if out != in {
|
|
t.Fatalf("expected raw passthrough on error, got %q", out)
|
|
}
|
|
}
|
|
|
|
func TestEnsureStatsRouting_AcceptsInboundTagAsString(t *testing.T) {
|
|
// Some manually-edited configs use a single string instead of an
|
|
// array for inboundTag. Make sure we still recognize the api rule.
|
|
in := `{"routing":{"rules":[{"type":"field","inboundTag":["other"],"outboundTag":"vless-cascade"},{"type":"field","inboundTag":"api","outboundTag":"api"}]}}`
|
|
out, err := EnsureStatsRouting(in)
|
|
if err != nil {
|
|
t.Fatalf("unexpected err: %v", err)
|
|
}
|
|
if got := firstRuleOutbound(t, out); got != "api" {
|
|
t.Fatalf("api rule with string-form inboundTag should hoist to front, got %q\nfull: %s", got, out)
|
|
}
|
|
}
|