mirror of
https://github.com/MHSanaei/3x-ui.git
synced 2026-07-05 12:24:20 +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.
632 lines
18 KiB
Go
632 lines
18 KiB
Go
package xray
|
|
|
|
import (
|
|
"bytes"
|
|
"encoding/json"
|
|
"errors"
|
|
"fmt"
|
|
"os"
|
|
"os/exec"
|
|
"path/filepath"
|
|
"runtime"
|
|
"sort"
|
|
"strings"
|
|
"sync"
|
|
"sync/atomic"
|
|
"syscall"
|
|
"time"
|
|
|
|
"github.com/mhsanaei/3x-ui/v3/internal/config"
|
|
"github.com/mhsanaei/3x-ui/v3/internal/logger"
|
|
"github.com/mhsanaei/3x-ui/v3/internal/util/common"
|
|
)
|
|
|
|
// GetBinaryName returns the Xray binary filename for the current OS and architecture.
|
|
func GetBinaryName() string {
|
|
arch := runtime.GOARCH
|
|
if arch == "arm" {
|
|
arch = "arm32"
|
|
}
|
|
return fmt.Sprintf("xray-%s-%s", runtime.GOOS, arch)
|
|
}
|
|
|
|
// GetBinaryPath returns the full path to the Xray binary executable.
|
|
func GetBinaryPath() string {
|
|
return config.GetBinFolderPath() + "/" + GetBinaryName()
|
|
}
|
|
|
|
// GetConfigPath returns the path to the Xray configuration file in the binary folder.
|
|
func GetConfigPath() string {
|
|
return config.GetBinFolderPath() + "/config.json"
|
|
}
|
|
|
|
// GetGeositePath returns the path to the geosite data file used by Xray.
|
|
func GetGeositePath() string {
|
|
return config.GetBinFolderPath() + "/geosite.dat"
|
|
}
|
|
|
|
// GetGeoipPath returns the path to the geoip data file used by Xray.
|
|
func GetGeoipPath() string {
|
|
return config.GetBinFolderPath() + "/geoip.dat"
|
|
}
|
|
|
|
// GetIPLimitLogPath returns the path to the IP limit log file.
|
|
func GetIPLimitLogPath() string {
|
|
return config.GetLogFolder() + "/3xipl.log"
|
|
}
|
|
|
|
// GetIPLimitBannedLogPath returns the path to the banned IP log file.
|
|
func GetIPLimitBannedLogPath() string {
|
|
return config.GetLogFolder() + "/3xipl-banned.log"
|
|
}
|
|
|
|
// GetIPLimitBannedPrevLogPath returns the path to the previous banned IP log file.
|
|
func GetIPLimitBannedPrevLogPath() string {
|
|
return config.GetLogFolder() + "/3xipl-banned.prev.log"
|
|
}
|
|
|
|
// GetAccessPersistentLogPath returns the path to the persistent access log file.
|
|
func GetAccessPersistentLogPath() string {
|
|
return config.GetLogFolder() + "/3xipl-ap.log"
|
|
}
|
|
|
|
// GetAccessPersistentPrevLogPath returns the path to the previous persistent access log file.
|
|
func GetAccessPersistentPrevLogPath() string {
|
|
return config.GetLogFolder() + "/3xipl-ap.prev.log"
|
|
}
|
|
|
|
// GetAccessLogPath reads the Xray config and returns the access log file path.
|
|
func GetAccessLogPath() (string, error) {
|
|
config, err := os.ReadFile(GetConfigPath())
|
|
if err != nil {
|
|
logger.Warningf("Failed to read configuration file: %s", err)
|
|
return "", err
|
|
}
|
|
|
|
jsonConfig := map[string]any{}
|
|
err = json.Unmarshal([]byte(config), &jsonConfig)
|
|
if err != nil {
|
|
logger.Warningf("Failed to parse JSON configuration: %s", err)
|
|
return "", err
|
|
}
|
|
|
|
if jsonConfig["log"] != nil {
|
|
jsonLog := jsonConfig["log"].(map[string]any)
|
|
if jsonLog["access"] != nil {
|
|
accessLogPath := jsonLog["access"].(string)
|
|
return accessLogPath, nil
|
|
}
|
|
}
|
|
return "", err
|
|
}
|
|
|
|
// stopProcess calls Stop on the given Process instance.
|
|
func stopProcess(p *Process) {
|
|
p.Stop()
|
|
}
|
|
|
|
// Process wraps an Xray process instance and provides management methods.
|
|
type Process struct {
|
|
*process
|
|
}
|
|
|
|
// NewProcess creates a new Xray process and sets up cleanup on garbage collection.
|
|
func NewProcess(xrayConfig *Config) *Process {
|
|
p := &Process{newProcess(xrayConfig)}
|
|
runtime.SetFinalizer(p, stopProcess)
|
|
return p
|
|
}
|
|
|
|
// NewTestProcess creates a new Xray process that uses a specific config file path.
|
|
// Used for test runs (e.g. outbound test) so the main config.json is not overwritten.
|
|
// The config file at configPath is removed when the process is stopped.
|
|
func NewTestProcess(xrayConfig *Config, configPath string) *Process {
|
|
p := &Process{newTestProcess(xrayConfig, configPath)}
|
|
runtime.SetFinalizer(p, stopProcess)
|
|
return p
|
|
}
|
|
|
|
type process struct {
|
|
cmd *exec.Cmd
|
|
done chan struct{}
|
|
|
|
version string
|
|
apiPort int
|
|
|
|
// onlineClients is the set of emails active on THIS panel's own xray
|
|
// within the online grace window. It is derived only from local xray
|
|
// traffic polls (see RefreshLocalOnline) — never from remote-node
|
|
// snapshots — so a client connected solely to a remote node is not
|
|
// reported online on local inbounds.
|
|
onlineClients []string
|
|
// localActiveInbounds is the set of THIS panel's inbound tags that
|
|
// carried traffic within the same grace window. Xray's user>>>email
|
|
// stat aggregates across every inbound a client is attached to, so an
|
|
// online email alone can't say which inbound it actually used. Pairing
|
|
// it with the inbound>>>tag stat lets the per-inbound view drop a
|
|
// multi-inbound client from inbounds that saw no traffic this window.
|
|
localActiveInbounds []string
|
|
// localLastOnline records, per email, the last time this panel's own
|
|
// xray reported traffic for it. RefreshLocalOnline rebuilds
|
|
// onlineClients from this map each tick, keeping the local online set
|
|
// independent of the shared client_traffics.last_online column — that
|
|
// column is bumped by remote-node syncs too and would otherwise leak
|
|
// remote-only clients into the local set.
|
|
localLastOnline map[string]int64
|
|
// localInboundLastActive mirrors localLastOnline for inbound tags: the
|
|
// last tick this panel's xray reported traffic through each tag.
|
|
// Rebuilt into localActiveInbounds under the same grace window so the
|
|
// two signals stay aligned — an email within grace always has the
|
|
// inbound it used within grace too.
|
|
localInboundLastActive map[string]int64
|
|
// nodeOnlineTrees holds, per direct remote node (keyed by that node's
|
|
// panel-local id), the GUID-keyed online-emails subtree that node
|
|
// reported — its own clients under its panelGuid plus every descendant
|
|
// under theirs. Keying the stored value by GUID (not node id) lets the
|
|
// master attribute a deeply nested client to the node that physically
|
|
// hosts it across a chain (#4983); the outer node-id key is only so a
|
|
// failed probe can drop that whole branch's contribution. NodeTrafficSyncJob
|
|
// populates entries per cron tick and clears them when a probe fails. The
|
|
// mutex guards this map, onlineClients, and localLastOnline above so the
|
|
// online getters never see a torn read.
|
|
nodeOnlineTrees map[int]map[string][]string
|
|
onlineMu sync.RWMutex
|
|
|
|
config *Config
|
|
configPath string // if set, use this path instead of GetConfigPath() and remove on Stop
|
|
logWriter *LogWriter
|
|
exitErr error
|
|
startTime time.Time
|
|
|
|
intentionalStop atomic.Bool
|
|
}
|
|
|
|
var (
|
|
xrayGracefulStopTimeout = 5 * time.Second
|
|
xrayForceStopTimeout = 2 * time.Second
|
|
)
|
|
|
|
// newProcess creates a new internal process struct for Xray.
|
|
func newProcess(config *Config) *process {
|
|
return &process{
|
|
version: "Unknown",
|
|
config: config,
|
|
logWriter: NewLogWriter(),
|
|
startTime: time.Now(),
|
|
}
|
|
}
|
|
|
|
// newTestProcess creates a process that writes and runs with a specific config path.
|
|
func newTestProcess(config *Config, configPath string) *process {
|
|
p := newProcess(config)
|
|
p.configPath = configPath
|
|
return p
|
|
}
|
|
|
|
// IsRunning returns true if the Xray process is currently running.
|
|
func (p *process) IsRunning() bool {
|
|
if p.cmd == nil || p.cmd.Process == nil {
|
|
return false
|
|
}
|
|
if p.done != nil {
|
|
select {
|
|
case <-p.done:
|
|
return false
|
|
default:
|
|
}
|
|
}
|
|
if p.cmd.ProcessState == nil {
|
|
return true
|
|
}
|
|
return false
|
|
}
|
|
|
|
// GetErr returns the last error encountered by the Xray process.
|
|
func (p *process) GetErr() error {
|
|
return p.exitErr
|
|
}
|
|
|
|
// GetResult returns the last log line or error from the Xray process.
|
|
func (p *process) GetResult() string {
|
|
if len(p.logWriter.lastLine) == 0 && p.exitErr != nil {
|
|
return p.exitErr.Error()
|
|
}
|
|
return p.logWriter.lastLine
|
|
}
|
|
|
|
// GetVersion returns the version string of the Xray process.
|
|
func (p *process) GetVersion() string {
|
|
return p.version
|
|
}
|
|
|
|
// GetAPIPort returns the API port used by the Xray process.
|
|
func (p *Process) GetAPIPort() int {
|
|
return p.apiPort
|
|
}
|
|
|
|
// GetConfig returns the configuration used by the Xray process.
|
|
func (p *Process) GetConfig() *Config {
|
|
return p.config
|
|
}
|
|
|
|
// GetOnlineClients returns the union of locally-online clients and
|
|
// node-online clients from every registered remote panel. Dedupes by
|
|
// email so a client connected to both a local and a node-managed inbound
|
|
// surfaces once. Cheap allocation — typical online sets are small and
|
|
// the union is recomputed on demand.
|
|
func (p *Process) GetOnlineClients() []string {
|
|
p.onlineMu.RLock()
|
|
defer p.onlineMu.RUnlock()
|
|
|
|
if len(p.nodeOnlineTrees) == 0 {
|
|
// Hot path for single-panel deployments: avoid the map+dedupe
|
|
// work entirely and return the local slice as-is.
|
|
return p.onlineClients
|
|
}
|
|
|
|
seen := make(map[string]struct{}, len(p.onlineClients))
|
|
out := make([]string, 0, len(p.onlineClients))
|
|
add := func(emails []string) {
|
|
for _, email := range emails {
|
|
if _, dup := seen[email]; dup {
|
|
continue
|
|
}
|
|
seen[email] = struct{}{}
|
|
out = append(out, email)
|
|
}
|
|
}
|
|
add(p.onlineClients)
|
|
for _, tree := range p.nodeOnlineTrees {
|
|
for _, emails := range tree {
|
|
add(emails)
|
|
}
|
|
}
|
|
return out
|
|
}
|
|
|
|
// GetLocalOnlineClients returns a copy of the emails online on THIS panel's own
|
|
// xray within the grace window. The service layer keys these under the panel's
|
|
// own GUID when assembling the per-node online view.
|
|
func (p *Process) GetLocalOnlineClients() []string {
|
|
p.onlineMu.RLock()
|
|
defer p.onlineMu.RUnlock()
|
|
if len(p.onlineClients) == 0 {
|
|
return nil
|
|
}
|
|
out := make([]string, len(p.onlineClients))
|
|
copy(out, p.onlineClients)
|
|
return out
|
|
}
|
|
|
|
// GetMergedNodeTrees returns the union of every direct node's reported subtree,
|
|
// keyed by the panelGuid of the node that physically hosts each client set.
|
|
// Because each child already reports its descendants under their own GUIDs,
|
|
// merging the direct children yields the whole tree at any depth (#4983), so a
|
|
// client three hops down is attributed to its real node, not the intermediate
|
|
// one. GUIDs are globally unique, but a set reported under the same GUID by more
|
|
// than one path is deduped per key; empty sets are omitted.
|
|
func (p *Process) GetMergedNodeTrees() map[string][]string {
|
|
p.onlineMu.RLock()
|
|
defer p.onlineMu.RUnlock()
|
|
if len(p.nodeOnlineTrees) == 0 {
|
|
return map[string][]string{}
|
|
}
|
|
out := make(map[string][]string)
|
|
seen := make(map[string]map[string]struct{})
|
|
for _, tree := range p.nodeOnlineTrees {
|
|
for guid, emails := range tree {
|
|
if guid == "" || len(emails) == 0 {
|
|
continue
|
|
}
|
|
dedup := seen[guid]
|
|
if dedup == nil {
|
|
dedup = make(map[string]struct{}, len(emails))
|
|
seen[guid] = dedup
|
|
}
|
|
for _, email := range emails {
|
|
if _, ok := dedup[email]; ok {
|
|
continue
|
|
}
|
|
dedup[email] = struct{}{}
|
|
out[guid] = append(out[guid], email)
|
|
}
|
|
}
|
|
}
|
|
return out
|
|
}
|
|
|
|
// GetLocalActiveInbounds returns a copy of THIS panel's inbound tags that
|
|
// carried traffic within the grace window. Only the local xray reports
|
|
// per-inbound activity; remote-node snapshots don't carry it, so the service
|
|
// layer keys these under the panel's own GUID and a node missing from the
|
|
// active-inbounds map means "don't gate" (fall back to the email-only signal).
|
|
func (p *Process) GetLocalActiveInbounds() []string {
|
|
p.onlineMu.RLock()
|
|
defer p.onlineMu.RUnlock()
|
|
if len(p.localActiveInbounds) == 0 {
|
|
return nil
|
|
}
|
|
out := make([]string, len(p.localActiveInbounds))
|
|
copy(out, p.localActiveInbounds)
|
|
return out
|
|
}
|
|
|
|
// RefreshLocalOnline records that each email in activeEmails and each tag in
|
|
// activeInboundTags had local xray traffic at now, then rebuilds onlineClients
|
|
// and localActiveInbounds from every entry seen within graceMs, pruning older
|
|
// ones. Called by the local XrayTrafficJob after each xray gRPC stats poll.
|
|
// Pass nil/empty slices to only prune — NodeTrafficSyncJob does this so a
|
|
// stopped local xray's clients and inbounds still age out between local polls.
|
|
func (p *Process) RefreshLocalOnline(activeEmails, activeInboundTags []string, now, graceMs int64) {
|
|
p.onlineMu.Lock()
|
|
defer p.onlineMu.Unlock()
|
|
if p.localLastOnline == nil {
|
|
p.localLastOnline = make(map[string]int64, len(activeEmails))
|
|
}
|
|
for _, email := range activeEmails {
|
|
p.localLastOnline[email] = now
|
|
}
|
|
online := make([]string, 0, len(p.localLastOnline))
|
|
for email, ts := range p.localLastOnline {
|
|
if now-ts < graceMs {
|
|
online = append(online, email)
|
|
} else {
|
|
delete(p.localLastOnline, email)
|
|
}
|
|
}
|
|
p.onlineClients = online
|
|
|
|
if p.localInboundLastActive == nil {
|
|
p.localInboundLastActive = make(map[string]int64, len(activeInboundTags))
|
|
}
|
|
for _, tag := range activeInboundTags {
|
|
p.localInboundLastActive[tag] = now
|
|
}
|
|
activeInbounds := make([]string, 0, len(p.localInboundLastActive))
|
|
for tag, ts := range p.localInboundLastActive {
|
|
if now-ts < graceMs {
|
|
activeInbounds = append(activeInbounds, tag)
|
|
} else {
|
|
delete(p.localInboundLastActive, tag)
|
|
}
|
|
}
|
|
p.localActiveInbounds = activeInbounds
|
|
}
|
|
|
|
// SetNodeOnlineTree records the GUID-keyed online subtree one direct remote
|
|
// node reported (its own clients under its panelGuid plus every descendant
|
|
// under theirs). Replaces any previous entry for that node — NodeTrafficSyncJob
|
|
// always sends the full subtree per tick.
|
|
func (p *Process) SetNodeOnlineTree(nodeID int, tree map[string][]string) {
|
|
p.onlineMu.Lock()
|
|
defer p.onlineMu.Unlock()
|
|
if p.nodeOnlineTrees == nil {
|
|
p.nodeOnlineTrees = map[int]map[string][]string{}
|
|
}
|
|
p.nodeOnlineTrees[nodeID] = tree
|
|
}
|
|
|
|
// ClearNodeOnlineClients drops a direct node's whole subtree contribution.
|
|
// Called when a probe fails so a downed node — and everything behind it — doesn't
|
|
// keep its clients listed as "online" until the next successful probe.
|
|
func (p *Process) ClearNodeOnlineClients(nodeID int) {
|
|
p.onlineMu.Lock()
|
|
defer p.onlineMu.Unlock()
|
|
delete(p.nodeOnlineTrees, nodeID)
|
|
}
|
|
|
|
// GetUptime returns the uptime of the Xray process in seconds.
|
|
func (p *Process) GetUptime() uint64 {
|
|
return uint64(time.Since(p.startTime).Seconds())
|
|
}
|
|
|
|
// refreshAPIPort updates the API port from the inbound configs.
|
|
func (p *process) refreshAPIPort() {
|
|
for _, inbound := range p.config.InboundConfigs {
|
|
if inbound.Tag == "api" {
|
|
p.apiPort = inbound.Port
|
|
break
|
|
}
|
|
}
|
|
}
|
|
|
|
// refreshVersion updates the version string by running the Xray binary with -version.
|
|
func (p *process) refreshVersion() {
|
|
cmd := exec.Command(GetBinaryPath(), "-version")
|
|
data, err := cmd.Output()
|
|
if err != nil {
|
|
p.version = "Unknown"
|
|
} else {
|
|
datas := bytes.Split(data, []byte(" "))
|
|
if len(datas) <= 1 {
|
|
p.version = "Unknown"
|
|
} else {
|
|
p.version = string(datas[1])
|
|
}
|
|
}
|
|
}
|
|
|
|
// Start launches the Xray process with the current configuration.
|
|
func (p *process) Start() (err error) {
|
|
if p.IsRunning() {
|
|
return errors.New("xray is already running")
|
|
}
|
|
|
|
defer func() {
|
|
if err != nil {
|
|
logger.Error("Failure in running xray-core process: ", err)
|
|
p.exitErr = err
|
|
}
|
|
}()
|
|
|
|
data, err := json.MarshalIndent(p.config, "", " ")
|
|
if err != nil {
|
|
return common.NewErrorf("Failed to generate XRAY configuration files: %v", err)
|
|
}
|
|
|
|
err = os.MkdirAll(config.GetLogFolder(), 0o770)
|
|
if err != nil {
|
|
logger.Warningf("Failed to create log folder: %s", err)
|
|
}
|
|
|
|
configPath := GetConfigPath()
|
|
if p.configPath != "" {
|
|
configPath = p.configPath
|
|
}
|
|
err = os.WriteFile(configPath, data, 0644)
|
|
if err != nil {
|
|
return common.NewErrorf("Failed to write configuration file: %v", err)
|
|
}
|
|
|
|
cmd := exec.Command(GetBinaryPath(), "-c", configPath)
|
|
cmd.Stdout = p.logWriter
|
|
cmd.Stderr = p.logWriter
|
|
|
|
err = p.startCommand(cmd)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
|
|
p.refreshVersion()
|
|
p.refreshAPIPort()
|
|
|
|
return nil
|
|
}
|
|
|
|
func (p *process) startCommand(cmd *exec.Cmd) error {
|
|
p.cmd = cmd
|
|
p.done = make(chan struct{})
|
|
p.exitErr = nil
|
|
p.intentionalStop.Store(false)
|
|
|
|
if err := cmd.Start(); err != nil {
|
|
close(p.done)
|
|
p.cmd = nil
|
|
return err
|
|
}
|
|
|
|
attachChildLifetime(cmd)
|
|
|
|
go p.waitForCommand(cmd)
|
|
return nil
|
|
}
|
|
|
|
func (p *process) waitForCommand(cmd *exec.Cmd) {
|
|
defer close(p.done)
|
|
|
|
err := cmd.Wait()
|
|
if err == nil || p.intentionalStop.Load() {
|
|
return
|
|
}
|
|
|
|
// On Windows, killing the process results in "exit status 1" which isn't an error for us.
|
|
if runtime.GOOS == "windows" {
|
|
errStr := strings.ToLower(err.Error())
|
|
if strings.Contains(errStr, "exit status 1") {
|
|
p.exitErr = err
|
|
return
|
|
}
|
|
}
|
|
|
|
logger.Error("Failure in running xray-core:", err)
|
|
p.exitErr = err
|
|
}
|
|
|
|
// Stop terminates the running Xray process.
|
|
func (p *process) Stop() error {
|
|
if !p.IsRunning() {
|
|
return errors.New("xray is not running")
|
|
}
|
|
p.intentionalStop.Store(true)
|
|
|
|
// Remove temporary config file used for test runs so main config is never touched
|
|
if p.configPath != "" {
|
|
if p.configPath != GetConfigPath() {
|
|
// Check if file exists before removing
|
|
if _, err := os.Stat(p.configPath); err == nil {
|
|
_ = os.Remove(p.configPath)
|
|
}
|
|
}
|
|
}
|
|
|
|
if runtime.GOOS == "windows" {
|
|
if err := p.cmd.Process.Kill(); err != nil && !errors.Is(err, os.ErrProcessDone) {
|
|
return err
|
|
}
|
|
return p.waitForExit(xrayForceStopTimeout)
|
|
}
|
|
|
|
if err := p.cmd.Process.Signal(syscall.SIGTERM); err != nil {
|
|
if errors.Is(err, os.ErrProcessDone) {
|
|
return p.waitForExit(xrayForceStopTimeout)
|
|
}
|
|
return err
|
|
}
|
|
|
|
if err := p.waitForExit(xrayGracefulStopTimeout); err == nil {
|
|
return nil
|
|
}
|
|
|
|
logger.Warning("xray-core did not stop after SIGTERM, killing process")
|
|
if err := p.cmd.Process.Kill(); err != nil && !errors.Is(err, os.ErrProcessDone) {
|
|
return err
|
|
}
|
|
return p.waitForExit(xrayForceStopTimeout)
|
|
}
|
|
|
|
func (p *process) waitForExit(timeout time.Duration) error {
|
|
if p.done == nil {
|
|
return nil
|
|
}
|
|
|
|
timer := time.NewTimer(timeout)
|
|
defer timer.Stop()
|
|
|
|
select {
|
|
case <-p.done:
|
|
return nil
|
|
case <-timer.C:
|
|
return common.NewErrorf("timed out waiting for xray-core process to stop after %s", timeout)
|
|
}
|
|
}
|
|
|
|
const (
|
|
crashReportPrefix = "core_crash_"
|
|
crashReportSuffix = ".log"
|
|
maxCrashReports = 10
|
|
)
|
|
|
|
// writeCrashReport persists a captured xray crash chunk to the log folder
|
|
// with nanosecond-precision filename so restart-loop bursts don't overwrite
|
|
// each other, and prunes old reports to keep the folder bounded.
|
|
func writeCrashReport(m []byte) error {
|
|
dir := config.GetLogFolder()
|
|
if err := os.MkdirAll(dir, 0o770); err != nil {
|
|
return err
|
|
}
|
|
pruneOldCrashReports(dir, maxCrashReports-1)
|
|
name := crashReportPrefix + time.Now().Format("20060102_150405_000000000") + crashReportSuffix
|
|
return os.WriteFile(filepath.Join(dir, name), m, 0o640)
|
|
}
|
|
|
|
func pruneOldCrashReports(dir string, keep int) {
|
|
entries, err := os.ReadDir(dir)
|
|
if err != nil {
|
|
return
|
|
}
|
|
var reports []string
|
|
for _, e := range entries {
|
|
n := e.Name()
|
|
if !e.IsDir() && strings.HasPrefix(n, crashReportPrefix) && strings.HasSuffix(n, crashReportSuffix) {
|
|
reports = append(reports, n)
|
|
}
|
|
}
|
|
if len(reports) <= keep {
|
|
return
|
|
}
|
|
sort.Strings(reports)
|
|
for _, old := range reports[:len(reports)-keep] {
|
|
_ = os.Remove(filepath.Join(dir, old))
|
|
}
|
|
}
|