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.
202 lines
7.9 KiB
Markdown
202 lines
7.9 KiB
Markdown
# 3x-ui frontend
|
||
|
||
React 19 + Ant Design 6 + TypeScript + Vite 8. Three SPA bundles —
|
||
`index.html` (admin panel SPA, all `/panel/*` routes), `login.html`
|
||
(login + 2FA), and `subpage.html` (public subscription viewer). All
|
||
three are built into `../internal/web/dist/` and embedded into the Go binary
|
||
via `embed.FS`.
|
||
|
||
State is split between local `useState`, TanStack Query for server
|
||
state, and `useTheme` / `useWebSocket` contexts. Form validation,
|
||
API parsing, and the xray config model all run through a single
|
||
shared Zod schema tree (see [Schemas](#schemas)).
|
||
|
||
## Dev
|
||
|
||
```sh
|
||
npm install
|
||
npm run dev
|
||
```
|
||
|
||
Vite serves on `http://localhost:5173/`. API calls and `/panel/*`
|
||
routes proxy to the Go panel at `http://localhost:2053/`, so start
|
||
the Go panel first (`go run main.go`) and then Vite. The proxy
|
||
auto-rewrites `/panel`, `/panel/settings`, `/panel/inbounds`,
|
||
`/panel/xray` to the matching Vite-served HTML, so the sidebar's
|
||
production-style links work without round-tripping through Go.
|
||
|
||
## Scripts
|
||
|
||
| Command | What |
|
||
|---|---|
|
||
| `npm run dev` | Vite dev server with API + WS proxy to Go |
|
||
| `npm run build` | Regenerates OpenAPI + Zod, then builds into `../internal/web/dist/` |
|
||
| `npm run preview` | Serve the built bundle locally |
|
||
| `npm run typecheck` | `tsc --noEmit` (strict, no emit) |
|
||
| `npm run lint` | ESLint flat config (`@typescript-eslint` + `react-hooks`) |
|
||
| `npm run test` | Vitest single run (schema fixtures, link parsers, …) |
|
||
| `npm run test:watch` | Vitest watch mode |
|
||
| `npm run gen:api` | Build `public/openapi.json` from `pages/api-docs/endpoints.ts` |
|
||
| `npm run gen:zod` | Run the Go-side openapigen tool → `src/generated/{zod,types}.ts` |
|
||
|
||
CI runs `typecheck`, `lint`, `test`, and `build` on every PR
|
||
(see `../.github/workflows/ci.yml`).
|
||
|
||
### One-off: scan for deprecated APIs
|
||
|
||
Run this command to sweep the codebase for usages of APIs marked
|
||
with the JSDoc `@deprecated` tag (AntD prop renames, Zod renames,
|
||
removed Web APIs, etc.):
|
||
|
||
```sh
|
||
npx eslint --config eslint.deprecated.config.js src
|
||
```
|
||
|
||
It's a type-aware ESLint run against `eslint.deprecated.config.js`
|
||
and is not wired into `npm run lint` because typed linting triples
|
||
the wall-clock time.
|
||
|
||
## Production build
|
||
|
||
```sh
|
||
npm run build
|
||
```
|
||
|
||
Outputs to `../internal/web/dist/` (HTML at the root, hashed JS/CSS under
|
||
`assets/`). `manualChunks` splits AntD, icons, codemirror, and
|
||
react-query into separate vendor bundles to keep the per-page
|
||
initial JS small. The Go binary embeds this directory at compile
|
||
time and `internal/web/controller/dist.go` serves the per-page HTML.
|
||
|
||
## Layout
|
||
|
||
```
|
||
frontend/
|
||
├── index.html, login.html, subpage.html # 3 Vite entries
|
||
├── tsconfig.json
|
||
├── eslint.config.js
|
||
├── eslint.deprecated.config.js # On-demand type-aware lint config that flags
|
||
│ # usages of APIs marked with JSDoc @deprecated
|
||
├── vitest.config.ts
|
||
├── vite.config.js
|
||
├── scripts/
|
||
│ └── build-openapi.mjs # endpoints.ts → openapi.json
|
||
└── src/
|
||
├── entries/ # Per-page bootstrap (createRoot + render)
|
||
├── main.tsx # Shared root for the admin SPA (index.html)
|
||
├── routes.tsx # react-router routes mounted under /panel/
|
||
├── pages/ # One folder per route, page component + helpers
|
||
│ ├── index/, login/, inbounds/, clients/, xray/, nodes/,
|
||
│ ├── settings/, api-docs/, sub/
|
||
├── layouts/ # AdminLayout (sidebar + header + outlet)
|
||
├── components/ # Cross-page React components
|
||
├── hooks/ # useClients, useTheme, useWebSocket, …
|
||
├── api/ # Axios + CSRF interceptor, TanStack Query bridge,
|
||
│ # WebSocket client + queryClient.ts
|
||
├── i18n/ # react-i18next init (locales in internal/web/translation/)
|
||
├── lib/xray/ # Pure functions: link generation, defaults,
|
||
│ # form ⇄ wire adapters, protocol capabilities
|
||
├── schemas/ # Zod source-of-truth (see "Schemas" below)
|
||
├── generated/ # Code-generated zod + ts types from Go
|
||
│ # (DO NOT hand-edit — regenerated by gen:zod)
|
||
├── models/ # Thin legacy types still in transit
|
||
│ # (DBInbound, Status, AllSetting, reality-targets)
|
||
├── styles/ # Shared CSS modules
|
||
├── test/ # Vitest specs + golden fixtures
|
||
│ ├── *.test.ts
|
||
│ ├── __snapshots__/
|
||
│ └── golden/fixtures/ # Per-(protocol × network × security) JSON
|
||
└── utils/ # HttpUtil, ClipboardManager, SizeFormatter, …
|
||
```
|
||
|
||
## Schemas
|
||
|
||
`src/schemas/` is the single source of truth for the xray
|
||
configuration model. Every API response is parsed through it,
|
||
every form field is validated against it, and TypeScript types
|
||
are inferred via `z.infer<typeof X>` — never hand-written.
|
||
|
||
```
|
||
schemas/
|
||
├── primitives/ # Atomic reusable schemas (port, protocol, sniffing, …)
|
||
├── api/ # Backend response shapes (e.g. SlimInboundSchema)
|
||
├── forms/ # User-facing form shapes (narrower than api/)
|
||
├── protocols/
|
||
│ ├── inbound/ # Per-protocol settings (vmess, vless, trojan, …)
|
||
│ ├── outbound/
|
||
│ ├── stream/ # Network transports (tcp, ws, grpc, xhttp, kcp, …)
|
||
│ └── security/ # TLS, Reality, none
|
||
├── client.ts, dns.ts, routing.ts, setting.ts, status.ts, xray.ts
|
||
└── _envelope.ts # Generic `Msg<T>` envelope wrapper
|
||
```
|
||
|
||
Patterns:
|
||
|
||
- **Discriminated unions** for polymorphic data — inbound `settings`
|
||
is `z.discriminatedUnion('protocol', […])`, same for stream and
|
||
security.
|
||
- **Three validation layers**, non-overlapping:
|
||
- API boundary: `parseMsg(msg, schema, ctx)` inside TanStack
|
||
Query `queryFn` — warn-only in prod, throws in dev
|
||
- Form input: `antdRule(schema.shape.field)` on every `<Form.Item>` —
|
||
blocks submit + per-field inline error
|
||
- Wire request: `Schema.parse(payload)` inside `mutationFn` — throws,
|
||
because a malformed payload here is always a developer bug
|
||
- **No `.loose()` or `[key: string]: any`** in production schemas.
|
||
`@typescript-eslint/no-explicit-any: error` is enforced.
|
||
|
||
## Form pattern (Pattern A)
|
||
|
||
All non-trivial modals use this single pattern:
|
||
|
||
```tsx
|
||
const [form] = Form.useForm<InboundFormValues>();
|
||
|
||
const onFinish = async () => {
|
||
const values = await form.validateFields();
|
||
await createInbound.mutateAsync(values);
|
||
};
|
||
|
||
<Form form={form} onFinish={onFinish}>
|
||
<Form.Item
|
||
name="port"
|
||
label="Port"
|
||
rules={[antdRule(InboundFormSchema.shape.port, t)]}
|
||
>
|
||
<InputNumber min={1} max={65535} />
|
||
</Form.Item>
|
||
</Form>
|
||
```
|
||
|
||
No `safeParse`-on-submit handlers, no `useRef<any>` for form
|
||
references, no inline `z.string().min(1)` in rules. Conditional
|
||
fields use `<Form.Item dependencies={...} shouldUpdate>` with the
|
||
nested protocol schema.
|
||
|
||
## Testing
|
||
|
||
Vitest runs everything under `src/test/`. Schemas have **golden
|
||
fixture suites** — one JSON per `(protocol × network × security)`
|
||
combination round-tripped through `schema.parse` → link generator
|
||
→ snapshot. Regenerate snapshots after intentional changes:
|
||
|
||
```sh
|
||
npx vitest run -u
|
||
```
|
||
|
||
Fixtures live in `src/test/golden/fixtures/` and are auto-discovered
|
||
via `import.meta.glob`.
|
||
|
||
## Adding a new page
|
||
|
||
Most new routes go inside the admin SPA (`index.html`) via
|
||
`routes.tsx` — no new HTML or Vite entry needed.
|
||
|
||
1. Add the page component under `src/pages/<page>/`.
|
||
2. Register it in `src/routes.tsx` under the `/panel/...` tree.
|
||
3. If you need a brand-new top-level bundle (login-style standalone
|
||
page), add the HTML at `frontend/<page>.html`, an entry at
|
||
`src/entries/<page>.tsx`, and register it in `rollupOptions.input`
|
||
in `vite.config.js`. Then add the Go controller call to
|
||
`serveDistPage(c, "<page>.html")`.
|