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.
541 lines
18 KiB
Go
541 lines
18 KiB
Go
package service
|
|
|
|
import (
|
|
"context"
|
|
"encoding/json"
|
|
"fmt"
|
|
"io"
|
|
"net/http"
|
|
"regexp"
|
|
"strconv"
|
|
"strings"
|
|
"time"
|
|
|
|
"github.com/mhsanaei/3x-ui/v3/internal/database"
|
|
"github.com/mhsanaei/3x-ui/v3/internal/database/model"
|
|
"github.com/mhsanaei/3x-ui/v3/internal/logger"
|
|
"github.com/mhsanaei/3x-ui/v3/internal/util/common"
|
|
"github.com/mhsanaei/3x-ui/v3/internal/util/link"
|
|
)
|
|
|
|
// OutboundSubscriptionService manages remote outbound subscriptions.
|
|
type OutboundSubscriptionService struct {
|
|
settingService SettingService
|
|
}
|
|
|
|
// NewOutboundSubscriptionService returns a service for managing outbound subscriptions.
|
|
func NewOutboundSubscriptionService() *OutboundSubscriptionService {
|
|
return &OutboundSubscriptionService{}
|
|
}
|
|
|
|
// List returns all subscriptions (newest first).
|
|
func (s *OutboundSubscriptionService) List() ([]*model.OutboundSubscription, error) {
|
|
db := database.GetDB()
|
|
var subs []*model.OutboundSubscription
|
|
if err := db.Model(&model.OutboundSubscription{}).Order("priority asc, id asc").Find(&subs).Error; err != nil {
|
|
return nil, err
|
|
}
|
|
for _, sub := range subs {
|
|
sub.OutboundCount = countOutbounds(sub.LastFetchedOutbounds)
|
|
// Don't ship the heavy raw blobs to the list view.
|
|
sub.LastFetchedOutbounds = ""
|
|
sub.LinkIdentities = ""
|
|
}
|
|
return subs, nil
|
|
}
|
|
|
|
// countOutbounds returns the number of outbounds in a stored LastFetchedOutbounds
|
|
// JSON array (0 for empty/invalid).
|
|
func countOutbounds(raw string) int {
|
|
if strings.TrimSpace(raw) == "" {
|
|
return 0
|
|
}
|
|
var arr []any
|
|
if json.Unmarshal([]byte(raw), &arr) != nil {
|
|
return 0
|
|
}
|
|
return len(arr)
|
|
}
|
|
|
|
// Get returns a single subscription by id.
|
|
func (s *OutboundSubscriptionService) Get(id int) (*model.OutboundSubscription, error) {
|
|
db := database.GetDB()
|
|
var sub model.OutboundSubscription
|
|
if err := db.First(&sub, id).Error; err != nil {
|
|
return nil, err
|
|
}
|
|
return &sub, nil
|
|
}
|
|
|
|
// Create persists a new subscription. It does not fetch immediately; the caller
|
|
// can call Refresh on the returned id if desired.
|
|
var defaultPrefixRe = regexp.MustCompile(`^sub(\d+)-$`)
|
|
|
|
// defaultPrefixNumber returns the smallest positive integer N that is not already
|
|
// in use as a "subN-" tag prefix among the given subscriptions. This is used to
|
|
// auto-name a subscription's outbounds when the user leaves the prefix blank, so
|
|
// deleting a subscription frees its number for reuse instead of letting the
|
|
// number grow forever with the auto-increment DB id. A subscription with a blank
|
|
// prefix reserves its own id (it falls back to id-based "sub<id>-" tags).
|
|
func defaultPrefixNumber(subs []*model.OutboundSubscription, excludeId int) int {
|
|
used := map[int]bool{}
|
|
for _, sub := range subs {
|
|
if sub.Id == excludeId {
|
|
continue
|
|
}
|
|
if sub.TagPrefix == "" {
|
|
used[sub.Id] = true
|
|
continue
|
|
}
|
|
if m := defaultPrefixRe.FindStringSubmatch(sub.TagPrefix); m != nil {
|
|
if n, err := strconv.Atoi(m[1]); err == nil {
|
|
used[n] = true
|
|
}
|
|
}
|
|
}
|
|
n := 1
|
|
for used[n] {
|
|
n++
|
|
}
|
|
return n
|
|
}
|
|
|
|
// nextDefaultSubPrefix builds the default "subN-" prefix for a new/edited
|
|
// subscription, picking the smallest free N (excludeId skips a subscription's
|
|
// own current prefix when editing).
|
|
func (s *OutboundSubscriptionService) nextDefaultSubPrefix(excludeId int) string {
|
|
var subs []*model.OutboundSubscription
|
|
_ = database.GetDB().Find(&subs).Error
|
|
return fmt.Sprintf("sub%d-", defaultPrefixNumber(subs, excludeId))
|
|
}
|
|
|
|
func (s *OutboundSubscriptionService) Create(remark, rawURL, tagPrefix string, enabled bool, updateInterval int, allowPrivate, prepend bool) (*model.OutboundSubscription, error) {
|
|
cleanURL, err := SanitizePublicHTTPURL(rawURL, allowPrivate)
|
|
if err != nil {
|
|
return nil, common.NewError("invalid subscription URL:", err)
|
|
}
|
|
if cleanURL == "" {
|
|
return nil, common.NewError("subscription URL is required")
|
|
}
|
|
if updateInterval <= 0 {
|
|
updateInterval = 600
|
|
}
|
|
prefix := strings.TrimSpace(tagPrefix)
|
|
if prefix == "" {
|
|
prefix = s.nextDefaultSubPrefix(0)
|
|
}
|
|
// New subscriptions go to the end of the priority order.
|
|
var count int64
|
|
database.GetDB().Model(&model.OutboundSubscription{}).Count(&count)
|
|
sub := &model.OutboundSubscription{
|
|
Remark: strings.TrimSpace(remark),
|
|
Url: cleanURL,
|
|
Enabled: enabled,
|
|
AllowPrivate: allowPrivate,
|
|
Prepend: prepend,
|
|
Priority: int(count),
|
|
TagPrefix: prefix,
|
|
UpdateInterval: updateInterval,
|
|
}
|
|
if err := database.GetDB().Create(sub).Error; err != nil {
|
|
return nil, err
|
|
}
|
|
return sub, nil
|
|
}
|
|
|
|
// Update updates editable fields.
|
|
func (s *OutboundSubscriptionService) Update(id int, remark, rawURL, tagPrefix string, enabled bool, updateInterval int, allowPrivate, prepend bool) error {
|
|
sub, err := s.Get(id)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
cleanURL, err := SanitizePublicHTTPURL(rawURL, allowPrivate)
|
|
if err != nil {
|
|
return common.NewError("invalid subscription URL:", err)
|
|
}
|
|
if cleanURL == "" {
|
|
return common.NewError("subscription URL is required")
|
|
}
|
|
if updateInterval <= 0 {
|
|
updateInterval = 600
|
|
}
|
|
prefix := strings.TrimSpace(tagPrefix)
|
|
if prefix == "" {
|
|
prefix = s.nextDefaultSubPrefix(sub.Id)
|
|
}
|
|
sub.Remark = strings.TrimSpace(remark)
|
|
sub.Url = cleanURL
|
|
sub.Enabled = enabled
|
|
sub.AllowPrivate = allowPrivate
|
|
sub.Prepend = prepend
|
|
sub.TagPrefix = prefix
|
|
sub.UpdateInterval = updateInterval
|
|
return database.GetDB().Save(sub).Error
|
|
}
|
|
|
|
// Delete removes a subscription.
|
|
func (s *OutboundSubscriptionService) Delete(id int) error {
|
|
return database.GetDB().Delete(&model.OutboundSubscription{}, id).Error
|
|
}
|
|
|
|
// GetLastOutbounds returns the last successfully fetched outbounds for a subscription
|
|
// (as raw interface slice ready for JSON merge). Returns nil slice when none.
|
|
func (s *OutboundSubscriptionService) GetLastOutbounds(id int) ([]any, error) {
|
|
sub, err := s.Get(id)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
if strings.TrimSpace(sub.LastFetchedOutbounds) == "" {
|
|
return nil, nil
|
|
}
|
|
var arr []any
|
|
if err := json.Unmarshal([]byte(sub.LastFetchedOutbounds), &arr); err != nil {
|
|
return nil, err
|
|
}
|
|
return arr, nil
|
|
}
|
|
|
|
// Refresh fetches the subscription URL, parses the links, assigns stable tags,
|
|
// persists the results, and returns the generated outbounds.
|
|
func (s *OutboundSubscriptionService) Refresh(id int) ([]any, error) {
|
|
sub, err := s.Get(id)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
outbounds, err := s.fetchAndStore(sub)
|
|
return outbounds, err
|
|
}
|
|
|
|
// RefreshAllEnabled fetches every enabled subscription whose due time has passed
|
|
// (lastUpdated + updateInterval <= now). It returns the number of subscriptions
|
|
// that were actually refreshed.
|
|
func (s *OutboundSubscriptionService) RefreshAllEnabled() (int, error) {
|
|
db := database.GetDB()
|
|
var subs []*model.OutboundSubscription
|
|
if err := db.Where("enabled = ?", true).Find(&subs).Error; err != nil {
|
|
return 0, err
|
|
}
|
|
now := time.Now().Unix()
|
|
refreshed := 0
|
|
for _, sub := range subs {
|
|
due := sub.LastUpdated + int64(sub.UpdateInterval)
|
|
if sub.LastUpdated == 0 || due <= now {
|
|
if _, err := s.fetchAndStore(sub); err != nil {
|
|
logger.Warningf("outbound sub %d (%s) refresh failed: %v", sub.Id, sub.Remark, err)
|
|
// continue with others
|
|
} else {
|
|
refreshed++
|
|
}
|
|
}
|
|
}
|
|
return refreshed, nil
|
|
}
|
|
|
|
// fetchAndStore does the actual network + parse + stability + persist work.
|
|
func (s *OutboundSubscriptionService) fetchAndStore(sub *model.OutboundSubscription) ([]any, error) {
|
|
// Re-sanitize on every fetch (handles legacy rows + defense in depth against
|
|
// any direct DB tampering). Private targets are blocked unless this
|
|
// subscription was explicitly created with AllowPrivate.
|
|
cleanURL, err := SanitizePublicHTTPURL(sub.Url, sub.AllowPrivate)
|
|
if err != nil {
|
|
s.recordError(sub, err)
|
|
return nil, err
|
|
}
|
|
if cleanURL == "" {
|
|
return nil, common.NewError("subscription has no valid URL")
|
|
}
|
|
sub.Url = cleanURL // persist the cleaned version
|
|
|
|
client := s.settingService.NewProxiedHTTPClient(30 * time.Second)
|
|
// Re-validate every redirect hop: the initial host is checked above, but a
|
|
// redirect could still point at a private/internal address (SSRF). Cap the
|
|
// redirect chain as well.
|
|
client.CheckRedirect = func(req *http.Request, via []*http.Request) error {
|
|
if len(via) >= 10 {
|
|
return fmt.Errorf("stopped after 10 redirects")
|
|
}
|
|
if sub.AllowPrivate {
|
|
return nil
|
|
}
|
|
ctx, cancel := context.WithTimeout(req.Context(), 5*time.Second)
|
|
defer cancel()
|
|
return rejectPrivateHost(ctx, req.URL.Hostname())
|
|
}
|
|
|
|
req, err := http.NewRequest("GET", sub.Url, nil)
|
|
if err != nil {
|
|
s.recordError(sub, err)
|
|
return nil, err
|
|
}
|
|
req.Header.Set("User-Agent", "3x-ui-outbound-sub/1.0")
|
|
|
|
resp, err := client.Do(req)
|
|
if err != nil {
|
|
s.recordError(sub, err)
|
|
return nil, err
|
|
}
|
|
defer resp.Body.Close()
|
|
|
|
if resp.StatusCode != 200 {
|
|
err := fmt.Errorf("http %d", resp.StatusCode)
|
|
s.recordError(sub, err)
|
|
return nil, err
|
|
}
|
|
body, err := io.ReadAll(resp.Body)
|
|
if err != nil {
|
|
s.recordError(sub, err)
|
|
return nil, err
|
|
}
|
|
|
|
parsed, identities, err := link.ParseSubscriptionBody(body)
|
|
if err != nil {
|
|
s.recordError(sub, err)
|
|
return nil, err
|
|
}
|
|
|
|
// Load previous identities -> tags for stability
|
|
prev := map[string]string{}
|
|
if strings.TrimSpace(sub.LinkIdentities) != "" {
|
|
_ = json.Unmarshal([]byte(sub.LinkIdentities), &prev)
|
|
}
|
|
|
|
// Also load previous outbounds so we can reuse tags even for identities we
|
|
// temporarily lost (defensive).
|
|
prevTagByIndex := map[int]string{}
|
|
if strings.TrimSpace(sub.LastFetchedOutbounds) != "" {
|
|
var prevObs []any
|
|
if json.Unmarshal([]byte(sub.LastFetchedOutbounds), &prevObs) == nil {
|
|
for i, o := range prevObs {
|
|
if m, ok := o.(map[string]any); ok {
|
|
if tag, _ := m["tag"].(string); tag != "" {
|
|
prevTagByIndex[i] = tag
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
// Assign tags with stability (identity reuse, positional fallback, then a
|
|
// fresh allocation), keeping tags unique within this batch. Extracted into a
|
|
// pure function so it can be unit-tested without network/DB. Tags are written
|
|
// back into the parsed outbounds in place.
|
|
assigned := assignStableTags(parsed, identities, prev, prevTagByIndex, sub.Id, sub.TagPrefix)
|
|
|
|
// Persist identities for next time
|
|
newIdent := map[string]string{}
|
|
for i, id := range identities {
|
|
newIdent[id] = assigned[i]
|
|
}
|
|
identJSON, _ := json.Marshal(newIdent)
|
|
|
|
// Persist the outbounds (as compact JSON array)
|
|
obsJSON, _ := json.Marshal(parsed)
|
|
|
|
sub.LastFetchedOutbounds = string(obsJSON)
|
|
sub.LinkIdentities = string(identJSON)
|
|
sub.LastUpdated = time.Now().Unix()
|
|
sub.LastError = ""
|
|
|
|
if err := database.GetDB().Save(sub).Error; err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
// Return as []any for the config merger
|
|
result := make([]any, len(parsed))
|
|
for i := range parsed {
|
|
result[i] = parsed[i]
|
|
}
|
|
return result, nil
|
|
}
|
|
|
|
func (s *OutboundSubscriptionService) recordError(sub *model.OutboundSubscription, err error) {
|
|
sub.LastError = err.Error()
|
|
_ = database.GetDB().Model(sub).Update("last_error", sub.LastError).Error
|
|
}
|
|
|
|
// assignStableTags assigns a tag to each parsed outbound, preferring stability:
|
|
// 1. reuse the tag previously mapped to the link's identity (prev),
|
|
// 2. else reuse the tag at the same position from the last fetch (prevTagByIndex),
|
|
// 3. else allocate a fresh tag from the prefix + remark (link.SuggestTag).
|
|
//
|
|
// Tags are kept unique within the batch by appending "-N" on collision, and are
|
|
// written back into parsed[i]["tag"]. The returned slice holds the assigned tags
|
|
// in order. When tagPrefix is empty a "sub<subID>-" prefix is used for fresh tags.
|
|
func assignStableTags(parsed []link.Outbound, identities []string, prev map[string]string, prevTagByIndex map[int]string, subID int, tagPrefix string) []string {
|
|
used := map[string]bool{} // uniqueness within this refresh batch
|
|
assigned := make([]string, len(parsed))
|
|
for i := range parsed {
|
|
id := ""
|
|
if i < len(identities) {
|
|
id = identities[i]
|
|
}
|
|
candidate := ""
|
|
if old, ok := prev[id]; ok && old != "" {
|
|
candidate = old
|
|
}
|
|
if candidate == "" {
|
|
// try to reuse by rough positional match from previous fetch (best effort)
|
|
if old, ok := prevTagByIndex[i]; ok && old != "" {
|
|
candidate = old
|
|
}
|
|
}
|
|
if candidate == "" {
|
|
// fresh allocation
|
|
prefix := tagPrefix
|
|
if prefix == "" {
|
|
prefix = fmt.Sprintf("sub%d-", subID)
|
|
}
|
|
remark := ""
|
|
if m, ok := parsed[i]["tag"].(string); ok {
|
|
remark = m
|
|
}
|
|
candidate = link.SuggestTag(prefix, remark, i)
|
|
}
|
|
// ensure local uniqueness inside this batch
|
|
final := candidate
|
|
for k := 1; used[final]; k++ {
|
|
final = fmt.Sprintf("%s-%d", candidate, k)
|
|
}
|
|
used[final] = true
|
|
assigned[i] = final
|
|
|
|
// write back the tag into the outbound
|
|
parsed[i]["tag"] = final
|
|
}
|
|
return assigned
|
|
}
|
|
|
|
// AllActiveOutbounds returns the concatenation of the last-fetched outbounds
|
|
// for every enabled subscription. This is the set that should be merged into
|
|
// the final Xray config. Order: subscription creation order (by id asc) so
|
|
// that later subscriptions can shadow earlier ones if the admin uses colliding
|
|
// prefixes (last writer wins inside xray, but we try to keep tags unique).
|
|
func (s *OutboundSubscriptionService) AllActiveOutbounds() ([]any, error) {
|
|
prepend, appendList, err := s.activeOutboundsSplit()
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
return append(prepend, appendList...), nil
|
|
}
|
|
|
|
// activeOutboundsSplit returns the active subscription outbounds split into those
|
|
// that should be placed BEFORE the manual template outbounds (Prepend) and those
|
|
// placed AFTER. Within each group, subscriptions are ordered by Priority (then id)
|
|
// so the admin can control the merged order.
|
|
func (s *OutboundSubscriptionService) activeOutboundsSplit() (prepend []any, appendList []any, err error) {
|
|
db := database.GetDB()
|
|
var subs []*model.OutboundSubscription
|
|
if err := db.Where("enabled = ?", true).Order("priority asc, id asc").Find(&subs).Error; err != nil {
|
|
return nil, nil, err
|
|
}
|
|
for _, sub := range subs {
|
|
if strings.TrimSpace(sub.LastFetchedOutbounds) == "" {
|
|
continue
|
|
}
|
|
var arr []any
|
|
if err := json.Unmarshal([]byte(sub.LastFetchedOutbounds), &arr); err != nil {
|
|
logger.Warningf("outbound sub %d has corrupt LastFetchedOutbounds: %v", sub.Id, err)
|
|
continue
|
|
}
|
|
if sub.Prepend {
|
|
prepend = append(prepend, arr...)
|
|
} else {
|
|
appendList = append(appendList, arr...)
|
|
}
|
|
}
|
|
return prepend, appendList, nil
|
|
}
|
|
|
|
// Move shifts a subscription one step up or down in the priority order and
|
|
// re-normalizes all priorities to a 0..n-1 sequence.
|
|
func (s *OutboundSubscriptionService) Move(id int, up bool) error {
|
|
db := database.GetDB()
|
|
var subs []*model.OutboundSubscription
|
|
if err := db.Order("priority asc, id asc").Find(&subs).Error; err != nil {
|
|
return err
|
|
}
|
|
idx := -1
|
|
for i, sub := range subs {
|
|
if sub.Id == id {
|
|
idx = i
|
|
break
|
|
}
|
|
}
|
|
if idx == -1 {
|
|
return common.NewError("subscription not found")
|
|
}
|
|
swap := idx + 1
|
|
if up {
|
|
swap = idx - 1
|
|
}
|
|
if swap < 0 || swap >= len(subs) {
|
|
return nil // already at the edge
|
|
}
|
|
subs[idx], subs[swap] = subs[swap], subs[idx]
|
|
for i, sub := range subs {
|
|
if sub.Priority != i {
|
|
if err := db.Model(sub).Update("priority", i).Error; err != nil {
|
|
return err
|
|
}
|
|
}
|
|
}
|
|
return nil
|
|
}
|
|
|
|
// AllActiveOutboundTags returns only the tags of active subscription outbounds.
|
|
// Useful for populating balancer / routing selectors without shipping full objects.
|
|
func (s *OutboundSubscriptionService) AllActiveOutboundTags() ([]string, error) {
|
|
obs, err := s.AllActiveOutbounds()
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
tags := make([]string, 0, len(obs))
|
|
for _, o := range obs {
|
|
if m, ok := o.(map[string]any); ok {
|
|
if t, _ := m["tag"].(string); t != "" {
|
|
tags = append(tags, t)
|
|
}
|
|
}
|
|
}
|
|
return tags, nil
|
|
}
|
|
|
|
/*
|
|
Tag stability strategy (important for balancers and routing rules)
|
|
|
|
When a subscription is refreshed we try very hard to keep the *same* tag for the
|
|
same logical outbound so that existing balancers and routing rules keep working.
|
|
|
|
How we do it:
|
|
- On every successful parse we compute a stable "identity" for each link
|
|
(the core of the URI with the remark fragment removed, or for vmess the inner
|
|
JSON without the "ps" field).
|
|
- We persist a map identity -> tag in the LinkIdentities column.
|
|
- On the next refresh, if we see the same identity again we reuse the previous tag,
|
|
even if the remark changed or minor parameters moved.
|
|
- Only when we have never seen the identity before do we allocate a fresh tag
|
|
using the user-supplied TagPrefix + slug(remark) (or an index fallback).
|
|
- Within one refresh we still deduplicate with -N suffixes.
|
|
|
|
Consequences for balancers / routing:
|
|
- If you use an *exact* tag in a balancer selector or a routing rule, that
|
|
specific server will continue to be used after refreshes (as long as the
|
|
provider still returns a link that produces the same identity).
|
|
- If you use a *prefix/wildcard* selector (e.g. "hk-*", "sg-.*"), then any
|
|
*new* servers that the subscription later returns will automatically be
|
|
eligible for that balancer on the next Xray reload — this is the recommended
|
|
way to "subscribe to a pool".
|
|
- When a server disappears from the subscription, its tag simply stops
|
|
existing in the final outbounds array. The balancer will have fewer
|
|
candidates. If you configured a `fallbackTag` on the balancer, Xray will use
|
|
it. Otherwise connections that would have used the missing member may fail
|
|
or be routed by the next rule.
|
|
- If the provider rotates credentials/UUIDs/hosts for a server, the identity
|
|
changes → we treat it as a brand new outbound and give it a new tag. Any
|
|
balancer/rule that referenced the *old* tag will no longer see it. This is
|
|
an inherent limitation of subscription-based outbounds.
|
|
|
|
We deliberately do *not* mutate the saved xrayTemplateConfig. Subscription
|
|
outbounds are always injected at runtime in GetXrayConfig.
|
|
*/
|