-
-
-
-
- 
-
+
+
+ 
+
+
-
+
+
+
+
+
-
+- USDT (TRC20): `TXncxkvhkDWGts487Pjqq1qT9JmwRUz8CC`
+- MATIC (polygon): `0x41C9548675D044c6Bfb425786C765bc37427256A`
+- LTC (Litecoin): `ltc1q2ach7x6d2zq0n4l0t4zl7d7xe2s6fs7a3vspwv`
## Estrellas a lo Largo del Tiempo
diff --git a/README.fa_IR.md b/README.fa_IR.md
index 94165260..2b2dc5ec 100644
--- a/README.fa_IR.md
+++ b/README.fa_IR.md
@@ -7,13 +7,11 @@
-[](https://github.com/MHSanaei/3x-ui/releases)
-[](https://github.com/MHSanaei/3x-ui/actions)
-[](#)
-[](https://github.com/MHSanaei/3x-ui/releases/latest)
-[](https://www.gnu.org/licenses/gpl-3.0.en.html)
-[](https://pkg.go.dev/github.com/mhsanaei/3x-ui/v2)
-[](https://goreportcard.com/report/github.com/mhsanaei/3x-ui/v2)
+[](https://github.com/MHSanaei/3x-ui/releases)
+[](https://github.com/MHSanaei/3x-ui/actions)
+[](#)
+[](https://github.com/MHSanaei/3x-ui/releases/latest)
+[](https://www.gnu.org/licenses/gpl-3.0.en.html)
**3X-UI** — یک پنل کنترل پیشرفته مبتنی بر وب با کد باز که برای مدیریت سرور Xray-core طراحی شده است. این پنل یک رابط کاربری آسان برای پیکربندی و نظارت بر پروتکلهای مختلف VPN و پراکسی ارائه میدهد.
@@ -43,14 +41,15 @@ bash <(curl -Ls https://raw.githubusercontent.com/mhsanaei/3x-ui/master/install.
**اگر این پروژه برای شما مفید است، میتوانید به آن یک**:star2: بدهید
-
-
-
+
+
+
+
+
-
+- USDT (TRC20): `TXncxkvhkDWGts487Pjqq1qT9JmwRUz8CC`
+- MATIC (polygon): `0x41C9548675D044c6Bfb425786C765bc37427256A`
+- LTC (Litecoin): `ltc1q2ach7x6d2zq0n4l0t4zl7d7xe2s6fs7a3vspwv`
## ستارهها در طول زمان
diff --git a/README.md b/README.md
index 9d20850e..7cda8370 100644
--- a/README.md
+++ b/README.md
@@ -7,13 +7,11 @@
-[](https://github.com/MHSanaei/3x-ui/releases)
-[](https://github.com/MHSanaei/3x-ui/actions)
-[](#)
-[](https://github.com/MHSanaei/3x-ui/releases/latest)
-[](https://www.gnu.org/licenses/gpl-3.0.en.html)
-[](https://pkg.go.dev/github.com/mhsanaei/3x-ui/v2)
-[](https://goreportcard.com/report/github.com/mhsanaei/3x-ui/v2)
+[](https://github.com/MHSanaei/3x-ui/releases)
+[](https://github.com/MHSanaei/3x-ui/actions)
+[](#)
+[](https://github.com/MHSanaei/3x-ui/releases/latest)
+[](https://www.gnu.org/licenses/gpl-3.0.en.html)
**3X-UI** — advanced, open-source web-based control panel designed for managing Xray-core server. It offers a user-friendly interface for configuring and monitoring various VPN and proxy protocols.
@@ -43,14 +41,15 @@ For full documentation, please visit the [project Wiki](https://github.com/MHSan
**If this project is helpful to you, you may wish to give it a**:star2:
-
-
-
+
+
+
+
+
-
+- USDT (TRC20): `TXncxkvhkDWGts487Pjqq1qT9JmwRUz8CC`
+- MATIC (polygon): `0x41C9548675D044c6Bfb425786C765bc37427256A`
+- LTC (Litecoin): `ltc1q2ach7x6d2zq0n4l0t4zl7d7xe2s6fs7a3vspwv`
## Stargazers over Time
diff --git a/README.ru_RU.md b/README.ru_RU.md
index 6623a801..d971f403 100644
--- a/README.ru_RU.md
+++ b/README.ru_RU.md
@@ -7,13 +7,11 @@
-[](https://github.com/MHSanaei/3x-ui/releases)
-[](https://github.com/MHSanaei/3x-ui/actions)
-[](#)
-[](https://github.com/MHSanaei/3x-ui/releases/latest)
-[](https://www.gnu.org/licenses/gpl-3.0.en.html)
-[](https://pkg.go.dev/github.com/mhsanaei/3x-ui/v2)
-[](https://goreportcard.com/report/github.com/mhsanaei/3x-ui/v2)
+[](https://github.com/MHSanaei/3x-ui/releases)
+[](https://github.com/MHSanaei/3x-ui/actions)
+[](#)
+[](https://github.com/MHSanaei/3x-ui/releases/latest)
+[](https://www.gnu.org/licenses/gpl-3.0.en.html)
**3X-UI** — продвинутая панель управления с открытым исходным кодом на основе веб-интерфейса, разработанная для управления сервером Xray-core. Предоставляет удобный интерфейс для настройки и мониторинга различных VPN и прокси-протоколов.
@@ -43,14 +41,15 @@ bash <(curl -Ls https://raw.githubusercontent.com/mhsanaei/3x-ui/master/install.
**Если этот проект полезен для вас, вы можете поставить ему**:star2:
-
-
-
+
+
+
+
+
-
+- USDT (TRC20): `TXncxkvhkDWGts487Pjqq1qT9JmwRUz8CC`
+- MATIC (polygon): `0x41C9548675D044c6Bfb425786C765bc37427256A`
+- LTC (Litecoin): `ltc1q2ach7x6d2zq0n4l0t4zl7d7xe2s6fs7a3vspwv`
## Звезды с течением времени
diff --git a/README.zh_CN.md b/README.zh_CN.md
index 6eb30ee0..75e75603 100644
--- a/README.zh_CN.md
+++ b/README.zh_CN.md
@@ -7,13 +7,11 @@
-[](https://github.com/MHSanaei/3x-ui/releases)
-[](https://github.com/MHSanaei/3x-ui/actions)
-[](#)
-[](https://github.com/MHSanaei/3x-ui/releases/latest)
-[](https://www.gnu.org/licenses/gpl-3.0.en.html)
-[](https://pkg.go.dev/github.com/mhsanaei/3x-ui/v2)
-[](https://goreportcard.com/report/github.com/mhsanaei/3x-ui/v2)
+[](https://github.com/MHSanaei/3x-ui/releases)
+[](https://github.com/MHSanaei/3x-ui/actions)
+[](#)
+[](https://github.com/MHSanaei/3x-ui/releases/latest)
+[](https://www.gnu.org/licenses/gpl-3.0.en.html)
**3X-UI** — 一个基于网页的高级开源控制面板，专为管理 Xray-core 服务器而设计。它提供了用户友好的界面，用于配置和监控各种 VPN 和代理协议。
@@ -43,14 +41,15 @@ bash <(curl -Ls https://raw.githubusercontent.com/mhsanaei/3x-ui/master/install.
**如果这个项目对您有帮助，您可以给它一个**:star2:
-
-
-
+
+
+
+
+
-
+- USDT (TRC20): `TXncxkvhkDWGts487Pjqq1qT9JmwRUz8CC`
+- MATIC (polygon): `0x41C9548675D044c6Bfb425786C765bc37427256A`
+- LTC (Litecoin): `ltc1q2ach7x6d2zq0n4l0t4zl7d7xe2s6fs7a3vspwv`
## 随时间变化的星标数
diff --git a/build/x-ui b/build/x-ui
new file mode 100644
index 00000000..a366972c
Binary files /dev/null and b/build/x-ui differ
diff --git a/config/config.go b/config/config.go
index 17c9a77f..70be5ae6 100644
--- a/config/config.go
+++ b/config/config.go
@@ -1,14 +1,9 @@
-// Package config provides configuration management utilities for the 3x-ui panel,
-// including version information, logging levels, database paths, and environment variable handling.
package config
import (
_ "embed"
"fmt"
- "io"
"os"
- "path/filepath"
- "runtime"
"strings"
)
@@ -18,29 +13,24 @@ var version string
//go:embed name
var name string
-// LogLevel represents the logging level for the application.
type LogLevel string
-// Logging level constants
const (
- Debug LogLevel = "debug"
- Info LogLevel = "info"
- Notice LogLevel = "notice"
- Warning LogLevel = "warning"
- Error LogLevel = "error"
+ Debug LogLevel = "debug"
+ Info LogLevel = "info"
+ Notice LogLevel = "notice"
+ Warn LogLevel = "warn"
+ Error LogLevel = "error"
)
-// GetVersion returns the version string of the 3x-ui application.
func GetVersion() string {
return strings.TrimSpace(version)
}
-// GetName returns the name of the 3x-ui application.
func GetName() string {
return strings.TrimSpace(name)
}
-// GetLogLevel returns the current logging level based on environment variables or defaults to Info.
func GetLogLevel() LogLevel {
if IsDebug() {
return Debug
@@ -52,12 +42,10 @@ func GetLogLevel() LogLevel {
return LogLevel(logLevel)
}
-// IsDebug returns true if debug mode is enabled via the XUI_DEBUG environment variable.
func IsDebug() bool {
return os.Getenv("XUI_DEBUG") == "true"
}
-// GetBinFolderPath returns the path to the binary folder, defaulting to "bin" if not set via XUI_BIN_FOLDER.
func GetBinFolderPath() string {
binFolderPath := os.Getenv("XUI_BIN_FOLDER")
if binFolderPath == "" {
@@ -66,91 +54,22 @@ func GetBinFolderPath() string {
return binFolderPath
}
-func getBaseDir() string {
- exePath, err := os.Executable()
- if err != nil {
- return "."
- }
- exeDir := filepath.Dir(exePath)
- exeDirLower := strings.ToLower(filepath.ToSlash(exeDir))
- if strings.Contains(exeDirLower, "/appdata/local/temp/") || strings.Contains(exeDirLower, "/go-build") {
- wd, err := os.Getwd()
- if err != nil {
- return "."
- }
- return wd
- }
- return exeDir
-}
-
-// GetDBFolderPath returns the path to the database folder based on environment variables or platform defaults.
func GetDBFolderPath() string {
dbFolderPath := os.Getenv("XUI_DB_FOLDER")
- if dbFolderPath != "" {
- return dbFolderPath
+ if dbFolderPath == "" {
+ dbFolderPath = "/etc/x-ui"
}
- if runtime.GOOS == "windows" {
- return getBaseDir()
- }
- return "/etc/x-ui"
+ return dbFolderPath
}
-// GetDBPath returns the full path to the database file.
func GetDBPath() string {
return fmt.Sprintf("%s/%s.db", GetDBFolderPath(), GetName())
}
-// GetLogFolder returns the path to the log folder based on environment variables or platform defaults.
func GetLogFolder() string {
logFolderPath := os.Getenv("XUI_LOG_FOLDER")
- if logFolderPath != "" {
- return logFolderPath
+ if logFolderPath == "" {
+ logFolderPath = "/var/log"
}
- if runtime.GOOS == "windows" {
- return filepath.Join(".", "log")
- }
- return "/var/log"
-}
-
-func copyFile(src, dst string) error {
- in, err := os.Open(src)
- if err != nil {
- return err
- }
- defer in.Close()
-
- out, err := os.Create(dst)
- if err != nil {
- return err
- }
- defer out.Close()
-
- _, err = io.Copy(out, in)
- if err != nil {
- return err
- }
-
- return out.Sync()
-}
-
-func init() {
- if runtime.GOOS != "windows" {
- return
- }
- if os.Getenv("XUI_DB_FOLDER") != "" {
- return
- }
- oldDBFolder := "/etc/x-ui"
- oldDBPath := fmt.Sprintf("%s/%s.db", oldDBFolder, GetName())
- newDBFolder := GetDBFolderPath()
- newDBPath := fmt.Sprintf("%s/%s.db", newDBFolder, GetName())
- _, err := os.Stat(newDBPath)
- if err == nil {
- return // new exists
- }
- _, err = os.Stat(oldDBPath)
- if os.IsNotExist(err) {
- return // old does not exist
- }
- _ = copyFile(oldDBPath, newDBPath) // ignore error
+ return logFolderPath
}
diff --git a/config/version b/config/version
index 0409c163..952f449f 100644
--- a/config/version
+++ b/config/version
@@ -1 +1 @@
-2.8.4
\ No newline at end of file
+2.6.6
\ No newline at end of file
diff --git a/database/db.go b/database/db.go
index 6de81d79..da420603 100644
--- a/database/db.go
+++ b/database/db.go
@@ -1,22 +1,18 @@
-// Package database provides database initialization, migration, and management utilities
-// for the 3x-ui panel using GORM with SQLite.
package database
import (
"bytes"
+ "fmt"
"io"
- "io/fs"
"log"
"os"
- "path"
- "slices"
- "github.com/mhsanaei/3x-ui/v2/config"
- "github.com/mhsanaei/3x-ui/v2/database/model"
- "github.com/mhsanaei/3x-ui/v2/util/crypto"
- "github.com/mhsanaei/3x-ui/v2/xray"
+ "x-ui/config"
+ "x-ui/database/model"
+ "x-ui/util/crypto"
+ "x-ui/xray"
- "gorm.io/driver/sqlite"
+ "gorm.io/driver/mysql"
"gorm.io/gorm"
"gorm.io/gorm/logger"
)
@@ -47,7 +43,6 @@ func initModels() error {
return nil
}
-// initUser creates a default admin user if the users table is empty.
func initUser() error {
empty, err := isTableEmpty("users")
if err != nil {
@@ -71,7 +66,15 @@ func initUser() error {
return nil
}
-// runSeeders migrates user passwords to bcrypt and records seeder execution to prevent re-running.
+func contains(slice []string, item string) bool {
+ for _, s := range slice {
+ if s == item {
+ return s == item
+ }
+ }
+ return false
+}
+
func runSeeders(isUsersEmpty bool) error {
empty, err := isTableEmpty("history_of_seeders")
if err != nil {
@@ -88,7 +91,7 @@ func runSeeders(isUsersEmpty bool) error {
var seedersHistory []string
db.Model(&model.HistoryOfSeeders{}).Pluck("seeder_name", &seedersHistory)
- if !slices.Contains(seedersHistory, "UserPasswordHash") && !isUsersEmpty {
+ if !contains(seedersHistory, "UserPasswordHash") && !isUsersEmpty {
var users []model.User
db.Find(&users)
@@ -111,21 +114,13 @@ func runSeeders(isUsersEmpty bool) error {
return nil
}
-// isTableEmpty returns true if the named table contains zero rows.
func isTableEmpty(tableName string) (bool, error) {
var count int64
err := db.Table(tableName).Count(&count).Error
return count == 0, err
}
-// InitDB sets up the database connection, migrates models, and runs seeders.
func InitDB(dbPath string) error {
- dir := path.Dir(dbPath)
- err := os.MkdirAll(dir, fs.ModePerm)
- if err != nil {
- return err
- }
-
var gormLogger logger.Interface
if config.IsDebug() {
@@ -134,12 +129,25 @@ func InitDB(dbPath string) error {
gormLogger = logger.Discard
}
- c := &gorm.Config{
- Logger: gormLogger,
+ dbHost := os.Getenv("DB_HOST")
+ dbPort := os.Getenv("DB_PORT")
+ dbName := os.Getenv("DB_NAME")
+ dbUser := os.Getenv("DB_USER")
+ dbPass := os.Getenv("DB_PASSWORD")
+
+ if dbHost == "" || dbPort == "" || dbName == "" || dbUser == "" || dbPass == "" {
+ return fmt.Errorf("missing database configuration environment variables")
}
- db, err = gorm.Open(sqlite.Open(dbPath), c)
+
+ dsn := fmt.Sprintf("%s:%s@tcp(%s:%s)/%s?charset=utf8mb4&parseTime=True&loc=Local",
+ dbUser, dbPass, dbHost, dbPort, dbName)
+
+ var err error
+ db, err = gorm.Open(mysql.Open(dsn), &gorm.Config{
+ Logger: gormLogger,
+ })
if err != nil {
- return err
+ return fmt.Errorf("failed to connect to database: %v", err)
}
if err := initModels(); err != nil {
@@ -154,10 +162,10 @@ func InitDB(dbPath string) error {
if err := initUser(); err != nil {
return err
}
+
return runSeeders(isUsersEmpty)
}
-// CloseDB closes the database connection if it exists.
func CloseDB() error {
if db != nil {
sqlDB, err := db.DB()
@@ -169,17 +177,14 @@ func CloseDB() error {
return nil
}
-// GetDB returns the global GORM database instance.
func GetDB() *gorm.DB {
return db
}
-// IsNotFound checks if the given error is a GORM record not found error.
func IsNotFound(err error) bool {
return err == gorm.ErrRecordNotFound
}
-// IsSQLiteDB checks if the given file is a valid SQLite database by reading its signature.
func IsSQLiteDB(file io.ReaderAt) (bool, error) {
signature := []byte("SQLite format 3\x00")
buf := make([]byte, len(signature))
@@ -190,12 +195,7 @@ func IsSQLiteDB(file io.ReaderAt) (bool, error) {
return bytes.Equal(buf, signature), nil
}
-// Checkpoint performs a WAL checkpoint on the SQLite database to ensure data consistency.
func Checkpoint() error {
- // Update WAL
- err := db.Exec("PRAGMA wal_checkpoint;").Error
- if err != nil {
- return err
- }
+ // MariaDB doesn't need WAL checkpoint
return nil
}
diff --git a/database/model/model.go b/database/model/model.go
index 4ca39d87..0e8d4951 100644
--- a/database/model/model.go
+++ b/database/model/model.go
@@ -1,51 +1,43 @@
-// Package model defines the database models and data structures used by the 3x-ui panel.
package model
import (
"fmt"
- "github.com/mhsanaei/3x-ui/v2/util/json_util"
- "github.com/mhsanaei/3x-ui/v2/xray"
+ "x-ui/util/json_util"
+ "x-ui/xray"
)
-// Protocol represents the protocol type for Xray inbounds.
type Protocol string
-// Protocol constants for different Xray inbound protocols
const (
VMESS Protocol = "vmess"
VLESS Protocol = "vless"
- Tunnel Protocol = "tunnel"
+ DOKODEMO Protocol = "dokodemo-door"
HTTP Protocol = "http"
Trojan Protocol = "trojan"
Shadowsocks Protocol = "shadowsocks"
- Mixed Protocol = "mixed"
+ Socks Protocol = "socks"
WireGuard Protocol = "wireguard"
)
-// User represents a user account in the 3x-ui panel.
type User struct {
Id int `json:"id" gorm:"primaryKey;autoIncrement"`
Username string `json:"username"`
Password string `json:"password"`
}
-// Inbound represents an Xray inbound configuration with traffic statistics and settings.
type Inbound struct {
- Id int `json:"id" form:"id" gorm:"primaryKey;autoIncrement"` // Unique identifier
- UserId int `json:"-"` // Associated user ID
- Up int64 `json:"up" form:"up"` // Upload traffic in bytes
- Down int64 `json:"down" form:"down"` // Download traffic in bytes
- Total int64 `json:"total" form:"total"` // Total traffic limit in bytes
- AllTime int64 `json:"allTime" form:"allTime" gorm:"default:0"` // All-time traffic usage
- Remark string `json:"remark" form:"remark"` // Human-readable remark
- Enable bool `json:"enable" form:"enable" gorm:"index:idx_enable_traffic_reset,priority:1"` // Whether the inbound is enabled
- ExpiryTime int64 `json:"expiryTime" form:"expiryTime"` // Expiration timestamp
- TrafficReset string `json:"trafficReset" form:"trafficReset" gorm:"default:never;index:idx_enable_traffic_reset,priority:2"` // Traffic reset schedule
- LastTrafficResetTime int64 `json:"lastTrafficResetTime" form:"lastTrafficResetTime" gorm:"default:0"` // Last traffic reset timestamp
- ClientStats []xray.ClientTraffic `gorm:"foreignKey:InboundId;references:Id" json:"clientStats" form:"clientStats"` // Client traffic statistics
+ Id int `json:"id" form:"id" gorm:"primaryKey;autoIncrement"`
+ UserId int `json:"-"`
+ Up int64 `json:"up" form:"up"`
+ Down int64 `json:"down" form:"down"`
+ Total int64 `json:"total" form:"total"`
+ Remark string `json:"remark" form:"remark"`
+ Enable bool `json:"enable" form:"enable"`
+ ExpiryTime int64 `json:"expiryTime" form:"expiryTime"`
+ ClientStats []xray.ClientTraffic `gorm:"foreignKey:InboundId;references:Id" json:"clientStats" form:"clientStats"`
- // Xray configuration fields
+ // config part
Listen string `json:"listen" form:"listen"`
Port int `json:"port" form:"port"`
Protocol Protocol `json:"protocol" form:"protocol"`
@@ -53,9 +45,9 @@ type Inbound struct {
StreamSettings string `json:"streamSettings" form:"streamSettings"`
Tag string `json:"tag" form:"tag" gorm:"unique"`
Sniffing string `json:"sniffing" form:"sniffing"`
+ Allocate string `json:"allocate" form:"allocate"`
}
-// OutboundTraffics tracks traffic statistics for Xray outbound connections.
type OutboundTraffics struct {
Id int `json:"id" form:"id" gorm:"primaryKey;autoIncrement"`
Tag string `json:"tag" form:"tag" gorm:"unique"`
@@ -64,20 +56,17 @@ type OutboundTraffics struct {
Total int64 `json:"total" form:"total" gorm:"default:0"`
}
-// InboundClientIps stores IP addresses associated with inbound clients for access control.
type InboundClientIps struct {
Id int `json:"id" gorm:"primaryKey;autoIncrement"`
ClientEmail string `json:"clientEmail" form:"clientEmail" gorm:"unique"`
Ips string `json:"ips" form:"ips"`
}
-// HistoryOfSeeders tracks which database seeders have been executed to prevent re-running.
type HistoryOfSeeders struct {
Id int `json:"id" gorm:"primaryKey;autoIncrement"`
SeederName string `json:"seederName"`
}
-// GenXrayInboundConfig generates an Xray inbound configuration from the Inbound model.
func (i *Inbound) GenXrayInboundConfig() *xray.InboundConfig {
listen := i.Listen
if listen != "" {
@@ -91,31 +80,30 @@ func (i *Inbound) GenXrayInboundConfig() *xray.InboundConfig {
StreamSettings: json_util.RawMessage(i.StreamSettings),
Tag: i.Tag,
Sniffing: json_util.RawMessage(i.Sniffing),
+ Allocate: json_util.RawMessage(i.Allocate),
}
}
-// Setting stores key-value configuration settings for the 3x-ui panel.
type Setting struct {
- Id int `json:"id" form:"id" gorm:"primaryKey;autoIncrement"`
- Key string `json:"key" form:"key"`
- Value string `json:"value" form:"value"`
+ ID uint `gorm:"primaryKey"`
+ Key string `gorm:"column:key"`
+ Value string
}
-// Client represents a client configuration for Xray inbounds with traffic limits and settings.
+
+
type Client struct {
- ID string `json:"id"` // Unique client identifier
- Security string `json:"security"` // Security method (e.g., "auto", "aes-128-gcm")
- Password string `json:"password"` // Client password
- Flow string `json:"flow"` // Flow control (XTLS)
- Email string `json:"email"` // Client email identifier
- LimitIP int `json:"limitIp"` // IP limit for this client
- TotalGB int64 `json:"totalGB" form:"totalGB"` // Total traffic limit in GB
- ExpiryTime int64 `json:"expiryTime" form:"expiryTime"` // Expiration timestamp
- Enable bool `json:"enable" form:"enable"` // Whether the client is enabled
- TgID int64 `json:"tgId" form:"tgId"` // Telegram user ID for notifications
- SubID string `json:"subId" form:"subId"` // Subscription identifier
- Comment string `json:"comment" form:"comment"` // Client comment
- Reset int `json:"reset" form:"reset"` // Reset period in days
- CreatedAt int64 `json:"created_at,omitempty"` // Creation timestamp
- UpdatedAt int64 `json:"updated_at,omitempty"` // Last update timestamp
+ ID string `json:"id"`
+ Security string `json:"security"`
+ Password string `json:"password"`
+ Flow string `json:"flow"`
+ Email string `json:"email"`
+ LimitIP int `json:"limitIp"`
+ TotalGB int64 `json:"totalGB" form:"totalGB"`
+ ExpiryTime int64 `json:"expiryTime" form:"expiryTime"`
+ Enable bool `json:"enable" form:"enable"`
+ TgID int64 `json:"tgId" form:"tgId"`
+ SubID string `json:"subId" form:"subId"`
+ Comment string `json:"comment" form:"comment"`
+ Reset int `json:"reset" form:"reset"`
}
diff --git a/docker-compose.yml b/docker-compose.yml
index 198df198..fac94d3b 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,16 +1,131 @@
+# services:
+# # mysql1:
+# # image: mysql:8.0
+# # container_name: 3xui1_db
+# # environment:
+# # MYSQL_ROOT_PASSWORD: your_root_password
+# # MYSQL_DATABASE: x_ui_db
+# # MYSQL_USER: x_ui_user
+# # MYSQL_PASSWORD: your_password
+# # volumes:
+# # - mysql_data:/var/lib/mysql
+# # restart: unless-stopped
+# # ports:
+# # - "3307:3306"
+
+# 3xui1:
+# build:
+# context: .
+# dockerfile: ./Dockerfile
+# container_name: 3xui1_app
+# volumes:
+# - $PWD/cert/:/root/cert/
+# environment:
+# XRAY_VMESS_AEAD_FORCED: "false"
+# XUI_ENABLE_FAIL2BAN: "true"
+# DB_HOST:
+# DB_PORT: 3306
+# DB_NAME: x_ui_db
+# DB_USER: x_ui_user
+# DB_PASSWORD: your_password
+# tty: true
+# # depends_on:
+# # - mysql
+# networks:
+# - default
+
+# ports:
+# - "20531:2053"
+# - "20541:2054"
+# restart: unless-stopped
+
+# volumes:
+# mysql_data:
+
+
+# networks:
+# default:
+# driver: bridge
+version: "3.9"
+
services:
- 3xui:
+ mysql1:
+ image: mysql:8.0
+ container_name: 3xui1_db
+ environment:
+ MYSQL_ROOT_PASSWORD: your_root_password
+ MYSQL_DATABASE: x_ui_db
+ MYSQL_USER: x_ui_user
+ MYSQL_PASSWORD: your_password
+ volumes:
+ - mysql_data:/var/lib/mysql
+ restart: unless-stopped
+ ports:
+ - "3307:3306"
+ networks:
+ - default
+
+ 3xui1:
build:
context: .
dockerfile: ./Dockerfile
- container_name: 3xui_app
- # hostname: yourhostname <- optional
+ container_name: 3xui1_app
volumes:
- - $PWD/db/:/etc/x-ui/
- - $PWD/cert/:/root/cert/
+ - ./cert/:/root/cert/
environment:
XRAY_VMESS_AEAD_FORCED: "false"
XUI_ENABLE_FAIL2BAN: "true"
+ DB_HOST: mysql1
+ DB_PORT: 3306
+ DB_NAME: x_ui_db
+ DB_USER: x_ui_user
+ DB_PASSWORD: your_password
tty: true
- network_mode: host
+ depends_on:
+ - mysql1
+ networks:
+ - default
+ ports:
+ - "20531:2053"
+ - "20541:2054"
restart: unless-stopped
+
+ ldap:
+ image: osixia/openldap:1.5.0
+ container_name: ldap_server
+ environment:
+ LDAP_ORGANISATION: "TestOrg"
+ LDAP_DOMAIN: "test.local"
+ LDAP_ADMIN_PASSWORD: admin
+ ports:
+ - "389:389"
+ - "636:636"
+ volumes:
+ - ldap_data:/var/lib/ldap
+ - ldap_config:/etc/ldap/slapd.d
+ restart: unless-stopped
+ networks:
+ - default
+
+ phpldapadmin:
+ image: osixia/phpldapadmin:0.9.0
+ container_name: ldap_admin
+ environment:
+ PHPLDAPADMIN_LDAP_HOSTS: ldap
+ PHPLDAPADMIN_HTTPS: "false"
+ ports:
+ - "8080:80"
+ depends_on:
+ - ldap
+ restart: unless-stopped
+ networks:
+ - default
+
+volumes:
+ mysql_data:
+ ldap_data:
+ ldap_config:
+
+networks:
+ default:
+ driver: bridge
diff --git a/go.mod b/go.mod
index daf1d537..62c83589 100644
--- a/go.mod
+++ b/go.mod
@@ -1,49 +1,52 @@
-module github.com/mhsanaei/3x-ui/v2
+module x-ui
-go 1.25.1
+go 1.24
+
+toolchain go1.24.6
require (
github.com/gin-contrib/gzip v1.2.3
github.com/gin-contrib/sessions v1.0.4
- github.com/gin-gonic/gin v1.11.0
+ github.com/gin-gonic/gin v1.10.1
+ github.com/go-ldap/ldap/v3 v3.4.7
github.com/goccy/go-json v0.10.5
github.com/google/uuid v1.6.0
github.com/joho/godotenv v1.5.1
- github.com/mymmrac/telego v1.3.0
+ github.com/mymmrac/telego v0.32.0
github.com/nicksnyder/go-i18n/v2 v2.6.0
github.com/op/go-logging v0.0.0-20160315200505-970db520ece7
github.com/pelletier/go-toml/v2 v2.2.4
github.com/robfig/cron/v3 v3.0.1
- github.com/shirou/gopsutil/v4 v4.25.8
- github.com/skip2/go-qrcode v0.0.0-20200617195104-da1b6568686e
- github.com/valyala/fasthttp v1.66.0
+ github.com/shirou/gopsutil/v4 v4.25.7
+ github.com/valyala/fasthttp v1.64.0
github.com/xlzd/gotp v0.1.0
- github.com/xtls/xray-core v1.250911.0
+ github.com/xtls/xray-core v1.250803.0
go.uber.org/atomic v1.11.0
- golang.org/x/crypto v0.42.0
- golang.org/x/sys v0.36.0
- golang.org/x/text v0.29.0
- google.golang.org/grpc v1.75.1
- gorm.io/driver/sqlite v1.6.0
- gorm.io/gorm v1.31.0
+ golang.org/x/crypto v0.40.0
+ golang.org/x/text v0.27.0
+ google.golang.org/grpc v1.74.2
+ gorm.io/driver/mysql v1.5.2
+ gorm.io/gorm v1.30.1
)
require (
+ github.com/Azure/go-ntlmssp v0.0.0-20221128193559-754e69321358 // indirect
github.com/andybalholm/brotli v1.2.0 // indirect
- github.com/bytedance/gopkg v0.1.3 // indirect
- github.com/bytedance/sonic v1.14.1 // indirect
+ github.com/bytedance/sonic v1.14.0 // indirect
github.com/bytedance/sonic/loader v0.3.0 // indirect
github.com/cloudflare/circl v1.6.1 // indirect
- github.com/cloudwego/base64x v0.1.6 // indirect
+ github.com/cloudwego/base64x v0.1.5 // indirect
github.com/dgryski/go-metro v0.0.0-20250106013310-edb8663e5e33 // indirect
- github.com/ebitengine/purego v0.9.0 // indirect
- github.com/gabriel-vasile/mimetype v1.4.10 // indirect
+ github.com/ebitengine/purego v0.8.4 // indirect
+ github.com/fasthttp/router v1.5.4 // indirect
+ github.com/gabriel-vasile/mimetype v1.4.9 // indirect
github.com/gin-contrib/sse v1.1.0 // indirect
+ github.com/go-asn1-ber/asn1-ber v1.5.5 // indirect
github.com/go-ole/go-ole v1.3.0 // indirect
github.com/go-playground/locales v0.14.1 // indirect
github.com/go-playground/universal-translator v0.18.1 // indirect
github.com/go-playground/validator/v10 v10.27.0 // indirect
- github.com/goccy/go-yaml v1.18.0 // indirect
+ github.com/go-sql-driver/mysql v1.7.0 // indirect
github.com/google/btree v1.1.3 // indirect
github.com/gorilla/context v1.1.2 // indirect
github.com/gorilla/securecookie v1.1.2 // indirect
@@ -58,9 +61,8 @@ require (
github.com/klauspost/cpuid/v2 v2.3.0 // indirect
github.com/kr/text v0.2.0 // indirect
github.com/leodido/go-urn v1.4.0 // indirect
- github.com/lufia/plan9stats v0.0.0-20250827001030-24949be3fa54 // indirect
+ github.com/lufia/plan9stats v0.0.0-20250317134145-8bc96cf8fc35 // indirect
github.com/mattn/go-isatty v0.0.20 // indirect
- github.com/mattn/go-sqlite3 v1.14.32 // indirect
github.com/miekg/dns v1.1.68 // indirect
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
github.com/modern-go/reflect2 v1.0.2 // indirect
@@ -71,8 +73,9 @@ require (
github.com/refraction-networking/utls v1.8.0 // indirect
github.com/riobard/go-bloom v0.0.0-20200614022211-cdc8013cb5b3 // indirect
github.com/rogpeppe/go-internal v1.14.1 // indirect
- github.com/sagernet/sing v0.7.10 // indirect
- github.com/sagernet/sing-shadowsocks v0.2.9 // indirect
+ github.com/sagernet/sing v0.6.6 // indirect
+ github.com/sagernet/sing-shadowsocks v0.2.7 // indirect
+ github.com/savsgio/gotils v0.0.0-20250408102913-196191ec6287 // indirect
github.com/seiflotfy/cuckoofilter v0.0.0-20240715131351-a2f2c23f1771 // indirect
github.com/tklauser/go-sysconf v0.3.15 // indirect
github.com/tklauser/numcpus v0.10.0 // indirect
@@ -83,20 +86,22 @@ require (
github.com/valyala/fastjson v1.6.4 // indirect
github.com/vishvananda/netlink v1.3.1 // indirect
github.com/vishvananda/netns v0.0.5 // indirect
- github.com/xtls/reality v0.0.0-20250904214705-431b6ff8c67c // indirect
+ github.com/xtls/reality v0.0.0-20250727231020-de3bb4d08f5a // indirect
github.com/yusufpapurcu/wmi v1.2.4 // indirect
- go.uber.org/mock v0.6.0 // indirect
+ go.uber.org/mock v0.5.2 // indirect
go4.org/netipx v0.0.0-20231129151722-fdeea329fbba // indirect
- golang.org/x/arch v0.21.0 // indirect
- golang.org/x/mod v0.28.0 // indirect
- golang.org/x/net v0.44.0 // indirect
- golang.org/x/sync v0.17.0 // indirect
- golang.org/x/time v0.13.0 // indirect
- golang.org/x/tools v0.37.0 // indirect
+ golang.org/x/arch v0.19.0 // indirect
+ golang.org/x/mod v0.26.0 // indirect
+ golang.org/x/net v0.42.0 // indirect
+ golang.org/x/sync v0.16.0 // indirect
+ golang.org/x/sys v0.34.0 // indirect
+ golang.org/x/time v0.12.0 // indirect
+ golang.org/x/tools v0.35.0 // indirect
golang.zx2c4.com/wintun v0.0.0-20230126152724-0fa3db229ce2 // indirect
- golang.zx2c4.com/wireguard v0.0.0-20250521234502-f333402bd9cb // indirect
- google.golang.org/genproto/googleapis/rpc v0.0.0-20250922171735-9219d122eba9 // indirect
- google.golang.org/protobuf v1.36.9 // indirect
- gvisor.dev/gvisor v0.0.0-20250503011706-39ed1f5ac29c // indirect
+ golang.zx2c4.com/wireguard v0.0.0-20231211153847-12269c276173 // indirect
+ google.golang.org/genproto/googleapis/rpc v0.0.0-20250728155136-f173205681a0 // indirect
+ google.golang.org/protobuf v1.36.6 // indirect
+ gopkg.in/yaml.v3 v3.0.1 // indirect
+ gvisor.dev/gvisor v0.0.0-20250428193742-2d800c3129d5 // indirect
lukechampine.com/blake3 v1.4.1 // indirect
)
diff --git a/go.sum b/go.sum
index a4610d2b..87dab94b 100644
--- a/go.sum
+++ b/go.sum
@@ -1,17 +1,21 @@
+github.com/Azure/go-ntlmssp v0.0.0-20221128193559-754e69321358 h1:mFRzDkZVAjdal+s7s0MwaRv9igoPqLRdzOLzw/8Xvq8=
+github.com/Azure/go-ntlmssp v0.0.0-20221128193559-754e69321358/go.mod h1:chxPXzSsl7ZWRAuOIE23GDNzjWuZquvFlgA8xmpunjU=
github.com/BurntSushi/toml v1.5.0 h1:W5quZX/G/csjUnuI8SUYlsHs9M38FC7znL0lIO+DvMg=
github.com/BurntSushi/toml v1.5.0/go.mod h1:ukJfTF/6rtPPRCnwkur4qwRxa8vTRFBF0uk2lLoLwho=
+github.com/alexbrainman/sspi v0.0.0-20231016080023-1a75b4708caa h1:LHTHcTQiSGT7VVbI0o4wBRNQIgn917usHWOd6VAffYI=
+github.com/alexbrainman/sspi v0.0.0-20231016080023-1a75b4708caa/go.mod h1:cEWa1LVoE5KvSD9ONXsZrj0z6KqySlCCNKHlLzbqAt4=
github.com/andybalholm/brotli v1.2.0 h1:ukwgCxwYrmACq68yiUqwIWnGY0cTPox/M94sVwToPjQ=
github.com/andybalholm/brotli v1.2.0/go.mod h1:rzTDkvFWvIrjDXZHkuS16NPggd91W3kUSvPlQ1pLaKY=
-github.com/bytedance/gopkg v0.1.3 h1:TPBSwH8RsouGCBcMBktLt1AymVo2TVsBVCY4b6TnZ/M=
-github.com/bytedance/gopkg v0.1.3/go.mod h1:576VvJ+eJgyCzdjS+c4+77QF3p7ubbtiKARP3TxducM=
-github.com/bytedance/sonic v1.14.1 h1:FBMC0zVz5XUmE4z9wF4Jey0An5FueFvOsTKKKtwIl7w=
-github.com/bytedance/sonic v1.14.1/go.mod h1:gi6uhQLMbTdeP0muCnrjHLeCUPyb70ujhnNlhOylAFc=
+github.com/bytedance/sonic v1.14.0 h1:/OfKt8HFw0kh2rj8N0F6C/qPGRESq0BbaNZgcNXXzQQ=
+github.com/bytedance/sonic v1.14.0/go.mod h1:WoEbx8WTcFJfzCe0hbmyTGrfjt8PzNEBdxlNUO24NhA=
+github.com/bytedance/sonic/loader v0.1.1/go.mod h1:ncP89zfokxS5LZrJxl5z0UJcsk4M4yY2JpfqGeCtNLU=
github.com/bytedance/sonic/loader v0.3.0 h1:dskwH8edlzNMctoruo8FPTJDF3vLtDT0sXZwvZJyqeA=
github.com/bytedance/sonic/loader v0.3.0/go.mod h1:N8A3vUdtUebEY2/VQC0MyhYeKUFosQU6FxH2JmUe6VI=
github.com/cloudflare/circl v1.6.1 h1:zqIqSPIndyBh1bjLVVDHMPpVKqp8Su/V+6MeDzzQBQ0=
github.com/cloudflare/circl v1.6.1/go.mod h1:uddAzsPgqdMAYatqJ0lsjX1oECcQLIlRpzZh3pJrofs=
-github.com/cloudwego/base64x v0.1.6 h1:t11wG9AECkCDk5fMSoxmufanudBtJ+/HemLstXDLI2M=
-github.com/cloudwego/base64x v0.1.6/go.mod h1:OFcloc187FXDaYHvrNIjxSe8ncn0OOM8gEHfghB2IPU=
+github.com/cloudwego/base64x v0.1.5 h1:XPciSp1xaq2VCSt6lF0phncD4koWyULpl5bUxbfCyP4=
+github.com/cloudwego/base64x v0.1.5/go.mod h1:0zlkT4Wn5C6NdauXdJRhSKRlJvmclQ1hhJgA0rcu/8w=
+github.com/cloudwego/iasm v0.2.0/go.mod h1:8rXZaNYT2n95jn+zTI1sDr+IgcD2GVs0nlbbQPiEFhY=
github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
@@ -19,10 +23,12 @@ github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSs
github.com/dgryski/go-metro v0.0.0-20200812162917-85c65e2d0165/go.mod h1:c9O8+fpSOX1DM8cPNSkX/qsBWdkD4yd2dpciOWQjpBw=
github.com/dgryski/go-metro v0.0.0-20250106013310-edb8663e5e33 h1:ucRHb6/lvW/+mTEIGbvhcYU3S8+uSNkuMjx/qZFfhtM=
github.com/dgryski/go-metro v0.0.0-20250106013310-edb8663e5e33/go.mod h1:c9O8+fpSOX1DM8cPNSkX/qsBWdkD4yd2dpciOWQjpBw=
-github.com/ebitengine/purego v0.9.0 h1:mh0zpKBIXDceC63hpvPuGLiJ8ZAa3DfrFTudmfi8A4k=
-github.com/ebitengine/purego v0.9.0/go.mod h1:iIjxzd6CiRiOG0UyXP+V1+jWqUXVjPKLAI0mRfJZTmQ=
-github.com/gabriel-vasile/mimetype v1.4.10 h1:zyueNbySn/z8mJZHLt6IPw0KoZsiQNszIpU+bX4+ZK0=
-github.com/gabriel-vasile/mimetype v1.4.10/go.mod h1:d+9Oxyo1wTzWdyVUPMmXFvp4F9tea18J8ufA774AB3s=
+github.com/ebitengine/purego v0.8.4 h1:CF7LEKg5FFOsASUj0+QwaXf8Ht6TlFxg09+S9wz0omw=
+github.com/ebitengine/purego v0.8.4/go.mod h1:iIjxzd6CiRiOG0UyXP+V1+jWqUXVjPKLAI0mRfJZTmQ=
+github.com/fasthttp/router v1.5.4 h1:oxdThbBwQgsDIYZ3wR1IavsNl6ZS9WdjKukeMikOnC8=
+github.com/fasthttp/router v1.5.4/go.mod h1:3/hysWq6cky7dTfzaaEPZGdptwjwx0qzTgFCKEWRjgc=
+github.com/gabriel-vasile/mimetype v1.4.9 h1:5k+WDwEsD9eTLL8Tz3L0VnmVh9QxGjRmjBvAG7U/oYY=
+github.com/gabriel-vasile/mimetype v1.4.9/go.mod h1:WnSQhFKJuBlRyLiKohA/2DtIlPFAbguNaG7QCHcyGok=
github.com/ghodss/yaml v1.0.1-0.20220118164431-d8423dcdf344 h1:Arcl6UOIS/kgO2nW3A65HN+7CMjSDP/gofXL4CZt1V4=
github.com/ghodss/yaml v1.0.1-0.20220118164431-d8423dcdf344/go.mod h1:GIjDIg/heH5DOkXY3YJ/wNhfHsQHoXGjl8G8amsYQ1I=
github.com/gin-contrib/gzip v1.2.3 h1:dAhT722RuEG330ce2agAs75z7yB+NKvX/ZM1r8w0u2U=
@@ -31,8 +37,12 @@ github.com/gin-contrib/sessions v1.0.4 h1:ha6CNdpYiTOK/hTp05miJLbpTSNfOnFg5Jm2kb
github.com/gin-contrib/sessions v1.0.4/go.mod h1:ccmkrb2z6iU2osiAHZG3x3J4suJK+OU27oqzlWOqQgs=
github.com/gin-contrib/sse v1.1.0 h1:n0w2GMuUpWDVp7qSpvze6fAu9iRxJY4Hmj6AmBOU05w=
github.com/gin-contrib/sse v1.1.0/go.mod h1:hxRZ5gVpWMT7Z0B0gSNYqqsSCNIJMjzvm6fqCz9vjwM=
-github.com/gin-gonic/gin v1.11.0 h1:OW/6PLjyusp2PPXtyxKHU0RbX6I/l28FTdDlae5ueWk=
-github.com/gin-gonic/gin v1.11.0/go.mod h1:+iq/FyxlGzII0KHiBGjuNn4UNENUlKbGlNmc+W50Dls=
+github.com/gin-gonic/gin v1.10.1 h1:T0ujvqyCSqRopADpgPgiTT63DUQVSfojyME59Ei63pQ=
+github.com/gin-gonic/gin v1.10.1/go.mod h1:4PMNQiOhvDRa013RKVbsiNwoyezlm2rm0uX/T7kzp5Y=
+github.com/go-asn1-ber/asn1-ber v1.5.5 h1:MNHlNMBDgEKD4TcKr36vQN68BA00aDfjIt3/bD50WnA=
+github.com/go-asn1-ber/asn1-ber v1.5.5/go.mod h1:hEBeB/ic+5LoWskz+yKT7vGhhPYkProFKoKdwZRWMe0=
+github.com/go-ldap/ldap/v3 v3.4.7 h1:3Hbd7mIB1qjd3Ra59fI3JYea/t5kykFu2CVHBca9koE=
+github.com/go-ldap/ldap/v3 v3.4.7/go.mod h1:qS3Sjlu76eHfHGpUdWkAXQTw4beih+cHsco2jXlIXrk=
github.com/go-logr/logr v1.4.3 h1:CjnDlHq8ikf6E492q6eKboGOC0T8CDaOvkHCIg8idEI=
github.com/go-logr/logr v1.4.3/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY=
github.com/go-logr/stdr v1.2.2 h1:hSWxHoqTgW2S2qGc0LTAI563KZ5YKYRhT3MFKZMbjag=
@@ -48,10 +58,10 @@ github.com/go-playground/universal-translator v0.18.1 h1:Bcnm0ZwsGyWbCzImXv+pAJn
github.com/go-playground/universal-translator v0.18.1/go.mod h1:xekY+UJKNuX9WP91TpwSH2VMlDf28Uj24BCp08ZFTUY=
github.com/go-playground/validator/v10 v10.27.0 h1:w8+XrWVMhGkxOaaowyKH35gFydVHOvC0/uWoy2Fzwn4=
github.com/go-playground/validator/v10 v10.27.0/go.mod h1:I5QpIEbmr8On7W0TktmJAumgzX4CA1XNl4ZmDuVHKKo=
+github.com/go-sql-driver/mysql v1.7.0 h1:ueSltNNllEqE3qcWBTD0iQd3IpL/6U+mJxLkazJ7YPc=
+github.com/go-sql-driver/mysql v1.7.0/go.mod h1:OXbVy3sEdcQ2Doequ6Z5BW6fXNQTmx+9S1MCJN5yJMI=
github.com/goccy/go-json v0.10.5 h1:Fq85nIqj+gXn/S5ahsiTlK3TmC85qgirsdTP/+DeaC4=
github.com/goccy/go-json v0.10.5/go.mod h1:oq7eo15ShAhp70Anwd5lgX2pLfOS3QCiwU/PULtXL6M=
-github.com/goccy/go-yaml v1.18.0 h1:8W7wMFS12Pcas7KU+VVkaiCng+kG8QiFeFwzFb+rwuw=
-github.com/goccy/go-yaml v1.18.0/go.mod h1:XBurs7gK8ATbW4ZPGKgcbrY1Br56PdM69F7LkFRi1kA=
github.com/golang/mock v1.7.0-rc.1 h1:YojYx61/OLFsiv6Rw1Z96LpldJIy31o+UHmwAUMJ6/U=
github.com/golang/mock v1.7.0-rc.1/go.mod h1:s42URUywIqd+OcERslBJvOjepvNymP31m3q8d/GkuRs=
github.com/golang/protobuf v1.5.4 h1:i7eJL8qZTpSEXOPTxNKhASYpMn+8e5Q6AdndVa1dWek=
@@ -67,14 +77,31 @@ github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
github.com/gorilla/context v1.1.2 h1:WRkNAv2uoa03QNIc1A6u4O7DAGMUVoopZhkiXWA2V1o=
github.com/gorilla/context v1.1.2/go.mod h1:KDPwT9i/MeWHiLl90fuTgrt4/wPcv75vFAZLaOOcbxM=
+github.com/gorilla/securecookie v1.1.1/go.mod h1:ra0sb63/xPlUeL+yeDciTfxMRAA+MP+HVt/4epWDjd4=
github.com/gorilla/securecookie v1.1.2 h1:YCIWL56dvtr73r6715mJs5ZvhtnY73hBvEF8kXD8ePA=
github.com/gorilla/securecookie v1.1.2/go.mod h1:NfCASbcHqRSY+3a8tlWJwsQap2VX5pwzwo4h3eOamfo=
+github.com/gorilla/sessions v1.2.1/go.mod h1:dk2InVEVJ0sfLlnXv9EAgkf6ecYs/i80K/zI+bUmuGM=
github.com/gorilla/sessions v1.4.0 h1:kpIYOp/oi6MG/p5PgxApU8srsSw9tuFbt46Lt7auzqQ=
github.com/gorilla/sessions v1.4.0/go.mod h1:FLWm50oby91+hl7p/wRxDth9bWSuk0qVL2emc7lT5ik=
github.com/gorilla/websocket v1.5.3 h1:saDtZ6Pbx/0u+bgYQ3q96pZgCzfhKXGPqt7kZ72aNNg=
github.com/gorilla/websocket v1.5.3/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
github.com/grbit/go-json v0.11.0 h1:bAbyMdYrYl/OjYsSqLH99N2DyQ291mHy726Mx+sYrnc=
github.com/grbit/go-json v0.11.0/go.mod h1:IYpHsdybQ386+6g3VE6AXQ3uTGa5mquBme5/ZWmtzek=
+github.com/hashicorp/go-uuid v1.0.2/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro=
+github.com/hashicorp/go-uuid v1.0.3 h1:2gKiV6YVmrJ1i2CKKa9obLvRieoRGviZFL26PcT/Co8=
+github.com/hashicorp/go-uuid v1.0.3/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro=
+github.com/jcmturner/aescts/v2 v2.0.0 h1:9YKLH6ey7H4eDBXW8khjYslgyqG2xZikXP0EQFKrle8=
+github.com/jcmturner/aescts/v2 v2.0.0/go.mod h1:AiaICIRyfYg35RUkr8yESTqvSy7csK90qZ5xfvvsoNs=
+github.com/jcmturner/dnsutils/v2 v2.0.0 h1:lltnkeZGL0wILNvrNiVCR6Ro5PGU/SeBvVO/8c/iPbo=
+github.com/jcmturner/dnsutils/v2 v2.0.0/go.mod h1:b0TnjGOvI/n42bZa+hmXL+kFJZsFT7G4t3HTlQ184QM=
+github.com/jcmturner/gofork v1.7.6 h1:QH0l3hzAU1tfT3rZCnW5zXl+orbkNMMRGJfdJjHVETg=
+github.com/jcmturner/gofork v1.7.6/go.mod h1:1622LH6i/EZqLloHfE7IeZ0uEJwMSUyQ/nDd82IeqRo=
+github.com/jcmturner/goidentity/v6 v6.0.1 h1:VKnZd2oEIMorCTsFBnJWbExfNN7yZr3EhJAxwOkZg6o=
+github.com/jcmturner/goidentity/v6 v6.0.1/go.mod h1:X1YW3bgtvwAXju7V3LCIMpY0Gbxyjn/mY9zx4tFonSg=
+github.com/jcmturner/gokrb5/v8 v8.4.4 h1:x1Sv4HaTpepFkXbt2IkL29DXRf8sOfZXo8eRKh687T8=
+github.com/jcmturner/gokrb5/v8 v8.4.4/go.mod h1:1btQEpgT6k+unzCwX1KdWMEwPPkkgBtP+F6aCACiMrs=
+github.com/jcmturner/rpc/v2 v2.0.3 h1:7FXXj8Ti1IaVFpSAziCZWNzbNuZmnvw/i6CqLNdWfZY=
+github.com/jcmturner/rpc/v2 v2.0.3/go.mod h1:VUJYCIDm3PVOEHw8sgt091/20OJjskO/YJki3ELg/Hc=
github.com/jinzhu/inflection v1.0.0 h1:K317FqzuhWc8YvSVlFMCCUb36O/S9MCKRDI7QkRKD/E=
github.com/jinzhu/inflection v1.0.0/go.mod h1:h+uFLlag+Qp1Va5pdKtLDYj+kHp5pxUVkryuEj+Srlc=
github.com/jinzhu/now v1.1.5 h1:/o9tlHleP7gOFmsnYNz3RGnqzefHA47wQpKrrdTIwXQ=
@@ -87,20 +114,20 @@ github.com/juju/ratelimit v1.0.2 h1:sRxmtRiajbvrcLQT7S+JbqU0ntsb9W2yhSdNN8tWfaI=
github.com/juju/ratelimit v1.0.2/go.mod h1:qapgC/Gy+xNh9UxzV13HGGl/6UXNN+ct+vwSgWNm/qk=
github.com/klauspost/compress v1.18.0 h1:c/Cqfb0r+Yi+JtIEq73FWXVkRonBlf0CRNYc8Zttxdo=
github.com/klauspost/compress v1.18.0/go.mod h1:2Pp+KzxcywXVXMr50+X0Q/Lsb43OQHYWRCY2AiWywWQ=
+github.com/klauspost/cpuid/v2 v2.0.9/go.mod h1:FInQzS24/EEf25PyTYn52gqo7WaD8xa0213Md/qVLRg=
github.com/klauspost/cpuid/v2 v2.3.0 h1:S4CRMLnYUhGeDFDqkGriYKdfoFlDnMtqTiI/sFzhA9Y=
github.com/klauspost/cpuid/v2 v2.3.0/go.mod h1:hqwkgyIinND0mEev00jJYCxPNVRVXFQeu1XKlok6oO0=
+github.com/knz/go-libedit v1.10.1/go.mod h1:MZTVkCWyz0oBc7JOWP3wNAzd002ZbM/5hgShxwh4x8M=
github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE=
github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk=
github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
github.com/leodido/go-urn v1.4.0 h1:WT9HwE9SGECu3lg4d/dIA+jxlljEa1/ffXKmRjqdmIQ=
github.com/leodido/go-urn v1.4.0/go.mod h1:bvxc+MVxLKB4z00jd1z+Dvzr47oO32F/QSNjSBOlFxI=
-github.com/lufia/plan9stats v0.0.0-20250827001030-24949be3fa54 h1:mFWunSatvkQQDhpdyuFAYwyAan3hzCuma+Pz8sqvOfg=
-github.com/lufia/plan9stats v0.0.0-20250827001030-24949be3fa54/go.mod h1:autxFIvghDt3jPTLoqZ9OZ7s9qTGNAWmYCjVFWPX/zg=
+github.com/lufia/plan9stats v0.0.0-20250317134145-8bc96cf8fc35 h1:PpXWgLPs+Fqr325bN2FD2ISlRRztXibcX6e8f5FR5Dc=
+github.com/lufia/plan9stats v0.0.0-20250317134145-8bc96cf8fc35/go.mod h1:autxFIvghDt3jPTLoqZ9OZ7s9qTGNAWmYCjVFWPX/zg=
github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWEY=
github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y=
-github.com/mattn/go-sqlite3 v1.14.32 h1:JD12Ag3oLy1zQA+BNn74xRgaBbdhbNIDYvQUEuuErjs=
-github.com/mattn/go-sqlite3 v1.14.32/go.mod h1:Uh1q+B4BYcTPb+yiD3kU8Ct7aC0hY9fxUwlHK0RXw+Y=
github.com/miekg/dns v1.1.68 h1:jsSRkNozw7G/mnmXULynzMNIsgY2dHC8LO6U6Ij2JEA=
github.com/miekg/dns v1.1.68/go.mod h1:fujopn7TB3Pu3JM69XaawiU0wqjpL9/8xGop5UrTPps=
github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
@@ -108,8 +135,8 @@ github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9Gz0M=
github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk=
-github.com/mymmrac/telego v1.3.0 h1:y2bDDCioLgkcs+5luUaPgTNHKel1Qh30iUxFcMUrowg=
-github.com/mymmrac/telego v1.3.0/go.mod h1:0D2l/IA/gUFn4oqsi1O4/tSnlezw5jNV/ReFRDUEKk8=
+github.com/mymmrac/telego v0.32.0 h1:4X8C1l3k+opkk86r95+eQE8DxiS2LYlR61L/G7yreDY=
+github.com/mymmrac/telego v0.32.0/go.mod h1:qS6NaRhJgcuEEBEMVCV79S2xCAuHq9O+ixwfLuRW31M=
github.com/nicksnyder/go-i18n/v2 v2.6.0 h1:C/m2NNWNiTB6SK4Ao8df5EWm3JETSTIGNXBpMJTxzxQ=
github.com/nicksnyder/go-i18n/v2 v2.6.0/go.mod h1:88sRqr0C6OPyJn0/KRNaEz1uWorjxIKP7rUUcvycecE=
github.com/op/go-logging v0.0.0-20160315200505-970db520ece7 h1:lDH9UUVJtmYCjyT0CI4q8xvlXPxeZ0gYCVvWbmPlp88=
@@ -136,26 +163,28 @@ github.com/robfig/cron/v3 v3.0.1 h1:WdRxkvbJztn8LMz/QEvLN5sBU+xKpSqwwUO1Pjr4qDs=
github.com/robfig/cron/v3 v3.0.1/go.mod h1:eQICP3HwyT7UooqI/z+Ov+PtYAWygg1TEWWzGIFLtro=
github.com/rogpeppe/go-internal v1.14.1 h1:UQB4HGPB6osV0SQTLymcB4TgvyWu6ZyliaW0tI/otEQ=
github.com/rogpeppe/go-internal v1.14.1/go.mod h1:MaRKkUm5W0goXpeCfT7UZI6fk/L7L7so1lCWt35ZSgc=
-github.com/sagernet/sing v0.7.10 h1:2yPhZFx+EkyHPH8hXNezgyRSHyGY12CboId7CtwLROw=
-github.com/sagernet/sing v0.7.10/go.mod h1:ARkL0gM13/Iv5VCZmci/NuoOlePoIsW0m7BWfln/Hak=
-github.com/sagernet/sing-shadowsocks v0.2.9 h1:Paep5zCszRKsEn8587O0MnhFWKJwDW1Y4zOYYlIxMkM=
-github.com/sagernet/sing-shadowsocks v0.2.9/go.mod h1:TE/Z6401Pi8tgr0nBZcM/xawAI6u3F6TTbz4nH/qw+8=
+github.com/sagernet/sing v0.6.6 h1:3JkvJ0vqDj/jJcx0a+ve/6lMOrSzZm30I3wrIuZtmRE=
+github.com/sagernet/sing v0.6.6/go.mod h1:ARkL0gM13/Iv5VCZmci/NuoOlePoIsW0m7BWfln/Hak=
+github.com/sagernet/sing-shadowsocks v0.2.7 h1:zaopR1tbHEw5Nk6FAkM05wCslV6ahVegEZaKMv9ipx8=
+github.com/sagernet/sing-shadowsocks v0.2.7/go.mod h1:0rIKJZBR65Qi0zwdKezt4s57y/Tl1ofkaq6NlkzVuyE=
+github.com/savsgio/gotils v0.0.0-20250408102913-196191ec6287 h1:qIQ0tWF9vxGtkJa24bR+2i53WBCz1nW/Pc47oVYauC4=
+github.com/savsgio/gotils v0.0.0-20250408102913-196191ec6287/go.mod h1:sM7Mt7uEoCeFSCBM+qBrqvEo+/9vdmj19wzp3yzUhmg=
github.com/seiflotfy/cuckoofilter v0.0.0-20240715131351-a2f2c23f1771 h1:emzAzMZ1L9iaKCTxdy3Em8Wv4ChIAGnfiz18Cda70g4=
github.com/seiflotfy/cuckoofilter v0.0.0-20240715131351-a2f2c23f1771/go.mod h1:bR6DqgcAl1zTcOX8/pE2Qkj9XO00eCNqmKb7lXP8EAg=
-github.com/shirou/gopsutil/v4 v4.25.8 h1:NnAsw9lN7587WHxjJA9ryDnqhJpFH6A+wagYWTOH970=
-github.com/shirou/gopsutil/v4 v4.25.8/go.mod h1:q9QdMmfAOVIw7a+eF86P7ISEU6ka+NLgkUxlopV4RwI=
-github.com/skip2/go-qrcode v0.0.0-20200617195104-da1b6568686e h1:MRM5ITcdelLK2j1vwZ3Je0FKVCfqOLp5zO6trqMLYs0=
-github.com/skip2/go-qrcode v0.0.0-20200617195104-da1b6568686e/go.mod h1:XV66xRDqSt+GTGFMVlhk3ULuV0y9ZmzeVGR4mloJI3M=
+github.com/shirou/gopsutil/v4 v4.25.7 h1:bNb2JuqKuAu3tRlPv5piSmBZyMfecwQ+t/ILq+1JqVM=
+github.com/shirou/gopsutil/v4 v4.25.7/go.mod h1:XV/egmwJtd3ZQjBpJVY5kndsiOO4IRqy9TQnmm6VP7U=
github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw=
github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo=
github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
+github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
+github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
-github.com/stretchr/testify v1.11.1 h1:7s2iGBzp5EwR7/aIZr8ao5+dra3wiQyKjjFuvgVKu7U=
-github.com/stretchr/testify v1.11.1/go.mod h1:wZwfW3scLgRK+23gO65QZefKpKQRnfz6sD981Nm4B6U=
+github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOfJA=
+github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
github.com/tklauser/go-sysconf v0.3.15 h1:VE89k0criAymJ/Os65CSn1IXaol+1wrsFHEB8Ol49K4=
github.com/tklauser/go-sysconf v0.3.15/go.mod h1:Dmjwr6tYFIseJw7a3dRLJfsHAMXZ3nEnL/aZY+0IuI4=
github.com/tklauser/numcpus v0.10.0 h1:18njr6LDBk1zuna922MgdjQuJFjrdppsZG60sHGfjso=
@@ -168,8 +197,8 @@ github.com/v2fly/ss-bloomring v0.0.0-20210312155135-28617310f63e h1:5QefA066A1tF
github.com/v2fly/ss-bloomring v0.0.0-20210312155135-28617310f63e/go.mod h1:5t19P9LBIrNamL6AcMQOncg/r10y3Pc01AbHeMhwlpU=
github.com/valyala/bytebufferpool v1.0.0 h1:GqA5TC/0021Y/b9FG4Oi9Mr3q7XYx6KllzawFIhcdPw=
github.com/valyala/bytebufferpool v1.0.0/go.mod h1:6bBcMArwyJ5K/AmCkWv1jt77kVWyCJ6HpOuEn7z0Csc=
-github.com/valyala/fasthttp v1.66.0 h1:M87A0Z7EayeyNaV6pfO3tUTUiYO0dZfEJnRGXTVNuyU=
-github.com/valyala/fasthttp v1.66.0/go.mod h1:Y4eC+zwoocmXSVCB1JmhNbYtS7tZPRI2ztPB72EVObs=
+github.com/valyala/fasthttp v1.64.0 h1:QBygLLQmiAyiXuRhthf0tuRkqAFcrC42dckN2S+N3og=
+github.com/valyala/fasthttp v1.64.0/go.mod h1:dGmFxwkWXSK0NbOSJuF7AMVzU+lkHz0wQVvVITv2UQA=
github.com/valyala/fastjson v1.6.4 h1:uAUNq9Z6ymTgGhcm0UynUAB6tlbakBrz6CQFax3BXVQ=
github.com/valyala/fastjson v1.6.4/go.mod h1:CLCAqky6SMuOcxStkYQvblddUtoRxhYMGLrsQns1aXY=
github.com/vishvananda/netlink v1.3.1 h1:3AEMt62VKqz90r0tmNhog0r/PpWKmrEShJU0wJW6bV0=
@@ -178,84 +207,129 @@ github.com/vishvananda/netns v0.0.5 h1:DfiHV+j8bA32MFM7bfEunvT8IAqQ/NzSJHtcmW5zd
github.com/vishvananda/netns v0.0.5/go.mod h1:SpkAiCQRtJ6TvvxPnOSyH3BMl6unz3xZlaprSwhNNJM=
github.com/xlzd/gotp v0.1.0 h1:37blvlKCh38s+fkem+fFh7sMnceltoIEBYTVXyoa5Po=
github.com/xlzd/gotp v0.1.0/go.mod h1:ndLJ3JKzi3xLmUProq4LLxCuECL93dG9WASNLpHz8qg=
-github.com/xtls/reality v0.0.0-20250904214705-431b6ff8c67c h1:LHLhQY3mKXSpTcQAkjFR4/6ar3rXjQryNeM7khK3AHU=
-github.com/xtls/reality v0.0.0-20250904214705-431b6ff8c67c/go.mod h1:XxvnCCgBee4WWE0bc4E+a7wbk8gkJ/rS0vNVNtC5qp0=
-github.com/xtls/xray-core v1.250911.0 h1:KMN8zVurAjHFixiUoFV/jwmzYohf27dQRntjV+8LQno=
-github.com/xtls/xray-core v1.250911.0/go.mod h1:LkqA/BFVtPS2e5fRzg/bkYas9nQu4Uztlx+/fjlLM9k=
+github.com/xtls/reality v0.0.0-20250727231020-de3bb4d08f5a h1:Fs8Pc0JAc/LDOf9Q4DzKrk+Ujf4ILlyvfvDVZcmOZ2o=
+github.com/xtls/reality v0.0.0-20250727231020-de3bb4d08f5a/go.mod h1:XxvnCCgBee4WWE0bc4E+a7wbk8gkJ/rS0vNVNtC5qp0=
+github.com/xtls/xray-core v1.250803.0 h1:sYdRC243UsujnePINH4IfM4MfHE4lj2p4wZFAfeE2GI=
+github.com/xtls/xray-core v1.250803.0/go.mod h1:z2vn2o30flYEgpSz1iEhdZP1I46UZ3+gXINZyohH3yE=
github.com/xyproto/randomstring v1.0.5 h1:YtlWPoRdgMu3NZtP45drfy1GKoojuR7hmRcnhZqKjWU=
github.com/xyproto/randomstring v1.0.5/go.mod h1:rgmS5DeNXLivK7YprL0pY+lTuhNQW3iGxZ18UQApw/E=
+github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
github.com/yusufpapurcu/wmi v1.2.4 h1:zFUKzehAFReQwLys1b/iSMl+JQGSCSjtVqQn9bBrPo0=
github.com/yusufpapurcu/wmi v1.2.4/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQmPyzfmi0=
go.opentelemetry.io/auto/sdk v1.1.0 h1:cH53jehLUN6UFLY71z+NDOiNJqDdPRaXzTel0sJySYA=
go.opentelemetry.io/auto/sdk v1.1.0/go.mod h1:3wSPjt5PWp2RhlCcmmOial7AvC4DQqZb7a7wCow3W8A=
-go.opentelemetry.io/otel v1.37.0 h1:9zhNfelUvx0KBfu/gb+ZgeAfAgtWrfHJZcAqFC228wQ=
-go.opentelemetry.io/otel v1.37.0/go.mod h1:ehE/umFRLnuLa/vSccNq9oS1ErUlkkK71gMcN34UG8I=
-go.opentelemetry.io/otel/metric v1.37.0 h1:mvwbQS5m0tbmqML4NqK+e3aDiO02vsf/WgbsdpcPoZE=
-go.opentelemetry.io/otel/metric v1.37.0/go.mod h1:04wGrZurHYKOc+RKeye86GwKiTb9FKm1WHtO+4EVr2E=
-go.opentelemetry.io/otel/sdk v1.37.0 h1:ItB0QUqnjesGRvNcmAcU0LyvkVyGJ2xftD29bWdDvKI=
-go.opentelemetry.io/otel/sdk v1.37.0/go.mod h1:VredYzxUvuo2q3WRcDnKDjbdvmO0sCzOvVAiY+yUkAg=
-go.opentelemetry.io/otel/sdk/metric v1.37.0 h1:90lI228XrB9jCMuSdA0673aubgRobVZFhbjxHHspCPc=
-go.opentelemetry.io/otel/sdk/metric v1.37.0/go.mod h1:cNen4ZWfiD37l5NhS+Keb5RXVWZWpRE+9WyVCpbo5ps=
-go.opentelemetry.io/otel/trace v1.37.0 h1:HLdcFNbRQBE2imdSEgm/kwqmQj1Or1l/7bW6mxVK7z4=
-go.opentelemetry.io/otel/trace v1.37.0/go.mod h1:TlgrlQ+PtQO5XFerSPUYG0JSgGyryXewPGyayAWSBS0=
+go.opentelemetry.io/otel v1.36.0 h1:UumtzIklRBY6cI/lllNZlALOF5nNIzJVb16APdvgTXg=
+go.opentelemetry.io/otel v1.36.0/go.mod h1:/TcFMXYjyRNh8khOAO9ybYkqaDBb/70aVwkNML4pP8E=
+go.opentelemetry.io/otel/metric v1.36.0 h1:MoWPKVhQvJ+eeXWHFBOPoBOi20jh6Iq2CcCREuTYufE=
+go.opentelemetry.io/otel/metric v1.36.0/go.mod h1:zC7Ks+yeyJt4xig9DEw9kuUFe5C3zLbVjV2PzT6qzbs=
+go.opentelemetry.io/otel/sdk v1.36.0 h1:b6SYIuLRs88ztox4EyrvRti80uXIFy+Sqzoh9kFULbs=
+go.opentelemetry.io/otel/sdk v1.36.0/go.mod h1:+lC+mTgD+MUWfjJubi2vvXWcVxyr9rmlshZni72pXeY=
+go.opentelemetry.io/otel/sdk/metric v1.36.0 h1:r0ntwwGosWGaa0CrSt8cuNuTcccMXERFwHX4dThiPis=
+go.opentelemetry.io/otel/sdk/metric v1.36.0/go.mod h1:qTNOhFDfKRwX0yXOqJYegL5WRaW376QbB7P4Pb0qva4=
+go.opentelemetry.io/otel/trace v1.36.0 h1:ahxWNuqZjpdiFAyrIoQ4GIiAIhxAunQR6MUoKrsNd4w=
+go.opentelemetry.io/otel/trace v1.36.0/go.mod h1:gQ+OnDZzrybY4k4seLzPAWNwVBBVlF2szhehOBB/tGA=
go.uber.org/atomic v1.11.0 h1:ZvwS0R+56ePWxUNi+Atn9dWONBPp/AUETXlHW0DxSjE=
go.uber.org/atomic v1.11.0/go.mod h1:LUxbIzbOniOlMKjJjyPfpl4v+PKK2cNJn91OQbhoJI0=
-go.uber.org/mock v0.6.0 h1:hyF9dfmbgIX5EfOdasqLsWD6xqpNZlXblLB/Dbnwv3Y=
-go.uber.org/mock v0.6.0/go.mod h1:KiVJ4BqZJaMj4svdfmHM0AUx4NJYO8ZNpPnZn1Z+BBU=
+go.uber.org/mock v0.5.2 h1:LbtPTcP8A5k9WPXj54PPPbjcI4Y6lhyOZXn+VS7wNko=
+go.uber.org/mock v0.5.2/go.mod h1:wLlUxC2vVTPTaE3UD51E0BGOAElKrILxhVSDYQLld5o=
go4.org/netipx v0.0.0-20231129151722-fdeea329fbba h1:0b9z3AuHCjxk0x/opv64kcgZLBseWJUpBw5I82+2U4M=
go4.org/netipx v0.0.0-20231129151722-fdeea329fbba/go.mod h1:PLyyIXexvUFg3Owu6p/WfdlivPbZJsZdgWZlrGope/Y=
-golang.org/x/arch v0.21.0 h1:iTC9o7+wP6cPWpDWkivCvQFGAHDQ59SrSxsLPcnkArw=
-golang.org/x/arch v0.21.0/go.mod h1:dNHoOeKiyja7GTvF9NJS1l3Z2yntpQNzgrjh1cU103A=
-golang.org/x/crypto v0.42.0 h1:chiH31gIWm57EkTXpwnqf8qeuMUi0yekh6mT2AvFlqI=
-golang.org/x/crypto v0.42.0/go.mod h1:4+rDnOTJhQCx2q7/j6rAN5XDw8kPjeaXEUR2eL94ix8=
-golang.org/x/mod v0.28.0 h1:gQBtGhjxykdjY9YhZpSlZIsbnaE2+PgjfLWUQTnoZ1U=
-golang.org/x/mod v0.28.0/go.mod h1:yfB/L0NOf/kmEbXjzCPOx1iK1fRutOydrCMsqRhEBxI=
-golang.org/x/net v0.44.0 h1:evd8IRDyfNBMBTTY5XRF1vaZlD+EmWx6x8PkhR04H/I=
-golang.org/x/net v0.44.0/go.mod h1:ECOoLqd5U3Lhyeyo/QDCEVQ4sNgYsqvCZ722XogGieY=
-golang.org/x/sync v0.17.0 h1:l60nONMj9l5drqw6jlhIELNv9I0A4OFgRsG9k2oT9Ug=
-golang.org/x/sync v0.17.0/go.mod h1:9KTHXmSnoGruLpwFjVSX0lNNA75CykiMECbovNTZqGI=
+golang.org/x/arch v0.19.0 h1:LmbDQUodHThXE+htjrnmVD73M//D9GTH6wFZjyDkjyU=
+golang.org/x/arch v0.19.0/go.mod h1:bdwinDaKcfZUGpH09BB7ZmOfhalA8lQdzl62l8gGWsk=
+golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
+golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
+golang.org/x/crypto v0.6.0/go.mod h1:OFC/31mSvZgRz0V1QTNCzfAI1aIRzbiufJtkMIlEp58=
+golang.org/x/crypto v0.19.0/go.mod h1:Iy9bg/ha4yyC70EfRS8jz+B6ybOBKMaSxLj6P6oBDfU=
+golang.org/x/crypto v0.21.0/go.mod h1:0BP7YvVV9gBbVKyeTG0Gyn+gZm94bibOW5BjDEYAOMs=
+golang.org/x/crypto v0.40.0 h1:r4x+VvoG5Fm+eJcxMaY8CQM7Lb0l1lsmjGBQ6s8BfKM=
+golang.org/x/crypto v0.40.0/go.mod h1:Qr1vMER5WyS2dfPHAlsOj01wgLbsyWtFn/aY+5+ZdxY=
+golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
+golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
+golang.org/x/mod v0.26.0 h1:EGMPT//Ezu+ylkCijjPc+f4Aih7sZvaAr+O3EHBxvZg=
+golang.org/x/mod v0.26.0/go.mod h1:/j6NAhSk8iQ723BGAUyoAcn7SlD7s15Dp9Nd/SfeaFQ=
+golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
+golang.org/x/net v0.0.0-20200114155413-6afb5195e5aa/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
+golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
+golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
+golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs=
+golang.org/x/net v0.7.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs=
+golang.org/x/net v0.10.0/go.mod h1:0qNGK6F8kojg2nk9dLZ2mShWaEBan6FAoqfSigmmuDg=
+golang.org/x/net v0.21.0/go.mod h1:bIjVDfnllIU7BJ2DNgfnXvpSvtn8VRwhlsaeUTyUS44=
+golang.org/x/net v0.22.0/go.mod h1:JKghWKKOSdJwpW2GEx0Ja7fmaKnMsbu+MWVZTokSYmg=
+golang.org/x/net v0.42.0 h1:jzkYrhi3YQWD6MLBJcsklgQsoAcw89EcZbJw8Z614hs=
+golang.org/x/net v0.42.0/go.mod h1:FF1RA5d3u7nAYA4z2TkclSCKh68eSXtiFwcWQpPXdt8=
+golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.16.0 h1:ycBJEhp9p4vXvUZNszeOq0kGTPghopOL8q0fq3vstxw=
+golang.org/x/sync v0.16.0/go.mod h1:1dzgHSNfp02xaA81J2MS99Qcpr2w7fw1gpm99rleRqA=
+golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
golang.org/x/sys v0.0.0-20190916202348-b4ddaad3f8a3/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20201204225414-ed752295db88/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.1.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.2.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.10.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.36.0 h1:KVRy2GtZBrk1cBYA7MKu5bEZFxQk4NIDV6RLVcC8o0k=
-golang.org/x/sys v0.36.0/go.mod h1:OgkHotnGiDImocRcuBABYBEXf8A9a87e/uXjp9XT3ks=
-golang.org/x/text v0.29.0 h1:1neNs90w9YzJ9BocxfsQNHKuAT4pkghyXc4nhZ6sJvk=
-golang.org/x/text v0.29.0/go.mod h1:7MhJOA9CD2qZyOKYazxdYMF85OwPdEr9jTtBpO7ydH4=
-golang.org/x/time v0.13.0 h1:eUlYslOIt32DgYD6utsuUeHs4d7AsEYLuIAdg7FlYgI=
-golang.org/x/time v0.13.0/go.mod h1:eL/Oa2bBBK0TkX57Fyni+NgnyQQN4LitPmob2Hjnqw4=
-golang.org/x/tools v0.37.0 h1:DVSRzp7FwePZW356yEAChSdNcQo6Nsp+fex1SUW09lE=
-golang.org/x/tools v0.37.0/go.mod h1:MBN5QPQtLMHVdvsbtarmTNukZDdgwdwlO5qGacAzF0w=
+golang.org/x/sys v0.17.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
+golang.org/x/sys v0.18.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
+golang.org/x/sys v0.34.0 h1:H5Y5sJ2L2JRdyv7ROF1he/lPdvFsd0mJHFw2ThKHxLA=
+golang.org/x/sys v0.34.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k=
+golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
+golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
+golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k=
+golang.org/x/term v0.8.0/go.mod h1:xPskH00ivmX89bAKVGSKKtLOWNx2+17Eiy94tnKShWo=
+golang.org/x/term v0.17.0/go.mod h1:lLRBjIVuehSbZlaOtGMbcMncT+aqLLLmKrsjNrUguwk=
+golang.org/x/term v0.18.0/go.mod h1:ILwASektA3OnRv7amZ1xhE/KTR+u50pbXfZ03+6Nx58=
+golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
+golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
+golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
+golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
+golang.org/x/text v0.9.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8=
+golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
+golang.org/x/text v0.27.0 h1:4fGWRpyh641NLlecmyl4LOe6yDdfaYNrGb2zdfo4JV4=
+golang.org/x/text v0.27.0/go.mod h1:1D28KMCvyooCX9hBiosv5Tz/+YLxj0j7XhWjpSUF7CU=
+golang.org/x/time v0.12.0 h1:ScB/8o8olJvc+CQPWrK3fPZNfh7qgwCrY0zJmoEQLSE=
+golang.org/x/time v0.12.0/go.mod h1:CDIdPxbZBQxdj6cxyCIdrNogrJKMJ7pr37NYpMcMDSg=
+golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
+golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
+golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=
+golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU=
+golang.org/x/tools v0.35.0 h1:mBffYraMEf7aa0sB+NuKnuCy8qI/9Bughn8dC2Gu5r0=
+golang.org/x/tools v0.35.0/go.mod h1:NKdj5HkL/73byiZSJjqJgKn3ep7KjFkBOkR/Hps3VPw=
+golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
golang.zx2c4.com/wintun v0.0.0-20230126152724-0fa3db229ce2 h1:B82qJJgjvYKsXS9jeunTOisW56dUokqW/FOteYJJ/yg=
golang.zx2c4.com/wintun v0.0.0-20230126152724-0fa3db229ce2/go.mod h1:deeaetjYA+DHMHg+sMSMI58GrEteJUUzzw7en6TJQcI=
-golang.zx2c4.com/wireguard v0.0.0-20250521234502-f333402bd9cb h1:whnFRlWMcXI9d+ZbWg+4sHnLp52d5yiIPUxMBSt4X9A=
-golang.zx2c4.com/wireguard v0.0.0-20250521234502-f333402bd9cb/go.mod h1:rpwXGsirqLqN2L0JDJQlwOboGHmptD5ZD6T2VmcqhTw=
-gonum.org/v1/gonum v0.16.0 h1:5+ul4Swaf3ESvrOnidPp4GZbzf0mxVQpDCYUQE7OJfk=
-gonum.org/v1/gonum v0.16.0/go.mod h1:fef3am4MQ93R2HHpKnLk4/Tbh/s0+wqD5nfa6Pnwy4E=
-google.golang.org/genproto/googleapis/rpc v0.0.0-20250908214217-97024824d090 h1:/OQuEa4YWtDt7uQWHd3q3sUMb+QOLQUg1xa8CEsRv5w=
-google.golang.org/genproto/googleapis/rpc v0.0.0-20250908214217-97024824d090/go.mod h1:GmFNa4BdJZ2a8G+wCe9Bg3wwThLrJun751XstdJt5Og=
-google.golang.org/genproto/googleapis/rpc v0.0.0-20250922171735-9219d122eba9 h1:V1jCN2HBa8sySkR5vLcCSqJSTMv093Rw9EJefhQGP7M=
-google.golang.org/genproto/googleapis/rpc v0.0.0-20250922171735-9219d122eba9/go.mod h1:HSkG/KdJWusxU1F6CNrwNDjBMgisKxGnc5dAZfT0mjQ=
-google.golang.org/grpc v1.75.1 h1:/ODCNEuf9VghjgO3rqLcfg8fiOP0nSluljWFlDxELLI=
-google.golang.org/grpc v1.75.1/go.mod h1:JtPAzKiq4v1xcAB2hydNlWI2RnF85XXcV0mhKXr2ecQ=
-google.golang.org/protobuf v1.36.9 h1:w2gp2mA27hUeUzj9Ex9FBjsBm40zfaDtEWow293U7Iw=
-google.golang.org/protobuf v1.36.9/go.mod h1:fuxRtAxBytpl4zzqUh6/eyUujkJdNiuEkXntxiD/uRU=
+golang.zx2c4.com/wireguard v0.0.0-20231211153847-12269c276173 h1:/jFs0duh4rdb8uIfPMv78iAJGcPKDeqAFnaLBropIC4=
+golang.zx2c4.com/wireguard v0.0.0-20231211153847-12269c276173/go.mod h1:tkCQ4FQXmpAgYVh++1cq16/dH4QJtmvpRv19DWGAHSA=
+google.golang.org/genproto/googleapis/rpc v0.0.0-20250728155136-f173205681a0 h1:MAKi5q709QWfnkkpNQ0M12hYJ1+e8qYVDyowc4U1XZM=
+google.golang.org/genproto/googleapis/rpc v0.0.0-20250728155136-f173205681a0/go.mod h1:qQ0YXyHHx3XkvlzUtpXDkS29lDSafHMZBAZDc03LQ3A=
+google.golang.org/grpc v1.74.2 h1:WoosgB65DlWVC9FqI82dGsZhWFNBSLjQ84bjROOpMu4=
+google.golang.org/grpc v1.74.2/go.mod h1:CtQ+BGjaAIXHs/5YS3i473GqwBBa1zGQNevxdeBEXrM=
+google.golang.org/protobuf v1.36.6 h1:z1NpPI8ku2WgiWnf+t9wTPsn6eP1L7ksHUlkfLvd9xY=
+google.golang.org/protobuf v1.36.6/go.mod h1:jduwjTPXsFjZGTmRluh+L6NjiWu7pchiJ2/5YcXBHnY=
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q=
+gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY=
gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
gopkg.in/yaml.v3 v3.0.0-20200605160147-a5ece683394c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
-gorm.io/driver/sqlite v1.6.0 h1:WHRRrIiulaPiPFmDcod6prc4l2VGVWHz80KspNsxSfQ=
-gorm.io/driver/sqlite v1.6.0/go.mod h1:AO9V1qIQddBESngQUKWL9yoH93HIeA1X6V633rBwyT8=
-gorm.io/gorm v1.31.0 h1:0VlycGreVhK7RF/Bwt51Fk8v0xLiiiFdbGDPIZQ7mJY=
-gorm.io/gorm v1.31.0/go.mod h1:XyQVbO2k6YkOis7C2437jSit3SsDK72s7n7rsSHd+Gs=
-gvisor.dev/gvisor v0.0.0-20250503011706-39ed1f5ac29c h1:m/r7OM+Y2Ty1sgBQ7Qb27VgIMBW8ZZhT4gLnUyDIhzI=
-gvisor.dev/gvisor v0.0.0-20250503011706-39ed1f5ac29c/go.mod h1:3r5CMtNQMKIvBlrmM9xWUNamjKBYPOWyXOjmg5Kts3g=
+gorm.io/driver/mysql v1.5.2 h1:QC2HRskSE75wBuOxe0+iCkyJZ+RqpudsQtqkp+IMuXs=
+gorm.io/driver/mysql v1.5.2/go.mod h1:pQLhh1Ut/WUAySdTHwBpBv6+JKcj+ua4ZFx1QQTBzb8=
+gorm.io/gorm v1.25.2-0.20230530020048-26663ab9bf55/go.mod h1:L4uxeKpfBml98NYqVqwAdmV1a2nBtAec/cf3fpucW/k=
+gorm.io/gorm v1.30.1 h1:lSHg33jJTBxs2mgJRfRZeLDG+WZaHYCk3Wtfl6Ngzo4=
+gorm.io/gorm v1.30.1/go.mod h1:8Z33v652h4//uMA76KjeDH8mJXPm1QNCYrMeatR0DOE=
+gvisor.dev/gvisor v0.0.0-20250428193742-2d800c3129d5 h1:sfK5nHuG7lRFZ2FdTT3RimOqWBg8IrVm+/Vko1FVOsk=
+gvisor.dev/gvisor v0.0.0-20250428193742-2d800c3129d5/go.mod h1:3r5CMtNQMKIvBlrmM9xWUNamjKBYPOWyXOjmg5Kts3g=
lukechampine.com/blake3 v1.4.1 h1:I3Smz7gso8w4/TunLKec6K2fn+kyKtDxr/xcQEN84Wg=
lukechampine.com/blake3 v1.4.1/go.mod h1:QFosUxmjB8mnrWFSNwKmvxHpfY72bmD2tQ0kBMM3kwo=
+nullprogram.com/x/optparse v1.0.0/go.mod h1:KdyPE+Igbe0jQUrVfMqDMeJQIJZEuyV7pjYmp6pbG50=
diff --git a/install.sh b/install.sh
index 58d5aa0b..d3e6dd1b 100644
--- a/install.sh
+++ b/install.sh
@@ -7,6 +7,7 @@ yellow='\033[0;33m'
plain='\033[0m'
cur_dir=$(pwd)
+show_ip_service_lists=("https://api.ipify.org" "https://4.ident.me")
# check root
[[ $EUID -ne 0 ]] && echo -e "${red}Fatal error: ${plain} Please run this script with root privilege \n " && exit 1
@@ -56,11 +57,8 @@ install_base() {
opensuse-tumbleweed)
zypper refresh && zypper -q install -y wget curl tar timezone
;;
- alpine)
- apk update && apk add wget curl tar tzdata
- ;;
*)
- apt-get update && apt-get install -y -q wget curl tar tzdata
+ apt-get update && apt install -y -q wget curl tar tzdata
;;
esac
}
@@ -75,18 +73,10 @@ config_after_install() {
local existing_hasDefaultCredential=$(/usr/local/x-ui/x-ui setting -show true | grep -Eo 'hasDefaultCredential: .+' | awk '{print $2}')
local existing_webBasePath=$(/usr/local/x-ui/x-ui setting -show true | grep -Eo 'webBasePath: .+' | awk '{print $2}')
local existing_port=$(/usr/local/x-ui/x-ui setting -show true | grep -Eo 'port: .+' | awk '{print $2}')
- local URL_lists=(
- "https://api4.ipify.org"
- "https://ipv4.icanhazip.com"
- "https://v4.api.ipinfo.io/ip"
- "https://ipv4.myexternalip.com/raw"
- "https://4.ident.me"
- "https://check-host.net/ip"
- )
- local server_ip=""
- for ip_address in "${URL_lists[@]}"; do
- server_ip=$(curl -s --max-time 3 "${ip_address}" 2>/dev/null | tr -d '[:space:]')
- if [[ -n "${server_ip}" ]]; then
+
+ for ip_service_addr in "${show_ip_service_lists[@]}"; do
+ local server_ip=$(curl -s --max-time 3 ${ip_service_addr} 2>/dev/null)
+ if [ -n "${server_ip}" ]; then
break
fi
done
@@ -149,15 +139,11 @@ install_x-ui() {
if [ $# == 0 ]; then
tag_version=$(curl -Ls "https://api.github.com/repos/MHSanaei/3x-ui/releases/latest" | grep '"tag_name":' | sed -E 's/.*"([^"]+)".*/\1/')
if [[ ! -n "$tag_version" ]]; then
- echo -e "${yellow}Trying to fetch version with IPv4...${plain}"
- tag_version=$(curl -4 -Ls "https://api.github.com/repos/MHSanaei/3x-ui/releases/latest" | grep '"tag_name":' | sed -E 's/.*"([^"]+)".*/\1/')
- if [[ ! -n "$tag_version" ]]; then
- echo -e "${red}Failed to fetch x-ui version, it may be due to GitHub API restrictions, please try it later${plain}"
- exit 1
- fi
+ echo -e "${red}Failed to fetch x-ui version, it may be due to GitHub API restrictions, please try it later${plain}"
+ exit 1
fi
echo -e "Got x-ui latest version: ${tag_version}, beginning the installation..."
- wget --inet4-only -N -O /usr/local/x-ui-linux-$(arch).tar.gz https://github.com/MHSanaei/3x-ui/releases/download/${tag_version}/x-ui-linux-$(arch).tar.gz
+ wget -N -O /usr/local/x-ui-linux-$(arch).tar.gz https://github.com/MHSanaei/3x-ui/releases/download/${tag_version}/x-ui-linux-$(arch).tar.gz
if [[ $? -ne 0 ]]; then
echo -e "${red}Downloading x-ui failed, please be sure that your server can access GitHub ${plain}"
exit 1
@@ -174,25 +160,17 @@ install_x-ui() {
url="https://github.com/MHSanaei/3x-ui/releases/download/${tag_version}/x-ui-linux-$(arch).tar.gz"
echo -e "Beginning to install x-ui $1"
- wget --inet4-only -N -O /usr/local/x-ui-linux-$(arch).tar.gz ${url}
+ wget -N -O /usr/local/x-ui-linux-$(arch).tar.gz ${url}
if [[ $? -ne 0 ]]; then
echo -e "${red}Download x-ui $1 failed, please check if the version exists ${plain}"
exit 1
fi
fi
- wget --inet4-only -O /usr/bin/x-ui-temp https://raw.githubusercontent.com/MHSanaei/3x-ui/main/x-ui.sh
- if [[ $? -ne 0 ]]; then
- echo -e "${red}Failed to download x-ui.sh${plain}"
- exit 1
- fi
+ wget -O /usr/bin/x-ui-temp https://raw.githubusercontent.com/MHSanaei/3x-ui/main/x-ui.sh
# Stop x-ui service and remove old resources
if [[ -e /usr/local/x-ui/ ]]; then
- if [[ $release == "alpine" ]]; then
- rc-service x-ui stop
- else
- systemctl stop x-ui
- fi
+ systemctl stop x-ui
rm /usr/local/x-ui/ -rf
fi
@@ -216,22 +194,10 @@ install_x-ui() {
chmod +x /usr/bin/x-ui
config_after_install
- if [[ $release == "alpine" ]]; then
- wget --inet4-only -O /etc/init.d/x-ui https://raw.githubusercontent.com/MHSanaei/3x-ui/main/x-ui.rc
- if [[ $? -ne 0 ]]; then
- echo -e "${red}Failed to download x-ui.rc${plain}"
- exit 1
- fi
- chmod +x /etc/init.d/x-ui
- rc-update add x-ui
- rc-service x-ui start
- else
- cp -f x-ui.service /etc/systemd/system/
- systemctl daemon-reload
- systemctl enable x-ui
- systemctl start x-ui
- fi
-
+ cp -f x-ui.service /etc/systemd/system/
+ systemctl daemon-reload
+ systemctl enable x-ui
+ systemctl start x-ui
echo -e "${green}x-ui ${tag_version}${plain} installation finished, it is running now..."
echo -e ""
echo -e "┌───────────────────────────────────────────────────────┐
diff --git a/logger/logger.go b/logger/logger.go
index ccacf697..3705c3df 100644
--- a/logger/logger.go
+++ b/logger/logger.go
@@ -1,5 +1,3 @@
-// Package logger provides logging functionality for the 3x-ui panel with
-// buffered log storage and multiple log levels.
package logger
import (
@@ -11,11 +9,7 @@ import (
)
var (
- logger *logging.Logger
-
- // addToBuffer appends a log entry into the in-memory ring buffer used for
- // retrieving recent logs via the web UI. It keeps the buffer bounded to avoid
- // uncontrolled growth.
+ logger *logging.Logger
logBuffer []struct {
time string
level logging.Level
@@ -27,7 +21,6 @@ func init() {
InitLogger(logging.INFO)
}
-// InitLogger initializes the logger with the specified logging level.
func InitLogger(level logging.Level) {
newLogger := logging.MustGetLogger("x-ui")
var err error
@@ -54,61 +47,51 @@ func InitLogger(level logging.Level) {
logger = newLogger
}
-// Debug logs a debug message and adds it to the log buffer.
func Debug(args ...any) {
logger.Debug(args...)
addToBuffer("DEBUG", fmt.Sprint(args...))
}
-// Debugf logs a formatted debug message and adds it to the log buffer.
func Debugf(format string, args ...any) {
logger.Debugf(format, args...)
addToBuffer("DEBUG", fmt.Sprintf(format, args...))
}
-// Info logs an info message and adds it to the log buffer.
func Info(args ...any) {
logger.Info(args...)
addToBuffer("INFO", fmt.Sprint(args...))
}
-// Infof logs a formatted info message and adds it to the log buffer.
func Infof(format string, args ...any) {
logger.Infof(format, args...)
addToBuffer("INFO", fmt.Sprintf(format, args...))
}
-// Notice logs a notice message and adds it to the log buffer.
func Notice(args ...any) {
logger.Notice(args...)
addToBuffer("NOTICE", fmt.Sprint(args...))
}
-// Noticef logs a formatted notice message and adds it to the log buffer.
func Noticef(format string, args ...any) {
logger.Noticef(format, args...)
addToBuffer("NOTICE", fmt.Sprintf(format, args...))
}
-// Warning logs a warning message and adds it to the log buffer.
func Warning(args ...any) {
logger.Warning(args...)
addToBuffer("WARNING", fmt.Sprint(args...))
}
-// Warningf logs a formatted warning message and adds it to the log buffer.
func Warningf(format string, args ...any) {
logger.Warningf(format, args...)
addToBuffer("WARNING", fmt.Sprintf(format, args...))
}
-// Error logs an error message and adds it to the log buffer.
func Error(args ...any) {
logger.Error(args...)
addToBuffer("ERROR", fmt.Sprint(args...))
}
-// Errorf logs a formatted error message and adds it to the log buffer.
func Errorf(format string, args ...any) {
logger.Errorf(format, args...)
addToBuffer("ERROR", fmt.Sprintf(format, args...))
@@ -132,7 +115,6 @@ func addToBuffer(level string, newLog string) {
})
}
-// GetLogs retrieves up to c log entries from the buffer that are at or below the specified level.
func GetLogs(c int, level string) []string {
var output []string
logLevel, _ := logging.LogLevel(level)
diff --git a/main.go b/main.go
index 8ab8b13f..9986ede1 100644
--- a/main.go
+++ b/main.go
@@ -1,5 +1,3 @@
-// Package main is the entry point for the 3x-ui web panel application.
-// It initializes the database, web server, and handles command-line operations for managing the panel.
package main
import (
@@ -11,20 +9,19 @@ import (
"syscall"
_ "unsafe"
- "github.com/mhsanaei/3x-ui/v2/config"
- "github.com/mhsanaei/3x-ui/v2/database"
- "github.com/mhsanaei/3x-ui/v2/logger"
- "github.com/mhsanaei/3x-ui/v2/sub"
- "github.com/mhsanaei/3x-ui/v2/util/crypto"
- "github.com/mhsanaei/3x-ui/v2/web"
- "github.com/mhsanaei/3x-ui/v2/web/global"
- "github.com/mhsanaei/3x-ui/v2/web/service"
+ "x-ui/config"
+ "x-ui/database"
+ "x-ui/logger"
+ "x-ui/sub"
+ "x-ui/util/crypto"
+ "x-ui/web"
+ "x-ui/web/global"
+ "x-ui/web/service"
"github.com/joho/godotenv"
"github.com/op/go-logging"
)
-// runWebServer initializes and starts the web server for the 3x-ui panel.
func runWebServer() {
log.Printf("Starting %v %v", config.GetName(), config.GetVersion())
@@ -35,7 +32,7 @@ func runWebServer() {
logger.InitLogger(logging.INFO)
case config.Notice:
logger.InitLogger(logging.NOTICE)
- case config.Warning:
+ case config.Warn:
logger.InitLogger(logging.WARNING)
case config.Error:
logger.InitLogger(logging.ERROR)
@@ -114,7 +111,6 @@ func runWebServer() {
}
}
-// resetSetting resets all panel settings to their default values.
func resetSetting() {
err := database.InitDB(config.GetDBPath())
if err != nil {
@@ -131,7 +127,6 @@ func resetSetting() {
}
}
-// showSetting displays the current panel settings if show is true.
func showSetting(show bool) {
if show {
settingService := service.SettingService{}
@@ -181,7 +176,6 @@ func showSetting(show bool) {
}
}
-// updateTgbotEnableSts enables or disables the Telegram bot notifications based on the status parameter.
func updateTgbotEnableSts(status bool) {
settingService := service.SettingService{}
currentTgSts, err := settingService.GetTgbotEnabled()
@@ -201,7 +195,6 @@ func updateTgbotEnableSts(status bool) {
}
}
-// updateTgbotSetting updates Telegram bot settings including token, chat ID, and runtime schedule.
func updateTgbotSetting(tgBotToken string, tgBotChatid string, tgBotRuntime string) {
err := database.InitDB(config.GetDBPath())
if err != nil {
@@ -239,7 +232,6 @@ func updateTgbotSetting(tgBotToken string, tgBotChatid string, tgBotRuntime stri
}
}
-// updateSetting updates various panel settings including port, credentials, base path, listen IP, and two-factor authentication.
func updateSetting(port int, username string, password string, webBasePath string, listenIP string, resetTwoFactor bool) {
err := database.InitDB(config.GetDBPath())
if err != nil {
@@ -298,7 +290,6 @@ func updateSetting(port int, username string, password string, webBasePath strin
}
}
-// updateCert updates the SSL certificate files for the panel.
func updateCert(publicKey string, privateKey string) {
err := database.InitDB(config.GetDBPath())
if err != nil {
@@ -326,7 +317,6 @@ func updateCert(publicKey string, privateKey string) {
}
}
-// GetCertificate displays the current SSL certificate settings if getCert is true.
func GetCertificate(getCert bool) {
if getCert {
settingService := service.SettingService{}
@@ -344,7 +334,6 @@ func GetCertificate(getCert bool) {
}
}
-// GetListenIP displays the current panel listen IP address if getListen is true.
func GetListenIP(getListen bool) {
if getListen {
@@ -359,7 +348,6 @@ func GetListenIP(getListen bool) {
}
}
-// migrateDb performs database migration operations for the 3x-ui panel.
func migrateDb() {
inboundService := service.InboundService{}
@@ -372,8 +360,6 @@ func migrateDb() {
fmt.Println("Migration done!")
}
-// main is the entry point of the 3x-ui application.
-// It parses command-line arguments to run the web server, migrate database, or update settings.
func main() {
if len(os.Args) < 2 {
runWebServer()
diff --git a/media/buymeacoffe.png b/media/buymeacoffe.png
new file mode 100644
index 00000000..81571db7
Binary files /dev/null and b/media/buymeacoffe.png differ
diff --git a/sub/default.json b/sub/default.json
index 59c8a5ce..fff1b3ad 100644
--- a/sub/default.json
+++ b/sub/default.json
@@ -13,7 +13,7 @@
"inbounds": [
{
"port": 10808,
- "protocol": "mixed",
+ "protocol": "socks",
"settings": {
"auth": "noauth",
"udp": true,
@@ -28,7 +28,7 @@
],
"enabled": true
},
- "tag": "mixed"
+ "tag": "socks"
},
{
"port": 10809,
diff --git a/sub/sub.go b/sub/sub.go
index 1a1a7d9e..4f8f5672 100644
--- a/sub/sub.go
+++ b/sub/sub.go
@@ -1,47 +1,23 @@
-// Package sub provides subscription server functionality for the 3x-ui panel,
-// including HTTP/HTTPS servers for serving subscription links and JSON configurations.
package sub
import (
"context"
"crypto/tls"
- "html/template"
"io"
- "io/fs"
"net"
"net/http"
- "os"
- "path/filepath"
"strconv"
- "strings"
- "github.com/mhsanaei/3x-ui/v2/logger"
- "github.com/mhsanaei/3x-ui/v2/util/common"
- webpkg "github.com/mhsanaei/3x-ui/v2/web"
- "github.com/mhsanaei/3x-ui/v2/web/locale"
- "github.com/mhsanaei/3x-ui/v2/web/middleware"
- "github.com/mhsanaei/3x-ui/v2/web/network"
- "github.com/mhsanaei/3x-ui/v2/web/service"
+ "x-ui/config"
+ "x-ui/logger"
+ "x-ui/util/common"
+ "x-ui/web/middleware"
+ "x-ui/web/network"
+ "x-ui/web/service"
"github.com/gin-gonic/gin"
)
-// setEmbeddedTemplates parses and sets embedded templates on the engine
-func setEmbeddedTemplates(engine *gin.Engine) error {
- t, err := template.New("").Funcs(engine.FuncMap).ParseFS(
- webpkg.EmbeddedHTML(),
- "html/common/page.html",
- "html/component/aThemeSwitch.html",
- "html/settings/panel/subscription/subpage.html",
- )
- if err != nil {
- return err
- }
- engine.SetHTMLTemplate(t)
- return nil
-}
-
-// Server represents the subscription server that serves subscription links and JSON configurations.
type Server struct {
httpServer *http.Server
listener net.Listener
@@ -53,7 +29,6 @@ type Server struct {
cancel context.CancelFunc
}
-// NewServer creates a new subscription server instance with a cancellable context.
func NewServer() *Server {
ctx, cancel := context.WithCancel(context.Background())
return &Server{
@@ -62,13 +37,14 @@ func NewServer() *Server {
}
}
-// initRouter configures the subscription server's Gin engine, middleware,
-// templates and static assets and returns the ready-to-use engine.
func (s *Server) initRouter() (*gin.Engine, error) {
- // Always run in release mode for the subscription server
- gin.DefaultWriter = io.Discard
- gin.DefaultErrorWriter = io.Discard
- gin.SetMode(gin.ReleaseMode)
+ if config.IsDebug() {
+ gin.SetMode(gin.DebugMode)
+ } else {
+ gin.DefaultWriter = io.Discard
+ gin.DefaultErrorWriter = io.Discard
+ gin.SetMode(gin.ReleaseMode)
+ }
engine := gin.Default()
@@ -91,23 +67,6 @@ func (s *Server) initRouter() (*gin.Engine, error) {
return nil, err
}
- // Determine if JSON subscription endpoint is enabled
- subJsonEnable, err := s.settingService.GetSubJsonEnable()
- if err != nil {
- return nil, err
- }
-
- // Set base_path based on LinksPath for template rendering
- // Ensure LinksPath ends with "/" for proper asset URL generation
- basePath := LinksPath
- if basePath != "/" && !strings.HasSuffix(basePath, "/") {
- basePath += "/"
- }
- logger.Debug("sub: Setting base_path to:", basePath)
- engine.Use(func(c *gin.Context) {
- c.Set("base_path", basePath)
- })
-
Encrypt, err := s.settingService.GetSubEncrypt()
if err != nil {
return nil, err
@@ -153,114 +112,15 @@ func (s *Server) initRouter() (*gin.Engine, error) {
SubTitle = ""
}
- // set per-request localizer from headers/cookies
- engine.Use(locale.LocalizerMiddleware())
-
- // register i18n function similar to web server
- i18nWebFunc := func(key string, params ...string) string {
- return locale.I18n(locale.Web, key, params...)
- }
- engine.SetFuncMap(map[string]any{"i18n": i18nWebFunc})
-
- // Templates: prefer embedded; fallback to disk if necessary
- if err := setEmbeddedTemplates(engine); err != nil {
- logger.Warning("sub: failed to parse embedded templates:", err)
- if files, derr := s.getHtmlFiles(); derr == nil {
- engine.LoadHTMLFiles(files...)
- } else {
- logger.Error("sub: no templates available (embedded parse and disk load failed)", err, derr)
- }
- }
-
- // Assets: use disk if present, fallback to embedded
- // Serve under both root (/assets) and under the subscription path prefix (LinksPath + "assets")
- // so reverse proxies with a URI prefix can load assets correctly.
- // Determine LinksPath earlier to compute prefixed assets mount.
- // Note: LinksPath always starts and ends with "/" (validated in settings).
- var linksPathForAssets string
- if LinksPath == "/" {
- linksPathForAssets = "/assets"
- } else {
- // ensure single slash join
- linksPathForAssets = strings.TrimRight(LinksPath, "/") + "/assets"
- }
-
- // Mount assets in multiple paths to handle different URL patterns
- var assetsFS http.FileSystem
- if _, err := os.Stat("web/assets"); err == nil {
- assetsFS = http.FS(os.DirFS("web/assets"))
- } else {
- if subFS, err := fs.Sub(webpkg.EmbeddedAssets(), "assets"); err == nil {
- assetsFS = http.FS(subFS)
- } else {
- logger.Error("sub: failed to mount embedded assets:", err)
- }
- }
-
- if assetsFS != nil {
- engine.StaticFS("/assets", assetsFS)
- if linksPathForAssets != "/assets" {
- engine.StaticFS(linksPathForAssets, assetsFS)
- }
-
- // Add middleware to handle dynamic asset paths with subid
- if LinksPath != "/" {
- engine.Use(func(c *gin.Context) {
- path := c.Request.URL.Path
- // Check if this is an asset request with subid pattern: /sub/path/{subid}/assets/...
- pathPrefix := strings.TrimRight(LinksPath, "/") + "/"
- if strings.HasPrefix(path, pathPrefix) && strings.Contains(path, "/assets/") {
- // Extract the asset path after /assets/
- assetsIndex := strings.Index(path, "/assets/")
- if assetsIndex != -1 {
- assetPath := path[assetsIndex+8:] // +8 to skip "/assets/"
- if assetPath != "" {
- // Serve the asset file
- c.FileFromFS(assetPath, assetsFS)
- c.Abort()
- return
- }
- }
- }
- c.Next()
- })
- }
- }
-
g := engine.Group("/")
s.sub = NewSUBController(
- g, LinksPath, JsonPath, subJsonEnable, Encrypt, ShowInfo, RemarkModel, SubUpdates,
+ g, LinksPath, JsonPath, Encrypt, ShowInfo, RemarkModel, SubUpdates,
SubJsonFragment, SubJsonNoises, SubJsonMux, SubJsonRules, SubTitle)
return engine, nil
}
-// getHtmlFiles loads templates from local folder (used in debug mode)
-func (s *Server) getHtmlFiles() ([]string, error) {
- dir, _ := os.Getwd()
- files := []string{}
- // common layout
- common := filepath.Join(dir, "web", "html", "common", "page.html")
- if _, err := os.Stat(common); err == nil {
- files = append(files, common)
- }
- // components used
- theme := filepath.Join(dir, "web", "html", "component", "aThemeSwitch.html")
- if _, err := os.Stat(theme); err == nil {
- files = append(files, theme)
- }
- // page itself
- page := filepath.Join(dir, "web", "html", "subpage.html")
- if _, err := os.Stat(page); err == nil {
- files = append(files, page)
- } else {
- return nil, err
- }
- return files, nil
-}
-
-// Start initializes and starts the subscription server with configured settings.
func (s *Server) Start() (err error) {
// This is an anonymous function, no function name
defer func() {
@@ -334,7 +194,6 @@ func (s *Server) Start() (err error) {
return nil
}
-// Stop gracefully shuts down the subscription server and closes the listener.
func (s *Server) Stop() error {
s.cancel()
@@ -349,7 +208,6 @@ func (s *Server) Stop() error {
return common.Combine(err1, err2)
}
-// GetCtx returns the server's context for cancellation and deadline management.
func (s *Server) GetCtx() context.Context {
return s.ctx
}
diff --git a/sub/subController.go b/sub/subController.go
index ec574d6e..2f22ecab 100644
--- a/sub/subController.go
+++ b/sub/subController.go
@@ -2,20 +2,16 @@ package sub
import (
"encoding/base64"
- "fmt"
+ "net"
"strings"
- "github.com/mhsanaei/3x-ui/v2/config"
-
"github.com/gin-gonic/gin"
)
-// SUBController handles HTTP requests for subscription links and JSON configurations.
type SUBController struct {
subTitle string
subPath string
subJsonPath string
- jsonEnabled bool
subEncrypt bool
updateInterval string
@@ -23,12 +19,10 @@ type SUBController struct {
subJsonService *SubJsonService
}
-// NewSUBController creates a new subscription controller with the given configuration.
func NewSUBController(
g *gin.RouterGroup,
subPath string,
jsonPath string,
- jsonEnabled bool,
encrypt bool,
showInfo bool,
rModel string,
@@ -44,7 +38,6 @@ func NewSUBController(
subTitle: subTitle,
subPath: subPath,
subJsonPath: jsonPath,
- jsonEnabled: jsonEnabled,
subEncrypt: encrypt,
updateInterval: update,
@@ -55,22 +48,32 @@ func NewSUBController(
return a
}
-// initRouter registers HTTP routes for subscription links and JSON endpoints
-// on the provided router group.
func (a *SUBController) initRouter(g *gin.RouterGroup) {
gLink := g.Group(a.subPath)
+ gJson := g.Group(a.subJsonPath)
+
gLink.GET(":subid", a.subs)
- if a.jsonEnabled {
- gJson := g.Group(a.subJsonPath)
- gJson.GET(":subid", a.subJsons)
- }
+
+ gJson.GET(":subid", a.subJsons)
}
-// subs handles HTTP requests for subscription links, returning either HTML page or base64-encoded subscription data.
func (a *SUBController) subs(c *gin.Context) {
subId := c.Param("subid")
- scheme, host, hostWithPort, hostHeader := a.subService.ResolveRequest(c)
- subs, lastOnline, traffic, err := a.subService.GetSubs(subId, host)
+ var host string
+ if h, err := getHostFromXFH(c.GetHeader("X-Forwarded-Host")); err == nil {
+ host = h
+ }
+ if host == "" {
+ host = c.GetHeader("X-Real-IP")
+ }
+ if host == "" {
+ var err error
+ host, _, err = net.SplitHostPort(c.Request.Host)
+ if err != nil {
+ host = c.Request.Host
+ }
+ }
+ subs, header, err := a.subService.GetSubs(subId, host)
if err != nil || len(subs) == 0 {
c.String(400, "Error!")
} else {
@@ -79,55 +82,10 @@ func (a *SUBController) subs(c *gin.Context) {
result += sub + "\n"
}
- // If the request expects HTML (e.g., browser) or explicitly asked (?html=1 or ?view=html), render the info page here
- accept := c.GetHeader("Accept")
- if strings.Contains(strings.ToLower(accept), "text/html") || c.Query("html") == "1" || strings.EqualFold(c.Query("view"), "html") {
- // Build page data in service
- subURL, subJsonURL := a.subService.BuildURLs(scheme, hostWithPort, a.subPath, a.subJsonPath, subId)
- if !a.jsonEnabled {
- subJsonURL = ""
- }
- // Get base_path from context (set by middleware)
- basePath, exists := c.Get("base_path")
- if !exists {
- basePath = "/"
- }
- // Add subId to base_path for asset URLs
- basePathStr := basePath.(string)
- if basePathStr == "/" {
- basePathStr = "/" + subId + "/"
- } else {
- // Remove trailing slash if exists, add subId, then add trailing slash
- basePathStr = strings.TrimRight(basePathStr, "/") + "/" + subId + "/"
- }
- page := a.subService.BuildPageData(subId, hostHeader, traffic, lastOnline, subs, subURL, subJsonURL, basePathStr)
- c.HTML(200, "subpage.html", gin.H{
- "title": "subscription.title",
- "cur_ver": config.GetVersion(),
- "host": page.Host,
- "base_path": page.BasePath,
- "sId": page.SId,
- "download": page.Download,
- "upload": page.Upload,
- "total": page.Total,
- "used": page.Used,
- "remained": page.Remained,
- "expire": page.Expire,
- "lastOnline": page.LastOnline,
- "datepicker": page.Datepicker,
- "downloadByte": page.DownloadByte,
- "uploadByte": page.UploadByte,
- "totalByte": page.TotalByte,
- "subUrl": page.SubUrl,
- "subJsonUrl": page.SubJsonUrl,
- "result": page.Result,
- })
- return
- }
-
// Add headers
- header := fmt.Sprintf("upload=%d; download=%d; total=%d; expire=%d", traffic.Up, traffic.Down, traffic.Total, traffic.ExpiryTime/1000)
- a.ApplyCommonHeaders(c, header, a.updateInterval, a.subTitle)
+ c.Writer.Header().Set("Subscription-Userinfo", header)
+ c.Writer.Header().Set("Profile-Update-Interval", a.updateInterval)
+ c.Writer.Header().Set("Profile-Title", "base64:" + base64.StdEncoding.EncodeToString([]byte(a.subTitle)))
if a.subEncrypt {
c.String(200, base64.StdEncoding.EncodeToString([]byte(result)))
@@ -137,25 +95,43 @@ func (a *SUBController) subs(c *gin.Context) {
}
}
-// subJsons handles HTTP requests for JSON subscription configurations.
func (a *SUBController) subJsons(c *gin.Context) {
subId := c.Param("subid")
- _, host, _, _ := a.subService.ResolveRequest(c)
+ var host string
+ if h, err := getHostFromXFH(c.GetHeader("X-Forwarded-Host")); err == nil {
+ host = h
+ }
+ if host == "" {
+ host = c.GetHeader("X-Real-IP")
+ }
+ if host == "" {
+ var err error
+ host, _, err = net.SplitHostPort(c.Request.Host)
+ if err != nil {
+ host = c.Request.Host
+ }
+ }
jsonSub, header, err := a.subJsonService.GetJson(subId, host)
if err != nil || len(jsonSub) == 0 {
c.String(400, "Error!")
} else {
// Add headers
- a.ApplyCommonHeaders(c, header, a.updateInterval, a.subTitle)
+ c.Writer.Header().Set("Subscription-Userinfo", header)
+ c.Writer.Header().Set("Profile-Update-Interval", a.updateInterval)
+ c.Writer.Header().Set("Profile-Title", "base64:" + base64.StdEncoding.EncodeToString([]byte(a.subTitle)))
c.String(200, jsonSub)
}
}
-// ApplyCommonHeaders sets common HTTP headers for subscription responses including user info, update interval, and profile title.
-func (a *SUBController) ApplyCommonHeaders(c *gin.Context, header, updateInterval, profileTitle string) {
- c.Writer.Header().Set("Subscription-Userinfo", header)
- c.Writer.Header().Set("Profile-Update-Interval", updateInterval)
- c.Writer.Header().Set("Profile-Title", "base64:"+base64.StdEncoding.EncodeToString([]byte(profileTitle)))
+func getHostFromXFH(s string) (string, error) {
+ if strings.Contains(s, ":") {
+ realHost, _, err := net.SplitHostPort(s)
+ if err != nil {
+ return "", err
+ }
+ return realHost, nil
+ }
+ return s, nil
}
diff --git a/sub/subJsonService.go b/sub/subJsonService.go
index 86a7a405..7bc4d1db 100644
--- a/sub/subJsonService.go
+++ b/sub/subJsonService.go
@@ -6,18 +6,17 @@ import (
"fmt"
"strings"
- "github.com/mhsanaei/3x-ui/v2/database/model"
- "github.com/mhsanaei/3x-ui/v2/logger"
- "github.com/mhsanaei/3x-ui/v2/util/json_util"
- "github.com/mhsanaei/3x-ui/v2/util/random"
- "github.com/mhsanaei/3x-ui/v2/web/service"
- "github.com/mhsanaei/3x-ui/v2/xray"
+ "x-ui/database/model"
+ "x-ui/logger"
+ "x-ui/util/json_util"
+ "x-ui/util/random"
+ "x-ui/web/service"
+ "x-ui/xray"
)
//go:embed default.json
var defaultJson string
-// SubJsonService handles JSON subscription configuration generation and management.
type SubJsonService struct {
configJson map[string]any
defaultOutbounds []json_util.RawMessage
@@ -29,7 +28,6 @@ type SubJsonService struct {
SubService *SubService
}
-// NewSubJsonService creates a new JSON subscription service with the given configuration.
func NewSubJsonService(fragment string, noises string, mux string, rules string, subService *SubService) *SubJsonService {
var configJson map[string]any
var defaultOutbounds []json_util.RawMessage
@@ -69,7 +67,6 @@ func NewSubJsonService(fragment string, noises string, mux string, rules string,
}
}
-// GetJson generates a JSON subscription configuration for the given subscription ID and host.
func (s *SubJsonService) GetJson(subId string, host string) (string, string, error) {
inbounds, err := s.SubService.getInboundsBySubId(subId)
if err != nil || len(inbounds) == 0 {
@@ -174,12 +171,12 @@ func (s *SubJsonService) getConfig(inbound *model.Inbound, client model.Client,
case "tls":
if newStream["security"] != "tls" {
newStream["security"] = "tls"
- newStream["tlsSettings"] = map[string]any{}
+ newStream["tslSettings"] = map[string]any{}
}
case "none":
if newStream["security"] != "none" {
newStream["security"] = "none"
- delete(newStream, "tlsSettings")
+ delete(newStream, "tslSettings")
}
}
streamSettings, _ := json.MarshalIndent(newStream, "", " ")
@@ -187,10 +184,8 @@ func (s *SubJsonService) getConfig(inbound *model.Inbound, client model.Client,
var newOutbounds []json_util.RawMessage
switch inbound.Protocol {
- case "vmess":
+ case "vmess", "vless":
newOutbounds = append(newOutbounds, s.genVnext(inbound, streamSettings, client))
- case "vless":
- newOutbounds = append(newOutbounds, s.genVless(inbound, streamSettings, client))
case "trojan", "shadowsocks":
newOutbounds = append(newOutbounds, s.genServer(inbound, streamSettings, client))
}
@@ -214,10 +209,9 @@ func (s *SubJsonService) streamData(stream string) map[string]any {
var streamSettings map[string]any
json.Unmarshal([]byte(stream), &streamSettings)
security, _ := streamSettings["security"].(string)
- switch security {
- case "tls":
+ if security == "tls" {
streamSettings["tlsSettings"] = s.tlsData(streamSettings["tlsSettings"].(map[string]any))
- case "reality":
+ } else if security == "reality" {
streamSettings["realitySettings"] = s.realityData(streamSettings["realitySettings"].(map[string]any))
}
delete(streamSettings, "sockopt")
@@ -294,8 +288,15 @@ func (s *SubJsonService) genVnext(inbound *model.Inbound, streamSettings json_ut
usersData := make([]UserVnext, 1)
usersData[0].ID = client.ID
- usersData[0].Email = client.Email
- usersData[0].Security = client.Security
+ usersData[0].Level = 8
+ if inbound.Protocol == model.VMESS {
+ usersData[0].Security = client.Security
+ }
+ if inbound.Protocol == model.VLESS {
+ usersData[0].Flow = client.Flow
+ usersData[0].Encryption = "none"
+ }
+
vnextData := make([]VnextSetting, 1)
vnextData[0] = VnextSetting{
Address: inbound.Listen,
@@ -309,42 +310,14 @@ func (s *SubJsonService) genVnext(inbound *model.Inbound, streamSettings json_ut
outbound.Mux = json_util.RawMessage(s.mux)
}
outbound.StreamSettings = streamSettings
- outbound.Settings = map[string]any{
- "vnext": vnextData,
+ outbound.Settings = OutboundSettings{
+ Vnext: vnextData,
}
result, _ := json.MarshalIndent(outbound, "", " ")
return result
}
-func (s *SubJsonService) genVless(inbound *model.Inbound, streamSettings json_util.RawMessage, client model.Client) json_util.RawMessage {
- outbound := Outbound{}
- outbound.Protocol = string(inbound.Protocol)
- outbound.Tag = "proxy"
- if s.mux != "" {
- outbound.Mux = json_util.RawMessage(s.mux)
- }
- outbound.StreamSettings = streamSettings
- settings := make(map[string]any)
- settings["address"] = inbound.Listen
- settings["port"] = inbound.Port
- settings["id"] = client.ID
- if client.Flow != "" {
- settings["flow"] = client.Flow
- }
-
- // Add encryption for VLESS outbound from inbound settings
- var inboundSettings map[string]any
- json.Unmarshal([]byte(inbound.Settings), &inboundSettings)
- if encryption, ok := inboundSettings["encryption"].(string); ok {
- settings["encryption"] = encryption
- }
-
- outbound.Settings = settings
- result, _ := json.MarshalIndent(outbound, "", " ")
- return result
-}
-
func (s *SubJsonService) genServer(inbound *model.Inbound, streamSettings json_util.RawMessage, client model.Client) json_util.RawMessage {
outbound := Outbound{}
@@ -376,8 +349,8 @@ func (s *SubJsonService) genServer(inbound *model.Inbound, streamSettings json_u
outbound.Mux = json_util.RawMessage(s.mux)
}
outbound.StreamSettings = streamSettings
- outbound.Settings = map[string]any{
- "servers": serverData,
+ outbound.Settings = OutboundSettings{
+ Servers: serverData,
}
result, _ := json.MarshalIndent(outbound, "", " ")
@@ -389,7 +362,13 @@ type Outbound struct {
Tag string `json:"tag"`
StreamSettings json_util.RawMessage `json:"streamSettings"`
Mux json_util.RawMessage `json:"mux,omitempty"`
- Settings map[string]any `json:"settings,omitempty"`
+ ProxySettings map[string]any `json:"proxySettings,omitempty"`
+ Settings OutboundSettings `json:"settings,omitempty"`
+}
+
+type OutboundSettings struct {
+ Vnext []VnextSetting `json:"vnext,omitempty"`
+ Servers []ServerSetting `json:"servers,omitempty"`
}
type VnextSetting struct {
@@ -399,9 +378,11 @@ type VnextSetting struct {
}
type UserVnext struct {
- ID string `json:"id"`
- Email string `json:"email,omitempty"`
- Security string `json:"security,omitempty"`
+ Encryption string `json:"encryption,omitempty"`
+ Flow string `json:"flow,omitempty"`
+ ID string `json:"id"`
+ Security string `json:"security,omitempty"`
+ Level int `json:"level"`
}
type ServerSetting struct {
diff --git a/sub/subService.go b/sub/subService.go
index 55bddf7f..dfb0863e 100644
--- a/sub/subService.go
+++ b/sub/subService.go
@@ -3,24 +3,21 @@ package sub
import (
"encoding/base64"
"fmt"
- "net"
"net/url"
"strings"
"time"
- "github.com/gin-gonic/gin"
- "github.com/goccy/go-json"
+ "x-ui/database"
+ "x-ui/database/model"
+ "x-ui/logger"
+ "x-ui/util/common"
+ "x-ui/util/random"
+ "x-ui/web/service"
+ "x-ui/xray"
- "github.com/mhsanaei/3x-ui/v2/database"
- "github.com/mhsanaei/3x-ui/v2/database/model"
- "github.com/mhsanaei/3x-ui/v2/logger"
- "github.com/mhsanaei/3x-ui/v2/util/common"
- "github.com/mhsanaei/3x-ui/v2/util/random"
- "github.com/mhsanaei/3x-ui/v2/web/service"
- "github.com/mhsanaei/3x-ui/v2/xray"
+ "github.com/goccy/go-json"
)
-// SubService provides business logic for generating subscription links and managing subscription data.
type SubService struct {
address string
showInfo bool
@@ -30,7 +27,6 @@ type SubService struct {
settingService service.SettingService
}
-// NewSubService creates a new subscription service with the given configuration.
func NewSubService(showInfo bool, remarkModel string) *SubService {
return &SubService{
showInfo: showInfo,
@@ -38,20 +34,19 @@ func NewSubService(showInfo bool, remarkModel string) *SubService {
}
}
-// GetSubs retrieves subscription links for a given subscription ID and host.
-func (s *SubService) GetSubs(subId string, host string) ([]string, int64, xray.ClientTraffic, error) {
+func (s *SubService) GetSubs(subId string, host string) ([]string, string, error) {
s.address = host
var result []string
+ var header string
var traffic xray.ClientTraffic
- var lastOnline int64
var clientTraffics []xray.ClientTraffic
inbounds, err := s.getInboundsBySubId(subId)
if err != nil {
- return nil, 0, traffic, err
+ return nil, "", err
}
if len(inbounds) == 0 {
- return nil, 0, traffic, common.NewError("No inbounds found with ", subId)
+ return nil, "", common.NewError("No inbounds found with ", subId)
}
s.datepicker, err = s.settingService.GetDatepicker()
@@ -78,11 +73,7 @@ func (s *SubService) GetSubs(subId string, host string) ([]string, int64, xray.C
if client.Enable && client.SubID == subId {
link := s.getLink(inbound, client.Email)
result = append(result, link)
- ct := s.getClientTraffics(inbound.ClientStats, client.Email)
- clientTraffics = append(clientTraffics, ct)
- if ct.LastOnline > lastOnline {
- lastOnline = ct.LastOnline
- }
+ clientTraffics = append(clientTraffics, s.getClientTraffics(inbound.ClientStats, client.Email))
}
}
}
@@ -109,7 +100,8 @@ func (s *SubService) GetSubs(subId string, host string) ([]string, int64, xray.C
}
}
}
- return result, lastOnline, traffic, nil
+ header = fmt.Sprintf("upload=%d; download=%d; total=%d; expire=%d", traffic.Up, traffic.Down, traffic.Total, traffic.ExpiryTime/1000)
+ return result, header, nil
}
func (s *SubService) getInboundsBySubId(subId string) ([]*model.Inbound, error) {
@@ -337,13 +329,6 @@ func (s *SubService) genVlessLink(inbound *model.Inbound, email string) string {
params := make(map[string]string)
params["type"] = streamNetwork
- // Add encryption parameter for VLESS from inbound settings
- var settings map[string]any
- json.Unmarshal([]byte(inbound.Settings), &settings)
- if encryption, ok := settings["encryption"].(string); ok {
- params["encryption"] = encryption
- }
-
switch streamNetwork {
case "tcp":
tcp, _ := stream["tcpSettings"].(map[string]any)
@@ -1010,189 +995,3 @@ func searchHost(headers any) string {
return ""
}
-
-// PageData is a view model for subpage.html
-// PageData contains data for rendering the subscription information page.
-type PageData struct {
- Host string
- BasePath string
- SId string
- Download string
- Upload string
- Total string
- Used string
- Remained string
- Expire int64
- LastOnline int64
- Datepicker string
- DownloadByte int64
- UploadByte int64
- TotalByte int64
- SubUrl string
- SubJsonUrl string
- Result []string
-}
-
-// ResolveRequest extracts scheme and host info from request/headers consistently.
-// ResolveRequest extracts scheme, host, and header information from an HTTP request.
-func (s *SubService) ResolveRequest(c *gin.Context) (scheme string, host string, hostWithPort string, hostHeader string) {
- // scheme
- scheme = "http"
- if c.Request.TLS != nil || strings.EqualFold(c.GetHeader("X-Forwarded-Proto"), "https") {
- scheme = "https"
- }
-
- // base host (no port)
- if h, err := getHostFromXFH(c.GetHeader("X-Forwarded-Host")); err == nil && h != "" {
- host = h
- }
- if host == "" {
- host = c.GetHeader("X-Real-IP")
- }
- if host == "" {
- var err error
- host, _, err = net.SplitHostPort(c.Request.Host)
- if err != nil {
- host = c.Request.Host
- }
- }
-
- // host:port for URLs
- hostWithPort = c.GetHeader("X-Forwarded-Host")
- if hostWithPort == "" {
- hostWithPort = c.Request.Host
- }
- if hostWithPort == "" {
- hostWithPort = host
- }
-
- // header display host
- hostHeader = c.GetHeader("X-Forwarded-Host")
- if hostHeader == "" {
- hostHeader = c.GetHeader("X-Real-IP")
- }
- if hostHeader == "" {
- hostHeader = host
- }
- return
-}
-
-// BuildURLs constructs absolute subscription and JSON subscription URLs for a given subscription ID.
-// It prioritizes configured URIs, then individual settings, and finally falls back to request-derived components.
-func (s *SubService) BuildURLs(scheme, hostWithPort, subPath, subJsonPath, subId string) (subURL, subJsonURL string) {
- // Input validation
- if subId == "" {
- return "", ""
- }
-
- // Get configured URIs first (highest priority)
- configuredSubURI, _ := s.settingService.GetSubURI()
- configuredSubJsonURI, _ := s.settingService.GetSubJsonURI()
-
- // Determine base scheme and host (cached to avoid duplicate calls)
- var baseScheme, baseHostWithPort string
- if configuredSubURI == "" || configuredSubJsonURI == "" {
- baseScheme, baseHostWithPort = s.getBaseSchemeAndHost(scheme, hostWithPort)
- }
-
- // Build subscription URL
- subURL = s.buildSingleURL(configuredSubURI, baseScheme, baseHostWithPort, subPath, subId)
-
- // Build JSON subscription URL
- subJsonURL = s.buildSingleURL(configuredSubJsonURI, baseScheme, baseHostWithPort, subJsonPath, subId)
-
- return subURL, subJsonURL
-}
-
-// getBaseSchemeAndHost determines the base scheme and host from settings or falls back to request values
-func (s *SubService) getBaseSchemeAndHost(requestScheme, requestHostWithPort string) (string, string) {
- subDomain, err := s.settingService.GetSubDomain()
- if err != nil || subDomain == "" {
- return requestScheme, requestHostWithPort
- }
-
- // Get port and TLS settings
- subPort, _ := s.settingService.GetSubPort()
- subKeyFile, _ := s.settingService.GetSubKeyFile()
- subCertFile, _ := s.settingService.GetSubCertFile()
-
- // Determine scheme from TLS configuration
- scheme := "http"
- if subKeyFile != "" && subCertFile != "" {
- scheme = "https"
- }
-
- // Build host:port, always include port for clarity
- hostWithPort := fmt.Sprintf("%s:%d", subDomain, subPort)
-
- return scheme, hostWithPort
-}
-
-// buildSingleURL constructs a single URL using configured URI or base components
-func (s *SubService) buildSingleURL(configuredURI, baseScheme, baseHostWithPort, basePath, subId string) string {
- if configuredURI != "" {
- return s.joinPathWithID(configuredURI, subId)
- }
-
- baseURL := fmt.Sprintf("%s://%s", baseScheme, baseHostWithPort)
- return s.joinPathWithID(baseURL+basePath, subId)
-}
-
-// joinPathWithID safely joins a base path with a subscription ID
-func (s *SubService) joinPathWithID(basePath, subId string) string {
- if strings.HasSuffix(basePath, "/") {
- return basePath + subId
- }
- return basePath + "/" + subId
-}
-
-// BuildPageData parses header and prepares the template view model.
-// BuildPageData constructs page data for rendering the subscription information page.
-func (s *SubService) BuildPageData(subId string, hostHeader string, traffic xray.ClientTraffic, lastOnline int64, subs []string, subURL, subJsonURL string, basePath string) PageData {
- download := common.FormatTraffic(traffic.Down)
- upload := common.FormatTraffic(traffic.Up)
- total := "∞"
- used := common.FormatTraffic(traffic.Up + traffic.Down)
- remained := ""
- if traffic.Total > 0 {
- total = common.FormatTraffic(traffic.Total)
- left := max(traffic.Total-(traffic.Up+traffic.Down), 0)
- remained = common.FormatTraffic(left)
- }
-
- datepicker := s.datepicker
- if datepicker == "" {
- datepicker = "gregorian"
- }
-
- return PageData{
- Host: hostHeader,
- BasePath: basePath,
- SId: subId,
- Download: download,
- Upload: upload,
- Total: total,
- Used: used,
- Remained: remained,
- Expire: traffic.ExpiryTime / 1000,
- LastOnline: lastOnline,
- Datepicker: datepicker,
- DownloadByte: traffic.Down,
- UploadByte: traffic.Up,
- TotalByte: traffic.Total,
- SubUrl: subURL,
- SubJsonUrl: subJsonURL,
- Result: subs,
- }
-}
-
-func getHostFromXFH(s string) (string, error) {
- if strings.Contains(s, ":") {
- realHost, _, err := net.SplitHostPort(s)
- if err != nil {
- return "", err
- }
- return realHost, nil
- }
- return s, nil
-}
diff --git a/util/common/err.go b/util/common/err.go
index e12bd13f..618bf8f3 100644
--- a/util/common/err.go
+++ b/util/common/err.go
@@ -1,26 +1,22 @@
-// Package common provides common utility functions for error handling, formatting, and multi-error management.
package common
import (
"errors"
"fmt"
- "github.com/mhsanaei/3x-ui/v2/logger"
+ "x-ui/logger"
)
-// NewErrorf creates a new error with formatted message.
func NewErrorf(format string, a ...any) error {
msg := fmt.Sprintf(format, a...)
return errors.New(msg)
}
-// NewError creates a new error from the given arguments.
func NewError(a ...any) error {
msg := fmt.Sprintln(a...)
return errors.New(msg)
}
-// Recover handles panic recovery and logs the panic error if a message is provided.
func Recover(msg string) any {
panicErr := recover()
if panicErr != nil {
diff --git a/util/common/format.go b/util/common/format.go
index c40bd3dc..c73e3a01 100644
--- a/util/common/format.go
+++ b/util/common/format.go
@@ -4,7 +4,6 @@ import (
"fmt"
)
-// FormatTraffic formats traffic bytes into human-readable units (B, KB, MB, GB, TB, PB).
func FormatTraffic(trafficBytes int64) string {
units := []string{"B", "KB", "MB", "GB", "TB", "PB"}
unitIndex := 0
diff --git a/util/common/multi_error.go b/util/common/multi_error.go
index c695e3c0..ff9ff628 100644
--- a/util/common/multi_error.go
+++ b/util/common/multi_error.go
@@ -4,10 +4,8 @@ import (
"strings"
)
-// multiError represents a collection of errors.
type multiError []error
-// Error returns a string representation of all errors joined with " | ".
func (e multiError) Error() string {
var r strings.Builder
r.WriteString("multierr: ")
@@ -18,7 +16,6 @@ func (e multiError) Error() string {
return r.String()
}
-// Combine combines multiple errors into a single error, filtering out nil errors.
func Combine(maybeError ...error) error {
var errs multiError
for _, err := range maybeError {
diff --git a/util/crypto/crypto.go b/util/crypto/crypto.go
index 05d088a8..f600e7a6 100644
--- a/util/crypto/crypto.go
+++ b/util/crypto/crypto.go
@@ -1,17 +1,14 @@
-// Package crypto provides cryptographic utilities for password hashing and verification.
package crypto
import (
"golang.org/x/crypto/bcrypt"
)
-// HashPasswordAsBcrypt generates a bcrypt hash of the given password.
func HashPasswordAsBcrypt(password string) (string, error) {
hash, err := bcrypt.GenerateFromPassword([]byte(password), bcrypt.DefaultCost)
return string(hash), err
}
-// CheckPasswordHash verifies if the given password matches the bcrypt hash.
func CheckPasswordHash(hash, password string) bool {
err := bcrypt.CompareHashAndPassword([]byte(hash), []byte(password))
return err == nil
diff --git a/util/json_util/json.go b/util/json_util/json.go
index d2d391bf..54e3728a 100644
--- a/util/json_util/json.go
+++ b/util/json_util/json.go
@@ -1,15 +1,12 @@
-// Package json_util provides JSON utilities including a custom RawMessage type.
package json_util
import (
"errors"
)
-// RawMessage is a custom JSON raw message type that marshals empty slices as "null".
type RawMessage []byte
-// MarshalJSON customizes the JSON marshaling behavior for RawMessage.
-// Empty RawMessage values are marshaled as "null" instead of "[]".
+// MarshalJSON: Customize json.RawMessage default behavior
func (m RawMessage) MarshalJSON() ([]byte, error) {
if len(m) == 0 {
return []byte("null"), nil
@@ -17,7 +14,7 @@ func (m RawMessage) MarshalJSON() ([]byte, error) {
return m, nil
}
-// UnmarshalJSON sets *m to a copy of the JSON data.
+// UnmarshalJSON: sets *m to a copy of data.
func (m *RawMessage) UnmarshalJSON(data []byte) error {
if m == nil {
return errors.New("json.RawMessage: UnmarshalJSON on nil pointer")
diff --git a/util/ldap/ldap.go b/util/ldap/ldap.go
new file mode 100644
index 00000000..3135dcab
--- /dev/null
+++ b/util/ldap/ldap.go
@@ -0,0 +1,91 @@
+package ldaputil
+
+import (
+ "crypto/tls"
+ "fmt"
+
+ "github.com/go-ldap/ldap/v3"
+)
+
+type Config struct {
+ Host string
+ Port int
+ UseTLS bool
+ BindDN string
+ Password string
+ BaseDN string
+ UserFilter string
+ UserAttr string
+ FlagField string
+ TruthyVals []string
+ Invert bool
+}
+
+// FetchVlessFlags returns map[email]enabled
+func FetchVlessFlags(cfg Config) (map[string]bool, error) {
+ addr := fmt.Sprintf("%s:%d", cfg.Host, cfg.Port)
+ var conn *ldap.Conn
+ var err error
+ if cfg.UseTLS {
+ conn, err = ldap.DialTLS("tcp", addr, &tls.Config{InsecureSkipVerify: true})
+ } else {
+ conn, err = ldap.Dial("tcp", addr)
+ }
+ if err != nil {
+ return nil, err
+ }
+ defer conn.Close()
+
+ if cfg.BindDN != "" {
+ if err := conn.Bind(cfg.BindDN, cfg.Password); err != nil {
+ return nil, err
+ }
+ }
+
+ if cfg.UserFilter == "" {
+ cfg.UserFilter = "(objectClass=person)"
+ }
+ if cfg.UserAttr == "" {
+ cfg.UserAttr = "mail"
+ }
+ // if field not set we fallback to legacy vless_enabled
+ if cfg.FlagField == "" {
+ cfg.FlagField = "vless_enabled"
+ }
+
+ req := ldap.NewSearchRequest(
+ cfg.BaseDN,
+ ldap.ScopeWholeSubtree, ldap.NeverDerefAliases, 0, 0, false,
+ cfg.UserFilter,
+ []string{cfg.UserAttr, cfg.FlagField},
+ nil,
+ )
+
+ res, err := conn.Search(req)
+ if err != nil {
+ return nil, err
+ }
+
+ result := make(map[string]bool, len(res.Entries))
+ for _, e := range res.Entries {
+ user := e.GetAttributeValue(cfg.UserAttr)
+ if user == "" {
+ continue
+ }
+ val := e.GetAttributeValue(cfg.FlagField)
+ enabled := false
+ for _, t := range cfg.TruthyVals {
+ if val == t {
+ enabled = true
+ break
+ }
+ }
+ if cfg.Invert {
+ enabled = !enabled
+ }
+ result[user] = enabled
+ }
+ return result, nil
+}
+
+
diff --git a/util/random/random.go b/util/random/random.go
index c746df63..67ee0691 100644
--- a/util/random/random.go
+++ b/util/random/random.go
@@ -1,9 +1,7 @@
-// Package random provides utilities for generating random strings and numbers.
package random
import (
- "crypto/rand"
- "math/big"
+ "math/rand"
)
var (
@@ -15,8 +13,6 @@ var (
allSeq [62]rune
)
-// init initializes the character sequences used for random string generation.
-// It sets up arrays for numbers, lowercase letters, uppercase letters, and combinations.
func init() {
for i := 0; i < 10; i++ {
numSeq[i] = rune('0' + i)
@@ -37,25 +33,14 @@ func init() {
copy(allSeq[len(numSeq)+len(lowerSeq):], upperSeq[:])
}
-// Seq generates a random string of length n containing alphanumeric characters (numbers, lowercase and uppercase letters).
func Seq(n int) string {
runes := make([]rune, n)
for i := 0; i < n; i++ {
- idx, err := rand.Int(rand.Reader, big.NewInt(int64(len(allSeq))))
- if err != nil {
- panic("crypto/rand failed: " + err.Error())
- }
- runes[i] = allSeq[idx.Int64()]
+ runes[i] = allSeq[rand.Intn(len(allSeq))]
}
return string(runes)
}
-// Num generates a random integer between 0 and n-1.
func Num(n int) int {
- bn := big.NewInt(int64(n))
- r, err := rand.Int(rand.Reader, bn)
- if err != nil {
- panic("crypto/rand failed: " + err.Error())
- }
- return int(r.Int64())
+ return rand.Intn(n)
}
diff --git a/util/reflect_util/reflect.go b/util/reflect_util/reflect.go
index 1f557e0d..1fdaec50 100644
--- a/util/reflect_util/reflect.go
+++ b/util/reflect_util/reflect.go
@@ -1,9 +1,7 @@
-// Package reflect_util provides reflection utilities for working with struct fields and values.
package reflect_util
import "reflect"
-// GetFields returns all struct fields of the given reflect.Type.
func GetFields(t reflect.Type) []reflect.StructField {
num := t.NumField()
fields := make([]reflect.StructField, 0, num)
@@ -13,7 +11,6 @@ func GetFields(t reflect.Type) []reflect.StructField {
return fields
}
-// GetFieldValues returns all field values of the given reflect.Value.
func GetFieldValues(v reflect.Value) []reflect.Value {
num := v.NumField()
fields := make([]reflect.Value, 0, num)
diff --git a/util/sys/psutil.go b/util/sys/psutil.go
index 98adf775..3d7cac80 100644
--- a/util/sys/psutil.go
+++ b/util/sys/psutil.go
@@ -1,5 +1,3 @@
-// Package sys provides system utilities for monitoring network connections and CPU usage.
-// Platform-specific implementations are provided for Windows, Linux, and macOS.
package sys
import (
diff --git a/util/sys/sys_darwin.go b/util/sys/sys_darwin.go
index 6ecc78c0..3f5b2072 100644
--- a/util/sys/sys_darwin.go
+++ b/util/sys/sys_darwin.go
@@ -4,12 +4,7 @@
package sys
import (
- "encoding/binary"
- "fmt"
- "sync"
-
"github.com/shirou/gopsutil/v4/net"
- "golang.org/x/sys/unix"
)
func GetTCPCount() (int, error) {
@@ -27,69 +22,3 @@ func GetUDPCount() (int, error) {
}
return len(stats), nil
}
-
-// --- CPU Utilization (macOS native) ---
-
-// sysctl kern.cp_time returns an array of 5 longs: user, nice, sys, idle, intr.
-// We compute utilization deltas without cgo.
-var (
- cpuMu sync.Mutex
- lastTotals [5]uint64
- hasLastCPUT bool
-)
-
-func CPUPercentRaw() (float64, error) {
- raw, err := unix.SysctlRaw("kern.cp_time")
- if err != nil {
- return 0, err
- }
- // Expect either 5*8 bytes (uint64) or 5*4 bytes (uint32)
- var out [5]uint64
- switch len(raw) {
- case 5 * 8:
- for i := 0; i < 5; i++ {
- out[i] = binary.LittleEndian.Uint64(raw[i*8 : (i+1)*8])
- }
- case 5 * 4:
- for i := 0; i < 5; i++ {
- out[i] = uint64(binary.LittleEndian.Uint32(raw[i*4 : (i+1)*4]))
- }
- default:
- return 0, fmt.Errorf("unexpected kern.cp_time size: %d", len(raw))
- }
-
- // user, nice, sys, idle, intr
- user := out[0]
- nice := out[1]
- sysv := out[2]
- idle := out[3]
- intr := out[4]
-
- cpuMu.Lock()
- defer cpuMu.Unlock()
-
- if !hasLastCPUT {
- lastTotals = out
- hasLastCPUT = true
- return 0, nil
- }
-
- dUser := user - lastTotals[0]
- dNice := nice - lastTotals[1]
- dSys := sysv - lastTotals[2]
- dIdle := idle - lastTotals[3]
- dIntr := intr - lastTotals[4]
-
- lastTotals = out
-
- totald := dUser + dNice + dSys + dIdle + dIntr
- if totald == 0 {
- return 0, nil
- }
- busy := totald - dIdle
- pct := float64(busy) / float64(totald) * 100.0
- if pct > 100 {
- pct = 100
- }
- return pct, nil
-}
diff --git a/util/sys/sys_linux.go b/util/sys/sys_linux.go
index 23483b57..d4e6e8ae 100644
--- a/util/sys/sys_linux.go
+++ b/util/sys/sys_linux.go
@@ -4,14 +4,10 @@
package sys
import (
- "bufio"
"bytes"
"fmt"
"io"
"os"
- "strconv"
- "strings"
- "sync"
)
func getLinesNum(filename string) (int, error) {
@@ -45,8 +41,6 @@ func getLinesNum(filename string) (int, error) {
return sum, nil
}
-// GetTCPCount returns the number of active TCP connections by reading
-// /proc/net/tcp and /proc/net/tcp6 when available.
func GetTCPCount() (int, error) {
root := HostProc()
@@ -77,8 +71,6 @@ func GetUDPCount() (int, error) {
return udp4 + udp6, nil
}
-// safeGetLinesNum returns 0 if the file does not exist, otherwise forwards
-// to getLinesNum to count the number of lines.
func safeGetLinesNum(path string) (int, error) {
if _, err := os.Stat(path); os.IsNotExist(err) {
return 0, nil
@@ -87,99 +79,3 @@ func safeGetLinesNum(path string) (int, error) {
}
return getLinesNum(path)
}
-
-// --- CPU Utilization (Linux native) ---
-
-var (
- cpuMu sync.Mutex
- lastTotal uint64
- lastIdleAll uint64
- hasLast bool
-)
-
-// CPUPercentRaw returns instantaneous total CPU utilization by reading /proc/stat.
-// First call initializes and returns 0; subsequent calls return busy/total * 100.
-func CPUPercentRaw() (float64, error) {
- f, err := os.Open("/proc/stat")
- if err != nil {
- return 0, err
- }
- defer f.Close()
-
- rd := bufio.NewReader(f)
- line, err := rd.ReadString('\n')
- if err != nil && err != io.EOF {
- return 0, err
- }
- // Expect line like: cpu user nice system idle iowait irq softirq steal guest guest_nice
- fields := strings.Fields(line)
- if len(fields) < 5 || fields[0] != "cpu" {
- return 0, fmt.Errorf("unexpected /proc/stat format")
- }
-
- var nums []uint64
- for i := 1; i < len(fields); i++ {
- v, err := strconv.ParseUint(fields[i], 10, 64)
- if err != nil {
- break
- }
- nums = append(nums, v)
- }
- if len(nums) < 4 { // need at least user,nice,system,idle
- return 0, fmt.Errorf("insufficient cpu fields")
- }
-
- // Conform with standard Linux CPU accounting
- var user, nice, system, idle, iowait, irq, softirq, steal uint64
- user = nums[0]
- if len(nums) > 1 {
- nice = nums[1]
- }
- if len(nums) > 2 {
- system = nums[2]
- }
- if len(nums) > 3 {
- idle = nums[3]
- }
- if len(nums) > 4 {
- iowait = nums[4]
- }
- if len(nums) > 5 {
- irq = nums[5]
- }
- if len(nums) > 6 {
- softirq = nums[6]
- }
- if len(nums) > 7 {
- steal = nums[7]
- }
-
- idleAll := idle + iowait
- nonIdle := user + nice + system + irq + softirq + steal
- total := idleAll + nonIdle
-
- cpuMu.Lock()
- defer cpuMu.Unlock()
-
- if !hasLast {
- lastTotal = total
- lastIdleAll = idleAll
- hasLast = true
- return 0, nil
- }
-
- totald := total - lastTotal
- idled := idleAll - lastIdleAll
- lastTotal = total
- lastIdleAll = idleAll
-
- if totald == 0 {
- return 0, nil
- }
- busy := totald - idled
- pct := float64(busy) / float64(totald) * 100.0
- if pct > 100 {
- pct = 100
- }
- return pct, nil
-}
diff --git a/util/sys/sys_windows.go b/util/sys/sys_windows.go
index 186fa4bb..fd51d470 100644
--- a/util/sys/sys_windows.go
+++ b/util/sys/sys_windows.go
@@ -5,14 +5,10 @@ package sys
import (
"errors"
- "sync"
- "syscall"
- "unsafe"
"github.com/shirou/gopsutil/v4/net"
)
-// GetConnectionCount returns the number of active connections for the specified protocol ("tcp" or "udp").
func GetConnectionCount(proto string) (int, error) {
if proto != "tcp" && proto != "udp" {
return 0, errors.New("invalid protocol")
@@ -25,92 +21,10 @@ func GetConnectionCount(proto string) (int, error) {
return len(stats), nil
}
-// GetTCPCount returns the number of active TCP connections.
func GetTCPCount() (int, error) {
return GetConnectionCount("tcp")
}
-// GetUDPCount returns the number of active UDP connections.
func GetUDPCount() (int, error) {
return GetConnectionCount("udp")
}
-
-// --- CPU Utilization (Windows native) ---
-
-var (
- modKernel32 = syscall.NewLazyDLL("kernel32.dll")
- procGetSystemTimes = modKernel32.NewProc("GetSystemTimes")
-
- cpuMu sync.Mutex
- lastIdle uint64
- lastKernel uint64
- lastUser uint64
- hasLast bool
-)
-
-type filetime struct {
- LowDateTime uint32
- HighDateTime uint32
-}
-
-// ftToUint64 converts a Windows FILETIME-like struct to a uint64 for
-// arithmetic and delta calculations used by CPUPercentRaw.
-func ftToUint64(ft filetime) uint64 {
- return (uint64(ft.HighDateTime) << 32) | uint64(ft.LowDateTime)
-}
-
-// CPUPercentRaw returns the instantaneous total CPU utilization percentage using
-// Windows GetSystemTimes across all logical processors. The first call returns 0
-// as it initializes the baseline. Subsequent calls compute deltas.
-func CPUPercentRaw() (float64, error) {
- var idleFT, kernelFT, userFT filetime
- r1, _, e1 := procGetSystemTimes.Call(
- uintptr(unsafe.Pointer(&idleFT)),
- uintptr(unsafe.Pointer(&kernelFT)),
- uintptr(unsafe.Pointer(&userFT)),
- )
- if r1 == 0 { // failure
- if e1 != nil {
- return 0, e1
- }
- return 0, syscall.GetLastError()
- }
-
- idle := ftToUint64(idleFT)
- kernel := ftToUint64(kernelFT)
- user := ftToUint64(userFT)
-
- cpuMu.Lock()
- defer cpuMu.Unlock()
-
- if !hasLast {
- lastIdle = idle
- lastKernel = kernel
- lastUser = user
- hasLast = true
- return 0, nil
- }
-
- idleDelta := idle - lastIdle
- kernelDelta := kernel - lastKernel
- userDelta := user - lastUser
-
- // Update for next call
- lastIdle = idle
- lastKernel = kernel
- lastUser = user
-
- total := kernelDelta + userDelta
- if total == 0 {
- return 0, nil
- }
- // On Windows, kernel time includes idle time; busy = total - idle
- busy := total - idleDelta
-
- pct := float64(busy) / float64(total) * 100.0
- // lower bound not needed; ratios of uint64 are non-negative
- if pct > 100 {
- pct = 100
- }
- return pct, nil
-}
diff --git a/web/assets/ant-design-vue/antd-with-locales.min.js b/web/assets/ant-design-vue/antd-with-locales.min.js
new file mode 100644
index 00000000..faf69ce0
--- /dev/null
+++ b/web/assets/ant-design-vue/antd-with-locales.min.js
@@ -0,0 +1,3 @@
+/*! For license information please see antd-with-locales.min.js.LICENSE.txt */
+!function(e,t){"object"==typeof exports&&"object"==typeof module?module.exports=t(require("moment"),require("vue")):"function"==typeof define&&define.amd?define(["moment","vue"],t):"object"==typeof exports?exports.antd=t(require("moment"),require("vue")):e.antd=t(e.moment,e.Vue)}(window,(function(e,t){return function(e){var t={};function n(i){if(t[i])return t[i].exports;var r=t[i]={i:i,l:!1,exports:{}};return e[i].call(r.exports,r,r.exports,n),r.l=!0,r.exports}return n.m=e,n.c=t,n.d=function(e,t,i){n.o(e,t)||Object.defineProperty(e,t,{enumerable:!0,get:i})},n.r=function(e){"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})},n.t=function(e,t){if(1&t&&(e=n(e)),8&t)return e;if(4&t&&"object"==typeof e&&e&&e.__esModule)return e;var i=Object.create(null);if(n.r(i),Object.defineProperty(i,"default",{enumerable:!0,value:e}),2&t&&"string"!=typeof e)for(var r in e)n.d(i,r,function(t){return e[t]}.bind(null,r));return i},n.n=function(e){var t=e&&e.__esModule?function(){return e.default}:function(){return e};return n.d(t,"a",t),t},n.o=function(e,t){return Object.prototype.hasOwnProperty.call(e,t)},n.p="",n(n.s=545)}([function(e,t,n){"use strict";var i=n(14),r=n.n(i),a=n(35),o=n.n(a),s=Object.prototype,c=s.toString,l=s.hasOwnProperty,u=/^\s*function (\w+)/,h=function(e){var t=null!=e?e.type?e.type:e:null,n=t&&t.toString().match(u);return n&&n[1]},d=function(e){if(null==e)return null;var t=e.constructor.toString().match(u);return t&&t[1]},f=Number.isInteger||function(e){return"number"==typeof e&&isFinite(e)&&Math.floor(e)===e},p=Array.isArray||function(e){return"[object Array]"===c.call(e)},v=function(e){return"[object Function]"===c.call(e)},m=function(e,t){var n;return Object.defineProperty(t,"_vueTypes_name",{enumerable:!1,writable:!1,value:e}),n=t,Object.defineProperty(n,"isRequired",{get:function(){return this.required=!0,this},enumerable:!1}),function(e){Object.defineProperty(e,"def",{value:function(e){return void 0===e&&void 0===this.default?(this.default=void 0,this):v(e)||g(this,e)?(this.default=p(e)||o()(e)?function(){return e}:e,this):(b(this._vueTypes_name+' - invalid default value: "'+e+'"',e),this)},enumerable:!1,writable:!1})}(t),v(t.validator)&&(t.validator=t.validator.bind(t)),t},g=function e(t,n){var i=arguments.length>2&&void 0!==arguments[2]&&arguments[2],r=t,a=!0,s=void 0;o()(t)||(r={type:t});var c=r._vueTypes_name?r._vueTypes_name+" - ":"";return l.call(r,"type")&&null!==r.type&&(p(r.type)?(a=r.type.some((function(t){return e(t,n,!0)})),s=r.type.map((function(e){return h(e)})).join(" or ")):a="Array"===(s=h(r))?p(n):"Object"===s?o()(n):"String"===s||"Number"===s||"Boolean"===s||"Function"===s?d(n)===s:n instanceof r.type),a?l.call(r,"validator")&&v(r.validator)?((a=r.validator(n))||!1!==i||b(c+"custom validation failed"),a):a:(!1===i&&b(c+'value "'+n+'" should be of type "'+s+'"'),!1)},b=function(){},y={get any(){return m("any",{type:null})},get func(){return m("function",{type:Function}).def(C.func)},get bool(){return m("boolean",{type:Boolean}).def(C.bool)},get string(){return m("string",{type:String}).def(C.string)},get number(){return m("number",{type:Number}).def(C.number)},get array(){return m("array",{type:Array}).def(C.array)},get object(){return m("object",{type:Object}).def(C.object)},get integer(){return m("integer",{type:Number,validator:function(e){return f(e)}}).def(C.integer)},get symbol(){return m("symbol",{type:null,validator:function(e){return"symbol"===(void 0===e?"undefined":r()(e))}})},custom:function(e){var t=arguments.length>1&&void 0!==arguments[1]?arguments[1]:"custom validation failed";if("function"!=typeof e)throw new TypeError("[VueTypes error]: You must provide a function as argument");return m(e.name||"<| Source IP | -|
| Source | +|
| Source Port | |
| VLESS Route | -|
| Network |