v2.5.6 - Happy Nowruz

* chore: pretty 'Inbounds' page

* chore: return styles for aCustomStatistic

styles was intended to properly display a-statistic in the app, but for some unknown reason it was removed

* fix: switch style in dark mode

---------

.github/workflows/docker.yml

@@ -7,7 +7,7 @@ on:
 
 jobs:
   build:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
 
     steps:
     - uses: actions/checkout@v4

.github/workflows/release.yml

@@ -18,7 +18,7 @@ jobs:
           - 386
           - armv5
           - s390x
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     steps:
       - name: Checkout repository
         uses: actions/checkout@v4
@@ -83,7 +83,7 @@ jobs:
           cd x-ui/bin
           
           # Download dependencies
-          Xray_URL="https://github.com/XTLS/Xray-core/releases/download/v25.3.3/"
+          Xray_URL="https://github.com/XTLS/Xray-core/releases/download/v25.3.6/"
           if [ "${{ matrix.platform }}" == "amd64" ]; then
             wget -q ${Xray_URL}Xray-linux-64.zip
             unzip Xray-linux-64.zip

DockerInit.sh

@@ -27,7 +27,7 @@ case $1 in
 esac
 mkdir -p build/bin
 cd build/bin
-wget -q "https://github.com/XTLS/Xray-core/releases/download/v25.3.3/Xray-linux-${ARCH}.zip"
+wget -q "https://github.com/XTLS/Xray-core/releases/download/v25.3.6/Xray-linux-${ARCH}.zip"
 unzip "Xray-linux-${ARCH}.zip"
 rm -f "Xray-linux-${ARCH}.zip" geoip.dat geosite.dat
 mv xray "xray-linux-${FNAME}"

README.es_ES.md

@@ -244,7 +244,7 @@ location /sub {
 
 ## SO Recomendados
 
-- Ubuntu 20.04+
+- Ubuntu 22.04+
 - Debian 11+
 - CentOS 8+
 - OpenEuler 22.03+
@@ -258,6 +258,7 @@ location /sub {
 - Oracle Linux 8+
 - OpenSUSE Tubleweed
 - Amazon Linux 2023
+- Virtuozzo Linux 8+
 - Windows x64
 
 ## Arquitecturas y Dispositivos Compatibles

README.fa_IR.md

@@ -245,7 +245,7 @@ location /sub {
 
 ## سیستم‌عامل‌های توصیه شده
 
-- Ubuntu 20.04+
+- Ubuntu 22.04+
 - Debian 11+
 - CentOS 8+
 - OpenEuler 22.03+
@@ -259,6 +259,7 @@ location /sub {
 - Oracle Linux 8+
 - OpenSUSE Tubleweed
 - Amazon Linux 2023
+- Virtuozzo Linux 8+
 - Windows x64
 
 ## معماری‌ها و دستگاه‌های پشتیبانی شده

README.md

@@ -249,7 +249,7 @@ location /sub {
 
 ## Recommended OS
 
-- Ubuntu 20.04+
+- Ubuntu 22.04+
 - Debian 11+
 - CentOS 8+
 - OpenEuler 22.03+
@@ -263,6 +263,7 @@ location /sub {
 - Oracle Linux 8+
 - OpenSUSE Tubleweed
 - Amazon Linux 2023
+- Virtuozzo Linux 8+
 - Windows x64
 
 ## Supported Architectures and Devices

README.ru_RU.md

@@ -248,7 +248,7 @@ location /sub {
 
 ## Рекомендуемые ОС
 
-- Ubuntu 20.04+
+- Ubuntu 22.04+
 - Debian 11+
 - CentOS 8+
 - OpenEuler 22.03+
@@ -262,6 +262,7 @@ location /sub {
 - Oracle Linux 8+
 - OpenSUSE Tubleweed
 - Amazon Linux 2023
+- Virtuozzo Linux 8+
 - Windows x64
 
 ## Поддерживаемые архитектуры и устройства

README.zh_CN.md

@@ -245,7 +245,7 @@ location /sub {
 
 ## 建议使用的操作系统
 
-- Ubuntu 20.04+
+- Ubuntu 22.04+
 - Debian 11+
 - CentOS 8+
 - OpenEuler 22.03+
@@ -259,6 +259,7 @@ location /sub {
 - Oracle Linux 8+
 - OpenSUSE Tubleweed
 - Amazon Linux 2023
+- Virtuozzo Linux 8+
 - Windows x64
 
 ## 支持的架构和设备

config/version

@@ -1 +1 @@
-2.5.4
+2.5.6

database/db.go

@@ -26,7 +26,7 @@ const (
 )
 
 func initModels() error {
-	models := []interface{}{
+	models := []any{
 		&model.User{},
 		&model.Inbound{},
 		&model.OutboundTraffics{},

go.mod

@@ -14,9 +14,9 @@ require (
 	github.com/robfig/cron/v3 v3.0.1
 	github.com/shirou/gopsutil/v4 v4.25.2
 	github.com/valyala/fasthttp v1.59.0
-	github.com/xtls/xray-core v1.8.25-0.20250303153022-e15dff94b5bd
+	github.com/xtls/xray-core v1.250306.0
 	go.uber.org/atomic v1.11.0
-	golang.org/x/text v0.22.0
+	golang.org/x/text v0.23.0
 	google.golang.org/grpc v1.71.0
 	gorm.io/driver/sqlite v1.5.7
 	gorm.io/gorm v1.25.12
@@ -24,8 +24,8 @@ require (
 
 require (
 	github.com/andybalholm/brotli v1.1.1 // indirect
-	github.com/bytedance/sonic v1.12.10 // indirect
+	github.com/bytedance/sonic v1.13.1 // indirect
-	github.com/bytedance/sonic/loader v0.2.3 // indirect
+	github.com/bytedance/sonic/loader v0.2.4 // indirect
 	github.com/cloudflare/circl v1.6.0 // indirect
 	github.com/cloudwego/base64x v0.1.5 // indirect
 	github.com/dgryski/go-metro v0.0.0-20250106013310-edb8663e5e33 // indirect
@@ -39,7 +39,7 @@ require (
 	github.com/go-playground/validator/v10 v10.25.0 // indirect
 	github.com/go-task/slim-sprig/v3 v3.0.0 // indirect
 	github.com/google/btree v1.1.3 // indirect
-	github.com/google/pprof v0.0.0-20250302191652-9094ed2288e7 // indirect
+	github.com/google/pprof v0.0.0-20250317173921-a4b03ec1a45e // indirect
 	github.com/gorilla/context v1.1.2 // indirect
 	github.com/gorilla/securecookie v1.1.2 // indirect
 	github.com/gorilla/sessions v1.4.0 // indirect
@@ -52,12 +52,12 @@ require (
 	github.com/klauspost/cpuid/v2 v2.2.10 // 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-20250303091104-876f3ea5145d // 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.24 // indirect
 	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
 	github.com/modern-go/reflect2 v1.0.2 // indirect
-	github.com/onsi/ginkgo/v2 v2.22.2 // indirect
+	github.com/onsi/ginkgo/v2 v2.23.1 // indirect
 	github.com/pires/go-proxyproto v0.8.0 // indirect
 	github.com/power-devops/perfstat v0.0.0-20240221224432-82ca36839d55 // indirect
 	github.com/quic-go/qpack v0.5.1 // indirect
@@ -65,12 +65,12 @@ require (
 	github.com/refraction-networking/utls v1.6.7 // 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.6.2 // indirect
+	github.com/sagernet/sing v0.6.3 // indirect
 	github.com/sagernet/sing-shadowsocks v0.2.7 // indirect
 	github.com/savsgio/gotils v0.0.0-20240704082632-aef3928b8a38 // indirect
 	github.com/seiflotfy/cuckoofilter v0.0.0-20240715131351-a2f2c23f1771 // indirect
-	github.com/tklauser/go-sysconf v0.3.14 // indirect
+	github.com/tklauser/go-sysconf v0.3.15 // indirect
-	github.com/tklauser/numcpus v0.9.0 // indirect
+	github.com/tklauser/numcpus v0.10.0 // indirect
 	github.com/twitchyliquid64/golang-asm v0.15.1 // indirect
 	github.com/ugorji/go/codec v1.2.12 // indirect
 	github.com/v2fly/ss-bloomring v0.0.0-20210312155135-28617310f63e // indirect
@@ -83,17 +83,17 @@ require (
 	go.uber.org/mock v0.5.0 // indirect
 	go4.org/netipx v0.0.0-20231129151722-fdeea329fbba // indirect
 	golang.org/x/arch v0.15.0 // indirect
-	golang.org/x/crypto v0.35.0 // indirect
+	golang.org/x/crypto v0.36.0 // indirect
-	golang.org/x/exp v0.0.0-20250228200357-dead58393ab7 // indirect
+	golang.org/x/exp v0.0.0-20250305212735-054e65f0b394 // indirect
 	golang.org/x/mod v0.24.0 // indirect
-	golang.org/x/net v0.36.0 // indirect
+	golang.org/x/net v0.37.0 // indirect
 	golang.org/x/sync v0.12.0 // indirect
 	golang.org/x/sys v0.31.0 // indirect
 	golang.org/x/time v0.11.0 // indirect
-	golang.org/x/tools v0.30.0 // indirect
+	golang.org/x/tools v0.31.0 // indirect
 	golang.zx2c4.com/wintun v0.0.0-20230126152724-0fa3db229ce2 // indirect
 	golang.zx2c4.com/wireguard v0.0.0-20231211153847-12269c276173 // indirect
-	google.golang.org/genproto/googleapis/rpc v0.0.0-20250303144028-a0af3efb3deb // indirect
+	google.golang.org/genproto/googleapis/rpc v0.0.0-20250313205543-e70fdf4c4cb4 // indirect
 	google.golang.org/protobuf v1.36.5 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 	gvisor.dev/gvisor v0.0.0-20240320123526-dc6abceb7ff0 // indirect

go.sum

@@ -4,11 +4,11 @@ github.com/OmarTariq612/goech v0.0.0-20240405204721-8e2e1dafd3a0 h1:Wo41lDOevRJS
 github.com/OmarTariq612/goech v0.0.0-20240405204721-8e2e1dafd3a0/go.mod h1:FVGavL/QEBQDcBpr3fAojoK17xX5k9bicBphrOpP7uM=
 github.com/andybalholm/brotli v1.1.1 h1:PR2pgnyFznKEugtsUo0xLdDop5SKXd5Qf5ysW+7XdTA=
 github.com/andybalholm/brotli v1.1.1/go.mod h1:05ib4cKhjx3OQYUY22hTVd34Bc8upXjOLL2rKwwZBoA=
-github.com/bytedance/sonic v1.12.10 h1:uVCQr6oS5669E9ZVW0HyksTLfNS7Q/9hV6IVS4nEMsI=
+github.com/bytedance/sonic v1.13.1 h1:Jyd5CIvdFnkOWuKXr+wm4Nyk2h0yAFsr8ucJgEasO3g=
-github.com/bytedance/sonic v1.12.10/go.mod h1:uVvFidNmlt9+wa31S1urfwwthTWteBgG0hWuoKAXTx8=
+github.com/bytedance/sonic v1.13.1/go.mod h1:o68xyaF9u2gvVBuGHPlUVCy+ZfmNNO5ETf1+KgkJhz4=
 github.com/bytedance/sonic/loader v0.1.1/go.mod h1:ncP89zfokxS5LZrJxl5z0UJcsk4M4yY2JpfqGeCtNLU=
-github.com/bytedance/sonic/loader v0.2.3 h1:yctD0Q3v2NOGfSWPLPvG2ggA2kV6TS6s4wioyEqssH0=
+github.com/bytedance/sonic/loader v0.2.4 h1:ZWCw4stuXUsn1/+zQDqeE7JKP+QO47tz7QCNan80NzY=
-github.com/bytedance/sonic/loader v0.2.3/go.mod h1:N8A3vUdtUebEY2/VQC0MyhYeKUFosQU6FxH2JmUe6VI=
+github.com/bytedance/sonic/loader v0.2.4/go.mod h1:N8A3vUdtUebEY2/VQC0MyhYeKUFosQU6FxH2JmUe6VI=
 github.com/cloudflare/circl v1.6.0 h1:cr5JKic4HI+LkINy2lg3W2jF8sHCVTBncJr5gIIq7qk=
 github.com/cloudflare/circl v1.6.0/go.mod h1:uddAzsPgqdMAYatqJ0lsjX1oECcQLIlRpzZh3pJrofs=
 github.com/cloudwego/base64x v0.1.5 h1:XPciSp1xaq2VCSt6lF0phncD4koWyULpl5bUxbfCyP4=
@@ -67,8 +67,8 @@ github.com/google/go-cmp v0.7.0/go.mod h1:pXiqmnSA92OHEEa9HXL2W4E7lf9JzCmGVUdgjX
 github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
 github.com/google/gofuzz v1.2.0 h1:xRy4A+RhZaiKjJ1bPfwQ8sedCA+YS2YcCHW6ec7JMi0=
 github.com/google/gofuzz v1.2.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
-github.com/google/pprof v0.0.0-20250302191652-9094ed2288e7 h1:+J3r2e8+RsmN3vKfo75g0YSY61ms37qzPglu4p0sGro=
+github.com/google/pprof v0.0.0-20250317173921-a4b03ec1a45e h1:ijClszYn+mADRFY17kjQEVQ1XRhq2/JR1M3sGqeJoxs=
-github.com/google/pprof v0.0.0-20250302191652-9094ed2288e7/go.mod h1:vavhavw2zAxS5dIdcRluK6cSGGPlZynqzFM8NdvU144=
+github.com/google/pprof v0.0.0-20250317173921-a4b03ec1a45e/go.mod h1:boTsfXsheKC2y+lKOCMpSfarhxDeIzfZG1jqGcPl3cA=
 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=
@@ -99,8 +99,8 @@ 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-20250303091104-876f3ea5145d h1:fjMbDVUGsMQiVZnSQsmouYJvMdwsGiDipOZoN66v844=
+github.com/lufia/plan9stats v0.0.0-20250317134145-8bc96cf8fc35 h1:PpXWgLPs+Fqr325bN2FD2ISlRRztXibcX6e8f5FR5Dc=
-github.com/lufia/plan9stats v0.0.0-20250303091104-876f3ea5145d/go.mod h1:autxFIvghDt3jPTLoqZ9OZ7s9qTGNAWmYCjVFWPX/zg=
+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.24 h1:tpSp2G2KyMnnQu99ngJ47EIkWVmliIizyZBfPrBWDRM=
@@ -116,8 +116,8 @@ 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.5.1 h1:IxtPxYsR9Gp60cGXjfuR/llTqV8aYMsC472zD0D1vHk=
 github.com/nicksnyder/go-i18n/v2 v2.5.1/go.mod h1:DrhgsSDZxoAfvVrBVLXoxZn/pN5TXqaDbq7ju94viiQ=
-github.com/onsi/ginkgo/v2 v2.22.2 h1:/3X8Panh8/WwhU/3Ssa6rCKqPLuAkVY2I0RoyDLySlU=
+github.com/onsi/ginkgo/v2 v2.23.1 h1:Ox0cOPv/t8RzKJUfDo9ZKtRvBOJY369sFJnl00CjqwY=
-github.com/onsi/ginkgo/v2 v2.22.2/go.mod h1:oeMosUL+8LtarXBHu/c0bx2D/K9zyQ6uX3cTyztHwsk=
+github.com/onsi/ginkgo/v2 v2.23.1/go.mod h1:zXTP6xIp3U8aVuXN8ENK9IXRaTjFnpVB9mGmaSRvxnM=
 github.com/onsi/gomega v1.36.2 h1:koNYke6TVk6ZmnyHrCXba/T/MoLBXFjeC1PtvYgw0A8=
 github.com/onsi/gomega v1.36.2/go.mod h1:DdwyADRjrc825LhMEkD76cHR5+pUnjhUN8GlHlRPHzY=
 github.com/op/go-logging v0.0.0-20160315200505-970db520ece7 h1:lDH9UUVJtmYCjyT0CI4q8xvlXPxeZ0gYCVvWbmPlp88=
@@ -144,8 +144,8 @@ 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.6.2 h1:TR9WeH0yDJMjSFThqgFYe/i2pdH69Gb0tDJzJLPuVec=
+github.com/sagernet/sing v0.6.3 h1:J1spMc6LMlqUvRjWjvNMAcbvACDneqxB9zxfLuS0UTE=
-github.com/sagernet/sing v0.6.2/go.mod h1:ARkL0gM13/Iv5VCZmci/NuoOlePoIsW0m7BWfln/Hak=
+github.com/sagernet/sing v0.6.3/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-20240704082632-aef3928b8a38 h1:D0vL7YNisV2yqE55+q0lFuGse6U8lxlg7fYTctlT5Gc=
@@ -167,10 +167,10 @@ github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o
 github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=
 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.14 h1:g5vzr9iPFFz24v2KZXs/pvpvh8/V9Fw6vQK5ZZb78yU=
+github.com/tklauser/go-sysconf v0.3.15 h1:VE89k0criAymJ/Os65CSn1IXaol+1wrsFHEB8Ol49K4=
-github.com/tklauser/go-sysconf v0.3.14/go.mod h1:1ym4lWMLUOhuBOPGtRcJm7tEGX4SCYNEEEtghGG/8uY=
+github.com/tklauser/go-sysconf v0.3.15/go.mod h1:Dmjwr6tYFIseJw7a3dRLJfsHAMXZ3nEnL/aZY+0IuI4=
-github.com/tklauser/numcpus v0.9.0 h1:lmyCHtANi8aRUgkckBgoDk1nHCux3n2cgkJLXdQGPDo=
+github.com/tklauser/numcpus v0.10.0 h1:18njr6LDBk1zuna922MgdjQuJFjrdppsZG60sHGfjso=
-github.com/tklauser/numcpus v0.9.0/go.mod h1:SN6Nq1O3VychhC1npsWostA+oW+VOQTxZrS604NSRyI=
+github.com/tklauser/numcpus v0.10.0/go.mod h1:BiTKazU708GQTYF4mB+cmlpT2Is1gLk7XVuEeem8LsQ=
 github.com/twitchyliquid64/golang-asm v0.15.1 h1:SU5vSMR7hnwNxj24w34ZyCi/FmDZTkS4MhqMhdFk5YI=
 github.com/twitchyliquid64/golang-asm v0.15.1/go.mod h1:a1lVb/DtPvCB8fslRZhAngC2+aY1QWCk3Cedj/Gdt08=
 github.com/ugorji/go/codec v1.2.12 h1:9LC83zGrHhuUA9l16C9AHXAqEV/2wBQ4nkvumAE65EE=
@@ -190,8 +190,8 @@ github.com/vishvananda/netns v0.0.5 h1:DfiHV+j8bA32MFM7bfEunvT8IAqQ/NzSJHtcmW5zd
 github.com/vishvananda/netns v0.0.5/go.mod h1:SpkAiCQRtJ6TvvxPnOSyH3BMl6unz3xZlaprSwhNNJM=
 github.com/xtls/reality v0.0.0-20240909153216-e26ae2305463 h1:g1Cj7d+my6k/HHxLAyxPwyX8i7FGRr6ulBDMkBzg2BM=
 github.com/xtls/reality v0.0.0-20240909153216-e26ae2305463/go.mod h1:BjIOLmkEEtAgloAiVUcYj0Mt+YU00JARZw8AEU0IwAg=
-github.com/xtls/xray-core v1.8.25-0.20250303153022-e15dff94b5bd h1:xzZCYhdr1pL1kZe7GysAMuVNtlzXqsQKTFbc1xvR+bI=
+github.com/xtls/xray-core v1.250306.0 h1:XZyZvSgcpAoVEGnFnxNdoHbSF7Kp77A/0TPk4lhv6rM=
-github.com/xtls/xray-core v1.8.25-0.20250303153022-e15dff94b5bd/go.mod h1:0n4A2nJD1yZlxuXexV5rJODKcJJo8zpbTFcESVg8fgM=
+github.com/xtls/xray-core v1.250306.0/go.mod h1:clXnUOnX6CKWBGgJY4ePYhb/EtTdSrUC7vPfT6m5p4c=
 github.com/xyproto/randomstring v1.0.5 h1:YtlWPoRdgMu3NZtP45drfy1GKoojuR7hmRcnhZqKjWU=
 github.com/xyproto/randomstring v1.0.5/go.mod h1:rgmS5DeNXLivK7YprL0pY+lTuhNQW3iGxZ18UQApw/E=
 github.com/yusufpapurcu/wmi v1.2.4 h1:zFUKzehAFReQwLys1b/iSMl+JQGSCSjtVqQn9bBrPo0=
@@ -216,14 +216,14 @@ go4.org/netipx v0.0.0-20231129151722-fdeea329fbba h1:0b9z3AuHCjxk0x/opv64kcgZLBs
 go4.org/netipx v0.0.0-20231129151722-fdeea329fbba/go.mod h1:PLyyIXexvUFg3Owu6p/WfdlivPbZJsZdgWZlrGope/Y=
 golang.org/x/arch v0.15.0 h1:QtOrQd0bTUnhNVNndMpLHNWrDmYzZ2KDqSrEymqInZw=
 golang.org/x/arch v0.15.0/go.mod h1:JmwW7aLIoRUKgaTzhkiEFxvcEiQGyOg9BMonBJUS7EE=
-golang.org/x/crypto v0.35.0 h1:b15kiHdrGCHrP6LvwaQ3c03kgNhhiMgvlhxHQhmg2Xs=
+golang.org/x/crypto v0.36.0 h1:AnAEvhDddvBdpY+uR+MyHmuZzzNqXSe/GvuDeob5L34=
-golang.org/x/crypto v0.35.0/go.mod h1:dy7dXNW32cAb/6/PRuTNsix8T+vJAqvuIy5Bli/x0YQ=
+golang.org/x/crypto v0.36.0/go.mod h1:Y4J0ReaxCR1IMaabaSMugxJES1EpwhBHhv2bDHklZvc=
-golang.org/x/exp v0.0.0-20250228200357-dead58393ab7 h1:aWwlzYV971S4BXRS9AmqwDLAD85ouC6X+pocatKY58c=
+golang.org/x/exp v0.0.0-20250305212735-054e65f0b394 h1:nDVHiLt8aIbd/VzvPWN6kSOPE7+F/fNFDSXLVYkE/Iw=
-golang.org/x/exp v0.0.0-20250228200357-dead58393ab7/go.mod h1:BHOTPb3L19zxehTsLoJXVaTktb06DFgmdW6Wb9s8jqk=
+golang.org/x/exp v0.0.0-20250305212735-054e65f0b394/go.mod h1:sIifuuw/Yco/y6yb6+bDNfyeQ/MdPUy/hKEMYQV17cM=
 golang.org/x/mod v0.24.0 h1:ZfthKaKaT4NrhGVZHO1/WDTwGES4De8KtWO0SIbNJMU=
 golang.org/x/mod v0.24.0/go.mod h1:IXM97Txy2VM4PJ3gI61r1YEk/gAj6zAHN3AdZt6S9Ww=
-golang.org/x/net v0.36.0 h1:vWF2fRbw4qslQsQzgFqZff+BItCvGFQqKzKIzx1rmoA=
+golang.org/x/net v0.37.0 h1:1zLorHbz+LYj7MQlSf1+2tPIIgibq2eL5xkrGk6f+2c=
-golang.org/x/net v0.36.0/go.mod h1:bFmbeoIPfrw4sMHNhb4J9f6+tPziuGjq7Jk/38fxi1I=
+golang.org/x/net v0.37.0/go.mod h1:ivrbrMbzFq5J41QOQh0siUuly180yBYtLp+CKbEaFx8=
 golang.org/x/sync v0.12.0 h1:MHc5BpPuC30uJk597Ri8TV3CNZcTLu6B6z4lJy+g6Jw=
 golang.org/x/sync v0.12.0/go.mod h1:1dzgHSNfp02xaA81J2MS99Qcpr2w7fw1gpm99rleRqA=
 golang.org/x/sys v0.0.0-20190916202348-b4ddaad3f8a3/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
@@ -234,18 +234,18 @@ golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.10.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.31.0 h1:ioabZlmFYtWhL+TRYpcnNlLwhyxaM9kWTDEmfnprqik=
 golang.org/x/sys v0.31.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k=
-golang.org/x/text v0.22.0 h1:bofq7m3/HAFvbF51jz3Q9wLg3jkvSPuiZu/pD1XwgtM=
+golang.org/x/text v0.23.0 h1:D71I7dUrlY+VX0gQShAThNGHFxZ13dGLBHQLVl1mJlY=
-golang.org/x/text v0.22.0/go.mod h1:YRoo4H8PVmsu+E3Ou7cqLVH8oXWIHVoX0jqUWALQhfY=
+golang.org/x/text v0.23.0/go.mod h1:/BLNzu4aZCJ1+kcD0DNRotWKage4q2rGVAg4o22unh4=
 golang.org/x/time v0.11.0 h1:/bpjEDfN9tkoN/ryeYHnv5hcMlc8ncjMcM4XBk5NWV0=
 golang.org/x/time v0.11.0/go.mod h1:CDIdPxbZBQxdj6cxyCIdrNogrJKMJ7pr37NYpMcMDSg=
-golang.org/x/tools v0.30.0 h1:BgcpHewrV5AUp2G9MebG4XPFI1E2W41zU1SaqVA9vJY=
+golang.org/x/tools v0.31.0 h1:0EedkvKDbh+qistFTd0Bcwe/YLh4vHwWEkiI0toFIBU=
-golang.org/x/tools v0.30.0/go.mod h1:c347cR/OJfw5TI+GfX7RUPNMdDRRbjvYTS0jPyvsVtY=
+golang.org/x/tools v0.31.0/go.mod h1:naFTU+Cev749tSJRXJlna0T3WxKvb1kWEx15xA4SdmQ=
 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-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-20250303144028-a0af3efb3deb h1:TLPQVbx1GJ8VKZxz52VAxl1EBgKXXbTiU9Fc5fZeLn4=
+google.golang.org/genproto/googleapis/rpc v0.0.0-20250313205543-e70fdf4c4cb4 h1:iK2jbkWL86DXjEx0qiHcRE9dE4/Ahua5k6V8OWFb//c=
-google.golang.org/genproto/googleapis/rpc v0.0.0-20250303144028-a0af3efb3deb/go.mod h1:LuRYeWDFV6WOn90g357N17oMCaxpgCnbi/44qJvDn2I=
+google.golang.org/genproto/googleapis/rpc v0.0.0-20250313205543-e70fdf4c4cb4/go.mod h1:LuRYeWDFV6WOn90g357N17oMCaxpgCnbi/44qJvDn2I=
 google.golang.org/grpc v1.71.0 h1:kF77BGdPTQ4/JZWMlb9VpJ5pa25aqvVqogsxNHHdeBg=
 google.golang.org/grpc v1.71.0/go.mod h1:H0GRtasmQOh9LkFoCPDu3ZrwUtD1YGE+b2vYBYd/8Ec=
 google.golang.org/protobuf v1.36.5 h1:tPhr+woSbjfYvY6/GPufUoYizxw1cF/yFoxJ2fmpwlM=

install.sh

@@ -63,8 +63,8 @@ elif [[ "${release}" == "centos" ]]; then
         echo -e "${red} Please use CentOS 8 or higher ${plain}\n" && exit 1
     fi
 elif [[ "${release}" == "ubuntu" ]]; then
-    if [[ ${os_version} -lt 2004 ]]; then
+    if [[ ${os_version} -lt 2204 ]]; then
-        echo -e "${red} Please use Ubuntu 20 or higher version!${plain}\n" && exit 1
+        echo -e "${red} Please use Ubuntu 22 or higher version!${plain}\n" && exit 1
     fi
 elif [[ "${release}" == "fedora" ]]; then
     if [[ ${os_version} -lt 36 ]]; then
@@ -97,7 +97,7 @@ elif [[ "${release}" == "virtuozzo" ]]; then
 else
     echo -e "${red}Your operating system is not supported by this script.${plain}\n"
     echo "Please ensure you are using one of the following supported operating systems:"
-    echo "- Ubuntu 20.04+"
+    echo "- Ubuntu 22.04+"
     echo "- Debian 11+"
     echo "- CentOS 8+"
     echo "- OpenEuler 22.03+"

logger/logger.go

@@ -47,52 +47,52 @@ func InitLogger(level logging.Level) {
 	logger = newLogger
 }
 
-func Debug(args ...interface{}) {
+func Debug(args ...any) {
 	logger.Debug(args...)
 	addToBuffer("DEBUG", fmt.Sprint(args...))
 }
 
-func Debugf(format string, args ...interface{}) {
+func Debugf(format string, args ...any) {
 	logger.Debugf(format, args...)
 	addToBuffer("DEBUG", fmt.Sprintf(format, args...))
 }
 
-func Info(args ...interface{}) {
+func Info(args ...any) {
 	logger.Info(args...)
 	addToBuffer("INFO", fmt.Sprint(args...))
 }
 
-func Infof(format string, args ...interface{}) {
+func Infof(format string, args ...any) {
 	logger.Infof(format, args...)
 	addToBuffer("INFO", fmt.Sprintf(format, args...))
 }
 
-func Notice(args ...interface{}) {
+func Notice(args ...any) {
 	logger.Notice(args...)
 	addToBuffer("NOTICE", fmt.Sprint(args...))
 }
 
-func Noticef(format string, args ...interface{}) {
+func Noticef(format string, args ...any) {
 	logger.Noticef(format, args...)
 	addToBuffer("NOTICE", fmt.Sprintf(format, args...))
 }
 
-func Warning(args ...interface{}) {
+func Warning(args ...any) {
 	logger.Warning(args...)
 	addToBuffer("WARNING", fmt.Sprint(args...))
 }
 
-func Warningf(format string, args ...interface{}) {
+func Warningf(format string, args ...any) {
 	logger.Warningf(format, args...)
 	addToBuffer("WARNING", fmt.Sprintf(format, args...))
 }
 
-func Error(args ...interface{}) {
+func Error(args ...any) {
 	logger.Error(args...)
 	addToBuffer("ERROR", fmt.Sprint(args...))
 }
 
-func Errorf(format string, args ...interface{}) {
+func Errorf(format string, args ...any) {
 	logger.Errorf(format, args...)
 	addToBuffer("ERROR", fmt.Sprintf(format, args...))
 }

sub/sub.go

@@ -107,11 +107,16 @@ func (s *Server) initRouter() (*gin.Engine, error) {
 		SubJsonRules = ""
 	}
 
+	SubTitle, err := s.settingService.GetSubTitle()
+	if err != nil {
+		SubTitle = ""
+	}
+
 	g := engine.Group("/")
 
 	s.sub = NewSUBController(
 		g, LinksPath, JsonPath, Encrypt, ShowInfo, RemarkModel, SubUpdates,
-		SubJsonFragment, SubJsonNoises, SubJsonMux, SubJsonRules)
+		SubJsonFragment, SubJsonNoises, SubJsonMux, SubJsonRules, SubTitle)
 
 	return engine, nil
 }

sub/subController.go

@@ -9,6 +9,7 @@ import (
 )
 
 type SUBController struct {
+	subTitle       string
 	subPath        string
 	subJsonPath    string
 	subEncrypt     bool
@@ -30,9 +31,11 @@ func NewSUBController(
 	jsonNoise string,
 	jsonMux string,
 	jsonRules string,
+	subTitle string,
 ) *SUBController {
 	sub := NewSubService(showInfo, rModel)
 	a := &SUBController{
+		subTitle:       subTitle,
 		subPath:        subPath,
 		subJsonPath:    jsonPath,
 		subEncrypt:     encrypt,
@@ -82,7 +85,7 @@ func (a *SUBController) subs(c *gin.Context) {
 		// Add headers
 		c.Writer.Header().Set("Subscription-Userinfo", header)
 		c.Writer.Header().Set("Profile-Update-Interval", a.updateInterval)
-		c.Writer.Header().Set("Profile-Title", subId)
+		c.Writer.Header().Set("Profile-Title", a.subTitle)
 
 		if a.subEncrypt {
 			c.String(200, base64.StdEncoding.EncodeToString([]byte(result)))
@@ -116,7 +119,7 @@ func (a *SUBController) subJsons(c *gin.Context) {
 		// Add headers
 		c.Writer.Header().Set("Subscription-Userinfo", header)
 		c.Writer.Header().Set("Profile-Update-Interval", a.updateInterval)
-		c.Writer.Header().Set("Profile-Title", subId)
+		c.Writer.Header().Set("Profile-Title", a.subTitle)
 
 		c.String(200, jsonSub)
 	}

sub/subJsonService.go

@@ -18,7 +18,7 @@ import (
 var defaultJson string
 
 type SubJsonService struct {
-	configJson       map[string]interface{}
+	configJson       map[string]any
 	defaultOutbounds []json_util.RawMessage
 	fragment         string
 	noises           string
@@ -29,10 +29,10 @@ type SubJsonService struct {
 }
 
 func NewSubJsonService(fragment string, noises string, mux string, rules string, subService *SubService) *SubJsonService {
-	var configJson map[string]interface{}
+	var configJson map[string]any
 	var defaultOutbounds []json_util.RawMessage
 	json.Unmarshal([]byte(defaultJson), &configJson)
-	if outboundSlices, ok := configJson["outbounds"].([]interface{}); ok {
+	if outboundSlices, ok := configJson["outbounds"].([]any); ok {
 		for _, defaultOutbound := range outboundSlices {
 			jsonBytes, _ := json.Marshal(defaultOutbound)
 			defaultOutbounds = append(defaultOutbounds, jsonBytes)
@@ -40,9 +40,9 @@ func NewSubJsonService(fragment string, noises string, mux string, rules string,
 	}
 
 	if rules != "" {
-		var newRules []interface{}
+		var newRules []any
-		routing, _ := configJson["routing"].(map[string]interface{})
+		routing, _ := configJson["routing"].(map[string]any)
-		defaultRules, _ := routing["rules"].([]interface{})
+		defaultRules, _ := routing["rules"].([]any)
 		json.Unmarshal([]byte(rules), &newRules)
 		defaultRules = append(newRules, defaultRules...)
 		routing["rules"] = defaultRules
@@ -148,10 +148,10 @@ func (s *SubJsonService) getConfig(inbound *model.Inbound, client model.Client,
 	var newJsonArray []json_util.RawMessage
 	stream := s.streamData(inbound.StreamSettings)
 
-	externalProxies, ok := stream["externalProxy"].([]interface{})
+	externalProxies, ok := stream["externalProxy"].([]any)
 	if !ok || len(externalProxies) == 0 {
-		externalProxies = []interface{}{
+		externalProxies = []any{
-			map[string]interface{}{
+			map[string]any{
 				"forceTls": "same",
 				"dest":     host,
 				"port":     float64(inbound.Port),
@@ -163,7 +163,7 @@ func (s *SubJsonService) getConfig(inbound *model.Inbound, client model.Client,
 	delete(stream, "externalProxy")
 
 	for _, ep := range externalProxies {
-		extPrxy := ep.(map[string]interface{})
+		extPrxy := ep.(map[string]any)
 		inbound.Listen = extPrxy["dest"].(string)
 		inbound.Port = int(extPrxy["port"].(float64))
 		newStream := stream
@@ -171,7 +171,7 @@ func (s *SubJsonService) getConfig(inbound *model.Inbound, client model.Client,
 		case "tls":
 			if newStream["security"] != "tls" {
 				newStream["security"] = "tls"
-				newStream["tslSettings"] = map[string]interface{}{}
+				newStream["tslSettings"] = map[string]any{}
 			}
 		case "none":
 			if newStream["security"] != "none" {
@@ -191,7 +191,7 @@ func (s *SubJsonService) getConfig(inbound *model.Inbound, client model.Client,
 		}
 
 		newOutbounds = append(newOutbounds, s.defaultOutbounds...)
-		newConfigJson := make(map[string]interface{})
+		newConfigJson := make(map[string]any)
 		for key, value := range s.configJson {
 			newConfigJson[key] = value
 		}
@@ -205,14 +205,14 @@ func (s *SubJsonService) getConfig(inbound *model.Inbound, client model.Client,
 	return newJsonArray
 }
 
-func (s *SubJsonService) streamData(stream string) map[string]interface{} {
+func (s *SubJsonService) streamData(stream string) map[string]any {
-	var streamSettings map[string]interface{}
+	var streamSettings map[string]any
 	json.Unmarshal([]byte(stream), &streamSettings)
 	security, _ := streamSettings["security"].(string)
 	if security == "tls" {
-		streamSettings["tlsSettings"] = s.tlsData(streamSettings["tlsSettings"].(map[string]interface{}))
+		streamSettings["tlsSettings"] = s.tlsData(streamSettings["tlsSettings"].(map[string]any))
 	} else if security == "reality" {
-		streamSettings["realitySettings"] = s.realityData(streamSettings["realitySettings"].(map[string]interface{}))
+		streamSettings["realitySettings"] = s.realityData(streamSettings["realitySettings"].(map[string]any))
 	}
 	delete(streamSettings, "sockopt")
 
@@ -233,17 +233,17 @@ func (s *SubJsonService) streamData(stream string) map[string]interface{} {
 	return streamSettings
 }
 
-func (s *SubJsonService) removeAcceptProxy(setting interface{}) map[string]interface{} {
+func (s *SubJsonService) removeAcceptProxy(setting any) map[string]any {
-	netSettings, ok := setting.(map[string]interface{})
+	netSettings, ok := setting.(map[string]any)
 	if ok {
 		delete(netSettings, "acceptProxyProtocol")
 	}
 	return netSettings
 }
 
-func (s *SubJsonService) tlsData(tData map[string]interface{}) map[string]interface{} {
+func (s *SubJsonService) tlsData(tData map[string]any) map[string]any {
-	tlsData := make(map[string]interface{}, 1)
+	tlsData := make(map[string]any, 1)
-	tlsClientSettings, _ := tData["settings"].(map[string]interface{})
+	tlsClientSettings, _ := tData["settings"].(map[string]any)
 
 	tlsData["serverName"] = tData["serverName"]
 	tlsData["alpn"] = tData["alpn"]
@@ -256,9 +256,9 @@ func (s *SubJsonService) tlsData(tData map[string]interface{}) map[string]interf
 	return tlsData
 }
 
-func (s *SubJsonService) realityData(rData map[string]interface{}) map[string]interface{} {
+func (s *SubJsonService) realityData(rData map[string]any) map[string]any {
-	rltyData := make(map[string]interface{}, 1)
+	rltyData := make(map[string]any, 1)
-	rltyClientSettings, _ := rData["settings"].(map[string]interface{})
+	rltyClientSettings, _ := rData["settings"].(map[string]any)
 
 	rltyData["show"] = false
 	rltyData["publicKey"] = rltyClientSettings["publicKey"]
@@ -266,13 +266,13 @@ func (s *SubJsonService) realityData(rData map[string]interface{}) map[string]in
 
 	// Set random data
 	rltyData["spiderX"] = "/" + random.Seq(15)
-	shortIds, ok := rData["shortIds"].([]interface{})
+	shortIds, ok := rData["shortIds"].([]any)
 	if ok && len(shortIds) > 0 {
 		rltyData["shortId"] = shortIds[random.Num(len(shortIds))].(string)
 	} else {
 		rltyData["shortId"] = ""
 	}
-	serverNames, ok := rData["serverNames"].([]interface{})
+	serverNames, ok := rData["serverNames"].([]any)
 	if ok && len(serverNames) > 0 {
 		rltyData["serverName"] = serverNames[random.Num(len(serverNames))].(string)
 	} else {
@@ -329,7 +329,7 @@ func (s *SubJsonService) genServer(inbound *model.Inbound, streamSettings json_u
 	}
 
 	if inbound.Protocol == model.Shadowsocks {
-		var inboundSettings map[string]interface{}
+		var inboundSettings map[string]any
 		json.Unmarshal([]byte(inbound.Settings), &inboundSettings)
 		method, _ := inboundSettings["method"].(string)
 		serverData[0].Method = method
@@ -357,12 +357,12 @@ func (s *SubJsonService) genServer(inbound *model.Inbound, streamSettings json_u
 }
 
 type Outbound struct {
-	Protocol       string                 `json:"protocol"`
+	Protocol       string               `json:"protocol"`
-	Tag            string                 `json:"tag"`
+	Tag            string               `json:"tag"`
-	StreamSettings json_util.RawMessage   `json:"streamSettings"`
+	StreamSettings json_util.RawMessage `json:"streamSettings"`
-	Mux            json_util.RawMessage   `json:"mux,omitempty"`
+	Mux            json_util.RawMessage `json:"mux,omitempty"`
-	ProxySettings  map[string]interface{} `json:"proxySettings,omitempty"`
+	ProxySettings  map[string]any       `json:"proxySettings,omitempty"`
-	Settings       OutboundSettings       `json:"settings,omitempty"`
+	Settings       OutboundSettings     `json:"settings,omitempty"`
 }
 
 type OutboundSettings struct {

sub/subService.go

@@ -141,9 +141,9 @@ func (s *SubService) getFallbackMaster(dest string, streamSettings string) (stri
 		return "", 0, "", err
 	}
 
-	var stream map[string]interface{}
+	var stream map[string]any
 	json.Unmarshal([]byte(streamSettings), &stream)
-	var masterStream map[string]interface{}
+	var masterStream map[string]any
 	json.Unmarshal([]byte(inbound.StreamSettings), &masterStream)
 	stream["security"] = masterStream["security"]
 	stream["tlsSettings"] = masterStream["tlsSettings"]
@@ -171,66 +171,66 @@ func (s *SubService) genVmessLink(inbound *model.Inbound, email string) string {
 	if inbound.Protocol != model.VMESS {
 		return ""
 	}
-	obj := map[string]interface{}{
+	obj := map[string]any{
 		"v":    "2",
 		"add":  s.address,
 		"port": inbound.Port,
 		"type": "none",
 	}
-	var stream map[string]interface{}
+	var stream map[string]any
 	json.Unmarshal([]byte(inbound.StreamSettings), &stream)
 	network, _ := stream["network"].(string)
 	obj["net"] = network
 	switch network {
 	case "tcp":
-		tcp, _ := stream["tcpSettings"].(map[string]interface{})
+		tcp, _ := stream["tcpSettings"].(map[string]any)
-		header, _ := tcp["header"].(map[string]interface{})
+		header, _ := tcp["header"].(map[string]any)
 		typeStr, _ := header["type"].(string)
 		obj["type"] = typeStr
 		if typeStr == "http" {
-			request := header["request"].(map[string]interface{})
+			request := header["request"].(map[string]any)
-			requestPath, _ := request["path"].([]interface{})
+			requestPath, _ := request["path"].([]any)
 			obj["path"] = requestPath[0].(string)
-			headers, _ := request["headers"].(map[string]interface{})
+			headers, _ := request["headers"].(map[string]any)
 			obj["host"] = searchHost(headers)
 		}
 	case "kcp":
-		kcp, _ := stream["kcpSettings"].(map[string]interface{})
+		kcp, _ := stream["kcpSettings"].(map[string]any)
-		header, _ := kcp["header"].(map[string]interface{})
+		header, _ := kcp["header"].(map[string]any)
 		obj["type"], _ = header["type"].(string)
 		obj["path"], _ = kcp["seed"].(string)
 	case "ws":
-		ws, _ := stream["wsSettings"].(map[string]interface{})
+		ws, _ := stream["wsSettings"].(map[string]any)
 		obj["path"] = ws["path"].(string)
 		if host, ok := ws["host"].(string); ok && len(host) > 0 {
 			obj["host"] = host
 		} else {
-			headers, _ := ws["headers"].(map[string]interface{})
+			headers, _ := ws["headers"].(map[string]any)
 			obj["host"] = searchHost(headers)
 		}
 	case "grpc":
-		grpc, _ := stream["grpcSettings"].(map[string]interface{})
+		grpc, _ := stream["grpcSettings"].(map[string]any)
 		obj["path"] = grpc["serviceName"].(string)
 		obj["authority"] = grpc["authority"].(string)
 		if grpc["multiMode"].(bool) {
 			obj["type"] = "multi"
 		}
 	case "httpupgrade":
-		httpupgrade, _ := stream["httpupgradeSettings"].(map[string]interface{})
+		httpupgrade, _ := stream["httpupgradeSettings"].(map[string]any)
 		obj["path"] = httpupgrade["path"].(string)
 		if host, ok := httpupgrade["host"].(string); ok && len(host) > 0 {
 			obj["host"] = host
 		} else {
-			headers, _ := httpupgrade["headers"].(map[string]interface{})
+			headers, _ := httpupgrade["headers"].(map[string]any)
 			obj["host"] = searchHost(headers)
 		}
 	case "xhttp":
-		xhttp, _ := stream["xhttpSettings"].(map[string]interface{})
+		xhttp, _ := stream["xhttpSettings"].(map[string]any)
 		obj["path"] = xhttp["path"].(string)
 		if host, ok := xhttp["host"].(string); ok && len(host) > 0 {
 			obj["host"] = host
 		} else {
-			headers, _ := xhttp["headers"].(map[string]interface{})
+			headers, _ := xhttp["headers"].(map[string]any)
 			obj["host"] = searchHost(headers)
 		}
 		obj["mode"] = xhttp["mode"].(string)
@@ -238,8 +238,8 @@ func (s *SubService) genVmessLink(inbound *model.Inbound, email string) string {
 	security, _ := stream["security"].(string)
 	obj["tls"] = security
 	if security == "tls" {
-		tlsSetting, _ := stream["tlsSettings"].(map[string]interface{})
+		tlsSetting, _ := stream["tlsSettings"].(map[string]any)
-		alpns, _ := tlsSetting["alpn"].([]interface{})
+		alpns, _ := tlsSetting["alpn"].([]any)
 		if len(alpns) > 0 {
 			var alpn []string
 			for _, a := range alpns {
@@ -273,14 +273,14 @@ func (s *SubService) genVmessLink(inbound *model.Inbound, email string) string {
 	obj["id"] = clients[clientIndex].ID
 	obj["scy"] = clients[clientIndex].Security
 
-	externalProxies, _ := stream["externalProxy"].([]interface{})
+	externalProxies, _ := stream["externalProxy"].([]any)
 
 	if len(externalProxies) > 0 {
 		links := ""
 		for index, externalProxy := range externalProxies {
-			ep, _ := externalProxy.(map[string]interface{})
+			ep, _ := externalProxy.(map[string]any)
 			newSecurity, _ := ep["forceTls"].(string)
-			newObj := map[string]interface{}{}
+			newObj := map[string]any{}
 			for key, value := range obj {
 				if !(newSecurity == "none" && (key == "alpn" || key == "sni" || key == "fp" || key == "allowInsecure")) {
 					newObj[key] = value
@@ -313,7 +313,7 @@ func (s *SubService) genVlessLink(inbound *model.Inbound, email string) string {
 	if inbound.Protocol != model.VLESS {
 		return ""
 	}
-	var stream map[string]interface{}
+	var stream map[string]any
 	json.Unmarshal([]byte(inbound.StreamSettings), &stream)
 	clients, _ := s.inboundService.GetClients(inbound)
 	clientIndex := -1
@@ -331,54 +331,54 @@ func (s *SubService) genVlessLink(inbound *model.Inbound, email string) string {
 
 	switch streamNetwork {
 	case "tcp":
-		tcp, _ := stream["tcpSettings"].(map[string]interface{})
+		tcp, _ := stream["tcpSettings"].(map[string]any)
-		header, _ := tcp["header"].(map[string]interface{})
+		header, _ := tcp["header"].(map[string]any)
 		typeStr, _ := header["type"].(string)
 		if typeStr == "http" {
-			request := header["request"].(map[string]interface{})
+			request := header["request"].(map[string]any)
-			requestPath, _ := request["path"].([]interface{})
+			requestPath, _ := request["path"].([]any)
 			params["path"] = requestPath[0].(string)
-			headers, _ := request["headers"].(map[string]interface{})
+			headers, _ := request["headers"].(map[string]any)
 			params["host"] = searchHost(headers)
 			params["headerType"] = "http"
 		}
 	case "kcp":
-		kcp, _ := stream["kcpSettings"].(map[string]interface{})
+		kcp, _ := stream["kcpSettings"].(map[string]any)
-		header, _ := kcp["header"].(map[string]interface{})
+		header, _ := kcp["header"].(map[string]any)
 		params["headerType"] = header["type"].(string)
 		params["seed"] = kcp["seed"].(string)
 	case "ws":
-		ws, _ := stream["wsSettings"].(map[string]interface{})
+		ws, _ := stream["wsSettings"].(map[string]any)
 		params["path"] = ws["path"].(string)
 		if host, ok := ws["host"].(string); ok && len(host) > 0 {
 			params["host"] = host
 		} else {
-			headers, _ := ws["headers"].(map[string]interface{})
+			headers, _ := ws["headers"].(map[string]any)
 			params["host"] = searchHost(headers)
 		}
 	case "grpc":
-		grpc, _ := stream["grpcSettings"].(map[string]interface{})
+		grpc, _ := stream["grpcSettings"].(map[string]any)
 		params["serviceName"] = grpc["serviceName"].(string)
 		params["authority"], _ = grpc["authority"].(string)
 		if grpc["multiMode"].(bool) {
 			params["mode"] = "multi"
 		}
 	case "httpupgrade":
-		httpupgrade, _ := stream["httpupgradeSettings"].(map[string]interface{})
+		httpupgrade, _ := stream["httpupgradeSettings"].(map[string]any)
 		params["path"] = httpupgrade["path"].(string)
 		if host, ok := httpupgrade["host"].(string); ok && len(host) > 0 {
 			params["host"] = host
 		} else {
-			headers, _ := httpupgrade["headers"].(map[string]interface{})
+			headers, _ := httpupgrade["headers"].(map[string]any)
 			params["host"] = searchHost(headers)
 		}
 	case "xhttp":
-		xhttp, _ := stream["xhttpSettings"].(map[string]interface{})
+		xhttp, _ := stream["xhttpSettings"].(map[string]any)
 		params["path"] = xhttp["path"].(string)
 		if host, ok := xhttp["host"].(string); ok && len(host) > 0 {
 			params["host"] = host
 		} else {
-			headers, _ := xhttp["headers"].(map[string]interface{})
+			headers, _ := xhttp["headers"].(map[string]any)
 			params["host"] = searchHost(headers)
 		}
 		params["mode"] = xhttp["mode"].(string)
@@ -386,8 +386,8 @@ func (s *SubService) genVlessLink(inbound *model.Inbound, email string) string {
 	security, _ := stream["security"].(string)
 	if security == "tls" {
 		params["security"] = "tls"
-		tlsSetting, _ := stream["tlsSettings"].(map[string]interface{})
+		tlsSetting, _ := stream["tlsSettings"].(map[string]any)
-		alpns, _ := tlsSetting["alpn"].([]interface{})
+		alpns, _ := tlsSetting["alpn"].([]any)
 		var alpn []string
 		for _, a := range alpns {
 			alpn = append(alpn, a.(string))
@@ -418,18 +418,18 @@ func (s *SubService) genVlessLink(inbound *model.Inbound, email string) string {
 
 	if security == "reality" {
 		params["security"] = "reality"
-		realitySetting, _ := stream["realitySettings"].(map[string]interface{})
+		realitySetting, _ := stream["realitySettings"].(map[string]any)
 		realitySettings, _ := searchKey(realitySetting, "settings")
 		if realitySetting != nil {
 			if sniValue, ok := searchKey(realitySetting, "serverNames"); ok {
-				sNames, _ := sniValue.([]interface{})
+				sNames, _ := sniValue.([]any)
 				params["sni"] = sNames[random.Num(len(sNames))].(string)
 			}
 			if pbkValue, ok := searchKey(realitySettings, "publicKey"); ok {
 				params["pbk"], _ = pbkValue.(string)
 			}
 			if sidValue, ok := searchKey(realitySetting, "shortIds"); ok {
-				shortIds, _ := sidValue.([]interface{})
+				shortIds, _ := sidValue.([]any)
 				params["sid"] = shortIds[random.Num(len(shortIds))].(string)
 			}
 			if fpValue, ok := searchKey(realitySettings, "fingerprint"); ok {
@@ -449,12 +449,12 @@ func (s *SubService) genVlessLink(inbound *model.Inbound, email string) string {
 		params["security"] = "none"
 	}
 
-	externalProxies, _ := stream["externalProxy"].([]interface{})
+	externalProxies, _ := stream["externalProxy"].([]any)
 
 	if len(externalProxies) > 0 {
 		links := ""
 		for index, externalProxy := range externalProxies {
-			ep, _ := externalProxy.(map[string]interface{})
+			ep, _ := externalProxy.(map[string]any)
 			newSecurity, _ := ep["forceTls"].(string)
 			dest, _ := ep["dest"].(string)
 			port := int(ep["port"].(float64))
@@ -507,7 +507,7 @@ func (s *SubService) genTrojanLink(inbound *model.Inbound, email string) string
 	if inbound.Protocol != model.Trojan {
 		return ""
 	}
-	var stream map[string]interface{}
+	var stream map[string]any
 	json.Unmarshal([]byte(inbound.StreamSettings), &stream)
 	clients, _ := s.inboundService.GetClients(inbound)
 	clientIndex := -1
@@ -525,54 +525,54 @@ func (s *SubService) genTrojanLink(inbound *model.Inbound, email string) string
 
 	switch streamNetwork {
 	case "tcp":
-		tcp, _ := stream["tcpSettings"].(map[string]interface{})
+		tcp, _ := stream["tcpSettings"].(map[string]any)
-		header, _ := tcp["header"].(map[string]interface{})
+		header, _ := tcp["header"].(map[string]any)
 		typeStr, _ := header["type"].(string)
 		if typeStr == "http" {
-			request := header["request"].(map[string]interface{})
+			request := header["request"].(map[string]any)
-			requestPath, _ := request["path"].([]interface{})
+			requestPath, _ := request["path"].([]any)
 			params["path"] = requestPath[0].(string)
-			headers, _ := request["headers"].(map[string]interface{})
+			headers, _ := request["headers"].(map[string]any)
 			params["host"] = searchHost(headers)
 			params["headerType"] = "http"
 		}
 	case "kcp":
-		kcp, _ := stream["kcpSettings"].(map[string]interface{})
+		kcp, _ := stream["kcpSettings"].(map[string]any)
-		header, _ := kcp["header"].(map[string]interface{})
+		header, _ := kcp["header"].(map[string]any)
 		params["headerType"] = header["type"].(string)
 		params["seed"] = kcp["seed"].(string)
 	case "ws":
-		ws, _ := stream["wsSettings"].(map[string]interface{})
+		ws, _ := stream["wsSettings"].(map[string]any)
 		params["path"] = ws["path"].(string)
 		if host, ok := ws["host"].(string); ok && len(host) > 0 {
 			params["host"] = host
 		} else {
-			headers, _ := ws["headers"].(map[string]interface{})
+			headers, _ := ws["headers"].(map[string]any)
 			params["host"] = searchHost(headers)
 		}
 	case "grpc":
-		grpc, _ := stream["grpcSettings"].(map[string]interface{})
+		grpc, _ := stream["grpcSettings"].(map[string]any)
 		params["serviceName"] = grpc["serviceName"].(string)
 		params["authority"], _ = grpc["authority"].(string)
 		if grpc["multiMode"].(bool) {
 			params["mode"] = "multi"
 		}
 	case "httpupgrade":
-		httpupgrade, _ := stream["httpupgradeSettings"].(map[string]interface{})
+		httpupgrade, _ := stream["httpupgradeSettings"].(map[string]any)
 		params["path"] = httpupgrade["path"].(string)
 		if host, ok := httpupgrade["host"].(string); ok && len(host) > 0 {
 			params["host"] = host
 		} else {
-			headers, _ := httpupgrade["headers"].(map[string]interface{})
+			headers, _ := httpupgrade["headers"].(map[string]any)
 			params["host"] = searchHost(headers)
 		}
 	case "xhttp":
-		xhttp, _ := stream["xhttpSettings"].(map[string]interface{})
+		xhttp, _ := stream["xhttpSettings"].(map[string]any)
 		params["path"] = xhttp["path"].(string)
 		if host, ok := xhttp["host"].(string); ok && len(host) > 0 {
 			params["host"] = host
 		} else {
-			headers, _ := xhttp["headers"].(map[string]interface{})
+			headers, _ := xhttp["headers"].(map[string]any)
 			params["host"] = searchHost(headers)
 		}
 		params["mode"] = xhttp["mode"].(string)
@@ -580,8 +580,8 @@ func (s *SubService) genTrojanLink(inbound *model.Inbound, email string) string
 	security, _ := stream["security"].(string)
 	if security == "tls" {
 		params["security"] = "tls"
-		tlsSetting, _ := stream["tlsSettings"].(map[string]interface{})
+		tlsSetting, _ := stream["tlsSettings"].(map[string]any)
-		alpns, _ := tlsSetting["alpn"].([]interface{})
+		alpns, _ := tlsSetting["alpn"].([]any)
 		var alpn []string
 		for _, a := range alpns {
 			alpn = append(alpn, a.(string))
@@ -608,18 +608,18 @@ func (s *SubService) genTrojanLink(inbound *model.Inbound, email string) string
 
 	if security == "reality" {
 		params["security"] = "reality"
-		realitySetting, _ := stream["realitySettings"].(map[string]interface{})
+		realitySetting, _ := stream["realitySettings"].(map[string]any)
 		realitySettings, _ := searchKey(realitySetting, "settings")
 		if realitySetting != nil {
 			if sniValue, ok := searchKey(realitySetting, "serverNames"); ok {
-				sNames, _ := sniValue.([]interface{})
+				sNames, _ := sniValue.([]any)
 				params["sni"] = sNames[random.Num(len(sNames))].(string)
 			}
 			if pbkValue, ok := searchKey(realitySettings, "publicKey"); ok {
 				params["pbk"], _ = pbkValue.(string)
 			}
 			if sidValue, ok := searchKey(realitySetting, "shortIds"); ok {
-				shortIds, _ := sidValue.([]interface{})
+				shortIds, _ := sidValue.([]any)
 				params["sid"] = shortIds[random.Num(len(shortIds))].(string)
 			}
 			if fpValue, ok := searchKey(realitySettings, "fingerprint"); ok {
@@ -639,12 +639,12 @@ func (s *SubService) genTrojanLink(inbound *model.Inbound, email string) string
 		params["security"] = "none"
 	}
 
-	externalProxies, _ := stream["externalProxy"].([]interface{})
+	externalProxies, _ := stream["externalProxy"].([]any)
 
 	if len(externalProxies) > 0 {
 		links := ""
 		for index, externalProxy := range externalProxies {
-			ep, _ := externalProxy.(map[string]interface{})
+			ep, _ := externalProxy.(map[string]any)
 			newSecurity, _ := ep["forceTls"].(string)
 			dest, _ := ep["dest"].(string)
 			port := int(ep["port"].(float64))
@@ -698,11 +698,11 @@ func (s *SubService) genShadowsocksLink(inbound *model.Inbound, email string) st
 	if inbound.Protocol != model.Shadowsocks {
 		return ""
 	}
-	var stream map[string]interface{}
+	var stream map[string]any
 	json.Unmarshal([]byte(inbound.StreamSettings), &stream)
 	clients, _ := s.inboundService.GetClients(inbound)
 
-	var settings map[string]interface{}
+	var settings map[string]any
 	json.Unmarshal([]byte(inbound.Settings), &settings)
 	inboundPassword := settings["password"].(string)
 	method := settings["method"].(string)
@@ -719,54 +719,54 @@ func (s *SubService) genShadowsocksLink(inbound *model.Inbound, email string) st
 
 	switch streamNetwork {
 	case "tcp":
-		tcp, _ := stream["tcpSettings"].(map[string]interface{})
+		tcp, _ := stream["tcpSettings"].(map[string]any)
-		header, _ := tcp["header"].(map[string]interface{})
+		header, _ := tcp["header"].(map[string]any)
 		typeStr, _ := header["type"].(string)
 		if typeStr == "http" {
-			request := header["request"].(map[string]interface{})
+			request := header["request"].(map[string]any)
-			requestPath, _ := request["path"].([]interface{})
+			requestPath, _ := request["path"].([]any)
 			params["path"] = requestPath[0].(string)
-			headers, _ := request["headers"].(map[string]interface{})
+			headers, _ := request["headers"].(map[string]any)
 			params["host"] = searchHost(headers)
 			params["headerType"] = "http"
 		}
 	case "kcp":
-		kcp, _ := stream["kcpSettings"].(map[string]interface{})
+		kcp, _ := stream["kcpSettings"].(map[string]any)
-		header, _ := kcp["header"].(map[string]interface{})
+		header, _ := kcp["header"].(map[string]any)
 		params["headerType"] = header["type"].(string)
 		params["seed"] = kcp["seed"].(string)
 	case "ws":
-		ws, _ := stream["wsSettings"].(map[string]interface{})
+		ws, _ := stream["wsSettings"].(map[string]any)
 		params["path"] = ws["path"].(string)
 		if host, ok := ws["host"].(string); ok && len(host) > 0 {
 			params["host"] = host
 		} else {
-			headers, _ := ws["headers"].(map[string]interface{})
+			headers, _ := ws["headers"].(map[string]any)
 			params["host"] = searchHost(headers)
 		}
 	case "grpc":
-		grpc, _ := stream["grpcSettings"].(map[string]interface{})
+		grpc, _ := stream["grpcSettings"].(map[string]any)
 		params["serviceName"] = grpc["serviceName"].(string)
 		params["authority"], _ = grpc["authority"].(string)
 		if grpc["multiMode"].(bool) {
 			params["mode"] = "multi"
 		}
 	case "httpupgrade":
-		httpupgrade, _ := stream["httpupgradeSettings"].(map[string]interface{})
+		httpupgrade, _ := stream["httpupgradeSettings"].(map[string]any)
 		params["path"] = httpupgrade["path"].(string)
 		if host, ok := httpupgrade["host"].(string); ok && len(host) > 0 {
 			params["host"] = host
 		} else {
-			headers, _ := httpupgrade["headers"].(map[string]interface{})
+			headers, _ := httpupgrade["headers"].(map[string]any)
 			params["host"] = searchHost(headers)
 		}
 	case "xhttp":
-		xhttp, _ := stream["xhttpSettings"].(map[string]interface{})
+		xhttp, _ := stream["xhttpSettings"].(map[string]any)
 		params["path"] = xhttp["path"].(string)
 		if host, ok := xhttp["host"].(string); ok && len(host) > 0 {
 			params["host"] = host
 		} else {
-			headers, _ := xhttp["headers"].(map[string]interface{})
+			headers, _ := xhttp["headers"].(map[string]any)
 			params["host"] = searchHost(headers)
 		}
 		params["mode"] = xhttp["mode"].(string)
@@ -775,8 +775,8 @@ func (s *SubService) genShadowsocksLink(inbound *model.Inbound, email string) st
 	security, _ := stream["security"].(string)
 	if security == "tls" {
 		params["security"] = "tls"
-		tlsSetting, _ := stream["tlsSettings"].(map[string]interface{})
+		tlsSetting, _ := stream["tlsSettings"].(map[string]any)
-		alpns, _ := tlsSetting["alpn"].([]interface{})
+		alpns, _ := tlsSetting["alpn"].([]any)
 		var alpn []string
 		for _, a := range alpns {
 			alpn = append(alpn, a.(string))
@@ -806,12 +806,12 @@ func (s *SubService) genShadowsocksLink(inbound *model.Inbound, email string) st
 		encPart = fmt.Sprintf("%s:%s:%s", method, inboundPassword, clients[clientIndex].Password)
 	}
 
-	externalProxies, _ := stream["externalProxy"].([]interface{})
+	externalProxies, _ := stream["externalProxy"].([]any)
 
 	if len(externalProxies) > 0 {
 		links := ""
 		for index, externalProxy := range externalProxies {
-			ep, _ := externalProxy.(map[string]interface{})
+			ep, _ := externalProxy.(map[string]any)
 			newSecurity, _ := ep["forceTls"].(string)
 			dest, _ := ep["dest"].(string)
 			port := int(ep["port"].(float64))
@@ -944,9 +944,9 @@ func (s *SubService) genRemark(inbound *model.Inbound, email string, extra strin
 	return strings.Join(remark, separationChar)
 }
 
-func searchKey(data interface{}, key string) (interface{}, bool) {
+func searchKey(data any, key string) (any, bool) {
 	switch val := data.(type) {
-	case map[string]interface{}:
+	case map[string]any:
 		for k, v := range val {
 			if k == key {
 				return v, true
@@ -955,7 +955,7 @@ func searchKey(data interface{}, key string) (interface{}, bool) {
 				return result, true
 			}
 		}
-	case []interface{}:
+	case []any:
 		for _, v := range val {
 			if result, ok := searchKey(v, key); ok {
 				return result, true
@@ -965,19 +965,19 @@ func searchKey(data interface{}, key string) (interface{}, bool) {
 	return nil, false
 }
 
-func searchHost(headers interface{}) string {
+func searchHost(headers any) string {
-	data, _ := headers.(map[string]interface{})
+	data, _ := headers.(map[string]any)
 	for k, v := range data {
 		if strings.EqualFold(k, "host") {
 			switch v.(type) {
-			case []interface{}:
+			case []any:
-				hosts, _ := v.([]interface{})
+				hosts, _ := v.([]any)
 				if len(hosts) > 0 {
 					return hosts[0].(string)
 				} else {
 					return ""
 				}
-			case interface{}:
+			case any:
 				return v.(string)
 			}
 		}

util/common/err.go

@@ -7,17 +7,17 @@ import (
 	"x-ui/logger"
 )
 
-func NewErrorf(format string, a ...interface{}) error {
+func NewErrorf(format string, a ...any) error {
 	msg := fmt.Sprintf(format, a...)
 	return errors.New(msg)
 }
 
-func NewError(a ...interface{}) error {
+func NewError(a ...any) error {
 	msg := fmt.Sprintln(a...)
 	return errors.New(msg)
 }
 
-func Recover(msg string) interface{} {
+func Recover(msg string) any {
 	panicErr := recover()
 	if panicErr != nil {
 		if msg != "" {

web/assets/base64/base64.min.js

@@ -1 +0,0 @@
-(function(global,factory){typeof exports==="object"&&typeof module!=="undefined"?module.exports=factory(global):typeof define==="function"&&define.amd?define(factory):factory(global)})(typeof self!=="undefined"?self:typeof window!=="undefined"?window:typeof global!=="undefined"?global:this,function(global){"use strict";var _Base64=global.Base64;var version="2.5.0";var buffer;if(typeof module!=="undefined"&&module.exports){try{buffer=eval("require('buffer').Buffer")}catch(err){buffer=undefined}}var b64chars="ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";var b64tab=function(bin){var t={};for(var i=0,l=bin.length;i<l;i++)t[bin.charAt(i)]=i;return t}(b64chars);var fromCharCode=String.fromCharCode;var cb_utob=function(c){if(c.length<2){var cc=c.charCodeAt(0);return cc<128?c:cc<2048?fromCharCode(192|cc>>>6)+fromCharCode(128|cc&63):fromCharCode(224|cc>>>12&15)+fromCharCode(128|cc>>>6&63)+fromCharCode(128|cc&63)}else{var cc=65536+(c.charCodeAt(0)-55296)*1024+(c.charCodeAt(1)-56320);return fromCharCode(240|cc>>>18&7)+fromCharCode(128|cc>>>12&63)+fromCharCode(128|cc>>>6&63)+fromCharCode(128|cc&63)}};var re_utob=/[\uD800-\uDBFF][\uDC00-\uDFFFF]|[^\x00-\x7F]/g;var utob=function(u){return u.replace(re_utob,cb_utob)};var cb_encode=function(ccc){var padlen=[0,2,1][ccc.length%3],ord=ccc.charCodeAt(0)<<16|(ccc.length>1?ccc.charCodeAt(1):0)<<8|(ccc.length>2?ccc.charCodeAt(2):0),chars=[b64chars.charAt(ord>>>18),b64chars.charAt(ord>>>12&63),padlen>=2?"=":b64chars.charAt(ord>>>6&63),padlen>=1?"=":b64chars.charAt(ord&63)];return chars.join("")};var btoa=global.btoa?function(b){return global.btoa(b)}:function(b){return b.replace(/[\s\S]{1,3}/g,cb_encode)};var _encode=buffer?buffer.from&&Uint8Array&&buffer.from!==Uint8Array.from?function(u){return(u.constructor===buffer.constructor?u:buffer.from(u)).toString("base64")}:function(u){return(u.constructor===buffer.constructor?u:new buffer(u)).toString("base64")}:function(u){return btoa(utob(u))};var encode=function(u,urisafe){return!urisafe?_encode(String(u)):_encode(String(u)).replace(/[+\/]/g,function(m0){return m0=="+"?"-":"_"}).replace(/=/g,"")};var encodeURI=function(u){return encode(u,true)};var re_btou=new RegExp(["[À-ß][€-¿]","[à-ï][€-¿]{2}","[ð-÷][€-¿]{3}"].join("|"),"g");var cb_btou=function(cccc){switch(cccc.length){case 4:var cp=(7&cccc.charCodeAt(0))<<18|(63&cccc.charCodeAt(1))<<12|(63&cccc.charCodeAt(2))<<6|63&cccc.charCodeAt(3),offset=cp-65536;return fromCharCode((offset>>>10)+55296)+fromCharCode((offset&1023)+56320);case 3:return fromCharCode((15&cccc.charCodeAt(0))<<12|(63&cccc.charCodeAt(1))<<6|63&cccc.charCodeAt(2));default:return fromCharCode((31&cccc.charCodeAt(0))<<6|63&cccc.charCodeAt(1))}};var btou=function(b){return b.replace(re_btou,cb_btou)};var cb_decode=function(cccc){var len=cccc.length,padlen=len%4,n=(len>0?b64tab[cccc.charAt(0)]<<18:0)|(len>1?b64tab[cccc.charAt(1)]<<12:0)|(len>2?b64tab[cccc.charAt(2)]<<6:0)|(len>3?b64tab[cccc.charAt(3)]:0),chars=[fromCharCode(n>>>16),fromCharCode(n>>>8&255),fromCharCode(n&255)];chars.length-=[0,0,2,1][padlen];return chars.join("")};var _atob=global.atob?function(a){return global.atob(a)}:function(a){return a.replace(/\S{1,4}/g,cb_decode)};var atob=function(a){return _atob(String(a).replace(/[^A-Za-z0-9\+\/]/g,""))};var _decode=buffer?buffer.from&&Uint8Array&&buffer.from!==Uint8Array.from?function(a){return(a.constructor===buffer.constructor?a:buffer.from(a,"base64")).toString()}:function(a){return(a.constructor===buffer.constructor?a:new buffer(a,"base64")).toString()}:function(a){return btou(_atob(a))};var decode=function(a){return _decode(String(a).replace(/[-_]/g,function(m0){return m0=="-"?"+":"/"}).replace(/[^A-Za-z0-9\+\/]/g,""))};var noConflict=function(){var Base64=global.Base64;global.Base64=_Base64;return Base64};global.Base64={VERSION:version,atob:atob,btoa:btoa,fromBase64:decode,toBase64:encode,utob:utob,encode:encode,encodeURI:encodeURI,btou:btou,decode:decode,noConflict:noConflict,__buffer__:buffer};if(typeof Object.defineProperty==="function"){var noEnum=function(v){return{value:v,enumerable:false,writable:true,configurable:true}};global.Base64.extendString=function(){Object.defineProperty(String.prototype,"fromBase64",noEnum(function(){return decode(this)}));Object.defineProperty(String.prototype,"toBase64",noEnum(function(urisafe){return encode(this,urisafe)}));Object.defineProperty(String.prototype,"toBase64URI",noEnum(function(){return encode(this,true)}))}}if(global["Meteor"]){Base64=global.Base64}if(typeof module!=="undefined"&&module.exports){module.exports.Base64=global.Base64}else if(typeof define==="function"&&define.amd){define([],function(){return global.Base64})}return{Base64:global.Base64}});

web/assets/js/langs.js

@@ -1,103 +0,0 @@
-const supportLangs = [
-	{
-		name: "English",
-		value: "en-US",
-		icon: "🇺🇸",
-	},
-	{
-		name: "فارسی",
-		value: "fa-IR",
-		icon: "🇮🇷",
-	},
-	{
-		name: "简体中文",
-		value: "zh-CN",
-		icon: "🇨🇳",
-	},
-	{
-		name: "繁體中文",
-		value: "zh-TW",
-		icon: "🇹🇼",
-	},
-	{
-		name: "日本語",
-		value: "ja-JP",
-		icon: "🇯🇵",
-	},
-	{
-		name: "Русский",
-		value: "ru-RU",
-		icon: "🇷🇺",
-	},
-	{
-		name: "Tiếng Việt",
-		value: "vi-VN",
-		icon: "🇻🇳",
-	},
-	{
-		name: "Español",
-		value: "es-ES",
-		icon: "🇪🇸",
-	},
-	{
-		name: "Indonesian",
-		value: "id-ID",
-		icon: "🇮🇩",
-	},
-	{
-		name: "Український",
-		value: "uk-UA",
-		icon: "🇺🇦",
-	},
-	{
-		name: "Türkçe",
-		value: "tr-TR",
-		icon: "🇹🇷",
-	},
-	{
-		name: "Português",
-		value: "pt-BR",
-		icon: "🇧🇷",
-	},
-];
-
-function getLang() {
-	let lang = getCookie("lang");
-
-	if (!lang) {
-		if (window.navigator) {
-			lang = window.navigator.language || window.navigator.userLanguage;
-
-			if (isSupportLang(lang)) {
-				setCookie("lang", lang, 150);
-			} else {
-				setCookie("lang", "en-US", 150);
-				window.location.reload();
-			}
-		} else {
-			setCookie("lang", "en-US", 150);
-			window.location.reload();
-		}
-	}
-
-	return lang;
-}
-
-function setLang(lang) {
-	if (!isSupportLang(lang)) {
-		lang = "en-US";
-	}
-
-	setCookie("lang", lang, 150);
-	window.location.reload();
-}
-
-function isSupportLang(lang) {
-	for (l of supportLangs) {
-		if (l.value === lang) {
-			return true;
-		}
-	}
-
-	return false;
-}

web/assets/js/model/dbinbound.js

@@ -25,11 +25,11 @@ class DBInbound {
     }
 
     get totalGB() {
-        return toFixed(this.total / ONE_GB, 2);
+        return NumberFormatter.toFixed(this.total / SizeFormatter.ONE_GB, 2);
     }
 
     set totalGB(gb) {
-        this.total = toFixed(gb * ONE_GB, 0);
+        this.total = NumberFormatter.toFixed(gb * SizeFormatter.ONE_GB, 0);
     }
 
     get isVMess() {

web/assets/js/model/inbound.js

@@ -1050,7 +1050,7 @@ class Allocate extends XrayCommonClass {
 
 class Inbound extends XrayCommonClass {
     constructor(
-        port = RandomUtil.randomIntRange(10000, 60000),
+        port = RandomUtil.randomInteger(10000, 60000),
         listen = '',
         protocol = Protocols.VLESS,
         settings = null,
@@ -1226,7 +1226,7 @@ class Inbound extends XrayCommonClass {
     }
 
     reset() {
-        this.port = RandomUtil.randomIntRange(10000, 60000);
+        this.port = RandomUtil.randomInteger(10000, 60000);
         this.listen = '';
         this.protocol = Protocols.VMESS;
         this.settings = Inbound.Settings.getSettings(Protocols.VMESS);
@@ -1302,7 +1302,7 @@ class Inbound extends XrayCommonClass {
             }
         }
 
-        return 'vmess://' + base64(JSON.stringify(obj, null, 2));
+        return 'vmess://' + Base64.encode(JSON.stringify(obj, null, 2));
     }
 
     genVLESSLink(address = '', port = this.port, forceTls, remark = '', clientId, flow) {
@@ -1474,7 +1474,7 @@ class Inbound extends XrayCommonClass {
         if (this.isSS2022) password.push(settings.password);
         if (this.isSSMultiUser) password.push(clientPassword);
 
-        let link = `ss://${safeBase64(settings.method + ':' + password.join(':'))}@${address}:${port}`;
+        let link = `ss://${Base64.encode(`${settings.method}:${password.join(':')}`, true)}@${address}:${port}`;
         const url = new URL(link);
         for (const [key, value] of params) {
             url.searchParams.set(key, value)
@@ -1837,11 +1837,11 @@ Inbound.VmessSettings.VMESS = class extends XrayCommonClass {
         }
     }
     get _totalGB() {
-        return toFixed(this.totalGB / ONE_GB, 2);
+        return NumberFormatter.toFixed(this.totalGB / SizeFormatter.ONE_GB, 2);
     }
 
     set _totalGB(gb) {
-        this.totalGB = toFixed(gb * ONE_GB, 0);
+        this.totalGB = NumberFormatter.toFixed(gb * SizeFormatter.ONE_GB, 0);
     }
 
 };
@@ -1947,11 +1947,11 @@ Inbound.VLESSSettings.VLESS = class extends XrayCommonClass {
         }
     }
     get _totalGB() {
-        return toFixed(this.totalGB / ONE_GB, 2);
+        return NumberFormatter.toFixed(this.totalGB / SizeFormatter.ONE_GB, 2);
     }
 
     set _totalGB(gb) {
-        this.totalGB = toFixed(gb * ONE_GB, 0);
+        this.totalGB = NumberFormatter.toFixed(gb * SizeFormatter.ONE_GB, 0);
     }
 };
 Inbound.VLESSSettings.Fallback = class extends XrayCommonClass {
@@ -2099,11 +2099,11 @@ Inbound.TrojanSettings.Trojan = class extends XrayCommonClass {
         }
     }
     get _totalGB() {
-        return toFixed(this.totalGB / ONE_GB, 2);
+        return NumberFormatter.toFixed(this.totalGB / SizeFormatter.ONE_GB, 2);
     }
 
     set _totalGB(gb) {
-        this.totalGB = toFixed(gb * ONE_GB, 0);
+        this.totalGB = NumberFormatter.toFixed(gb * SizeFormatter.ONE_GB, 0);
     }
 
 };
@@ -2263,11 +2263,11 @@ Inbound.ShadowsocksSettings.Shadowsocks = class extends XrayCommonClass {
         }
     }
     get _totalGB() {
-        return toFixed(this.totalGB / ONE_GB, 2);
+        return NumberFormatter.toFixed(this.totalGB / SizeFormatter.ONE_GB, 2);
     }
 
     set _totalGB(gb) {
-        this.totalGB = toFixed(gb * ONE_GB, 0);
+        this.totalGB = NumberFormatter.toFixed(gb * SizeFormatter.ONE_GB, 0);
     }
 
 };

web/assets/js/model/setting.js

@@ -26,6 +26,7 @@ class AllSetting {
         this.xrayTemplateConfig = "";
         this.secretEnable = false;
         this.subEnable = false;
+        this.subTitle = "";
         this.subListen = "";
         this.subPort = 2096;
         this.subPath = "/sub/";

web/assets/js/util/common.js

@@ -1,194 +0,0 @@
-const ONE_KB = 1024;
-const ONE_MB = ONE_KB * 1024;
-const ONE_GB = ONE_MB * 1024;
-const ONE_TB = ONE_GB * 1024;
-const ONE_PB = ONE_TB * 1024;
-
-function sizeFormat(size) {
-    if (size <= 0) return "0 B";
-
-    if (size < ONE_KB) {
-        return size.toFixed(0) + " B";
-    } else if (size < ONE_MB) {
-        return (size / ONE_KB).toFixed(2) + " KB";
-    } else if (size < ONE_GB) {
-        return (size / ONE_MB).toFixed(2) + " MB";
-    } else if (size < ONE_TB) {
-        return (size / ONE_GB).toFixed(2) + " GB";
-    } else if (size < ONE_PB) {
-        return (size / ONE_TB).toFixed(2) + " TB";
-    } else {
-        return (size / ONE_PB).toFixed(2) + " PB";
-    }
-}
-
-function cpuSpeedFormat(speed) {
-    if (speed > 1000) {
-        const GHz = speed / 1000;
-        return GHz.toFixed(2) + " GHz";
-    } else {
-        return speed.toFixed(2) + " MHz";
-    }
-}
-
-function cpuCoreFormat(cores) {
-    if (cores === 1) {
-        return "1 Core";
-    } else {
-        return cores + " Cores";
-    }
-}
-
-function base64(str) {
-    return Base64.encode(str);
-}
-
-function safeBase64(str) {
-    return base64(str)
-        .replace(/\+/g, '-')
-        .replace(/=/g, '')
-        .replace(/\//g, '_');
-}
-
-function formatSecond(second) {
-    if (second < 60) {
-        return second.toFixed(0) + 's';
-    } else if (second < 3600) {
-        return (second / 60).toFixed(0) + 'm';
-    } else if (second < 3600 * 24) {
-        return (second / 3600).toFixed(0) + 'h';
-    } else {
-        day = Math.floor(second / 3600 / 24);
-        remain = ((second / 3600) - (day * 24)).toFixed(0);
-        return day + 'd' + (remain > 0 ? ' ' + remain + 'h' : '');
-    }
-}
-
-function addZero(num) {
-    if (num < 10) {
-        return "0" + num;
-    } else {
-        return num;
-    }
-}
-
-function toFixed(num, n) {
-    n = Math.pow(10, n);
-    return Math.floor(num * n) / n;
-}
-
-function debounce(fn, delay) {
-    var timeoutID = null;
-    return function () {
-        clearTimeout(timeoutID);
-        var args = arguments;
-        var that = this;
-        timeoutID = setTimeout(function () {
-            fn.apply(that, args);
-        }, delay);
-    };
-}
-
-function getCookie(cname) {
-    let name = cname + '=';
-    let ca = document.cookie.split(';');
-    for (let i = 0; i < ca.length; i++) {
-        let c = ca[i];
-        while (c.charAt(0) == ' ') {
-            c = c.substring(1);
-        }
-        if (c.indexOf(name) == 0) {
-            // decode cookie value only
-            return decodeURIComponent(c.substring(name.length, c.length));
-        }
-    }
-    return '';
-}
-
-
-function setCookie(cname, cvalue, exdays) {
-    const d = new Date();
-    d.setTime(d.getTime() + exdays * 24 * 60 * 60 * 1000);
-    let expires = 'expires=' + d.toUTCString();
-    // encode cookie value
-    document.cookie = cname + '=' + encodeURIComponent(cvalue) + ';' + expires + ';path=/';
-}
-
-function usageColor(data, threshold, total) {
-    switch (true) {
-        case data === null:
-            return "purple";
-        case total < 0:
-            return "green";
-        case total == 0:
-            return "purple";
-        case data < total - threshold:
-            return "green";
-        case data < total:
-            return "orange";
-        default:
-            return "red";
-    }
-}
-
-function clientUsageColor(clientStats, trafficDiff) {
-    switch (true) {
-        case !clientStats || clientStats.total == 0:
-            return "#7a316f"; // purple
-        case clientStats.up + clientStats.down < clientStats.total - trafficDiff:
-            return "#008771"; // Green
-        case clientStats.up + clientStats.down < clientStats.total:
-            return "#f37b24"; // Orange
-        default:
-            return "#cf3c3c"; // Red
-    }
-}
-
-function userExpiryColor(threshold, client, isDark = false) {
-    if (!client.enable) {
-        return isDark ? '#2c3950' : '#bcbcbc';
-    }
-    now = new Date().getTime(),
-        expiry = client.expiryTime;
-    switch (true) {
-        case expiry === null:
-            return "#7a316f"; // purple
-        case expiry < 0:
-            return "#008771"; // Green
-        case expiry == 0:
-            return "#7a316f"; // purple
-        case now < expiry - threshold:
-            return "#008771"; // Green
-        case now < expiry:
-            return "#f37b24"; // Orange
-        default:
-            return "#cf3c3c"; // Red
-    }
-}
-
-function doAllItemsExist(array1, array2) {
-    for (let i = 0; i < array1.length; i++) {
-        if (!array2.includes(array1[i])) {
-            return false;
-        }
-    }
-    return true;
-}
-
-function buildURL({ host, port, isTLS, base, path }) {
-    if (!host || host.length === 0) host = window.location.hostname;
-    if (!port || port.length === 0) port = window.location.port;
-
-    if (isTLS === undefined) isTLS = window.location.protocol === "https:";
-
-    const protocol = isTLS ? "https:" : "http:";
-
-    port = String(port);
-    if (port === "" || (isTLS && port === "443") || (!isTLS && port === "80")) {
-        port = "";
-    } else {
-        port = `:${port}`;
-    }
-
-    return `${protocol}//${host}${port}${base}${path}`;
-}

web/assets/js/util/date-util.js

@@ -108,14 +108,14 @@ Date.prototype.setMaxTime = function () {
  * Formatting date
  */
 Date.prototype.formatDate = function () {
-    return this.getFullYear() + "-" + addZero(this.getMonth() + 1) + "-" + addZero(this.getDate());
+    return this.getFullYear() + "-" + NumberFormatter.addZero(this.getMonth() + 1) + "-" + NumberFormatter.addZero(this.getDate());
 };
 
 /**
  * Format time
  */
 Date.prototype.formatTime = function () {
-    return addZero(this.getHours()) + ":" + addZero(this.getMinutes()) + ":" + addZero(this.getSeconds());
+    return NumberFormatter.addZero(this.getHours()) + ":" + NumberFormatter.addZero(this.getMinutes()) + ":" + NumberFormatter.addZero(this.getSeconds());
 };
 
 /**

web/assets/js/util/index.js

@@ -80,66 +80,68 @@ class PromiseUtil {
     }
 }
 
-const seq = '0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ'.split('');
-
 class RandomUtil {
-    static randomIntRange(min, max) {
+    static getSeq({ type = "default", hasNumbers = true, hasLowercase = true, hasUppercase = true } = {}) {
-        return Math.floor(Math.random() * (max - min) + min);
+        let seq = '';
-    }
+        
-
+        switch (type) {
-    static randomInt(n) {
+            case "hex":
-        return this.randomIntRange(0, n);
+                seq += "0123456789abcdef";
-    }
+                break;
-
+            default:
-    static randomSeq(count) {
+                if (hasNumbers) seq += "0123456789";
-        let str = '';
+                if (hasLowercase) seq += "abcdefghijklmnopqrstuvwxyz";
-        for (let i = 0; i < count; ++i) {
+                if (hasUppercase) seq += "ABCDEFGHIJKLMNOPQRSTUVWXYZ";
-            str += seq[this.randomInt(62)];
+                break;
         }
-        return str;
+
+        return seq;
+    }
+
+    static randomInteger(min, max) {
+        const range = max - min + 1;
+        const randomBuffer = new Uint32Array(1);
+        window.crypto.getRandomValues(randomBuffer);
+        return Math.floor((randomBuffer[0] / (0xFFFFFFFF + 1)) * range) + min;
+    }
+
+    static randomSeq(count, options = {}) {
+        const seq = this.getSeq(options);
+        const seqLength = seq.length;
+        const randomValues = new Uint32Array(count);
+        window.crypto.getRandomValues(randomValues);
+        return Array.from(randomValues, v => seq[v % seqLength]).join('');
     }
 
     static randomShortIds() {
-        const lengths = [2, 4, 6, 8, 10, 12, 14, 16];
+        const lengths = [2, 4, 6, 8, 10, 12, 14, 16].sort(() => Math.random() - 0.5);
-        for (let i = lengths.length - 1; i > 0; i--) {
-            const j = Math.floor(Math.random() * (i + 1));
-            [lengths[i], lengths[j]] = [lengths[j], lengths[i]];
-        }
 
-        let shortIds = [];
+        return lengths.map(len => this.randomSeq(len, { type: "hex" })).join(',');
-        for (let length of lengths) {
-            let shortId = '';
-            for (let i = 0; i < length; i++) {
-                shortId += seq[this.randomInt(16)];
-            }
-            shortIds.push(shortId);
-        }
-        return shortIds.join(',');
     }
 
     static randomLowerAndNum(len) {
-        let str = '';
+        return this.randomSeq(len, { hasUppercase: false });
-        for (let i = 0; i < len; ++i) {
-            str += seq[this.randomInt(36)];
-        }
-        return str;
     }
 
     static randomUUID() {
-        const template = 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx';
+        if (window.location.protocol === "https:") {
-        return template.replace(/[xy]/g, function (c) {
+            return window.crypto.randomUUID();
-            const randomValues = new Uint8Array(1);
+        } else {
-            crypto.getRandomValues(randomValues);
+            return 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'
-            let randomValue = randomValues[0] % 16;
+                .replace(/[xy]/g, function (c) {
-            let calculatedValue = (c === 'x') ? randomValue : (randomValue & 0x3 | 0x8);
+                    const randomValues = new Uint8Array(1);
-            return calculatedValue.toString(16);
+                    window.crypto.getRandomValues(randomValues);
-        });
+                    let randomValue = randomValues[0] % 16;
+                    let calculatedValue = (c === 'x') ? randomValue : (randomValue & 0x3 | 0x8);
+                    return calculatedValue.toString(16);
+                });
+        }
     }
 
     static randomShadowsocksPassword() {
-        let array = new Uint8Array(32);
+        const array = new Uint8Array(32);
         window.crypto.getRandomValues(array);
-        return btoa(String.fromCharCode.apply(null, array));
+        return Base64.encode(String.fromCharCode(...array));
     }
 }
 
@@ -478,4 +480,304 @@ class Wireguard {
             privateKey: secretKey.length > 0 ? secretKey : this.keyToBase64(privateKey)
         };
     }
+}
+
+class ClipboardManager {
+    static copyText(content = "") {
+        // !! here old way of copying is used because not everyone can afford https connection
+        return new Promise((resolve) => {
+            try {
+                const textarea = window.document.createElement('textarea');
+    
+                textarea.style.fontSize = '12pt';
+                textarea.style.border = '0';
+                textarea.style.padding = '0';
+                textarea.style.margin = '0';
+                textarea.style.position = 'absolute';
+                textarea.style.left = '-9999px';
+                textarea.style.top = `${window.pageYOffset || document.documentElement.scrollTop}px`;
+                textarea.setAttribute('readonly', '');
+                textarea.value = content;
+    
+                window.document.body.appendChild(textarea);
+    
+                textarea.select();
+                window.document.execCommand("copy");
+    
+                window.document.body.removeChild(textarea);
+    
+                resolve(true)
+            } catch {
+                resolve(false)
+            }
+        })
+    }
+}
+
+class Base64 {
+    static encode(content = "", safe = false) {
+        if (safe) {
+            return Base64.encode(content)
+                .replace(/\+/g, '-')
+                .replace(/=/g, '')
+                .replace(/\//g, '_')
+        }
+
+        return window.btoa(
+            String.fromCharCode(...new TextEncoder().encode(content))
+        )
+    }
+
+    static decode(content = "") {
+        return new TextDecoder()
+            .decode(
+                Uint8Array.from(window.atob(content), c => c.charCodeAt(0))
+            )
+    }
+}
+
+class SizeFormatter {
+    static ONE_KB = 1024;
+    static ONE_MB = this.ONE_KB * 1024;
+    static ONE_GB = this.ONE_MB * 1024;
+    static ONE_TB = this.ONE_GB * 1024;
+    static ONE_PB = this.ONE_TB * 1024;
+
+    static sizeFormat(size) {
+        if (size <= 0) return "0 B";
+        if (size < this.ONE_KB) return size.toFixed(0) + " B";
+        if (size < this.ONE_MB) return (size / this.ONE_KB).toFixed(2) + " KB";
+        if (size < this.ONE_GB) return (size / this.ONE_MB).toFixed(2) + " MB";
+        if (size < this.ONE_TB) return (size / this.ONE_GB).toFixed(2) + " GB";
+        if (size < this.ONE_PB) return (size / this.ONE_TB).toFixed(2) + " TB";
+        return (size / this.ONE_PB).toFixed(2) + " PB";
+    }
+}
+
+class CPUFormatter {
+    static cpuSpeedFormat(speed) {
+        return speed > 1000 ? (speed / 1000).toFixed(2) + " GHz" : speed.toFixed(2) + " MHz";
+    }
+    
+    static cpuCoreFormat(cores) {
+        return cores === 1 ? "1 Core" : cores + " Cores";
+    }
+}
+
+class TimeFormatter {
+    static formatSecond(second) {
+        if (second < 60) return second.toFixed(0) + 's';
+        if (second < 3600) return (second / 60).toFixed(0) + 'm';
+        if (second < 3600 * 24) return (second / 3600).toFixed(0) + 'h';
+        let day = Math.floor(second / 3600 / 24);
+        let remain = ((second / 3600) - (day * 24)).toFixed(0);
+        return day + 'd' + (remain > 0 ? ' ' + remain + 'h' : '');
+    }
+}
+
+class NumberFormatter {
+    static addZero(num) {
+        return num < 10 ? "0" + num : num;
+    }
+    
+    static toFixed(num, n) {
+        n = Math.pow(10, n);
+        return Math.floor(num * n) / n;
+    }
+}
+
+class Utils {
+    static debounce(fn, delay) {
+        let timeoutID = null;
+        return function () {
+            clearTimeout(timeoutID);
+            let args = arguments;
+            let that = this;
+            timeoutID = setTimeout(() => fn.apply(that, args), delay);
+        };
+    }
+}
+
+class CookieManager {
+    static getCookie(cname) {
+        let name = cname + '=';
+        let ca = document.cookie.split(';');
+        for (let c of ca) {
+            c = c.trim();
+            if (c.indexOf(name) === 0) {
+                return decodeURIComponent(c.substring(name.length, c.length));
+            }
+        }
+        return '';
+    }
+    
+    static setCookie(cname, cvalue, exdays) {
+        const d = new Date();
+        d.setTime(d.getTime() + exdays * 24 * 60 * 60 * 1000);
+        let expires = 'expires=' + d.toUTCString();
+        document.cookie = cname + '=' + encodeURIComponent(cvalue) + ';' + expires + ';path=/';
+    }
+}
+
+class ColorUtils {
+    static usageColor(data, threshold, total) {
+        switch (true) {
+            case data === null: return "purple";
+            case total < 0: return "green";
+            case total == 0: return "purple";
+            case data < total - threshold: return "green";
+            case data < total: return "orange";
+            default: return "red";
+        }
+    }
+    
+    static clientUsageColor(clientStats, trafficDiff) {
+        switch (true) {
+            case !clientStats || clientStats.total == 0: return "#7a316f";
+            case clientStats.up + clientStats.down < clientStats.total - trafficDiff: return "#008771";
+            case clientStats.up + clientStats.down < clientStats.total: return "#f37b24";
+            default: return "#cf3c3c";
+        }
+    }
+    
+    static userExpiryColor(threshold, client, isDark = false) {
+        if (!client.enable) return isDark ? '#2c3950' : '#bcbcbc';
+        let now = new Date().getTime(), expiry = client.expiryTime;
+        switch (true) {
+            case expiry === null: return "#7a316f";
+            case expiry < 0: return "#008771";
+            case expiry == 0: return "#7a316f";
+            case now < expiry - threshold: return "#008771";
+            case now < expiry: return "#f37b24";
+            default: return "#cf3c3c";
+        }
+    }
+}
+
+class ArrayUtils {
+    static doAllItemsExist(array1, array2) {
+        return array1.every(item => array2.includes(item));
+    }
+}
+
+class URLBuilder {
+    static buildURL({ host, port, isTLS, base, path }) {
+        if (!host || host.length === 0) host = window.location.hostname;
+        if (!port || port.length === 0) port = window.location.port;
+        if (isTLS === undefined) isTLS = window.location.protocol === "https:";
+        
+        const protocol = isTLS ? "https:" : "http:";
+        port = String(port);
+        if (port === "" || (isTLS && port === "443") || (!isTLS && port === "80")) {
+            port = "";
+        } else {
+            port = `:${port}`;
+        }
+        
+        return `${protocol}//${host}${port}${base}${path}`;
+    }
+}
+
+class LanguageManager {
+    static supportedLanguages = [
+        {
+            name: "English",
+            value: "en-US",
+            icon: "🇺🇸",
+        },
+        {
+            name: "فارسی",
+            value: "fa-IR",
+            icon: "🇮🇷",
+        },
+        {
+            name: "简体中文",
+            value: "zh-CN",
+            icon: "🇨🇳",
+        },
+        {
+            name: "繁體中文",
+            value: "zh-TW",
+            icon: "🇹🇼",
+        },
+        {
+            name: "日本語",
+            value: "ja-JP",
+            icon: "🇯🇵",
+        },
+        {
+            name: "Русский",
+            value: "ru-RU",
+            icon: "🇷🇺",
+        },
+        {
+            name: "Tiếng Việt",
+            value: "vi-VN",
+            icon: "🇻🇳",
+        },
+        {
+            name: "Español",
+            value: "es-ES",
+            icon: "🇪🇸",
+        },
+        {
+            name: "Indonesian",
+            value: "id-ID",
+            icon: "🇮🇩",
+        },
+        {
+            name: "Український",
+            value: "uk-UA",
+            icon: "🇺🇦",
+        },
+        {
+            name: "Türkçe",
+            value: "tr-TR",
+            icon: "🇹🇷",
+        },
+        {
+            name: "Português",
+            value: "pt-BR",
+            icon: "🇧🇷",
+        }
+    ]
+
+    static getLanguage() {
+        let lang = CookieManager.getCookie("lang");
+    
+        if (!lang) {
+            if (window.navigator) {
+                lang = window.navigator.language || window.navigator.userLanguage;
+    
+                if (LanguageManager.isSupportLanguage(lang)) {
+                    CookieManager.setCookie("lang", lang, 150);
+                } else {
+                    CookieManager.setCookie("lang", "en-US", 150);
+                    window.location.reload();
+                }
+            } else {
+                CookieManager.setCookie("lang", "en-US", 150);
+                window.location.reload();
+            }
+        }
+    
+        return lang;
+    }
+    
+    static setLanguage(language) {
+        if (!LanguageManager.isSupportLanguage(language)) {
+            language = "en-US";
+        }
+    
+        CookieManager.setCookie("lang", language, 150);
+        window.location.reload();
+    }
+    
+    static isSupportLanguage(language) {
+        const languageFilter = LanguageManager.supportedLanguages.filter((lang) => {
+            return lang.value === language
+        })
+    
+        return languageFilter.length > 0;
+    }    
 }

web/controller/util.go

@@ -31,11 +31,11 @@ func jsonMsg(c *gin.Context, msg string, err error) {
 	jsonMsgObj(c, msg, nil, err)
 }
 
-func jsonObj(c *gin.Context, obj interface{}, err error) {
+func jsonObj(c *gin.Context, obj any, err error) {
 	jsonMsgObj(c, "", obj, err)
 }
 
-func jsonMsgObj(c *gin.Context, msg string, obj interface{}, err error) {
+func jsonMsgObj(c *gin.Context, msg string, obj any, err error) {
 	m := entity.Msg{
 		Obj: obj,
 	}

web/entity/entity.go

@@ -10,9 +10,9 @@ import (
 )
 
 type Msg struct {
-	Success bool        `json:"success"`
+	Success bool   `json:"success"`
-	Msg     string      `json:"msg"`
+	Msg     string `json:"msg"`
-	Obj     interface{} `json:"obj"`
+	Obj     any    `json:"obj"`
 }
 
 type AllSetting struct {
@@ -40,6 +40,7 @@ type AllSetting struct {
 	TimeLocation                string `json:"timeLocation" form:"timeLocation"`
 	SecretEnable                bool   `json:"secretEnable" form:"secretEnable"`
 	SubEnable                   bool   `json:"subEnable" form:"subEnable"`
+	SubTitle                    string `json:"subTitle" form:"subTitle"`
 	SubListen                   string `json:"subListen" form:"subListen"`
 	SubPort                     int    `json:"subPort" form:"subPort"`
 	SubPath                     string `json:"subPath" form:"subPath"`

web/html/common/js.html

@@ -5,10 +5,8 @@
 <script src="{{ .base_path }}assets/axios/axios.min.js?{{ .cur_ver }}"></script>
 <script src="{{ .base_path }}assets/qs/qs.min.js"></script>
 <script src="{{ .base_path }}assets/js/axios-init.js?{{ .cur_ver }}"></script>
-<script src="{{ .base_path }}assets/js/util/common.js?{{ .cur_ver }}"></script>
 <script src="{{ .base_path }}assets/js/util/date-util.js?{{ .cur_ver }}"></script>
-<script src="{{ .base_path }}assets/js/util/utils.js?{{ .cur_ver }}"></script>
+<script src="{{ .base_path }}assets/js/util/index.js?{{ .cur_ver }}"></script>
-<script src="{{ .base_path }}assets/js/langs.js"></script>
 <script>
     const basePath = '{{ .base_path }}';
     axios.defaults.baseURL = basePath;

web/html/common/qrcode_modal.html

@@ -10,7 +10,7 @@
         <a-tag color="purple" class="qr-tag"><span>{{ i18n "pages.settings.subSettings"}}</span></a-tag>
         <tr-qr-bg class="qr-bg-sub">
           <tr-qr-bg-inner class="qr-bg-sub-inner">
-            <canvas @click="copyToClipboard('qrCode-sub',genSubLink(qrModal.client.subId))" id="qrCode-sub" class="qr-cv"></canvas>
+            <canvas @click="copy(genSubLink(qrModal.client.subId))" id="qrCode-sub" class="qr-cv"></canvas>
           </tr-qr-bg-inner>
         </tr-qr-bg>
       </tr-qr-box>
@@ -18,7 +18,7 @@
         <a-tag color="purple" class="qr-tag"><span>{{ i18n "pages.settings.subSettings"}} Json</span></a-tag>
         <tr-qr-bg class="qr-bg-sub">
           <tr-qr-bg-inner class="qr-bg-sub-inner">
-            <canvas @click="copyToClipboard('qrCode-subJson',genSubJsonLink(qrModal.client.subId))" id="qrCode-subJson" class="qr-cv"></canvas>
+            <canvas @click="copy(genSubJsonLink(qrModal.client.subId))" id="qrCode-subJson" class="qr-cv"></canvas>
           </tr-qr-bg-inner>
         </tr-qr-bg>
       </tr-qr-box>
@@ -27,7 +27,7 @@
       <tr-qr-box class="qr-box">
         <a-tag color="green" class="qr-tag"><span>[[ row.remark ]]</span></a-tag>
         <tr-qr-bg class="qr-bg">
-          <canvas @click="copyToClipboard('qrCode-'+index, row.link)" :id="'qrCode-'+index" class="qr-cv"></canvas>
+          <canvas @click="copy(row.link)" :id="'qrCode-'+index" class="qr-cv"></canvas>
         </tr-qr-bg>
       </tr-qr-box>
     </template>
@@ -41,7 +41,6 @@
     dbInbound: new DBInbound(),
     client: null,
     qrcodes: [],
-    clipboard: null,
     visible: false,
     subId: '',
     show: function(title = '', dbInbound, client) {
@@ -79,14 +78,12 @@
       qrModal: qrModal,
     },
     methods: {
-      copyToClipboard(elementId, content) {
+      copy(content) {
-        this.qrModal.clipboard = new ClipboardJS('#' + elementId, {
+        ClipboardManager
-          text: () => content,
+          .copyText(content)
-        });
+          .then(() => {
-        this.qrModal.clipboard.on('success', () => {
+            app.$message.success('{{ i18n "copied" }}')
-          app.$message.success('{{ i18n "copied" }}')
+          })
-          this.qrModal.clipboard.destroy();
-        });
       },
       setQrCode(elementId, content) {
         new QRious({

web/html/common/text_modal.html

@@ -7,7 +7,7 @@
             :href="'data:application/text;charset=utf-8,' + encodeURIComponent(txtModal.content)"
             :download="txtModal.fileName">[[ txtModal.fileName ]]
         </a-button>
-            <a-button type="primary" id="copy-btn">{{ i18n "copy" }}</a-button>
+        <a-button type="primary" @click="txtModal.copy(txtModal.content)">{{ i18n "copy" }}</a-button>
     </template>
     <a-input style="overflow-y: auto;" type="textarea" v-model="txtModal.content"
         :autosize="{ minRows: 10, maxRows: 20}"></a-input>
@@ -20,24 +20,20 @@
         content: '',
         fileName: '',
         qrcode: null,
-        clipboard: null,
         visible: false,
         show: function (title = '', content = '', fileName = '') {
             this.title = title;
             this.content = content;
             this.fileName = fileName;
             this.visible = true;
-            textModalApp.$nextTick(() => {
+        },
-                if (this.clipboard === null) {
+        copy: function (content = '') {
-                    this.clipboard = new ClipboardJS('#copy-btn', {
+            ClipboardManager
-                        text: () => this.content,
+                .copyText(content)
-                    });
+                .then(() => {
-                    this.clipboard.on('success', () => {
+                    app.$message.success('{{ i18n "copied" }}')
-                        app.$message.success('{{ i18n "copied" }}')
+                    this.close();
-                        this.close();
+                })
-                    });
-                }
-            });
         },
         close: function () {
             this.visible = false;

web/html/login.html

@@ -422,16 +422,16 @@
                     </a-input>
                   </a-form-item>
                   <a-form-item>
-                    <password-input autocomplete="password" name="password" icon="lock" v-model.trim="user.password"
+                    <a-password-input autocomplete="password" name="password" icon="lock" v-model.trim="user.password"
                                     placeholder='{{ i18n "password" }}'
                                     @keydown.enter.native="login">
-                    </password-input>
+                    </a-password-input>
                   </a-form-item>
                   <a-form-item v-if="secretEnable">
-                    <password-input autocomplete="secret" name="secret" icon="key" v-model.trim="user.loginSecret"
+                    <a-password-input autocomplete="secret" name="secret" icon="key" v-model.trim="user.loginSecret"
                                     placeholder='{{ i18n "secretToken" }}'
                                     @keydown.enter.native="login">
-                    </password-input>
+                    </a-password-input>
                   </a-form-item>
                   <a-form-item>
                     <a-row justify="center" class="centered">
@@ -449,9 +449,9 @@
                     <a-row justify="center" class="centered">
                       <a-col :span="24">
                         <a-select ref="selectLang" v-model="lang"
-                                  @change="setLang(lang)" style="width: 200px;"
+                                  @change="LanguageManager.setLanguage(lang)" style="width: 200px;"
                                   :dropdown-class-name="themeSwitcher.currentTheme">
-                          <a-select-option :value="l.value" label="English" v-for="l in supportLangs">
+                          <a-select-option :value="l.value" label="English" v-for="l in LanguageManager.supportedLanguages">
                             <span role="img" aria-label="l.name" v-text="l.icon"></span>
                             &nbsp;&nbsp;<span v-text="l.name"></span>
                           </a-select-option>
@@ -461,7 +461,7 @@
                   </a-form-item>
                   <a-form-item>
                     <a-row justify="center" class="centered">
-                      <theme-switch-login></theme-switch-login>
+                      <a-theme-switch-login></a-theme-switch-login>
                     </a-row>
                   </a-form-item>
                 </a-form>
@@ -473,8 +473,8 @@
     </transition>
   </a-layout>
 {{template "js" .}}
-{{template "component/themeSwitcher" .}}
+{{template "component/aThemeSwitch" .}}
-{{template "component/password" .}}
+{{template "component/aPasswordInput" .}}
 <script>
   class User {
     constructor() {
@@ -493,7 +493,7 @@
       lang: ""
     },
     async created() {
-      this.lang = getLang();
+      this.lang = LanguageManager.getLanguage();
       this.secretEnable = await this.getSecretStatus();
     },
     methods: {

web/html/xui/client_bulk_modal.html

@@ -106,9 +106,9 @@
             <a-date-picker v-if="datepicker == 'gregorian'" :show-time="{ format: 'HH:mm:ss' }"
                 format="YYYY-MM-DD HH:mm:ss" :dropdown-class-name="themeSwitcher.currentTheme"
                 v-model="clientsBulkModal.expiryTime"></a-date-picker>
-            <persian-datepicker v-else placeholder='{{ i18n "pages.settings.datepickerPlaceholder" }}'
+            <a-persian-datepicker v-else placeholder='{{ i18n "pages.settings.datepickerPlaceholder" }}'
                 value="clientsBulkModal.expiryTime" v-model="clientsBulkModal.expiryTime">
-            </persian-datepicker>
+            </a-persian-datepicker>
         </a-form-item>
         <a-form-item v-if="clientsBulkModal.expiryTime != 0">
             <template slot="label">

web/html/xui/common_sider.html

@@ -1,40 +1,30 @@
 {{define "menuItems"}}
 <a-menu-item key="{{ .base_path }}panel/">
   <a-icon type="dashboard"></a-icon>
-  <span>
+  <span>{{ i18n "menu.dashboard"}}</span>
-    <b>{{ i18n "menu.dashboard"}}</b>
-  </span>
 </a-menu-item>
 <a-menu-item key="{{ .base_path }}panel/inbounds">
   <a-icon type="user"></a-icon>
-  <span>
+  <span>{{ i18n "menu.inbounds"}}</span>
-    <b>{{ i18n "menu.inbounds"}}</b>
-  </span>
 </a-menu-item>
 <a-menu-item key="{{ .base_path }}panel/settings">
   <a-icon type="setting"></a-icon>
-  <span>
+  <span>{{ i18n "menu.settings"}}</span>
-    <b>{{ i18n "menu.settings"}}</b>
-  </span>
 </a-menu-item>
 <a-menu-item key="{{ .base_path }}panel/xray">
   <a-icon type="tool"></a-icon>
-  <span>
+  <span>{{ i18n "menu.xray"}}</span>
-    <b>{{ i18n "menu.xray"}}</b>
-  </span>
 </a-menu-item>
 <a-menu-item key="{{ .base_path }}logout">
   <a-icon type="logout"></a-icon>
-  <span>
+  <span>{{ i18n "menu.logout"}}</span>
-    <b>{{ i18n "menu.logout"}}</b>
-  </span>
 </a-menu-item>
 {{end}}
 
 
 {{define "commonSider"}}
 <a-layout-sider :theme="themeSwitcher.currentTheme" id="sider" collapsible breakpoint="md">
-  <theme-switch></theme-switch>
+  <a-theme-switch></a-theme-switch>
   <a-menu :theme="themeSwitcher.currentTheme" mode="inline" :selected-keys="['{{ .request_uri }}']" @click="({key}) => key.startsWith('http') ? window.open(key) : location.href = key">
     {{template "menuItems" .}}
   </a-menu>
@@ -43,7 +33,7 @@
   <div class="drawer-handle" @click="siderDrawer.change()" slot="handle">
     <a-icon :type="siderDrawer.visible ? 'close' : 'menu-fold'"></a-icon>
   </div>
-  <theme-switch></theme-switch>
+  <a-theme-switch></a-theme-switch>
   <a-menu :theme="themeSwitcher.currentTheme" mode="inline" :selected-keys="['{{ .request_uri }}']" @click="({key}) => key.startsWith('http') ? window.open(key) : location.href = key">
     {{template "menuItems" .}}
   </a-menu>

web/html/xui/component/aCustomStatistic.html

@@ -0,0 +1,42 @@
+{{define "component/customStatistic"}}
+<template>
+    <a-statistic :title="title" :value="value">
+        <template #prefix>
+            <slot name="prefix"></slot>
+        </template>
+        <template #suffix>
+            <slot name="suffix"></slot>
+        </template>
+    </a-statistic>
+</template>
+{{end}}
+
+{{define "component/aCustomStatistic"}}
+<style>
+  .dark .ant-statistic-content {
+    color: var(--dark-color-text-primary)
+  }
+  .dark .ant-statistic-title {
+    color: rgba(255, 255, 255, 0.55)
+  }
+  .ant-statistic-content {
+    font-size: 16px;
+  }
+</style>
+
+<script>
+  Vue.component('a-custom-statistic', {
+    props: {
+      'title': {
+        type: String,
+        required: false,
+      },
+      'value': {
+        type: String,
+        required: false
+      }
+    },
+    template: `{{template "component/customStatistic"}}`,
+  });
+</script>
+{{end}}

web/html/xui/component/aPasswordInput.html

@@ -0,0 +1,57 @@
+{{define "component/passwordInput"}}
+<template>
+  <a-input :value="value" :type="showPassword ? 'text' : 'password'" :placeholder="placeholder"
+    :autocomplete="autocomplete" :name="name" @input="$emit('input', $event.target.value)">
+    <template v-if="icon" #prefix>
+      <a-icon :type="icon" style="font-size: 16px;" />
+    </template>
+    <template #addonAfter>
+      <a-icon :type="showPassword ? 'eye-invisible' : 'eye'" @click="toggleShowPassword" style="font-size: 16px;" />
+    </template>
+  </a-input>
+</template>
+{{end}}
+
+{{define "component/aPasswordInput"}}
+<script>
+  Vue.component('a-password-input', {
+    props: {
+      'title': {
+        type: String,
+        required: false,
+      },
+      'value': {
+        type: String,
+        required: false,
+      },
+      'placeholder': {
+        type: String,
+        required: false,
+      },
+      'autocomplete': {
+        type: String,
+        required: false,
+      },
+      'name': {
+        type: String,
+        required: false,
+      },
+      'icon': {
+        type: undefined,
+        required: false
+      }
+    },
+    template: `{{template "component/passwordInput"}}`,
+    data() {
+      return {
+        showPassword: false,
+      };
+    },
+    methods: {
+      toggleShowPassword() {
+        this.showPassword = !this.showPassword;
+      },
+    },
+  });
+</script>
+{{end}}

web/html/xui/component/aPersianDatepicker.html

@@ -2,26 +2,38 @@
 <template>
     <div>
         <a-input :value="value" type="text" v-model="date" data-jdp class="persian-datepicker"
-                 @input="$emit('input', convertToGregorian($event.target.value)); jalaliDatepicker.hide();"
+            @input="$emit('input', convertToGregorian($event.target.value)); jalaliDatepicker.hide();"
-                 :placeholder="placeholder">
+            :placeholder="placeholder">
             <template #addonAfter>
-                <a-icon type="calendar" style="font-size: 14px; opacity: 0.5;"/>
+                <a-icon type="calendar" style="font-size: 14px; opacity: 0.5;" />
             </template>
         </a-input>
     </div>
 </template>
 {{end}}
 
-{{define "component/persianDatepicker"}}
+{{define "component/aPersianDatepicker"}}
-<link rel="stylesheet" href="{{ .base_path }}assets/persian-datepicker/persian-datepicker.min.css?{{ .cur_ver }}"/>
+<link rel="stylesheet" href="{{ .base_path }}assets/persian-datepicker/persian-datepicker.min.css?{{ .cur_ver }}" />
 <script src="{{ .base_path }}assets/moment/moment-jalali.min.js?{{ .cur_ver }}"></script>
 <script src="{{ .base_path }}assets/persian-datepicker/persian-datepicker.min.js?{{ .cur_ver }}"></script>
 <script>
-
     const persianDatepicker = {};
 
-    Vue.component('persian-datepicker', {
+    Vue.component('a-persian-datepicker', {
-        props: ['placeholder', 'format', 'value'],
+        props: {
+            'format': {
+                type: undefined,
+                required: false,
+            },
+            'value': {
+                type: String,
+                required: false,
+            },
+            'placeholder': {
+                type: String,
+                required: false,
+            },
+        },
         template: `{{template "component/persianDatepickerTemplate"}}`,
         data() {
             return {
@@ -57,4 +69,4 @@
         }
     });
 </script>
-{{end}}
+{{end}}

web/html/xui/component/aSettingListItem.html

@@ -0,0 +1,49 @@
+{{define "component/settingListItem"}}
+<a-list-item :style="{ padding: padding }">
+    <a-row>
+        <a-col :lg="24" :xl="12">
+            <a-list-item-meta>
+                <template #title>
+                    <slot name="title"></slot>
+                </template>
+                <template #description>
+                    <slot name="description"></slot>
+                </template>
+            </a-list-item-meta>
+        </a-col>
+        <a-col :lg="24" :xl="12">
+            <slot name="control"></slot>
+        </a-col>
+    </a-row>
+</a-list-item>
+{{end}}
+
+{{define "component/aSettingListItem"}}
+<script>
+    Vue.component('a-setting-list-item', {
+        props: {
+            'paddings': {
+                type: String,
+                required: false,
+                defaultValue: "default",
+                validator: function (value) {
+                    return ['small', 'default'].includes(value)
+                }
+            }
+        },
+        template: `{{ template "component/settingListItem" }}`,
+        computed: {
+            padding() {
+                switch (this.paddings) {
+                    case "small":
+                        return "10px 20px !important"
+                        break;
+                    case "default":
+                        return "20px !important"
+                        break;
+                }
+            }
+        }
+    })
+</script>
+{{end}}

web/html/xui/component/aTableSortable.html

@@ -1,13 +1,9 @@
 {{define "component/sortableTableTrigger"}}
-<a-icon type="drag"
+<a-icon type="drag" class="sortable-icon" style="cursor: move;" @mouseup="mouseUpHandler" @mousedown="mouseDownHandler"
-  class="sortable-icon"
-  style="cursor: move;"
-  @mouseup="mouseUpHandler"
-  @mousedown="mouseDownHandler"
   @click="clickHandler" />
 {{end}}
 
-{{define "component/sortableTable"}}
+{{define "component/aTableSortable"}}
 <script>
   const DRAGGABLE_ROW_CLASS = 'draggable-row';
   const findParentRowElement = (el) => {
@@ -28,7 +24,16 @@
         newElementIndex: null,
       };
     },
-    props: ['data-source', 'customRow'],
+    props: {
+      'data-source': {
+        type: undefined,
+        required: false,
+      },
+      'customRow': {
+        type: undefined,
+        required: false,
+      }
+    },
     inheritAttrs: false,
     provide() {
       const sortable = {}
@@ -44,7 +49,7 @@
         sortable,
       }
     },
-    render: function(createElement) {
+    render: function (createElement) {
       return createElement('a-table', {
         class: {
           'ant-table-is-sorting': this.isDragging(),
@@ -59,7 +64,7 @@
           drop: (e) => this.dropHandler(e),
         },
         scopedSlots: this.$scopedSlots,
-      }, this.$slots.default, )
+      }, this.$slots.default,)
     },
     created() {
       this.$memoSort = {};
@@ -163,9 +168,14 @@
       }
     }
   });
-  Vue.component('table-sort-trigger', {
+  Vue.component('a-table-sort-trigger', {
     template: `{{template "component/sortableTableTrigger"}}`,
-    props: ['item-index'],
+    props: {
+      'item-index': {
+        type: undefined,
+        required: false
+      }
+    },
     inject: ['sortable'],
     methods: {
       mouseDownHandler(e) {
@@ -190,27 +200,33 @@
       display: none;
     }
   }
+
   .ant-table-is-sorting .draggable-row td {
     background-color: #ffffff !important;
   }
+
   .dark .ant-table-is-sorting .draggable-row td {
     background-color: var(--dark-color-surface-100) !important;
   }
+
   .ant-table-is-sorting .dragging td {
     background-color: rgb(232 244 242) !important;
     color: rgba(0, 0, 0, 0.3);
   }
+
   .dark .ant-table-is-sorting .dragging td {
     background-color: var(--dark-color-table-hover) !important;
     color: rgba(255, 255, 255, 0.3);
   }
+
   .ant-table-is-sorting .dragging {
     opacity: 1;
     box-shadow: 1px -2px 2px #008771;
     transition: all 0.2s;
   }
+
   .ant-table-is-sorting .dragging .ant-table-row-index {
     opacity: 0.3;
   }
 </style>
-{{end}}
+{{end}}

web/html/xui/component/aThemeSwitch.html

@@ -4,11 +4,15 @@
     <a-sub-menu>
       <span slot="title">
         <a-icon type="bulb" :theme="themeSwitcher.isDarkTheme ? 'filled' : 'outlined'"></a-icon>
-        <span>Theme</span>
+        <span>{{ i18n "menu.theme" }}</span>
       </span>
-      <a-menu-item id="change-theme" class="ant-menu-theme-switch" @mousedown="themeSwitcher.animationsOff()"> Dark <a-switch style="margin-left: 2px;" size="small" :default-checked="themeSwitcher.isDarkTheme" @change="themeSwitcher.toggleTheme()"></a-switch>
+      <a-menu-item id="change-theme" class="ant-menu-theme-switch" @mousedown="themeSwitcher.animationsOff()"> 
+        <span>{{ i18n "menu.dark" }}</span>
+        <a-switch style="margin-left: 2px;" size="small" :default-checked="themeSwitcher.isDarkTheme" @change="themeSwitcher.toggleTheme()"></a-switch>
       </a-menu-item>
-      <a-menu-item id="change-theme-ultra" v-if="themeSwitcher.isDarkTheme" class="ant-menu-theme-switch" @mousedown="themeSwitcher.animationsOffUltra()"> Ultra <a-checkbox style="margin-left: 2px;" :checked="themeSwitcher.isUltra" @click="themeSwitcher.toggleUltra()"></a-checkbox>
+      <a-menu-item id="change-theme-ultra" v-if="themeSwitcher.isDarkTheme" class="ant-menu-theme-switch" @mousedown="themeSwitcher.animationsOffUltra()"> 
+        <span>{{ i18n "menu.ultraDark" }}</span>
+        <a-checkbox style="margin-left: 2px;" :checked="themeSwitcher.isUltra" @click="themeSwitcher.toggleUltra()"></a-checkbox>
       </a-menu-item>
     </a-sub-menu>
   </a-menu>
@@ -17,19 +21,22 @@
 
 {{define "component/themeSwitchTemplateLogin"}}
 <template>
-  <a-menu @mousedown="themeSwitcher.animationsOff()" id="change-theme" :theme="themeSwitcher.currentTheme" mode="inline" selected-keys="">
+  <a-menu @mousedown="themeSwitcher.animationsOff()" id="change-theme" :theme="themeSwitcher.currentTheme" mode="inline"
+    selected-keys="">
     <a-menu-item mode="inline" class="ant-menu-theme-switch">
       <a-icon type="bulb" :theme="themeSwitcher.isDarkTheme ? 'filled' : 'outlined'"></a-icon>
-      <a-switch size="small" :default-checked="themeSwitcher.isDarkTheme" @change="themeSwitcher.toggleTheme()"></a-switch>
+      <a-switch size="small" :default-checked="themeSwitcher.isDarkTheme"
+        @change="themeSwitcher.toggleTheme()"></a-switch>
       <template v-if="themeSwitcher.isDarkTheme">
-        <a-checkbox style="margin-left: 1rem; vertical-align: middle;" :checked="themeSwitcher.isUltra" @click="themeSwitcher.toggleUltra()">Ultra</a-checkbox>
+        <a-checkbox style="margin-left: 1rem; vertical-align: middle;" :checked="themeSwitcher.isUltra"
+          @click="themeSwitcher.toggleUltra()">Ultra</a-checkbox>
       </template>
     </a-menu-item>
   </a-menu>
 </template>
 {{end}}
 
-{{define "component/themeSwitcher"}}
+{{define "component/aThemeSwitch"}}
 <script>
   function createThemeSwitcher() {
     const isDarkTheme = localStorage.getItem('dark-mode') === 'true';
@@ -83,8 +90,7 @@
     };
   }
   const themeSwitcher = createThemeSwitcher();
-  Vue.component('theme-switch', {
+  Vue.component('a-theme-switch', {
-    props: [],
     template: `{{template "component/themeSwitchTemplate"}}`,
     data: () => ({
       themeSwitcher
@@ -96,8 +102,7 @@
       document.getElementById('message').className = themeSwitcher.currentTheme;
     }
   });
-  Vue.component('theme-switch-login', {
+  Vue.component('a-theme-switch-login', {
-    props: [],
     template: `{{template "component/themeSwitchTemplateLogin"}}`,
     data: () => ({
       themeSwitcher
@@ -110,4 +115,4 @@
     }
   });
 </script>
-{{end}}
+{{end}}

web/html/xui/component/password.html

@@ -1,37 +0,0 @@
-{{define "component/passwordInput"}}
-<template>
-    <a-input :value="value" :type="showPassword ? 'text' : 'password'"
-             :placeholder="placeholder"
-             :autocomplete="autocomplete"
-             :name="name"
-             @input="$emit('input', $event.target.value)">
-        <template v-if="icon" #prefix>
-            <a-icon :type="icon" style="font-size: 16px;" />
-        </template>
-        <template #addonAfter>
-            <a-icon :type="showPassword ? 'eye-invisible' : 'eye'"
-                    @click="toggleShowPassword"
-                    style="font-size: 16px;" />
-        </template>
-    </a-input>
-</template>
-{{end}}
-
-{{define "component/password"}}
-<script>
-  Vue.component('password-input', {
-    props: ["title", "value", "placeholder", "icon", "autocomplete", "name"],
-    template: `{{template "component/passwordInput"}}`,
-    data() {
-      return {
-        showPassword: false,
-      };
-    },
-    methods: {
-      toggleShowPassword() {
-        this.showPassword = !this.showPassword;
-      },
-    },
-  });
-</script>
-{{end}}

web/html/xui/component/setting.html

@@ -1,36 +0,0 @@
-{{define "component/settingListItem"}}
-<a-list-item style="padding: 20px">
-    <a-row v-if="type === 'textarea'">
-        <a-col>
-            <a-list-item-meta :title="title" :description="desc"/>
-            <a-textarea class="ant-setting-textarea" :value="value" @input="$emit('input', $event.target.value)" :auto-size="{ minRows: 10 }"></a-textarea>
-            <!--a-textarea :value="value" @input="$emit('input', $event.target.value)" :auto-size="{ minRows: 10, maxRows: 30 }"></a-textarea-->
-        </a-col>
-    </a-row>
-    <a-row v-else>
-        <a-col :lg="24" :xl="12">
-            <a-list-item-meta :title="title" :description="desc"/>
-        </a-col>
-        <a-col :lg="24" :xl="12">
-            <template v-if="type === 'text'">
-                <a-input :value="value" @input="$emit('input', $event.target.value)" :placeholder="placeholder"></a-input>
-            </template>
-            <template v-else-if="type === 'number'">
-                <a-input-number :value="value" :step="step" @change="value => $emit('input', value)" :min="min" :max="max" style="width: 100%;"></a-input-number>
-            </template>
-            <template v-else-if="type === 'switch'">
-                <a-switch :checked="value" @change="value => $emit('input', value)"></a-switch>
-            </template>
-        </a-col>
-    </a-row>
-</a-list-item>
-{{end}}
-
-{{define "component/setting"}}
-<script>
-    Vue.component('setting-list-item', {
-        props: ["type", "title", "desc", "value", "min", "max" , "step", "placeholder"],
-        template: `{{template "component/settingListItem"}}`,
-    });
-</script>
-{{end}}

web/html/xui/form/client.html

@@ -126,10 +126,10 @@
         <a-input-number v-model.number="client._totalGB" :min="0"></a-input-number>
     </a-form-item>
     <a-form-item v-if="isEdit && clientStats" label='{{ i18n "usage" }}'>
-        <a-tag :color="clientUsageColor(clientStats, app.trafficDiff)">
+        <a-tag :color="ColorUtils.clientUsageColor(clientStats, app.trafficDiff)">
-            [[ sizeFormat(clientStats.up) ]] /
+            [[ SizeFormatter.sizeFormat(clientStats.up) ]] /
-            [[ sizeFormat(clientStats.down) ]]
+            [[ SizeFormatter.sizeFormat(clientStats.down) ]]
-            ([[ sizeFormat(clientStats.up + clientStats.down) ]])
+            ([[ SizeFormatter.sizeFormat(clientStats.up + clientStats.down) ]])
         </a-tag>
         <a-tooltip>
             <template slot="title">{{ i18n "pages.inbounds.resetTraffic" }}</template>
@@ -154,8 +154,8 @@
         </template>
         <a-date-picker v-if="datepicker == 'gregorian'" :show-time="{ format: 'HH:mm:ss' }" format="YYYY-MM-DD HH:mm:ss"
             :dropdown-class-name="themeSwitcher.currentTheme" v-model="client._expiryTime"></a-date-picker>
-        <persian-datepicker v-else placeholder='{{ i18n "pages.settings.datepickerPlaceholder" }}'
+        <a-persian-datepicker v-else placeholder='{{ i18n "pages.settings.datepickerPlaceholder" }}'
-                            value="client._expiryTime" v-model="client._expiryTime"></persian-datepicker>
+                            value="client._expiryTime" v-model="client._expiryTime"></a-persian-datepicker>
         <a-tag color="red" v-if="isEdit && isExpiry">Expired</a-tag>
     </a-form-item>
     <a-form-item v-if="client.expiryTime != 0">

web/html/xui/form/inbound.html

@@ -57,9 +57,9 @@
         <a-date-picker style="width: 100%;" v-if="datepicker == 'gregorian'" :show-time="{ format: 'HH:mm:ss' }"
             format="YYYY-MM-DD HH:mm:ss" :dropdown-class-name="themeSwitcher.currentTheme"
             v-model="dbInbound._expiryTime"></a-date-picker>
-        <persian-datepicker v-else placeholder='{{ i18n "pages.settings.datepickerPlaceholder" }}'
+        <a-persian-datepicker v-else placeholder='{{ i18n "pages.settings.datepickerPlaceholder" }}'
             value="dbInbound._expiryTime" v-model="dbInbound._expiryTime">
-        </persian-datepicker>
+        </a-persian-datepicker>
     </a-form-item>
 </a-form>
 

web/html/xui/form/outbound.html

@@ -506,12 +506,12 @@
     </a-form>
   </a-tab-pane>
   <a-tab-pane key="2" tab="JSON" force-render="true">
-    <a-form-item style="margin: 10px 0"> Link: <a-input v-model.trim="outModal.link" style="width: 300px; margin-right: 5px;" placeholder="vmess:// vless:// trojan:// ss://"></a-input>
+    <a-space direction="vertical" :size="10" style="margin-top: 10px;">
-      <a-button @click="convertLink" type="primary">
+      <a-input addon-before='{{ i18n "pages.xray.outbound.link" }}' v-model.trim="outModal.link" placeholder="vmess:// vless:// trojan:// ss://">
-        <a-icon type="form"></a-icon>
+        <a-icon slot="addonAfter" type="form" @click="convertLink"></a-icon>
-      </a-button>
+      </a-input>
-    </a-form-item>
+      <textarea style="position:absolute; left: -800px;" id="outboundJson"></textarea>
-    <textarea style="position:absolute; left: -800px;" id="outboundJson"></textarea>
+    </a-space>
   </a-tab-pane>
 </a-tabs>
 {{end}}

web/html/xui/form/stream/stream_kcp.html

@@ -8,6 +8,7 @@
             <a-select-option value="wechat-video">WeChat</a-select-option>
             <a-select-option value="dtls">DTLS 1.2</a-select-option>
             <a-select-option value="wireguard">WireGuard</a-select-option>
+            <a-select-option value="dns">DNS</a-select-option>
         </a-select>
     </a-form-item>
     <a-form-item>

web/html/xui/inbound_client_table.html

@@ -55,18 +55,18 @@
     <template slot="content" v-if="client.email">
       <table cellpadding="2" width="100%">
         <tr>
-          <td>↑[[ sizeFormat(getUpStats(record, client.email)) ]]</td>
+          <td>↑[[ SizeFormatter.sizeFormat(getUpStats(record, client.email)) ]]</td>
-          <td>↓[[ sizeFormat(getDownStats(record, client.email)) ]]</td>
+          <td>↓[[ SizeFormatter.sizeFormat(getDownStats(record, client.email)) ]]</td>
         </tr>
         <tr v-if="client.totalGB > 0">
           <td>{{ i18n "remained" }}</td>
-          <td>[[ sizeFormat(getRemStats(record, client.email)) ]]</td>
+          <td>[[ SizeFormatter.sizeFormat(getRemStats(record, client.email)) ]]</td>
         </tr>
       </table>
     </template>
     <table>
       <tr class="tr-table-box">
-        <td class="tr-table-rt"> [[ sizeFormat(getSumStats(record, client.email)) ]] </td>
+        <td class="tr-table-rt"> [[ SizeFormatter.sizeFormat(getSumStats(record, client.email)) ]] </td>
         <td class="tr-table-bar" v-if="!client.enable">
           <a-progress :stroke-color="themeSwitcher.isDarkTheme ? 'rgb(72 84 105)' : '#bcbcbc'" :show-info="false" :percent="statsProgress(record, client.email)" />
         </td>
@@ -124,9 +124,9 @@
           </template>
         </span>
       </template>
-      <a-tag style="min-width: 50px; border: none;" :color="userExpiryColor(app.expireDiff, client, themeSwitcher.isDarkTheme)"> [[ remainedDays(client.expiryTime) ]] </a-tag>
+      <a-tag style="min-width: 50px; border: none;" :color="ColorUtils.userExpiryColor(app.expireDiff, client, themeSwitcher.isDarkTheme)"> [[ remainedDays(client.expiryTime) ]] </a-tag>
     </a-popover>
-    <a-tag v-else :color="userExpiryColor(app.expireDiff, client, themeSwitcher.isDarkTheme)" style="border: none;" class="infinite-tag">
+    <a-tag v-else :color="ColorUtils.userExpiryColor(app.expireDiff, client, themeSwitcher.isDarkTheme)" style="border: none;" class="infinite-tag">
       <svg height="10px" width="14px" viewBox="0 0 640 512" fill="currentColor">
         <path d="M484.4 96C407 96 349.2 164.1 320 208.5C290.8 164.1 233 96 155.6 96C69.75 96 0 167.8 0 256s69.75 160 155.6 160C233.1 416 290.8 347.9 320 303.5C349.2 347.9 407 416 484.4 416C570.3 416 640 344.2 640 256S570.3 96 484.4 96zM155.6 368C96.25 368 48 317.8 48 256s48.25-112 107.6-112c67.75 0 120.5 82.25 137.1 112C276 285.8 223.4 368 155.6 368zM484.4 368c-67.75 0-120.5-82.25-137.1-112C364 226.2 416.6 144 484.4 144C543.8 144 592 194.2 592 256S543.8 368 484.4 368z" fill="currentColor"></path>
       </svg>
@@ -172,7 +172,7 @@
           <td colspan="3" style="text-align: center;">{{ i18n "pages.inbounds.traffic" }}</td>
         </tr>
         <tr>
-          <td width="80px" style="margin:0; text-align: right;font-size: 1em;"> [[ sizeFormat(getUpStats(record, client.email) + getDownStats(record, client.email)) ]] </td>
+          <td width="80px" style="margin:0; text-align: right;font-size: 1em;"> [[ SizeFormatter.sizeFormat(getUpStats(record, client.email) + getDownStats(record, client.email)) ]] </td>
           <td width="120px" v-if="!client.enable">
             <a-progress :stroke-color="themeSwitcher.isDarkTheme ? 'rgb(72 84 105)' : '#bcbcbc'" :show-info="false" :percent="statsProgress(record, client.email)" />
           </td>
@@ -181,12 +181,12 @@
               <template slot="content" v-if="client.email">
                 <table cellpadding="2" width="100%">
                   <tr>
-                    <td>↑[[ sizeFormat(getUpStats(record, client.email)) ]]</td>
+                    <td>↑[[ SizeFormatter.sizeFormat(getUpStats(record, client.email)) ]]</td>
-                    <td>↓[[ sizeFormat(getDownStats(record, client.email)) ]]</td>
+                    <td>↓[[ SizeFormatter.sizeFormat(getDownStats(record, client.email)) ]]</td>
                   </tr>
                   <tr>
                     <td>{{ i18n "remained" }}</td>
-                    <td>[[ sizeFormat(getRemStats(record, client.email)) ]]</td>
+                    <td>[[ SizeFormatter.sizeFormat(getRemStats(record, client.email)) ]]</td>
                   </tr>
                 </table>
               </template>
@@ -244,7 +244,7 @@
                     </template>
                   </span>
                 </template>
-                <a-tag style="min-width: 50px; border: none;" :color="userExpiryColor(app.expireDiff, client, themeSwitcher.isDarkTheme)"> [[ remainedDays(client.expiryTime) ]] </a-tag>
+                <a-tag style="min-width: 50px; border: none;" :color="ColorUtils.userExpiryColor(app.expireDiff, client, themeSwitcher.isDarkTheme)"> [[ remainedDays(client.expiryTime) ]] </a-tag>
               </a-popover>
               <a-tag v-else :color="client.enable ? 'purple' : themeSwitcher.isDarkTheme ? '#2c3950' : '#bcbcbc'" class="infinite-tag">
                 <svg height="10px" width="14px" viewBox="0 0 640 512" fill="currentColor">

web/html/xui/inbound_info_modal.html

@@ -181,8 +181,8 @@
         <tr v-if="infoModal.clientStats">
           <td>{{ i18n "usage" }}</td>
           <td>
-            <a-tag color="green">[[ sizeFormat(infoModal.clientStats.up + infoModal.clientStats.down) ]]</a-tag>
+            <a-tag color="green">[[ SizeFormatter.sizeFormat(infoModal.clientStats.up + infoModal.clientStats.down) ]]</a-tag>
-            <a-tag>↑ [[ sizeFormat(infoModal.clientStats.up) ]] / [[ sizeFormat(infoModal.clientStats.down) ]] ↓</a-tag>
+            <a-tag>↑ [[ SizeFormatter.sizeFormat(infoModal.clientStats.up) ]] / [[ SizeFormatter.sizeFormat(infoModal.clientStats.down) ]] ↓</a-tag>
           </td>
         </tr>
         <tr v-if="infoModal.clientSettings.comment">
@@ -224,7 +224,7 @@
             <a-tag v-if="infoModal.clientStats && infoModal.clientSettings.totalGB > 0" :color="statsColor(infoModal.clientStats)"> [[ getRemStats() ]] </a-tag>
           </td>
           <td>
-            <a-tag v-if="infoModal.clientSettings.totalGB > 0" :color="statsColor(infoModal.clientStats)"> [[ sizeFormat(infoModal.clientSettings.totalGB) ]] </a-tag>
+            <a-tag v-if="infoModal.clientSettings.totalGB > 0" :color="statsColor(infoModal.clientStats)"> [[ SizeFormatter.sizeFormat(infoModal.clientSettings.totalGB) ]] </a-tag>
             <a-tag v-else color="purple" class="infinite-tag">
               <svg height="10px" width="14px" viewBox="0 0 640 512" fill="currentColor">
                 <path d="M484.4 96C407 96 349.2 164.1 320 208.5C290.8 164.1 233 96 155.6 96C69.75 96 0 167.8 0 256s69.75 160 155.6 160C233.1 416 290.8 347.9 320 303.5C349.2 347.9 407 416 484.4 416C570.3 416 640 344.2 640 256S570.3 96 484.4 96zM155.6 368C96.25 368 48 317.8 48 256s48.25-112 107.6-112c67.75 0 120.5 82.25 137.1 112C276 285.8 223.4 368 155.6 368zM484.4 368c-67.75 0-120.5-82.25-137.1-112C364 226.2 416.6 144 484.4 144C543.8 144 592 194.2 592 256S543.8 368 484.4 368z" fill="currentColor"></path>
@@ -233,7 +233,7 @@
           </td>
           <td>
             <template v-if="infoModal.clientSettings.expiryTime > 0">
-              <a-tag :color="usageColor(new Date().getTime(), app.expireDiff, infoModal.clientSettings.expiryTime)"> 
+              <a-tag :color="ColorUtils.usageColor(new Date().getTime(), app.expireDiff, infoModal.clientSettings.expiryTime)"> 
                 <template v-if="app.datepicker === 'gregorian'">
                   [[ DateUtil.formatMillis(infoModal.clientSettings.expiryTime) ]]
                 </template>
@@ -258,7 +258,7 @@
           <tr-info-title class="tr-info-title">
             <a-tag color="purple">Subscription Link</a-tag>
             <a-tooltip title='{{ i18n "copy" }}'>
-              <a-button size="small" icon="snippets" id="copy-sub-link" @click="copyToClipboard('copy-sub-link', infoModal.subLink)"></a-button>
+              <a-button size="small" icon="snippets" @click="copy(infoModal.subLink)"></a-button>
             </a-tooltip>
           </tr-info-title>
           <a :href="[[ infoModal.subLink ]]" target="_blank">[[ infoModal.subLink ]]</a>
@@ -267,7 +267,7 @@
           <tr-info-title class="tr-info-title">
             <a-tag color="purple">Json Link</a-tag>
             <a-tooltip title='{{ i18n "copy" }}'>
-              <a-button size="small" icon="snippets" id="copy-subJson-link" @click="copyToClipboard('copy-subJson-link', infoModal.subJsonLink)"></a-button>
+              <a-button size="small" icon="snippets" @click="copy(infoModal.subJsonLink)"></a-button>
             </a-tooltip>
           </tr-info-title>
           <a :href="[[ infoModal.subJsonLink ]]" target="_blank">[[ infoModal.subJsonLink ]]</a>
@@ -279,7 +279,7 @@
           <tr-info-title class="tr-info-title">
             <a-tag color="blue">[[ infoModal.clientSettings.tgId ]]</a-tag>
             <a-tooltip title='{{ i18n "copy" }}'>
-              <a-button size="small" icon="snippets" id="copy-tg-link" @click="copyToClipboard('copy-tg-link', infoModal.clientSettings.tgId)"></a-button>
+              <a-button size="small" icon="snippets" @click="copy(infoModal.clientSettings.tgId)"></a-button>
             </a-tooltip>
           </tr-info-title>
         </tr-info-row>
@@ -290,7 +290,7 @@
           <tr-info-title class="tr-info-title">
             <a-tag class="tr-info-tag" color="green">[[ link.remark ]]</a-tag>
             <a-tooltip title='{{ i18n "copy" }}'>
-              <a-button style="min-width: 24px;" size="small" icon="snippets" :id="'copy-url-link-'+index" @click="copyToClipboard('copy-url-link-'+index, link.link)"></a-button>
+              <a-button style="min-width: 24px;" size="small" icon="snippets" @click="copy(link.link)"></a-button>
             </a-tooltip>
           </tr-info-title>
           <code>[[ link.link ]]</code>
@@ -304,7 +304,7 @@
           <tr-info-title class="tr-info-title">
             <a-tag class="tr-info-tag" color="green">[[ link.remark ]]</a-tag>
             <a-tooltip title='{{ i18n "copy" }}'>
-              <a-button style="min-width: 24px;" size="small" icon="snippets" :id="'copy-url-link-'+index" @click="copyToClipboard('copy-url-link-'+index, link.link)"></a-button>
+              <a-button style="min-width: 24px;" size="small" icon="snippets" @click="copy(link.link)"></a-button>
             </a-tooltip>
           </tr-info-title>
           <code>[[ link.link ]]</code>
@@ -431,7 +431,7 @@
                 <tr-info-title class="tr-info-title">
                   <a-tag color="blue">Config</a-tag>
                   <a-tooltip title='{{ i18n "copy" }}'>
-                    <a-button style="min-width: 24px;" size="small" icon="snippets" :id="'copy-url-link-'+index" @click="copyToClipboard('copy-url-link-'+index, infoModal.links[index])"></a-button>
+                    <a-button style="min-width: 24px;" size="small" icon="snippets" @click="copy(infoModal.links[index])"></a-button>
                   </a-tooltip>
                 </tr-info-title>
                 <div v-html="infoModal.links[index].replaceAll(`\n`,`<br />`)" style="border-radius: 1rem; padding: 0.5rem;" class="client-table-odd-row">
@@ -464,7 +464,6 @@
     clientStats: [],
     upStats: 0,
     downStats: 0,
-    clipboard: null,
     links: [],
     index: null,
     isExpired: false,
@@ -533,21 +532,19 @@
       },
     },
     methods: {
-      copyToClipboard(elementId, content) {
+      copy(content) {
-        this.infoModal.clipboard = new ClipboardJS('#' + elementId, {
+        ClipboardManager
-          text: () => content,
+          .copyText(content)
-        });
+          .then(() => {
-        this.infoModal.clipboard.on('success', () => {
+            app.$message.success('{{ i18n "copied" }}')
-          app.$message.success('{{ i18n "copied" }}')
+          })
-          this.infoModal.clipboard.destroy();
-        });
       },
       statsColor(stats) {
-        return usageColor(stats.up + stats.down, app.trafficDiff, stats.total);
+        return ColorUtils.usageColor(stats.up + stats.down, app.trafficDiff, stats.total);
       },
       getRemStats() {
         remained = this.infoModal.clientStats.total - this.infoModal.clientStats.up - this.infoModal.clientStats.down;
-        return remained > 0 ? sizeFormat(remained) : '-';
+        return remained > 0 ? SizeFormatter.sizeFormat(remained) : '-';
       },
       refreshIPs() {
         this.refreshing = true;

web/html/xui/inbounds.html

@@ -43,6 +43,15 @@
 	    margin:-10px 2px !important;
     }
   }
+  .dark .ant-switch-small:not(.ant-switch-checked) {
+    background-color: var(--dark-color-surface-100) !important;
+  }
+  .ant-custom-popover-title {
+    display: flex;
+    align-items: center;
+    gap: 10px;
+    margin: 5px 0;
+  }
   .ant-col-sm-24 {
     margin: 0.5rem -2rem 0.5rem 2rem;
   }
@@ -137,406 +146,433 @@
           </a-alert>
         </transition>
         <transition name="list" appear>
-          <a-card hoverable>
+          <a-card size="small" style="padding: 16px;" hoverable>
             <a-row>
-              <a-col :xs="24" :sm="24" :lg="12">
+              <a-col :sm="12" :md="6">
-                {{ i18n "pages.inbounds.totalDownUp" }}:
+                <a-custom-statistic title='{{ i18n "pages.inbounds.totalDownUp" }}' :value="`${SizeFormatter.sizeFormat(total.up)} / ${SizeFormatter.sizeFormat(total.down)}`">
-                <a-tag color="green">[[ sizeFormat(total.up) ]] / [[ sizeFormat(total.down) ]]</a-tag>
+                  <template #prefix>
+                    <a-icon type="swap"></a-icon>
+                  </template>
+                </a-custom-statistic>
               </a-col>
-              <a-col :xs="24" :sm="24" :lg="12">
+              <a-col :sm="12" :md="6">
-                {{ i18n "pages.inbounds.totalUsage" }}:
+                <a-custom-statistic title='{{ i18n "pages.inbounds.totalUsage" }}' :value="SizeFormatter.sizeFormat(total.up + total.down)" :style="{ marginTop: isMobile ? '10px' : 0 }">
-                <a-tag color="green">[[ sizeFormat(total.up + total.down) ]]</a-tag>
+                  <template #prefix>
+                    <a-icon type="pie-chart"></a-icon>
+                  </template>
+                </a-custom-statistic>
               </a-col>
-              <a-col :xs="24" :sm="24" :lg="12">
+              <a-col :sm="12" :md="6">
-                {{ i18n "pages.inbounds.inboundCount" }}:
+                <a-custom-statistic title='{{ i18n "pages.inbounds.inboundCount" }}' :value="dbInbounds.length" :style="{ marginTop: isMobile ? '10px' : 0 }">
-                <a-tag color="green">[[ dbInbounds.length ]]</a-tag>
+                  <template #prefix>
+                    <a-icon type="bars"></a-icon>
+                  </template>
+                </a-custom-statistic>
               </a-col>
-              <a-col :xs="24" :sm="24" :lg="12">
+              <a-col :sm="12" :md="6">
-                <template>
+                <a-custom-statistic title='{{ i18n "clients" }}' value=" " :style="{ marginTop: isMobile ? '10px' : 0 }">
-                  <div>
+                  <template #prefix>
-                    <a-back-top :target="() => document.getElementById('content-layout')" visibility-height="200"></a-back-top>
+                    <a-space direction="horizontal">
-                    {{ i18n "clients" }}:
+                      <a-icon type="team"></a-icon>
-                    <a-tag color="green">[[ total.clients ]]</a-tag>
+                      <div>
-                    <a-popover title='{{ i18n "disabled" }}' :overlay-class-name="themeSwitcher.currentTheme">
+                        <a-back-top :target="() => document.getElementById('content-layout')" visibility-height="200"></a-back-top>
-                      <template slot="content">
+                        <a-tag color="green">[[ total.clients ]]</a-tag>
-                        <p v-for="clientEmail in total.deactive">[[ clientEmail ]]</p>
+                        <a-popover title='{{ i18n "disabled" }}' :overlay-class-name="themeSwitcher.currentTheme">
-                      </template>
+                          <template slot="content">
-                      <a-tag v-if="total.deactive.length">[[ total.deactive.length ]]</a-tag>
+                            <div v-for="clientEmail in total.deactive"><span>[[ clientEmail ]]</span></div>
-                    </a-popover>
+                          </template>
-                    <a-popover title='{{ i18n "depleted" }}' :overlay-class-name="themeSwitcher.currentTheme">
+                          <a-tag v-if="total.deactive.length">[[ total.deactive.length ]]</a-tag>
-                      <template slot="content">
+                        </a-popover>
-                        <p v-for="clientEmail in total.depleted">[[ clientEmail ]]</p>
+                        <a-popover title='{{ i18n "depleted" }}' :overlay-class-name="themeSwitcher.currentTheme">
-                      </template>
+                          <template slot="content">
-                      <a-tag color="red" v-if="total.depleted.length">[[ total.depleted.length ]]</a-tag>
+                            <div v-for="clientEmail in total.depleted"><span>[[ clientEmail ]]</span></div>
-                    </a-popover>
+                          </template>
-                    <a-popover title='{{ i18n "depletingSoon" }}' :overlay-class-name="themeSwitcher.currentTheme">
+                          <a-tag color="red" v-if="total.depleted.length">[[ total.depleted.length ]]</a-tag>
-                      <template slot="content">
+                        </a-popover>
-                        <p v-for="clientEmail in total.expiring">[[ clientEmail ]]</p>
+                        <a-popover title='{{ i18n "depletingSoon" }}' :overlay-class-name="themeSwitcher.currentTheme">
-                      </template>
+                          <template slot="content">
-                      <a-tag color="orange" v-if="total.expiring.length">[[ total.expiring.length ]]</a-tag>
+                            <div v-for="clientEmail in total.expiring"><span>[[ clientEmail ]]</span></div>
-                    </a-popover>
+                          </template>
-                    <a-popover title='{{ i18n "online" }}' :overlay-class-name="themeSwitcher.currentTheme">
+                          <a-tag color="orange" v-if="total.expiring.length">[[ total.expiring.length ]]</a-tag>
-                      <template slot="content">
+                        </a-popover>
-                        <p v-for="clientEmail in onlineClients">[[ clientEmail ]]</p>
+                        <a-popover title='{{ i18n "online" }}' :overlay-class-name="themeSwitcher.currentTheme">
-                      </template>
+                          <template slot="content">
-                      <a-tag color="blue" v-if="onlineClients.length">[[ onlineClients.length ]]</a-tag>
+                            <div v-for="clientEmail in onlineClients"><span>[[ clientEmail ]]</span></div>
-                    </a-popover>
+                          </template>
-                  </div>
+                          <a-tag color="blue" v-if="onlineClients.length">[[ onlineClients.length ]]</a-tag>
-                </template>
+                        </a-popover>
+                      </div>
+                    </a-space>
+                  </template>
+                </a-custom-statistic>
               </a-col>
             </a-row>
           </a-card>
         </transition>
         <transition name="list" appear>
           <a-card hoverable>
-            <div slot="title">
+            <template #title>
-              <a-row>
+              <a-space direction="horizontal">
-                <a-col :xs="12" :sm="12" :lg="12">
+                <a-button type="primary" icon="plus" @click="openAddInbound">
-                  <a-button type="primary" icon="plus" @click="openAddInbound">
+                  <template v-if="!isMobile">{{ i18n "pages.inbounds.addInbound" }}</template>
-                    <template v-if="!isMobile">{{ i18n "pages.inbounds.addInbound" }}</template>
+                </a-button>
-                  </a-button>
-                  <a-dropdown :trigger="['click']">
-                    <a-button type="primary" icon="menu">
-                      <template v-if="!isMobile">{{ i18n "pages.inbounds.generalActions" }}</template>
-                    </a-button>
-                    <a-menu slot="overlay" @click="a => generalActions(a)" :theme="themeSwitcher.currentTheme">
-                      <a-menu-item key="import">
-                        <a-icon type="import"></a-icon>
-                        {{ i18n "pages.inbounds.importInbound" }}
-                      </a-menu-item>
-                      <a-menu-item key="export">
-                        <a-icon type="export"></a-icon>
-                        {{ i18n "pages.inbounds.export" }}
-                      </a-menu-item>
-                      <a-menu-item key="subs" v-if="subSettings.enable">
-                        <a-icon type="export"></a-icon>
-                        {{ i18n "pages.inbounds.export" }} - {{ i18n "pages.settings.subSettings" }}
-                      </a-menu-item>
-                      <a-menu-item key="resetInbounds">
-                        <a-icon type="reload"></a-icon>
-                        {{ i18n "pages.inbounds.resetAllTraffic" }}
-                      </a-menu-item>
-                      <a-menu-item key="resetClients">
-                        <a-icon type="file-done"></a-icon>
-                        {{ i18n "pages.inbounds.resetAllClientTraffics" }}
-                      </a-menu-item>
-                      <a-menu-item key="delDepletedClients" style="color: #FF4D4F;">
-                        <a-icon type="rest"></a-icon>
-                        {{ i18n "pages.inbounds.delDepletedClients" }}
-                      </a-menu-item>
-                    </a-menu>
-                  </a-dropdown>
-                </a-col>
-                <a-col :xs="12" :sm="12" :lg="12" style="text-align: right;">
-                  <a-select v-model="refreshInterval"
-                      style="width: 65px;"
-                      v-if="isRefreshEnabled"
-                      @change="changeRefreshInterval"
-                      :dropdown-class-name="themeSwitcher.currentTheme">
-                    <a-select-option v-for="key in [5,10,30,60]" :value="key*1000">[[ key ]]s</a-select-option>
-                  </a-select>
-                  <a-icon type="sync" :spin="refreshing" @click="manualRefresh" style="margin: 0 5px;"></a-icon>
-                  <a-switch v-model="isRefreshEnabled" @change="toggleRefresh"></a-switch>
-                </a-col>
-              </a-row>
-            </div>
-            <div :style="isMobile ? '' : 'display: flex; align-items: center; justify-content: flex-start;'">
-              <a-switch v-model="enableFilter"
-                  :style="isMobile ? 'margin-bottom: .5rem; display: flex;' : 'margin-right: .5rem;'"
-                  @change="toggleFilter">
-                <a-icon slot="checkedChildren" type="search"></a-icon>
-                <a-icon slot="unCheckedChildren" type="filter"></a-icon>
-              </a-switch>
-              <a-input v-if="!enableFilter" v-model.lazy="searchKey" placeholder='{{ i18n "search" }}' autofocus style="max-width: 300px" :size="isMobile ? 'small' : ''"></a-input>
-              <a-radio-group v-if="enableFilter" v-model="filterBy" @change="filterInbounds" button-style="solid" :size="isMobile ? 'small' : ''">
-                <a-radio-button value="">{{ i18n "none" }}</a-radio-button>
-                <a-radio-button value="deactive">{{ i18n "disabled" }}</a-radio-button>
-                <a-radio-button value="depleted">{{ i18n "depleted" }}</a-radio-button>
-                <a-radio-button value="expiring">{{ i18n "depletingSoon" }}</a-radio-button>
-                <a-radio-button value="online">{{ i18n "online" }}</a-radio-button>
-              </a-radio-group>
-            </div>
-            <a-back-top></a-back-top>
-            <a-table :columns="isMobile ? mobileColumns : columns" :row-key="dbInbound => dbInbound.id"
-                :data-source="searchedInbounds"
-                :scroll="isMobile ? {} : { x: 1000 }"
-                :pagination=pagination(searchedInbounds)
-                :expand-icon-as-cell="false"
-                :expand-row-by-click="false"
-                :expand-icon-column-index="0"
-                :indent-size="0"
-                :row-class-name="dbInbound => (dbInbound.isMultiUser() ? '' : 'hideExpandIcon')"
-                style="margin-top: 10px">
-              <template slot="action" slot-scope="text, dbInbound">
                 <a-dropdown :trigger="['click']">
-                  <a-icon @click="e => e.preventDefault()" type="more" style="font-size: 20px; text-decoration: solid;"></a-icon>
+                  <a-button type="primary" icon="menu">
-                  <a-menu slot="overlay" @click="a => clickAction(a, dbInbound)" :theme="themeSwitcher.currentTheme">
+                    <template v-if="!isMobile">{{ i18n "pages.inbounds.generalActions" }}</template>
-                    <a-menu-item key="edit">
+                  </a-button>
-                      <a-icon type="edit"></a-icon>
+                  <a-menu slot="overlay" @click="a => generalActions(a)" :theme="themeSwitcher.currentTheme">
-                      {{ i18n "edit" }}
+                    <a-menu-item key="import">
+                      <a-icon type="import"></a-icon>
+                      {{ i18n "pages.inbounds.importInbound" }}
                     </a-menu-item>
-                    <a-menu-item key="qrcode" v-if="(dbInbound.isSS && !dbInbound.toInbound().isSSMultiUser) || dbInbound.isWireguard">
+                    <a-menu-item key="export">
-                      <a-icon type="qrcode"></a-icon>
+                      <a-icon type="export"></a-icon>
-                      {{ i18n "qrCode" }}
+                      {{ i18n "pages.inbounds.export" }}
                     </a-menu-item>
-                    <template v-if="dbInbound.isMultiUser()">
+                    <a-menu-item key="subs" v-if="subSettings.enable">
-                      <a-menu-item key="addClient">
+                      <a-icon type="export"></a-icon>
-                        <a-icon type="user-add"></a-icon>
+                      {{ i18n "pages.inbounds.export" }} - {{ i18n "pages.settings.subSettings" }}
-                        {{ i18n "pages.client.add"}}
-                      </a-menu-item>
-                      <a-menu-item key="addBulkClient">
-                        <a-icon type="usergroup-add"></a-icon>
-                        {{ i18n "pages.client.bulk"}}
-                      </a-menu-item>
-                      <a-menu-item key="resetClients">
-                        <a-icon type="file-done"></a-icon>
-                        {{ i18n "pages.inbounds.resetInboundClientTraffics"}}
-                      </a-menu-item>
-                      <a-menu-item key="export">
-                        <a-icon type="export"></a-icon>
-                        {{ i18n "pages.inbounds.export"}}
-                      </a-menu-item>
-                      <a-menu-item key="subs" v-if="subSettings.enable">
-                        <a-icon type="export"></a-icon>
-                        {{ i18n "pages.inbounds.export"}} - {{ i18n "pages.settings.subSettings" }}
-                      </a-menu-item>
-                      <a-menu-item key="delDepletedClients" style="color: #FF4D4F;">
-                        <a-icon type="rest"></a-icon>
-                        {{ i18n "pages.inbounds.delDepletedClients" }}
-                      </a-menu-item>
-                    </template>
-                    <template v-else>
-                      <a-menu-item key="showInfo">
-                        <a-icon type="info-circle"></a-icon>
-                        {{ i18n "info"}}
-                      </a-menu-item>
-                    </template>
-                    <a-menu-item key="clipboard">
-                      <a-icon type="copy"></a-icon>
-                      {{ i18n "pages.inbounds.exportInbound" }}
                     </a-menu-item>
-                    <a-menu-item key="resetTraffic">
+                    <a-menu-item key="resetInbounds">
-                      <a-icon type="retweet"></a-icon> {{ i18n "pages.inbounds.resetTraffic" }}
+                      <a-icon type="reload"></a-icon>
+                      {{ i18n "pages.inbounds.resetAllTraffic" }}
                     </a-menu-item>
-                    <a-menu-item key="clone">
+                    <a-menu-item key="resetClients">
-                      <a-icon type="block"></a-icon> {{ i18n "pages.inbounds.clone"}}
+                      <a-icon type="file-done"></a-icon>
+                      {{ i18n "pages.inbounds.resetAllClientTraffics" }}
                     </a-menu-item>
-                    <a-menu-item key="delete">
+                    <a-menu-item key="delDepletedClients" style="color: #FF4D4F;">
-                      <span style="color: #FF4D4F">
+                      <a-icon type="rest"></a-icon>
-                        <a-icon type="delete"></a-icon> {{ i18n "delete"}}
+                      {{ i18n "pages.inbounds.delDepletedClients" }}
-                      </span>
-                    </a-menu-item>
-                    <a-menu-item v-if="isMobile">
-                      <a-switch size="small" v-model="dbInbound.enable" @change="switchEnable(dbInbound.id,dbInbound.enable)"></a-switch>
-                      {{ i18n "pages.inbounds.enable" }}
                     </a-menu-item>
                   </a-menu>
                 </a-dropdown>
-              </template>
+              </a-space>
-              <template slot="protocol" slot-scope="text, dbInbound">
+            </template>
-                <a-tag style="margin:0;" color="purple">[[ dbInbound.protocol ]]</a-tag>
+            <template #extra>
-                <template v-if="dbInbound.isVMess || dbInbound.isVLess || dbInbound.isTrojan || dbInbound.isSS">
+              <a-button-group>
-                  <a-tag style="margin:0;" color="green">[[ dbInbound.toInbound().stream.network ]]</a-tag>
+                <a-button icon="sync" @click="manualRefresh" :loading="refreshing"></a-button>
-                  <a-tag style="margin:0;" v-if="dbInbound.toInbound().stream.isTls" color="blue">TLS</a-tag>
+                <a-popover placement="bottomRight" trigger="click" :overlay-class-name="themeSwitcher.currentTheme"> 
-                  <a-tag style="margin:0;" v-if="dbInbound.toInbound().stream.isReality" color="blue">Reality</a-tag>
+                  <template #title>
+                    <div class="ant-custom-popover-title">
+                      <a-switch v-model="isRefreshEnabled" @change="toggleRefresh" size="small"></a-switch>
+                      <span>{{ i18n "pages.inbounds.autoRefresh" }}</span>
+                    </div>
+                  </template>
+                  <template #content>
+                    <a-space direction="vertical">
+                      <span>{{ i18n "pages.inbounds.autoRefreshInterval" }}</span>
+                      <a-select v-model="refreshInterval"
+                          :disabled="!isRefreshEnabled"
+                          style="width: 100%;"
+                          @change="changeRefreshInterval"
+                          :dropdown-class-name="themeSwitcher.currentTheme">
+                        <a-select-option v-for="key in [5,10,30,60]" :value="key*1000">[[ key ]]s</a-select-option>
+                      </a-select>
+                    </a-space>
+                  </template>
+                  <a-button icon="down"></a-button>
+                </a-popover>
+              </a-button-group>
+            </template>
+            <a-space direction="vertical">
+              <div :style="isMobile ? '' : 'display: flex; align-items: center; justify-content: flex-start;'">
+                <a-switch v-model="enableFilter"
+                    :style="isMobile ? 'margin-bottom: .5rem; display: flex;' : 'margin-right: .5rem;'"
+                    @change="toggleFilter">
+                  <a-icon slot="checkedChildren" type="search"></a-icon>
+                  <a-icon slot="unCheckedChildren" type="filter"></a-icon>
+                </a-switch>
+                <a-input v-if="!enableFilter" v-model.lazy="searchKey" placeholder='{{ i18n "search" }}' autofocus style="max-width: 300px" :size="isMobile ? 'small' : ''"></a-input>
+                <a-radio-group v-if="enableFilter" v-model="filterBy" @change="filterInbounds" button-style="solid" :size="isMobile ? 'small' : ''">
+                  <a-radio-button value="">{{ i18n "none" }}</a-radio-button>
+                  <a-radio-button value="deactive">{{ i18n "disabled" }}</a-radio-button>
+                  <a-radio-button value="depleted">{{ i18n "depleted" }}</a-radio-button>
+                  <a-radio-button value="expiring">{{ i18n "depletingSoon" }}</a-radio-button>
+                  <a-radio-button value="online">{{ i18n "online" }}</a-radio-button>
+                </a-radio-group>
+              </div>
+              <a-table :columns="isMobile ? mobileColumns : columns" :row-key="dbInbound => dbInbound.id"
+                  :data-source="searchedInbounds"
+                  :scroll="isMobile ? {} : { x: 1000 }"
+                  :pagination=pagination(searchedInbounds)
+                  :expand-icon-as-cell="false"
+                  :expand-row-by-click="false"
+                  :expand-icon-column-index="0"
+                  :indent-size="0"
+                  :row-class-name="dbInbound => (dbInbound.isMultiUser() ? '' : 'hideExpandIcon')"
+                  style="margin-top: 10px">
+                <template slot="action" slot-scope="text, dbInbound">
+                  <a-dropdown :trigger="['click']">
+                    <a-icon @click="e => e.preventDefault()" type="more" style="font-size: 20px; text-decoration: solid;"></a-icon>
+                    <a-menu slot="overlay" @click="a => clickAction(a, dbInbound)" :theme="themeSwitcher.currentTheme">
+                      <a-menu-item key="edit">
+                        <a-icon type="edit"></a-icon>
+                        {{ i18n "edit" }}
+                      </a-menu-item>
+                      <a-menu-item key="qrcode" v-if="(dbInbound.isSS && !dbInbound.toInbound().isSSMultiUser) || dbInbound.isWireguard">
+                        <a-icon type="qrcode"></a-icon>
+                        {{ i18n "qrCode" }}
+                      </a-menu-item>
+                      <template v-if="dbInbound.isMultiUser()">
+                        <a-menu-item key="addClient">
+                          <a-icon type="user-add"></a-icon>
+                          {{ i18n "pages.client.add"}}
+                        </a-menu-item>
+                        <a-menu-item key="addBulkClient">
+                          <a-icon type="usergroup-add"></a-icon>
+                          {{ i18n "pages.client.bulk"}}
+                        </a-menu-item>
+                        <a-menu-item key="resetClients">
+                          <a-icon type="file-done"></a-icon>
+                          {{ i18n "pages.inbounds.resetInboundClientTraffics"}}
+                        </a-menu-item>
+                        <a-menu-item key="export">
+                          <a-icon type="export"></a-icon>
+                          {{ i18n "pages.inbounds.export"}}
+                        </a-menu-item>
+                        <a-menu-item key="subs" v-if="subSettings.enable">
+                          <a-icon type="export"></a-icon>
+                          {{ i18n "pages.inbounds.export"}} - {{ i18n "pages.settings.subSettings" }}
+                        </a-menu-item>
+                        <a-menu-item key="delDepletedClients" style="color: #FF4D4F;">
+                          <a-icon type="rest"></a-icon>
+                          {{ i18n "pages.inbounds.delDepletedClients" }}
+                        </a-menu-item>
+                      </template>
+                      <template v-else>
+                        <a-menu-item key="showInfo">
+                          <a-icon type="info-circle"></a-icon>
+                          {{ i18n "info"}}
+                        </a-menu-item>
+                      </template>
+                      <a-menu-item key="clipboard">
+                        <a-icon type="copy"></a-icon>
+                        {{ i18n "pages.inbounds.exportInbound" }}
+                      </a-menu-item>
+                      <a-menu-item key="resetTraffic">
+                        <a-icon type="retweet"></a-icon> {{ i18n "pages.inbounds.resetTraffic" }}
+                      </a-menu-item>
+                      <a-menu-item key="clone">
+                        <a-icon type="block"></a-icon> {{ i18n "pages.inbounds.clone"}}
+                      </a-menu-item>
+                      <a-menu-item key="delete">
+                        <span style="color: #FF4D4F">
+                          <a-icon type="delete"></a-icon> {{ i18n "delete"}}
+                        </span>
+                      </a-menu-item>
+                      <a-menu-item v-if="isMobile">
+                        <a-switch size="small" v-model="dbInbound.enable" @change="switchEnable(dbInbound.id,dbInbound.enable)"></a-switch>
+                        {{ i18n "pages.inbounds.enable" }}
+                      </a-menu-item>
+                    </a-menu>
+                  </a-dropdown>
                 </template>
-              </template>
+                <template slot="protocol" slot-scope="text, dbInbound">
-              <template slot="clients" slot-scope="text, dbInbound">
+                  <a-tag style="margin:0;" color="purple">[[ dbInbound.protocol ]]</a-tag>
-                <template v-if="clientCount[dbInbound.id]">
+                  <template v-if="dbInbound.isVMess || dbInbound.isVLess || dbInbound.isTrojan || dbInbound.isSS">
-                  <a-tag style="margin:0;" color="green">[[ clientCount[dbInbound.id].clients ]]</a-tag>
+                    <a-tag style="margin:0;" color="green">[[ dbInbound.toInbound().stream.network ]]</a-tag>
-                  <a-popover title='{{ i18n "disabled" }}' :overlay-class-name="themeSwitcher.currentTheme">
+                    <a-tag style="margin:0;" v-if="dbInbound.toInbound().stream.isTls" color="blue">TLS</a-tag>
+                    <a-tag style="margin:0;" v-if="dbInbound.toInbound().stream.isReality" color="blue">Reality</a-tag>
+                  </template>
+                </template>
+                <template slot="clients" slot-scope="text, dbInbound">
+                  <template v-if="clientCount[dbInbound.id]">
+                    <a-tag style="margin:0;" color="green">[[ clientCount[dbInbound.id].clients ]]</a-tag>
+                    <a-popover title='{{ i18n "disabled" }}' :overlay-class-name="themeSwitcher.currentTheme">
+                      <template slot="content">
+                        <div v-for="clientEmail in clientCount[dbInbound.id].deactive"><span>[[ clientEmail ]]</span></div>
+                      </template>
+                      <a-tag style="margin:0; padding: 0 2px;" v-if="clientCount[dbInbound.id].deactive.length">[[ clientCount[dbInbound.id].deactive.length ]]</a-tag>
+                    </a-popover>
+                    <a-popover title='{{ i18n "depleted" }}' :overlay-class-name="themeSwitcher.currentTheme">
+                      <template slot="content">
+                        <div v-for="clientEmail in clientCount[dbInbound.id].depleted"><span>[[ clientEmail ]]</span></div>
+                      </template>
+                      <a-tag style="margin:0; padding: 0 2px;" color="red" v-if="clientCount[dbInbound.id].depleted.length">[[ clientCount[dbInbound.id].depleted.length ]]</a-tag>
+                    </a-popover>
+                    <a-popover title='{{ i18n "depletingSoon" }}' :overlay-class-name="themeSwitcher.currentTheme">
+                      <template slot="content">
+                        <div v-for="clientEmail in clientCount[dbInbound.id].expiring"><span>[[ clientEmail ]]</span></div>
+                      </template>
+                      <a-tag style="margin:0; padding: 0 2px;" color="orange" v-if="clientCount[dbInbound.id].expiring.length">[[ clientCount[dbInbound.id].expiring.length ]]</a-tag>
+                    </a-popover>
+                    <a-popover title='{{ i18n "online" }}' :overlay-class-name="themeSwitcher.currentTheme">
+                      <template slot="content">
+                        <div v-for="clientEmail in clientCount[dbInbound.id].online"><span>[[ clientEmail ]]</span></div>
+                      </template>
+                      <a-tag style="margin:0; padding: 0 2px;" color="blue" v-if="clientCount[dbInbound.id].online.length">[[ clientCount[dbInbound.id].online.length ]]</a-tag>
+                    </a-popover>
+                  </template>
+                </template>
+                <template slot="traffic" slot-scope="text, dbInbound">
+                  <a-popover :overlay-class-name="themeSwitcher.currentTheme">
                     <template slot="content">
-                      <p v-for="clientEmail in clientCount[dbInbound.id].deactive">[[ clientEmail ]]</p>
+                      <table cellpadding="2" width="100%">
+                        <tr>
+                          <td>↑[[ SizeFormatter.sizeFormat(dbInbound.up) ]]</td>
+                          <td>↓[[ SizeFormatter.sizeFormat(dbInbound.down) ]]</td>
+                        </tr>
+                        <tr v-if="dbInbound.total > 0 &&  dbInbound.up + dbInbound.down < dbInbound.total">
+                          <td>{{ i18n "remained" }}</td>
+                          <td>[[ SizeFormatter.sizeFormat(dbInbound.total - dbInbound.up - dbInbound.down) ]]</td>
+                        </tr>
+                      </table>
                     </template>
-                    <a-tag style="margin:0; padding: 0 2px;" v-if="clientCount[dbInbound.id].deactive.length">[[ clientCount[dbInbound.id].deactive.length ]]</a-tag>
+                    <a-tag :color="ColorUtils.usageColor(dbInbound.up + dbInbound.down, app.trafficDiff, dbInbound.total)">
-                  </a-popover>
+                      [[ SizeFormatter.sizeFormat(dbInbound.up + dbInbound.down) ]] /
-                  <a-popover title='{{ i18n "depleted" }}' :overlay-class-name="themeSwitcher.currentTheme">
+                      <template v-if="dbInbound.total > 0">
-                    <template slot="content">
+                          [[ SizeFormatter.sizeFormat(dbInbound.total) ]]
-                      <p v-for="clientEmail in clientCount[dbInbound.id].depleted">[[ clientEmail ]]</p>
+                      </template>
-                    </template>
+                      <template v-else>
-                    <a-tag style="margin:0; padding: 0 2px;" color="red" v-if="clientCount[dbInbound.id].depleted.length">[[ clientCount[dbInbound.id].depleted.length ]]</a-tag>
+                        <svg height="10px" width="14px" viewBox="0 0 640 512" fill="currentColor">
-                  </a-popover>
+                          <path d="M484.4 96C407 96 349.2 164.1 320 208.5C290.8 164.1 233 96 155.6 96C69.75 96 0 167.8 0 256s69.75 160 155.6 160C233.1 416 290.8 347.9 320 303.5C349.2 347.9 407 416 484.4 416C570.3 416 640 344.2 640 256S570.3 96 484.4 96zM155.6 368C96.25 368 48 317.8 48 256s48.25-112 107.6-112c67.75 0 120.5 82.25 137.1 112C276 285.8 223.4 368 155.6 368zM484.4 368c-67.75 0-120.5-82.25-137.1-112C364 226.2 416.6 144 484.4 144C543.8 144 592 194.2 592 256S543.8 368 484.4 368z" fill="currentColor"></path>
-                  <a-popover title='{{ i18n "depletingSoon" }}' :overlay-class-name="themeSwitcher.currentTheme">
+                        </svg>
-                    <template slot="content">
+                      </template>
-                      <p v-for="clientEmail in clientCount[dbInbound.id].expiring">[[ clientEmail ]]</p>
+                    </a-tag>
-                    </template>
-                    <a-tag style="margin:0; padding: 0 2px;" color="orange" v-if="clientCount[dbInbound.id].expiring.length">[[ clientCount[dbInbound.id].expiring.length ]]</a-tag>
-                  </a-popover>
-                  <a-popover title='{{ i18n "online" }}' :overlay-class-name="themeSwitcher.currentTheme">
-                    <template slot="content">
-                      <p v-for="clientEmail in clientCount[dbInbound.id].online">[[ clientEmail ]]</p>
-                    </template>
-                    <a-tag style="margin:0; padding: 0 2px;" color="blue" v-if="clientCount[dbInbound.id].online.length">[[ clientCount[dbInbound.id].online.length ]]</a-tag>
                   </a-popover>
                 </template>
-              </template>
+                <template slot="enable" slot-scope="text, dbInbound">
-              <template slot="traffic" slot-scope="text, dbInbound">
+                  <a-switch v-model="dbInbound.enable" @change="switchEnable(dbInbound.id,dbInbound.enable)"></a-switch>
-                <a-popover :overlay-class-name="themeSwitcher.currentTheme">
+                </template>
-                  <template slot="content">
+                <template slot="expiryTime" slot-scope="text, dbInbound">
-                    <table cellpadding="2" width="100%">
+                  <a-popover v-if="dbInbound.expiryTime > 0" :overlay-class-name="themeSwitcher.currentTheme">
-                      <tr>
+                    <template slot="content" v-if="app.datepicker === 'gregorian'">
-                        <td>↑[[ sizeFormat(dbInbound.up) ]]</td>
+                      [[ DateUtil.formatMillis(dbInbound.expiryTime) ]]
-                        <td>↓[[ sizeFormat(dbInbound.down) ]]</td>
-                      </tr>
-                      <tr v-if="dbInbound.total > 0 &&  dbInbound.up + dbInbound.down < dbInbound.total">
-                        <td>{{ i18n "remained" }}</td>
-                        <td>[[ sizeFormat(dbInbound.total - dbInbound.up - dbInbound.down) ]]</td>
-                      </tr>
-                    </table>
-                  </template>
-                  <a-tag :color="usageColor(dbInbound.up + dbInbound.down, app.trafficDiff, dbInbound.total)">
-                    [[ sizeFormat(dbInbound.up + dbInbound.down) ]] /
-                    <template v-if="dbInbound.total > 0">
-                        [[ sizeFormat(dbInbound.total) ]]
                     </template>
-                    <template v-else>
+                    <template v-else slot="content">
-                      <svg height="10px" width="14px" viewBox="0 0 640 512" fill="currentColor">
+                      [[ DateUtil.convertToJalalian(moment(dbInbound.expiryTime)) ]]
-                        <path d="M484.4 96C407 96 349.2 164.1 320 208.5C290.8 164.1 233 96 155.6 96C69.75 96 0 167.8 0 256s69.75 160 155.6 160C233.1 416 290.8 347.9 320 303.5C349.2 347.9 407 416 484.4 416C570.3 416 640 344.2 640 256S570.3 96 484.4 96zM155.6 368C96.25 368 48 317.8 48 256s48.25-112 107.6-112c67.75 0 120.5 82.25 137.1 112C276 285.8 223.4 368 155.6 368zM484.4 368c-67.75 0-120.5-82.25-137.1-112C364 226.2 416.6 144 484.4 144C543.8 144 592 194.2 592 256S543.8 368 484.4 368z" fill="currentColor"></path>
-                      </svg>
                     </template>
+                    <a-tag style="min-width: 50px;" :color="ColorUtils.usageColor(new Date().getTime(), app.expireDiff, dbInbound._expiryTime)">
+                      [[ remainedDays(dbInbound._expiryTime) ]]
+                    </a-tag>
+                  </a-popover>
+                  <a-tag v-else color="purple" class="infinite-tag">
+                    <svg height="10px" width="14px" viewBox="0 0 640 512" fill="currentColor">
+                      <path d="M484.4 96C407 96 349.2 164.1 320 208.5C290.8 164.1 233 96 155.6 96C69.75 96 0 167.8 0 256s69.75 160 155.6 160C233.1 416 290.8 347.9 320 303.5C349.2 347.9 407 416 484.4 416C570.3 416 640 344.2 640 256S570.3 96 484.4 96zM155.6 368C96.25 368 48 317.8 48 256s48.25-112 107.6-112c67.75 0 120.5 82.25 137.1 112C276 285.8 223.4 368 155.6 368zM484.4 368c-67.75 0-120.5-82.25-137.1-112C364 226.2 416.6 144 484.4 144C543.8 144 592 194.2 592 256S543.8 368 484.4 368z" fill="currentColor"></path>
+                    </svg>
                   </a-tag>
-                </a-popover>
+                </template>
-              </template>
+                <template slot="info" slot-scope="text, dbInbound">
-              <template slot="enable" slot-scope="text, dbInbound">
+                  <a-popover placement="bottomRight" :overlay-class-name="themeSwitcher.currentTheme" trigger="click">
-                <a-switch v-model="dbInbound.enable" @change="switchEnable(dbInbound.id,dbInbound.enable)"></a-switch>
+                    <template slot="content">
-              </template>
+                      <table cellpadding="2">
-              <template slot="expiryTime" slot-scope="text, dbInbound">
+                        <tr>
-                <a-popover v-if="dbInbound.expiryTime > 0" :overlay-class-name="themeSwitcher.currentTheme">
+                          <td>{{ i18n "pages.inbounds.protocol" }}</td>
-                  <template slot="content" v-if="app.datepicker === 'gregorian'">
+                          <td>
-                    [[ DateUtil.formatMillis(dbInbound.expiryTime) ]]
+                            <a-tag style="margin:0;" color="purple">[[ dbInbound.protocol ]]</a-tag>
-                  </template>
+                            <template v-if="dbInbound.isVMess || dbInbound.isVLess || dbInbound.isTrojan || dbInbound.isSS">
-                  <template v-else slot="content">
+                              <a-tag style="margin:0;" color="blue">[[ dbInbound.toInbound().stream.network ]]</a-tag>
-                    [[ DateUtil.convertToJalalian(moment(dbInbound.expiryTime)) ]]
+                              <a-tag style="margin:0;" v-if="dbInbound.toInbound().stream.isTls" color="green">tls</a-tag>
-                  </template>
+                              <a-tag style="margin:0;" v-if="dbInbound.toInbound().stream.isReality" color="green">reality</a-tag>
-                  <a-tag style="min-width: 50px;" :color="usageColor(new Date().getTime(), app.expireDiff, dbInbound._expiryTime)">
-                    [[ remainedDays(dbInbound._expiryTime) ]]
-                  </a-tag>
-                </a-popover>
-                <a-tag v-else color="purple" class="infinite-tag">
-                  <svg height="10px" width="14px" viewBox="0 0 640 512" fill="currentColor">
-                    <path d="M484.4 96C407 96 349.2 164.1 320 208.5C290.8 164.1 233 96 155.6 96C69.75 96 0 167.8 0 256s69.75 160 155.6 160C233.1 416 290.8 347.9 320 303.5C349.2 347.9 407 416 484.4 416C570.3 416 640 344.2 640 256S570.3 96 484.4 96zM155.6 368C96.25 368 48 317.8 48 256s48.25-112 107.6-112c67.75 0 120.5 82.25 137.1 112C276 285.8 223.4 368 155.6 368zM484.4 368c-67.75 0-120.5-82.25-137.1-112C364 226.2 416.6 144 484.4 144C543.8 144 592 194.2 592 256S543.8 368 484.4 368z" fill="currentColor"></path>
-                  </svg>
-                </a-tag>
-              </template>
-              <template slot="info" slot-scope="text, dbInbound">
-                <a-popover placement="bottomRight" :overlay-class-name="themeSwitcher.currentTheme" trigger="click">
-                  <template slot="content">
-                    <table cellpadding="2">
-                      <tr>
-                        <td>{{ i18n "pages.inbounds.protocol" }}</td>
-                        <td>
-                          <a-tag style="margin:0;" color="purple">[[ dbInbound.protocol ]]</a-tag>
-                          <template v-if="dbInbound.isVMess || dbInbound.isVLess || dbInbound.isTrojan || dbInbound.isSS">
-                            <a-tag style="margin:0;" color="blue">[[ dbInbound.toInbound().stream.network ]]</a-tag>
-                            <a-tag style="margin:0;" v-if="dbInbound.toInbound().stream.isTls" color="green">tls</a-tag>
-                            <a-tag style="margin:0;" v-if="dbInbound.toInbound().stream.isReality" color="green">reality</a-tag>
-                          </template>
-                        </td>
-                      </tr>
-                      <tr>
-                        <td>{{ i18n "pages.inbounds.port" }}</td>
-                        <td><a-tag>[[ dbInbound.port ]]</a-tag></td>
-                      </tr>
-                      <tr v-if="clientCount[dbInbound.id]">
-                        <td>{{ i18n "clients" }}</td>
-                        <td>
-                          <a-tag style="margin:0;" color="blue">[[ clientCount[dbInbound.id].clients ]]</a-tag>
-                          <a-popover title='{{ i18n "disabled" }}' :overlay-class-name="themeSwitcher.currentTheme">
-                            <template slot="content">
-                              <p v-for="clientEmail in clientCount[dbInbound.id].deactive">[[ clientEmail ]]</p>
                             </template>
-                            <a-tag style="margin:0; padding: 0 2px;" v-if="clientCount[dbInbound.id].deactive.length">[[ clientCount[dbInbound.id].deactive.length ]]</a-tag>
+                          </td>
-                          </a-popover>
+                        </tr>
-                          <a-popover title='{{ i18n "depleted" }}' :overlay-class-name="themeSwitcher.currentTheme">
+                        <tr>
-                            <template slot="content">
+                          <td>{{ i18n "pages.inbounds.port" }}</td>
-                              <p v-for="clientEmail in clientCount[dbInbound.id].depleted">[[ clientEmail ]]</p>
+                          <td><a-tag>[[ dbInbound.port ]]</a-tag></td>
-                            </template>
+                        </tr>
-                            <a-tag style="margin:0; padding: 0 2px;" color="red" v-if="clientCount[dbInbound.id].depleted.length">[[ clientCount[dbInbound.id].depleted.length ]]</a-tag>
+                        <tr v-if="clientCount[dbInbound.id]">
-                          </a-popover>
+                          <td>{{ i18n "clients" }}</td>
-                          <a-popover title='{{ i18n "depletingSoon" }}' :overlay-class-name="themeSwitcher.currentTheme">
+                          <td>
-                            <template slot="content">
+                            <a-tag style="margin:0;" color="blue">[[ clientCount[dbInbound.id].clients ]]</a-tag>
-                              <p v-for="clientEmail in clientCount[dbInbound.id].expiring">[[ clientEmail ]]</p>
+                            <a-popover title='{{ i18n "disabled" }}' :overlay-class-name="themeSwitcher.currentTheme">
-                            </template>
+                              <template slot="content">
-                            <a-tag style="margin:0; padding: 0 2px;" color="orange" v-if="clientCount[dbInbound.id].expiring.length">[[ clientCount[dbInbound.id].expiring.length ]]</a-tag>
+                                <p v-for="clientEmail in clientCount[dbInbound.id].deactive">[[ clientEmail ]]</p>
-                          </a-popover>
+                              </template>
-                          <a-popover title='{{ i18n "online" }}' :overlay-class-name="themeSwitcher.currentTheme">
+                              <a-tag style="margin:0; padding: 0 2px;" v-if="clientCount[dbInbound.id].deactive.length">[[ clientCount[dbInbound.id].deactive.length ]]</a-tag>
-                            <template slot="content">
+                            </a-popover>
-                              <p v-for="clientEmail in clientCount[dbInbound.id].online">[[ clientEmail ]]</p>
+                            <a-popover title='{{ i18n "depleted" }}' :overlay-class-name="themeSwitcher.currentTheme">
-                            </template>
+                              <template slot="content">
-                            <a-tag style="margin:0; padding: 0 2px;" color="green" v-if="clientCount[dbInbound.id].online.length">[[ clientCount[dbInbound.id].online.length ]]</a-tag>
+                                <p v-for="clientEmail in clientCount[dbInbound.id].depleted">[[ clientEmail ]]</p>
-                          </a-popover>
+                              </template>
-                        </td>
+                              <a-tag style="margin:0; padding: 0 2px;" color="red" v-if="clientCount[dbInbound.id].depleted.length">[[ clientCount[dbInbound.id].depleted.length ]]</a-tag>
-                      </tr>
+                            </a-popover>
-                      <tr>
+                            <a-popover title='{{ i18n "depletingSoon" }}' :overlay-class-name="themeSwitcher.currentTheme">
-                        <td>{{ i18n "pages.inbounds.traffic" }}</td>
+                              <template slot="content">
-                        <td>
+                                <p v-for="clientEmail in clientCount[dbInbound.id].expiring">[[ clientEmail ]]</p>
-                          <a-popover :overlay-class-name="themeSwitcher.currentTheme">
+                              </template>
-                            <template slot="content">
+                              <a-tag style="margin:0; padding: 0 2px;" color="orange" v-if="clientCount[dbInbound.id].expiring.length">[[ clientCount[dbInbound.id].expiring.length ]]</a-tag>
-                              <table cellpadding="2" width="100%">
+                            </a-popover>
-                                <tr>
+                            <a-popover title='{{ i18n "online" }}' :overlay-class-name="themeSwitcher.currentTheme">
-                                  <td>↑[[ sizeFormat(dbInbound.up) ]]</td>
+                              <template slot="content">
-                                  <td>↓[[ sizeFormat(dbInbound.down) ]]</td>
+                                <p v-for="clientEmail in clientCount[dbInbound.id].online">[[ clientEmail ]]</p>
-                                </tr>
+                              </template>
-                                <tr v-if="dbInbound.total > 0 &&  dbInbound.up + dbInbound.down < dbInbound.total">
+                              <a-tag style="margin:0; padding: 0 2px;" color="green" v-if="clientCount[dbInbound.id].online.length">[[ clientCount[dbInbound.id].online.length ]]</a-tag>
-                                  <td>{{ i18n "remained" }}</td>
+                            </a-popover>
-                                  <td>[[ sizeFormat(dbInbound.total - dbInbound.up - dbInbound.down) ]]</td>
+                          </td>
-                                </tr>
+                        </tr>
-                              </table>
+                        <tr>
-                            </template>
+                          <td>{{ i18n "pages.inbounds.traffic" }}</td>
-                            <a-tag :color="usageColor(dbInbound.up + dbInbound.down, app.trafficDiff, dbInbound.total)">
+                          <td>
-                                [[ sizeFormat(dbInbound.up + dbInbound.down) ]] /
+                            <a-popover :overlay-class-name="themeSwitcher.currentTheme">
-                                <template v-if="dbInbound.total > 0">
+                              <template slot="content">
-                                    [[ sizeFormat(dbInbound.total) ]]
+                                <table cellpadding="2" width="100%">
+                                  <tr>
+                                    <td>↑[[ SizeFormatter.sizeFormat(dbInbound.up) ]]</td>
+                                    <td>↓[[ SizeFormatter.sizeFormat(dbInbound.down) ]]</td>
+                                  </tr>
+                                  <tr v-if="dbInbound.total > 0 &&  dbInbound.up + dbInbound.down < dbInbound.total">
+                                    <td>{{ i18n "remained" }}</td>
+                                    <td>[[ SizeFormatter.sizeFormat(dbInbound.total - dbInbound.up - dbInbound.down) ]]</td>
+                                  </tr>
+                                </table>
+                              </template>
+                              <a-tag :color="ColorUtils.usageColor(dbInbound.up + dbInbound.down, app.trafficDiff, dbInbound.total)">
+                                  [[ SizeFormatter.sizeFormat(dbInbound.up + dbInbound.down) ]] /
+                                  <template v-if="dbInbound.total > 0">
+                                      [[ SizeFormatter.sizeFormat(dbInbound.total) ]]
+                                  </template>
+                                <template v-else>
+                                  <svg height="10px" width="14px" viewBox="0 0 640 512" fill="currentColor">
+                                    <path d="M484.4 96C407 96 349.2 164.1 320 208.5C290.8 164.1 233 96 155.6 96C69.75 96 0 167.8 0 256s69.75 160 155.6 160C233.1 416 290.8 347.9 320 303.5C349.2 347.9 407 416 484.4 416C570.3 416 640 344.2 640 256S570.3 96 484.4 96zM155.6 368C96.25 368 48 317.8 48 256s48.25-112 107.6-112c67.75 0 120.5 82.25 137.1 112C276 285.8 223.4 368 155.6 368zM484.4 368c-67.75 0-120.5-82.25-137.1-112C364 226.2 416.6 144 484.4 144C543.8 144 592 194.2 592 256S543.8 368 484.4 368z" fill="currentColor"></path>
+                                  </svg>
                                 </template>
+                              </a-tag>
+                            </a-popover>
+                          </td>
+                        </tr>
+                        <tr>
+                          <td>{{ i18n "pages.inbounds.expireDate" }}</td>
+                          <td>
+                            <a-tag style="min-width: 50px; text-align: center;" v-if="dbInbound.expiryTime > 0"
+                              :color="dbInbound.isExpiry? 'red': 'blue'">
+                              <template v-if="app.datepicker === 'gregorian'">
+                                [[ DateUtil.formatMillis(dbInbound.expiryTime) ]]
+                              </template>
                               <template v-else>
-                                <svg height="10px" width="14px" viewBox="0 0 640 512" fill="currentColor">
+                                [[ DateUtil.convertToJalalian(moment(dbInbound.expiryTime)) ]]
-                                  <path d="M484.4 96C407 96 349.2 164.1 320 208.5C290.8 164.1 233 96 155.6 96C69.75 96 0 167.8 0 256s69.75 160 155.6 160C233.1 416 290.8 347.9 320 303.5C349.2 347.9 407 416 484.4 416C570.3 416 640 344.2 640 256S570.3 96 484.4 96zM155.6 368C96.25 368 48 317.8 48 256s48.25-112 107.6-112c67.75 0 120.5 82.25 137.1 112C276 285.8 223.4 368 155.6 368zM484.4 368c-67.75 0-120.5-82.25-137.1-112C364 226.2 416.6 144 484.4 144C543.8 144 592 194.2 592 256S543.8 368 484.4 368z" fill="currentColor"></path>
-                                </svg>
                               </template>
                             </a-tag>
-                          </a-popover>
+                            <a-tag v-else style="text-align: center;" color="purple" class="infinite-tag">
-                        </td>
+                              <svg height="10px" width="14px" viewBox="0 0 640 512" fill="currentColor">
-                      </tr>
+                                <path d="M484.4 96C407 96 349.2 164.1 320 208.5C290.8 164.1 233 96 155.6 96C69.75 96 0 167.8 0 256s69.75 160 155.6 160C233.1 416 290.8 347.9 320 303.5C349.2 347.9 407 416 484.4 416C570.3 416 640 344.2 640 256S570.3 96 484.4 96zM155.6 368C96.25 368 48 317.8 48 256s48.25-112 107.6-112c67.75 0 120.5 82.25 137.1 112C276 285.8 223.4 368 155.6 368zM484.4 368c-67.75 0-120.5-82.25-137.1-112C364 226.2 416.6 144 484.4 144C543.8 144 592 194.2 592 256S543.8 368 484.4 368z" fill="currentColor"></path>
-                      <tr>
+                              </svg>
-                        <td>{{ i18n "pages.inbounds.expireDate" }}</td>
+                            </a-tag>
-                        <td>
+                          </td>
-                          <a-tag style="min-width: 50px; text-align: center;" v-if="dbInbound.expiryTime > 0"
+                        </tr>
-                            :color="dbInbound.isExpiry? 'red': 'blue'">
+                      </table>
-                            <template v-if="app.datepicker === 'gregorian'">
+                    </template>
-                              [[ DateUtil.formatMillis(dbInbound.expiryTime) ]]
+                    <a-badge>
-                            </template>
+                      <a-icon v-if="!dbInbound.enable" slot="count" type="pause-circle" :style="'color: ' + themeSwitcher.isDarkTheme ? '#2c3950' : '#bcbcbc'"></a-icon>
-                            <template v-else>
+                      <a-button shape="round" size="small" style="font-size: 14px; padding: 0 10px;">
-                              [[ DateUtil.convertToJalalian(moment(dbInbound.expiryTime)) ]]
+                        <a-icon type="info"></a-icon>
-                            </template>
+                      </a-button>
-                          </a-tag>
+                    </a-badge>
-                          <a-tag v-else style="text-align: center;" color="purple" class="infinite-tag">
+                  </a-popover>
-                            <svg height="10px" width="14px" viewBox="0 0 640 512" fill="currentColor">
+                </template>
-                              <path d="M484.4 96C407 96 349.2 164.1 320 208.5C290.8 164.1 233 96 155.6 96C69.75 96 0 167.8 0 256s69.75 160 155.6 160C233.1 416 290.8 347.9 320 303.5C349.2 347.9 407 416 484.4 416C570.3 416 640 344.2 640 256S570.3 96 484.4 96zM155.6 368C96.25 368 48 317.8 48 256s48.25-112 107.6-112c67.75 0 120.5 82.25 137.1 112C276 285.8 223.4 368 155.6 368zM484.4 368c-67.75 0-120.5-82.25-137.1-112C364 226.2 416.6 144 484.4 144C543.8 144 592 194.2 592 256S543.8 368 484.4 368z" fill="currentColor"></path>
+                <template slot="expandedRowRender" slot-scope="record">
-                            </svg>
+                  <a-table
-                          </a-tag>
+                    :row-key="client => client.id"
-                        </td>
+                    :columns="isMobile ? innerMobileColumns : innerColumns"
-                      </tr>
+                    :data-source="getInboundClients(record)"
-                    </table>
+                    :pagination=pagination(getInboundClients(record))
-                  </template>
+                    :style="isMobile ? 'margin: -10px 2px -11px;' : 'margin: -10px 22px -11px;'">
-                  <a-badge>
+                    {{template "client_table"}}
-                    <a-icon v-if="!dbInbound.enable" slot="count" type="pause-circle" :style="'color: ' + themeSwitcher.isDarkTheme ? '#2c3950' : '#bcbcbc'"></a-icon>
+                  </a-table>
-                    <a-button shape="round" size="small" style="font-size: 14px; padding: 0 10px;">
+                </template>
-                      <a-icon type="info"></a-icon>
+              </a-table>
-                    </a-button>
+            </a-space>
-                  </a-badge>
-                </a-popover>
-              </template>
-              <template slot="expandedRowRender" slot-scope="record">
-                <a-table
-                  :row-key="client => client.id"
-                  :columns="isMobile ? innerMobileColumns : innerColumns"
-                  :data-source="getInboundClients(record)"
-                  :pagination=pagination(getInboundClients(record))
-                  :style="isMobile ? 'margin: -10px 2px -11px;' : 'margin: -10px 22px -11px;'">
-                  {{template "client_table"}}
-                </a-table>
-              </template>
-            </a-table>
           </a-card>
         </transition>
       </a-spin>
@@ -544,14 +580,13 @@
   </a-layout>
 </a-layout>
 {{template "js" .}}
-<script src="{{ .base_path }}assets/base64/base64.min.js"></script>
 <script src="{{ .base_path }}assets/qrcode/qrious2.min.js?{{ .cur_ver }}"></script>
-<script src="{{ .base_path }}assets/clipboard/clipboard.min.js?{{ .cur_ver }}"></script>
 <script src="{{ .base_path }}assets/uri/URI.min.js?{{ .cur_ver }}"></script>
 <script src="{{ .base_path }}assets/js/model/inbound.js?{{ .cur_ver }}"></script>
 <script src="{{ .base_path }}assets/js/model/dbinbound.js?{{ .cur_ver }}"></script>
-{{template "component/themeSwitcher" .}}
+{{template "component/aThemeSwitch" .}}
-{{template "component/persianDatepicker" .}}
+{{template "component/aCustomStatistic" .}}
+{{template "component/aPersianDatepicker" .}}
 <script>
     const columns = [{
         title: "ID",
@@ -664,6 +699,7 @@
             refreshInterval: Number(localStorage.getItem("refreshInterval")) || 5000,
             subSettings: {
                 enable : false,
+                subTitle : '',
                 subURI : '',
                 subJsonURI : '',
             },
@@ -713,6 +749,7 @@
                     this.tgBotEnable = tgBotEnable;
                     this.subSettings = {
                         enable : subEnable,
+                        subTitle : subTitle,
                         subURI: subURI,
                         subJsonURI: subJsonURI
                     };
@@ -885,7 +922,7 @@
                         this.exportSubs(dbInbound.id);
                         break;
                     case "clipboard":
-                        this.copyToClipboard(dbInbound.id);
+                        this.copy(dbInbound.id);
                         break;
                     case "resetTraffic":
                         this.resetTraffic(dbInbound.id);
@@ -929,7 +966,7 @@
                     expiryTime: dbInbound.expiryTime,
 
                     listen: '',
-                    port: RandomUtil.randomIntRange(10000, 60000),
+                    port: RandomUtil.randomInteger(10000, 60000),
                     protocol: baseInbound.protocol,
                     settings: Inbound.Settings.getSettings(baseInbound.protocol).toString(),
                     streamSettings: baseInbound.stream.toString(),
@@ -1276,9 +1313,9 @@
                 return remained>0 ? remained : 0;
             },
             clientStatsColor(dbInbound, email) {
-                if (email.length == 0) return clientUsageColor();
+                if (email.length == 0) return ColorUtils.clientUsageColor();
                 clientStats = dbInbound.clientStats.find(stats => stats.email === email);
-                return clientUsageColor(clientStats, app.trafficDiff)
+                return ColorUtils.clientUsageColor(clientStats, app.trafficDiff)
             },
             statsProgress(dbInbound, email) {
                 if (email.length == 0) return 100;
@@ -1296,17 +1333,17 @@
             },
             remainedDays(expTime){
                 if (expTime == 0) return null;
-                if (expTime < 0) return formatSecond(expTime/-1000);
+                if (expTime < 0) return TimeFormatter.formatSecond(expTime/-1000);
                 now = new Date().getTime();
                 if (expTime < now) return '{{ i18n "depleted" }}';
-                return formatSecond((expTime-now)/1000);
+                return TimeFormatter.formatSecond((expTime-now)/1000);
             },
             statsExpColor(dbInbound, email){
                 if (email.length == 0) return '#7a316f';
                 clientStats = dbInbound.clientStats.find(stats => stats.email === email);
                 if (!clientStats) return '#7a316f';
-                statsColor = usageColor(clientStats.down + clientStats.up, this.trafficDiff, clientStats.total);
+                statsColor = ColorUtils.usageColor(clientStats.down + clientStats.up, this.trafficDiff, clientStats.total);
-                expColor = usageColor(new Date().getTime(), this.expireDiff, clientStats.expiryTime);
+                expColor = ColorUtils.usageColor(new Date().getTime(), this.expireDiff, clientStats.expiryTime);
                 switch (true) {
                     case statsColor == "red" || expColor == "red":
                         return "#cf3c3c"; // Red
@@ -1384,9 +1421,9 @@
                 }
                 txtModal.show('{{ i18n "pages.inbounds.export"}}', copyText.join('\r\n'), 'All-Inbounds');
             },
-            copyToClipboard(dbInboundId) {
+            copy(dbInboundId) {
-                dbInbound = this.dbInbounds.find(row => row.id === dbInboundId);
+              dbInbound = this.dbInbounds.find(row => row.id === dbInboundId);
-                txtModal.show('{{ i18n "pages.inbounds.inboundData" }}', JSON.stringify(dbInbound, null, 2));
+              txtModal.show('{{ i18n "pages.inbounds.inboundData" }}', JSON.stringify(dbInbound, null, 2));
             },
             async startDataRefreshLoop() {
                 while (this.isRefreshEnabled) {
@@ -1440,7 +1477,7 @@
             }
         },
         watch: {
-            searchKey: debounce(function (newVal) {
+            searchKey: Utils.debounce(function (newVal) {
                 this.searchInbounds(newVal);
             }, 500)
         },

web/html/xui/index.html

@@ -19,6 +19,57 @@
   .ant-card-dark h2 {
     color: var(--dark-color-text-primary);
   }
+  .ant-backup-list-item {
+    gap: 10px;
+  }
+  .dark .ant-backup-list-item svg,
+  .dark .ant-badge-status-text,
+  .dark .ant-card-extra {
+    color: var(--dark-color-text-primary);
+  }
+  .dark .ant-card-actions>li {
+    color: rgba(255, 255, 255, 0.55);
+  }
+  .dark .ant-radio-inner {
+    background-color: var(--dark-color-surface-100);
+    border-color: var(--dark-color-surface-600);
+  }
+  .dark .ant-radio-checked .ant-radio-inner {
+    border-color: var(--color-primary-100);
+  }
+  .dark .ant-backup-list, 
+  .dark .ant-xray-version-list,
+  .dark .ant-card-actions,
+  .dark .ant-card-actions>li:not(:last-child) {
+    border-color: var(--dark-color-stroke);
+  }
+  .ant-card-actions {
+    background: transparent;
+  }
+  .ip-hidden {
+    -webkit-user-select: none;
+    -moz-user-select: none;
+    user-select: none;
+    filter: blur(10px);
+  }
+  .running-animation .ant-badge-status-dot {
+    animation: runningAnimation 1.2s linear infinite;
+  }
+  .running-animation .ant-badge-status-processing:after {
+    border-color: var(--color-primary-100);
+  }
+  @keyframes runningAnimation {
+    0%,
+    50%,
+    100% {
+      transform: scale(1);
+      opacity: 1;
+    }
+    10% {
+      transform: scale(1.5);
+      opacity: .2;
+    }
+  }
 </style>
 
 <body>
@@ -36,238 +87,265 @@
             </a-alert>
           </transition>
           <transition name="list" appear>
-            <a-row>
+            <template>
-              <a-card hoverable>
+              <a-row v-if="!status.isLoaded">
+                <a-card hoverable style="text-align: center; padding: 30px 0; margin-top: 10px; background: transparent;">
+                  <a-spin tip="Loading..."></a-spin>
+                </a-card>
+              </a-row>
+              <a-row v-else>
                 <a-row>
-                  <a-col :sm="24" :md="12">
+                  <a-card hoverable>
                     <a-row>
-                      <a-col :span="12" style="text-align: center">
+                      <a-col :sm="24" :md="12">
-                        <a-progress type="dashboard" status="normal"
+                        <a-row>
-                          :stroke-color="status.cpu.color"
+                          <a-col :span="12" style="text-align: center">
-                          :percent="status.cpu.percent"></a-progress>
+                            <a-progress type="dashboard" status="normal"
-                        <div><b>CPU:</b> [[ cpuCoreFormat(status.cpuCores) ]] <a-tooltip>
+                              :stroke-color="status.cpu.color"
-                          <a-icon type="area-chart"></a-icon> 
+                              :percent="status.cpu.percent"></a-progress>
-                          <template slot="title">
+                            <div><b>CPU:</b> [[ CPUFormatter.cpuCoreFormat(status.cpuCores) ]] <a-tooltip>
-                            <div><b>Logical Processors:</b> [[ (status.logicalPro) ]]</div>
+                              <a-icon type="area-chart"></a-icon> 
-                            <div><b>Speed:</b> [[ cpuSpeedFormat(status.cpuSpeedMhz) ]]</div>
+                              <template slot="title">
-                          </template>
+                                <div><b>Logical Processors:</b> [[ (status.logicalPro) ]]</div>
-                        </a-tooltip></div>
+                                <div><b>Speed:</b> [[ CPUFormatter.cpuSpeedFormat(status.cpuSpeedMhz) ]]</div>
+                              </template>
+                            </a-tooltip></div>
+                          </a-col>
+                          <a-col :span="12" style="text-align: center">
+                            <a-progress type="dashboard" status="normal"
+                              :stroke-color="status.mem.color"
+                              :percent="status.mem.percent"></a-progress>
+                            <div>
+                              <b>{{ i18n "pages.index.memory"}}:</b> [[ SizeFormatter.sizeFormat(status.mem.current) ]] / [[ SizeFormatter.sizeFormat(status.mem.total) ]]
+                            </div>
+                          </a-col>
+                        </a-row>
                       </a-col>
-                      <a-col :span="12" style="text-align: center">
+                      <a-col :sm="24" :md="12">
-                        <a-progress type="dashboard" status="normal"
+                        <a-row>
-                          :stroke-color="status.mem.color"
+                          <a-col :span="12" style="text-align: center">
-                          :percent="status.mem.percent"></a-progress>
+                            <a-progress type="dashboard" status="normal"
-                        <div>
+                              :stroke-color="status.swap.color"
-                          <b>{{ i18n "pages.index.memory"}}:</b> [[ sizeFormat(status.mem.current) ]] / [[ sizeFormat(status.mem.total) ]]
+                              :percent="status.swap.percent"></a-progress>
-                        </div>
+                            <div>
+                              <b>Swap:</b> [[ SizeFormatter.sizeFormat(status.swap.current) ]] / [[ SizeFormatter.sizeFormat(status.swap.total) ]]
+                            </div>
+                          </a-col>
+                          <a-col :span="12" style="text-align: center">
+                            <a-progress type="dashboard" status="normal"
+                              :stroke-color="status.disk.color"
+                              :percent="status.disk.percent"></a-progress>
+                            <div>
+                              <b>{{ i18n "pages.index.hard"}}:</b> [[ SizeFormatter.sizeFormat(status.disk.current) ]] / [[ SizeFormatter.sizeFormat(status.disk.total) ]]
+                            </div>
+                          </a-col>
+                        </a-row>
                       </a-col>
                     </a-row>
-                  </a-col>
+                  </a-card>
-                  <a-col :sm="24" :md="12">
-                    <a-row>
-                      <a-col :span="12" style="text-align: center">
-                        <a-progress type="dashboard" status="normal"
-                          :stroke-color="status.swap.color"
-                          :percent="status.swap.percent"></a-progress>
-                        <div>
-                          <b>Swap:</b> [[ sizeFormat(status.swap.current) ]] / [[ sizeFormat(status.swap.total) ]]
-                        </div>
-                      </a-col>
-                      <a-col :span="12" style="text-align: center">
-                        <a-progress type="dashboard" status="normal"
-                          :stroke-color="status.disk.color"
-                          :percent="status.disk.percent"></a-progress>
-                        <div>
-                          <b>{{ i18n "pages.index.hard"}}:</b> [[ sizeFormat(status.disk.current) ]] / [[ sizeFormat(status.disk.total) ]]
-                        </div>
-                      </a-col>
-                    </a-row>
-                  </a-col>
                 </a-row>
-              </a-card>
+                <a-col :sm="24" :lg="12">
-            </a-row>
+                  <a-card hoverable>
-          </transition>
+                    <template #title>
-          <transition name="list" appear>
+                      <a-space direction="horizontal">
-            <a-row>
+                        <span>{{ i18n "pages.index.xrayStatus" }}</span>
-              <a-col :sm="24" :lg="12">
+                        <a-tag v-if="isMobile && status.xray.version != 'Unknown'" color="green">
-                <a-card hoverable>
+                          v[[ status.xray.version ]]
-                  <b>3X-UI:</b>
+                        </a-tag>
-                  <a rel="noopener" href="https://github.com/MHSanaei/3x-ui/releases" target="_blank"><a-tag color="green">v{{ .cur_ver }}</a-tag></a>
+                      </a-space>
-                  <a rel="noopener" href="https://t.me/XrayUI" target="_blank"><a-tag color="green">@XrayUI</a-tag></a>
-                </a-card>
-              </a-col>
-              <a-col :sm="24" :lg="12">
-                <a-card hoverable>
-                  <b>{{ i18n "pages.index.operationHours" }}:</b>
-                  <a-tag :color="status.xray.color">Xray: [[ formatSecond(status.appStats.uptime) ]]</a-tag>
-                  <a-tag color="green">OS: [[ formatSecond(status.uptime) ]]</a-tag>
-                </a-card>
-              </a-col>
-              <a-col :sm="24" :lg="12">
-                <a-card hoverable>
-                  <b>{{ i18n "pages.index.xrayStatus" }}:</b>
-                  <a-tag style="text-transform: capitalize;" :color="status.xray.color">[[ status.xray.state ]] </a-tag>
-                  <a-popover v-if="status.xray.state === State.Error" :overlay-class-name="themeSwitcher.currentTheme">
-                    <span slot="title" style="font-size: 12pt">An error occurred while running Xray
-                      <a-tag color="purple" style="cursor: pointer; float: right;" @click="openLogs()">{{ i18n "pages.index.logs" }}</a-tag>
-                    </span>
-                    <template slot="content">
-                      <p style="max-width: 400px" v-for="line in status.xray.errorMsg.split('\n')">[[ line ]]</p>
                     </template>
-                    <a-icon type="question-circle"></a-icon>
+                    <template #extra>
-                  </a-popover>
+                      <template v-if="status.xray.state != State.Error">
-                  <a-tag color="purple" style="cursor: pointer;" @click="stopXrayService">{{ i18n "pages.index.stopXray" }}</a-tag>
+                        <a-badge status="processing" class="running-animation" :text="status.xray.state" :color="status.xray.color" style="text-transform: capitalize;"/>
-                  <a-tag color="purple" style="cursor: pointer;" @click="restartXrayService">{{ i18n "pages.index.restartXray" }}</a-tag>
-                  <a-tag color="purple" style="cursor: pointer;" @click="openSelectV2rayVersion">v[[ status.xray.version ]]</a-tag>
-                </a-card>
-              </a-col>
-              <a-col :sm="24" :lg="12">
-                <a-card hoverable>
-                  <b>{{ i18n "menu.link" }}:</b>
-                  <a-tag color="purple" style="cursor: pointer;" @click="openLogs()">{{ i18n "pages.index.logs" }}</a-tag>
-                  <a-tag color="purple" style="cursor: pointer;" @click="openConfig">{{ i18n "pages.index.config" }}</a-tag>
-                  <a-tag color="purple" style="cursor: pointer;" @click="openBackup">{{ i18n "pages.index.backup" }}</a-tag>
-                </a-card>
-              </a-col>
-              <a-col :sm="24" :lg="12">
-                <a-card hoverable>
-                  <b>{{ i18n "pages.index.systemLoad" }}:</b>
-                  <a-tag color="green">
-                    <a-tooltip>
-                          [[ status.loads[0] ]] | [[ status.loads[1] ]] | [[ status.loads[2] ]]
-                      <template slot="title">
-                        {{ i18n "pages.index.systemLoadDesc" }}
                       </template>
-                    </a-tooltip>
+                      <template v-else>
-                  </a-tag>
+                        <a-popover :overlay-class-name="themeSwitcher.currentTheme">
-                </a-card>
+                          <span slot="title" style="font-size: 12pt">An error occurred while running Xray
-              </a-col>
+                            <a-tag color="purple" style="cursor: pointer; float: right;" @click="openLogs()">{{ i18n "pages.index.logs" }}</a-tag>
-              <a-col :sm="24" :lg="12">
+                          </span>
-                <a-card hoverable>
+                          <template slot="content">
-                  <b>{{ i18n "usage"}}:</b>
+                            <p style="max-width: 400px" v-for="line in status.xray.errorMsg.split('\n')">[[ line ]]</p>
-                  <a-tag color="green"> RAM: [[ sizeFormat(status.appStats.mem) ]] </a-tag>
-                  <a-tag color="green"> Threads: [[ status.appStats.threads ]] </a-tag>
-                </a-card>
-              </a-col>
-              <a-col :sm="24" :lg="12">
-                <a-card hoverable>
-                  <a-row>
-                    <a-col :span="12">
-                      <a-tag>
-                        <a-tooltip>
-                          <a-icon type="global"></a-icon> IPv4
-                          <template slot="title">
-                            [[ status.publicIP.ipv4 ]]
                           </template>
-                        </a-tooltip>
+                          <a-badge :text="status.xray.state" :color="status.xray.color" style="text-transform: capitalize;"/>
-                      </a-tag>
+                        </a-popover>
-                    </a-col>
+                      </template>
-                    <a-col :span="12">
+                    </template>
-                      <a-tag>
+                    <template #actions>
-                        <a-tooltip>
+                      <a-space direction="horizontal" @click="stopXrayService" style="justify-content: center;">
-                          <a-icon type="global"></a-icon> IPv6
+                        <a-icon type="poweroff"></a-icon>
-                          <template slot="title">
+                        <span v-if="!isMobile">{{ i18n "pages.index.stopXray" }}</span>
-                            [[ status.publicIP.ipv6 ]]
+                      </a-space>
+                      <a-space direction="horizontal" @click="restartXrayService" style="justify-content: center;">
+                        <a-icon type="reload"></a-icon>
+                        <span v-if="!isMobile">{{ i18n "pages.index.restartXray" }}</span>
+                      </a-space>
+                      <a-space direction="horizontal" @click="openSelectV2rayVersion" style="justify-content: center;">
+                        <a-icon type="tool"></a-icon>
+                        <span v-if="!isMobile">
+                          [[ status.xray.version != 'Unknown' ? `v${status.xray.version}` : '{{ i18n "pages.index.xraySwitch" }}' ]]
+                        </span>
+                      </a-space>
+                    </template>
+                  </a-card>
+                </a-col>
+                <a-col :sm="24" :lg="12">
+                  <a-card title='{{ i18n "menu.link" }}' hoverable>
+                    <template #actions>
+                      <a-space direction="horizontal" @click="openLogs()" style="justify-content: center;">
+                        <a-icon type="bars"></a-icon>
+                        <span v-if="!isMobile">{{ i18n "pages.index.logs" }}</span>
+                      </a-space>
+                      <a-space direction="horizontal" @click="openConfig" style="justify-content: center;">
+                        <a-icon type="control"></a-icon>
+                        <span v-if="!isMobile">{{ i18n "pages.index.config" }}</span>
+                      </a-space>
+                      <a-space direction="horizontal" @click="openBackup" style="justify-content: center;">
+                        <a-icon type="cloud-server"></a-icon>
+                        <span v-if="!isMobile">{{ i18n "pages.index.backup" }}</span>
+                      </a-space>
+                    </template>
+                  </a-card>
+                </a-col>
+                <a-col :sm="24" :lg="12">
+                  <a-card title='3X-UI' hoverable>
+                    <a rel="noopener" href="https://github.com/MHSanaei/3x-ui/releases" target="_blank"><a-tag color="green">v{{ .cur_ver }}</a-tag></a>
+                    <a rel="noopener" href="https://t.me/XrayUI" target="_blank"><a-tag color="green">@XrayUI</a-tag></a>
+                  </a-card>
+                </a-col>
+                <a-col :sm="24" :lg="12">
+                  <a-card title='{{ i18n "pages.index.operationHours" }}' hoverable>
+                    <a-tag :color="status.xray.color">Xray: [[ TimeFormatter.formatSecond(status.appStats.uptime) ]]</a-tag>
+                    <a-tag color="green">OS: [[ TimeFormatter.formatSecond(status.uptime) ]]</a-tag>
+                  </a-card>
+                </a-col>
+                <a-col :sm="24" :lg="12">
+                  <a-card title='{{ i18n "pages.index.systemLoad" }}' hoverable>
+                    <a-tag color="green">
+                      <a-tooltip>
+                        [[ status.loads[0] ]] | [[ status.loads[1] ]] | [[ status.loads[2] ]]
+                        <template slot="title">
+                          {{ i18n "pages.index.systemLoadDesc" }}
+                        </template>
+                      </a-tooltip>
+                    </a-tag>
+                  </a-card>
+                </a-col>
+                <a-col :sm="24" :lg="12">
+                  <a-card title='{{ i18n "usage"}}' hoverable>
+                    <a-tag color="green"> RAM: [[ SizeFormatter.sizeFormat(status.appStats.mem) ]] </a-tag>
+                    <a-tag color="green"> Threads: [[ status.appStats.threads ]] </a-tag>
+                  </a-card>
+                </a-col>
+                <a-col :sm="24" :lg="12">
+                  <a-card title='{{ i18n "pages.index.overallSpeed" }}' hoverable>
+                    <a-row>
+                      <a-col :span="12">
+                        <a-custom-statistic title='{{ i18n "pages.index.upload" }}' :value="SizeFormatter.sizeFormat(status.netIO.up)">
+                          <template #prefix>
+                            <a-icon type="arrow-up" />
                           </template>
-                        </a-tooltip>
+                          <template #suffix>
-                      </a-tag>
+                            /s
-                    </a-col>
-                  </a-row>
-                </a-card>
-              </a-col>
-              <a-col :sm="24" :lg="12">
-                <a-card hoverable>
-                  <a-row>
-                    <a-col :span="12">
-                      <a-tag>
-                        <a-tooltip>
-                          <a-icon type="swap"></a-icon> TCP: [[ status.tcpCount ]]
-                          <template slot="title">
-                            {{ i18n "pages.index.connectionTcpCountDesc" }}
                           </template>
-                        </a-tooltip>
+                        </a-custom-statistic>
-                      </a-tag>
+                      </a-col>
-                    </a-col>
+                      <a-col :span="12">
-                    <a-col :span="12">
+                        <a-custom-statistic title='{{ i18n "pages.index.download" }}' :value="SizeFormatter.sizeFormat(status.netIO.down)">
-                      <a-tag>
+                          <template #prefix>
-                        <a-tooltip>
+                            <a-icon type="arrow-down" />
-                          <a-icon type="swap"></a-icon> UDP: [[ status.udpCount ]]
-                          <template slot="title">
-                            {{ i18n "pages.index.connectionUdpCountDesc" }}
                           </template>
-                        </a-tooltip>
+                          <template #suffix>
-                      </a-tag>
+                            /s
-                    </a-col>
-                  </a-row>
-                </a-card>
-              </a-col>
-              <a-col :sm="24" :lg="12">
-                <a-card hoverable>
-                  <a-row>
-                    <a-col :span="12">
-                      <a-tag>
-                        <a-tooltip>
-                          <a-icon type="arrow-up"></a-icon> Up: [[ sizeFormat(status.netIO.up) ]]/s
-                          <template slot="title">
-                            {{ i18n "pages.index.upSpeed" }}
                           </template>
-                        </a-tooltip>
+                        </a-custom-statistic>
-                      </a-tag>
+                      </a-col>
-                    </a-col>
+                    </a-row>
-                    <a-col :span="12">
+                  </a-card>
-                      <a-tag>
+                </a-col>
-                        <a-tooltip>
+                <a-col :sm="24" :lg="12">
-                          <a-icon type="arrow-down"></a-icon> Down: [[ sizeFormat(status.netIO.down) ]]/s
+                  <a-card title='{{ i18n "pages.index.totalData" }}' hoverable>
-                          <template slot="title">
+                    <a-row>
-                            {{ i18n "pages.index.downSpeed" }}
+                      <a-col :span="12">
+                        <a-custom-statistic title='{{ i18n "pages.index.sent" }}' :value="SizeFormatter.sizeFormat(status.netTraffic.sent)">
+                          <template #prefix>
+                            <a-icon type="cloud-upload" />
                           </template>
-                        </a-tooltip>
+                        </a-custom-statistic>
-                      </a-tag>
+                      </a-col>
-                    </a-col>
+                      <a-col :span="12">
-                  </a-row>
+                        <a-custom-statistic title='{{ i18n "pages.index.received" }}' :value="SizeFormatter.sizeFormat(status.netTraffic.recv)">
-                </a-card>
+                          <template #prefix>
-              </a-col>
+                            <a-icon type="cloud-download" />
-              <a-col :sm="24" :lg="12">
+                          </template>
-                <a-card hoverable>
+                        </a-custom-statistic>
-                  <a-row>
+                      </a-col>
-                    <a-col :span="12">
+                    </a-row>
-                      <a-tag>
+                  </a-card>
-                        <a-tooltip>
+                </a-col>
-                          <a-icon type="cloud-upload"></a-icon>
+                <a-col :sm="24" :lg="12">
-                          <template slot="title">
+                  <a-card title='{{ i18n "pages.index.ipAddresses" }}' hoverable>
-                            {{ i18n "pages.index.totalSent" }}
+                    <template #extra>
-                          </template> Out: [[ sizeFormat(status.netTraffic.sent) ]]
+                      <a-tooltip>
-                        </a-tooltip>
+                        <template #title>
-                      </a-tag>
+                          {{ i18n "pages.index.toggleIpVisibility" }}
-                    </a-col>
+                        </template>
-                    <a-col :span="12">
+                        <a-icon :type="showIp ? 'eye' : 'eye-invisible'" :style="{ fontSize: '1rem' }" @click="showIp = !showIp"></a-icon>
-                      <a-tag>
+                      </a-tooltip>
-                        <a-tooltip>
+                    </template>
-                          <a-icon type="cloud-download"></a-icon>
+                    <a-row :class="showIp ? 'ip-visible' : 'ip-hidden'">
-                          <template slot="title">
+                      <a-col :xs="24" :xxl="12" :style="{ marginTop: isMobile ? '10px' : 0 }">
-                            {{ i18n "pages.index.totalReceive" }}
+                        <a-custom-statistic title="IPv4" :value="status.publicIP.ipv4">
-                          </template> In: [[ sizeFormat(status.netTraffic.recv) ]]
+                          <template #prefix>
-                        </a-tooltip>
+                            <a-icon type="global" />
-                      </a-tag>
+                          </template>
-                    </a-col>
+                        </a-custom-statistic>
-                  </a-row>
+                      </a-col>
-                </a-card>
+                      <a-col :xs="24" :xxl="12" :style="{ marginTop: isMobile ? '10px' : 0 }">
-              </a-col>
+                        <a-custom-statistic title="IPv6" :value="status.publicIP.ipv6">
-            </a-row>
+                          <template #prefix>
+                            <a-icon type="global" />
+                          </template>
+                        </a-custom-statistic>
+                      </a-col>
+                    </a-row>
+                  </a-card>
+                </a-col>
+                <a-col :sm="24" :lg="12">
+                  <a-card title='{{ i18n "pages.index.connectionCount" }}' hoverable>
+                    <a-row>
+                      <a-col :span="12">
+                        <a-custom-statistic title="TCP" :value="status.tcpCount">
+                          <template #prefix>
+                            <a-icon type="swap" />
+                          </template>
+                        </a-custom-statistic>
+                      </a-col>
+                      <a-col :span="12">
+                        <a-custom-statistic title="UDP" :value="status.udpCount">
+                          <template #prefix>
+                            <a-icon type="swap" />
+                          </template>
+                        </a-custom-statistic>
+                      </a-col>
+                    </a-row>
+                  </a-card>
+                </a-col>
+              </a-row>
+            </template>
           </transition>
         </a-spin>
       </a-layout-content>
     </a-layout>
     <a-modal id="version-modal" v-model="versionModal.visible" title='{{ i18n "pages.index.xraySwitch" }}' :closable="true"
         @ok="() => versionModal.visible = false" :class="themeSwitcher.currentTheme" footer="">
-      <a-alert type="warning" style="margin-bottom: 12px; width: fit-content"
+      <a-alert type="warning" style="margin-bottom: 12px; width: 100%;"
         message='{{ i18n "pages.index.xraySwitchClickDesk" }}' show-icon></a-alert>
-      <template v-for="version, index in versionModal.versions">
+      <a-list class="ant-xray-version-list" bordered style="width: 100%;">
-        <a-tag :color="index % 2 == 0 ? 'purple' : 'green'" style="margin-right: 12px; margin-bottom: 12px"
+        <a-list-item class="ant-xray-version-list-item" v-for="version, index in versionModal.versions">
-          @click="switchV2rayVersion(version)">
+          <a-tag :color="index % 2 == 0 ? 'purple' : 'green'">[[ version ]]</a-tag>
-          [[ version ]]
+          <a-radio :class="themeSwitcher.currentTheme" :checked="version === `v${status.xray.version}`" @click="switchV2rayVersion(version)"></a-radio>
-        </a-tag>
+        </a-list-item>
-      </template>
+      </a-list>
     </a-modal>
     <a-modal id="log-modal" v-model="logModal.visible"
         :closable="true" @cancel="() => logModal.visible = false"
@@ -314,32 +392,39 @@
       </a-form>
       <div class="ant-input" style="height: auto; max-height: 500px; overflow: auto; margin-top: 0.5rem;" v-html="logModal.formattedLogs"></div>
     </a-modal>
-    <a-modal id="backup-modal" v-model="backupModal.visible" :title="backupModal.title"
+    <a-modal id="backup-modal" 
-        :closable="true" footer=""
+        v-model="backupModal.visible" 
+        title='{{ i18n "pages.index.backupTitle" }}'
+        :closable="true"
+        footer=""
         :class="themeSwitcher.currentTheme">
-      <a-alert type="warning" style="margin-bottom: 10px; width: fit-content"
+      <a-list class="ant-backup-list" bordered style="width: 100%;">
-        :message="backupModal.description"
+        <a-list-item class="ant-backup-list-item">
-        show-icon>
+          <a-list-item-meta>
-      </a-alert>
+            <template #title>{{ i18n "pages.index.exportDatabase" }}</template>
-      <a-space direction="horizontal" style="text-align: center; margin-bottom: 10px;">
+            <template #description>{{ i18n "pages.index.exportDatabaseDesc" }}</template>
-        <a-button type="primary" @click="exportDatabase()">
+          </a-list-item-meta>
-            [[ backupModal.exportText ]]
+          <a-button @click="exportDatabase()" type="primary" icon="download"/>
-        </a-button>
+        </a-list-item>
-        <a-button type="primary" @click="importDatabase()">
+        <a-list-item class="ant-backup-list-item">
-            [[ backupModal.importText ]]
+          <a-list-item-meta>
-        </a-button>
+            <template #title>{{ i18n "pages.index.importDatabase" }}</template>
-      </a-space>
+            <template #description>{{ i18n "pages.index.importDatabaseDesc" }}</template>
+          </a-list-item-meta>
+          <a-button @click="importDatabase()" type="primary" icon="upload" />
+        </a-list-item>
+      </a-list>
     </a-modal>
   </a-layout>
 {{template "js" .}}
-<script src="{{ .base_path }}assets/clipboard/clipboard.min.js?{{ .cur_ver }}"></script>
+{{template "component/aThemeSwitch" .}}
-{{template "component/themeSwitcher" .}}
+{{template "component/aCustomStatistic" .}}
 {{template "textModal"}}
 <script>
     const State = {
-        Running: "running",
+      Running: "running",
-        Stop: "stop",
+      Stop: "stop",
-        Error: "error",
+      Error: "error",
     }
     Object.freeze(State);
 
@@ -354,7 +439,7 @@
             if (this.total === 0) {
                 return 0;
             }
-            return toFixed(this.current / this.total * 100, 2);
+            return NumberFormatter.toFixed(this.current / this.total * 100, 2);
         }
 
         get color() {
@@ -370,7 +455,7 @@
     }
 
     class Status {
-        constructor(data) {
+        constructor(data, isLoaded = false) {
             this.cpu = new CurTotal(0, 0);
             this.cpuCores = 0;
             this.logicalPro = 0;
@@ -390,14 +475,16 @@
             this.xray = { state: State.Stop, errorMsg: "", version: "", color: "" };
 
             if (data == null) {
-                return;
+              return;
             }
+
+            this.isLoaded = isLoaded;
             this.cpu = new CurTotal(data.cpu, 100);
             this.cpuCores = data.cpuCores;
             this.logicalPro = data.logicalPro;
             this.cpuSpeedMhz = data.cpuSpeedMhz;
             this.disk = new CurTotal(data.disk.current, data.disk.total);
-            this.loads = data.loads.map(load => toFixed(load, 2));
+            this.loads = data.loads.map(load => NumberFormatter.toFixed(load, 2));
             this.mem = new CurTotal(data.mem.current, data.mem.total);
             this.netIO = data.netIO;
             this.netTraffic = data.netTraffic;
@@ -492,24 +579,11 @@
 
     const backupModal = {
         visible: false,
-        title: '',
+        show() {
-        description: '',
+          this.visible = true;
-        exportText: '',
-        importText: '',
-        show({
-            title = '{{ i18n "pages.index.backupTitle" }}',
-            description = '{{ i18n "pages.index.backupDescription" }}',
-            exportText = '{{ i18n "pages.index.exportDatabase" }}',
-            importText = '{{ i18n "pages.index.importDatabase" }}',
-        }) {
-            this.title = title;
-            this.description = description;
-            this.exportText = exportText;
-            this.importText = importText;
-            this.visible = true;
         },
         hide() {
-            this.visible = false;
+          this.visible = false;
         },
     };
 
@@ -526,6 +600,8 @@
             spinning: false,
             loadingTip: '{{ i18n "loading"}}',
             showAlert: false,
+            showIp: false,
+            isMobile: window.innerWidth <= 768
         },
         methods: {
             loading(spinning, tip = '{{ i18n "loading"}}') {
@@ -536,14 +612,14 @@
                 try {
                     const msg = await HttpUtil.post('/server/status');
                     if (msg.success) {
-                        this.setStatus(msg.obj);
+                        this.setStatus(msg.obj, true);
                     }
                 } catch (e) {
                     console.error("Failed to get status:", e);
                 }
             },
-            setStatus(data) {
+            setStatus(data, isLoaded = false) {
-                this.status = new Status(data);
+              this.status = new Status(data, isLoaded);
             },
             async openSelectV2rayVersion() {
                 this.loading(true);
@@ -605,12 +681,7 @@
                 txtModal.show('config.json', JSON.stringify(msg.obj, null, 2), 'config.json');
             },
             openBackup() {
-                backupModal.show({
+              backupModal.show();
-                    title: '{{ i18n "pages.index.backupTitle" }}',
-                    description: '{{ i18n "pages.index.backupDescription" }}',
-                    exportText: '{{ i18n "pages.index.exportDatabase" }}',
-                    importText: '{{ i18n "pages.index.importDatabase" }}',
-                });
             },
             exportDatabase() {
                 window.location = basePath + 'server/getDb';

web/html/xui/settings.html

@@ -108,16 +108,17 @@
               </a-row>
             </a-card>
             <a-tabs default-active-key="1">
-              <a-tab-pane key="1" tab='{{ i18n "pages.settings.panelSettings"}}'>
+              <a-tab-pane key="1" tab='{{ i18n "pages.settings.panelSettings" }}' style="padding-top: 20px;">
-                <a-list item-layout="horizontal">
+                <a-collapse>
-                  <a-list-item>
+                  <a-collapse-panel header='{{ i18n "pages.xray.generalConfigs"}}'>
-                    <a-row style="padding: 20px">
+                    <a-setting-list-item paddings="small">
-                      <a-col :lg="24" :xl="12">
+                      <template #title>
-                        <a-list-item-meta title='{{ i18n "pages.settings.remarkModel"}}'>
+                        {{ i18n "pages.settings.remarkModel"}}
-                          <template slot="description">{{ i18n "pages.settings.sampleRemark"}}: <i>#[[ remarkSample ]]</i></template>
+                      </template>
-                        </a-list-item-meta>
+                      <template #description>
-                      </a-col>
+                        {{ i18n "pages.settings.sampleRemark"}}: <i>#[[ remarkSample ]]</i>
-                      <a-col :lg="24" :xl="12">
+                      </template>
+                      <template #control>
                         <a-input-group style="width: 100%;">
                           <a-select style="padding-right: .5rem; min-width: 80%; width: auto;"
                               mode="multiple"
@@ -129,350 +130,530 @@
                             <a-select-option v-for="key in remarkSeparators" :value="key">[[ key ]]</a-select-option>
                           </a-select>
                         </a-input-group>
-                      </a-col>
+                      </template>
-                    </a-row>
+                    </a-setting-list-item>
-                  </a-list-item>
+                    <a-setting-list-item paddings="small">
-                  <setting-list-item type="text" title='{{ i18n "pages.settings.panelListeningIP"}}' desc='{{ i18n "pages.settings.panelListeningIPDesc"}}' v-model="allSetting.webListen"></setting-list-item>
+                      <template #title>{{ i18n "pages.settings.panelListeningIP"}}</template>
-                  <setting-list-item type="text" title='{{ i18n "pages.settings.panelListeningDomain"}}' desc='{{ i18n "pages.settings.panelListeningDomainDesc"}}' v-model="allSetting.webDomain"></setting-list-item>
+                      <template #description>{{ i18n "pages.settings.panelListeningIPDesc"}}</template>
-                  <setting-list-item type="number" title='{{ i18n "pages.settings.panelPort"}}' desc='{{ i18n "pages.settings.panelPortDesc"}}' v-model="allSetting.webPort" :min="1" :max="65531"></setting-list-item>
+                      <template #control>
-                  <setting-list-item type="text" title='{{ i18n "pages.settings.publicKeyPath"}}' desc='{{ i18n "pages.settings.publicKeyPathDesc"}}' v-model="allSetting.webCertFile"></setting-list-item>
+                        <a-input type="text" v-model="allSetting.webListen"></a-input>
-                  <setting-list-item type="text" title='{{ i18n "pages.settings.privateKeyPath"}}' desc='{{ i18n "pages.settings.privateKeyPathDesc"}}' v-model="allSetting.webKeyFile"></setting-list-item>
+                      </template>
-                  <setting-list-item type="text" title='{{ i18n "pages.settings.panelUrlPath"}}' desc='{{ i18n "pages.settings.panelUrlPathDesc"}}' v-model="allSetting.webBasePath"></setting-list-item>
+                    </a-setting-list-item>
-                  <setting-list-item type="number" title='{{ i18n "pages.settings.sessionMaxAge" }}' desc='{{ i18n "pages.settings.sessionMaxAgeDesc" }}' v-model="allSetting.sessionMaxAge" :min="60"></setting-list-item>
+                    <a-setting-list-item paddings="small">
-                  <setting-list-item type="number" title='{{ i18n "pages.settings.pageSize" }}' desc='{{ i18n "pages.settings.pageSizeDesc" }}' v-model="allSetting.pageSize" :min="0" :step="5"></setting-list-item>
+                      <template #title>{{ i18n "pages.settings.panelListeningDomain"}}</template>
-                  <setting-list-item type="number" title='{{ i18n "pages.settings.expireTimeDiff" }}' desc='{{ i18n "pages.settings.expireTimeDiffDesc" }}' v-model="allSetting.expireDiff" :min="0"></setting-list-item>
+                      <template #description>{{ i18n "pages.settings.panelListeningDomainDesc"}}</template>
-                  <setting-list-item type="number" title='{{ i18n "pages.settings.trafficDiff" }}' desc='{{ i18n "pages.settings.trafficDiffDesc" }}' v-model="allSetting.trafficDiff" :min="0"></setting-list-item>
+                      <template #control>
-                  <setting-list-item type="switch" title='{{ i18n "pages.settings.externalTrafficInformEnable"}}' desc='{{ i18n "pages.settings.externalTrafficInformEnableDesc"}}' v-model="allSetting.externalTrafficInformEnable"></setting-list-item>
+                        <a-input type="text" v-model="allSetting.webDomain"></a-input>
-                  <setting-list-item type="text" title='{{ i18n "pages.settings.externalTrafficInformURI"}}' desc='{{ i18n "pages.settings.externalTrafficInformURIDesc"}}' v-model="allSetting.externalTrafficInformURI" placeholder="(http|https)://domain[:port]/path/"></setting-list-item>
+                      </template>
-                  <setting-list-item type="text" title='{{ i18n "pages.settings.timeZone"}}' desc='{{ i18n "pages.settings.timeZoneDesc"}}' v-model="allSetting.timeLocation"></setting-list-item>
+                    </a-setting-list-item>
-                  <a-list-item>
+                    <a-setting-list-item paddings="small">
-                    <a-row style="padding: 20px">
+                      <template #title>{{ i18n "pages.settings.panelPort"}}</template>
-                      <a-col :lg="24" :xl="12">
+                      <template #description>{{ i18n "pages.settings.panelPortDesc"}}</template>
-                        <a-list-item-meta title='{{ i18n "pages.settings.datepicker"}}'>
+                      <template #control>
-                          <template slot="description">{{ i18n "pages.settings.datepickerDescription"}}</template>
+                        <a-input-number :min="1" :min="65531" v-model="allSetting.webPort" style="width: 100%;"></a-input>
-                        </a-list-item-meta>
+                      </template>
-                      </a-col>
+                    </a-setting-list-item>
-                      <a-col :lg="24" :xl="12">
+                    <a-setting-list-item paddings="small">
-                        <template>
+                      <template #title>{{ i18n "pages.settings.panelUrlPath"}}</template>
-                          <a-select style="width: 100%" :dropdown-class-name="themeSwitcher.currentTheme" v-model="datepicker">
+                      <template #description>{{ i18n "pages.settings.panelUrlPathDesc"}}</template>
-                            <a-select-option v-for="item in datepickerList" :value="item.value">
+                      <template #control>
-                              <span v-text="item.name"></span>
+                        <a-input type="text" v-model="allSetting.webBasePath"></a-input>
-                            </a-select-option>
+                      </template>
-                          </a-select>
+                    </a-setting-list-item>
-                        </template>
+                    <a-setting-list-item paddings="small">
-                      </a-col>
+                      <template #title>{{ i18n "pages.settings.sessionMaxAge" }}</template>
-                    </a-row>
+                      <template #description>{{ i18n "pages.settings.sessionMaxAgeDesc" }}</template>
-                  </a-list-item>
+                      <template #control>
-                  <a-list-item>
+                        <a-input-number :min="60" v-model="allSetting.sessionMaxAge" style="width: 100%;"></a-input>
-                    <a-row style="padding: 20px">
+                      </template>
-                      <a-col :lg="24" :xl="12">
+                    </a-setting-list-item>
-                        <a-list-item-meta title="Language"></a-list-item-meta>
+                    <a-setting-list-item paddings="small">
-                      </a-col>
+                      <template #title>{{ i18n "pages.settings.pageSize" }}</template>
-                      <a-col :lg="24" :xl="12">
+                      <template #description>{{ i18n "pages.settings.pageSizeDesc" }}</template>
-                        <template>
+                      <template #control>
-                          <a-select ref="selectLang"
+                        <a-input-number :min="0" step="5" v-model="allSetting.pageSize" style="width: 100%;"></a-input>
-                              v-model="lang"
+                      </template>
-                              @change="setLang(lang)"
+                    </a-setting-list-item>
-                              :dropdown-class-name="themeSwitcher.currentTheme"
+                    <a-setting-list-item paddings="small">
-                              style="width: 100%">
+                      <template #title>{{ i18n "pages.settings.language"}}</template>
-                            <a-select-option :value="l.value" :label="l.value" v-for="l in supportLangs">
+                      <template #control>
-                              <span role="img" :aria-label="l.name" v-text="l.icon"></span> &nbsp;&nbsp; <span v-text="l.name"></span>
+                        <a-select ref="selectLang"
-                            </a-select-option>
+                            v-model="lang"
-                          </a-select>
+                            @change="LanguageManager.setLanguage(lang)"
-                        </template>
+                            :dropdown-class-name="themeSwitcher.currentTheme"
-                      </a-col>
+                            style="width: 100%">
-                    </a-row>
+                          <a-select-option :value="l.value" :label="l.value" v-for="l in LanguageManager.supportedLanguages">
-                  </a-list-item>
+                            <span role="img" :aria-label="l.name" v-text="l.icon"></span> &nbsp;&nbsp; <span v-text="l.name"></span>
-                </a-list>
+                          </a-select-option>
+                        </a-select>
+                      </template>
+                    </a-setting-list-item>
+                  </a-collapse-panel>
+                  <a-collapse-panel header='{{ i18n "pages.settings.notifications" }}'>
+                    <a-setting-list-item paddings="small">
+                      <template #title>{{ i18n "pages.settings.expireTimeDiff" }}</template>
+                      <template #description>{{ i18n "pages.settings.expireTimeDiffDesc" }}</template>
+                      <template #control>
+                        <a-input-number :min="0" v-model="allSetting.expireDiff" style="width: 100%;"></a-input>
+                      </template>
+                    </a-setting-list-item>
+                    <a-setting-list-item paddings="small">
+                      <template #title>{{ i18n "pages.settings.trafficDiff" }}</template>
+                      <template #description>{{ i18n "pages.settings.trafficDiffDesc" }}</template>
+                      <template #control>
+                        <a-input-number :min="0" v-model="allSetting.trafficDiff" style="width: 100%;"></a-input>
+                      </template>
+                    </a-setting-list-item>
+                  </a-collapse-panel>
+                  <a-collapse-panel header='{{ i18n "pages.settings.certs" }}'>
+                    <a-setting-list-item paddings="small">
+                      <template #title>{{ i18n "pages.settings.publicKeyPath"}}</template>
+                      <template #description>{{ i18n "pages.settings.publicKeyPathDesc"}}</template>
+                      <template #control>
+                        <a-input type="text" v-model="allSetting.webCertFile"></a-input>
+                      </template>
+                    </a-setting-list-item>
+                    <a-setting-list-item paddings="small">
+                      <template #title>{{ i18n "pages.settings.privateKeyPath"}}</template>
+                      <template #description>{{ i18n "pages.settings.privateKeyPathDesc"}}</template>
+                      <template #control>
+                        <a-input type="text" v-model="allSetting.webKeyFile"></a-input>
+                      </template>
+                    </a-setting-list-item>
+                  </a-collapse-panel>
+                  <a-collapse-panel header='{{ i18n "pages.settings.externalTraffic" }}'>
+                    <a-setting-list-item paddings="small">
+                      <template #title>{{ i18n "pages.settings.externalTrafficInformEnable"}}</template>
+                      <template #description>{{ i18n "pages.settings.externalTrafficInformEnableDesc"}}</template>
+                      <template #control>
+                        <a-switch v-model="allSetting.externalTrafficInformEnable"></a-switch>
+                      </template>
+                    </a-setting-list-item>
+                    <a-setting-list-item paddings="small">
+                      <template #title>{{ i18n "pages.settings.externalTrafficInformURI"}}</template>
+                      <template #description>{{ i18n "pages.settings.externalTrafficInformURIDesc"}}</template>
+                      <template #control>
+                        <a-input type="text" placeholder="(http|https)://domain[:port]/path/" v-model="allSetting.externalTrafficInformURI"></a-input>
+                      </template>
+                    </a-setting-list-item>
+                  </a-collapse-panel>
+                  <a-collapse-panel header='{{ i18n "pages.settings.dateAndTime" }}'>
+                    <a-setting-list-item paddings="small">
+                      <template #title>{{ i18n "pages.settings.timeZone"}}</template>
+                      <template #description>{{ i18n "pages.settings.timeZoneDesc"}}</template>
+                      <template #control>
+                        <a-input type="text" v-model="allSetting.timeLocation"></a-input>
+                      </template>
+                    </a-setting-list-item>
+                    <a-setting-list-item paddings="small">
+                      <template #title>{{ i18n "pages.settings.datepicker"}}</template>
+                      <template #description>{{ i18n "pages.settings.datepickerDescription"}}</template>
+                      <template #control>
+                        <a-select style="width: 100%" :dropdown-class-name="themeSwitcher.currentTheme" v-model="datepicker">
+                          <a-select-option v-for="item in datepickerList" :value="item.value">
+                            <span v-text="item.name"></span>
+                          </a-select-option>
+                        </a-select>
+                      </template>
+                    </a-setting-list-item>
+                  </a-collapse-panel>
+                </a-collapse>
               </a-tab-pane>
-              <a-tab-pane key="2" tab='{{ i18n "pages.settings.securitySettings"}}' style="padding-top: 20px;">
+              <a-tab-pane key="2" tab='{{ i18n "pages.settings.securitySettings" }}' style="padding-top: 20px;">
                 <a-collapse>
                   <a-collapse-panel header='{{ i18n "pages.settings.security.admin"}}'>
+                    <a-setting-list-item paddings="small">
+                      <template #title>{{ i18n "pages.settings.oldUsername"}}</template>
+                      <template #control>
+                        <a-input autocomplete="username" v-model="user.oldUsername"></a-input>
+                      </template>
+                    </a-setting-list-item>
+                    <a-setting-list-item paddings="small">
+                      <template #title>{{ i18n "pages.settings.currentPassword"}}</template>
+                      <template #control>
+                        <a-password-input autocomplete="current-password" v-model="user.oldPassword"></a-password-input>
+                      </template>
+                    </a-setting-list-item>
+                    <a-setting-list-item paddings="small">
+                      <template #title>{{ i18n "pages.settings.newUsername"}}</template>
+                      <template #control>
+                        <a-input v-model="user.newUsername"></a-input>
+                      </template>
+                    </a-setting-list-item>
+                    <a-setting-list-item paddings="small">
+                      <template #title>{{ i18n "pages.settings.newPassword"}}</template>
+                      <template #control>
+                        <a-password-input autocomplete="new-password" v-model="user.newPassword"></a-password-input>
+                      </template>
+                    </a-setting-list-item>
                     <a-list-item>
-                      <a-row style="padding: 0 20px; padding-bottom: 10px;">
+                      <a-space direction="horizontal" style="padding: 0 20px;">
-                        <a-col :lg="24" :xl="12">
-                          <a-list-item-meta title='{{ i18n "pages.settings.oldUsername"}}'></a-list-item-meta>
-                        </a-col>
-                        <a-col :lg="24" :xl="12">
-                          <template>
-                            <a-input autocomplete="username" v-model="user.oldUsername"></a-input>
-                          </template>
-                        </a-col>
-                      </a-row>
-                      <a-row style="padding: 10px 20px">
-                        <a-col :lg="24" :xl="12">
-                          <a-list-item-meta title='{{ i18n "pages.settings.currentPassword"}}'></a-list-item-meta>
-                        </a-col>
-                        <a-col :lg="24" :xl="12">
-                          <template>
-                            <password-input autocomplete="current-password" v-model="user.oldPassword"></password-input>
-                          </template>
-                        </a-col>
-                      </a-row>
-                      <a-row style="padding: 10px 20px">
-                        <a-col :lg="24" :xl="12">
-                          <a-list-item-meta title='{{ i18n "pages.settings.newUsername"}}'></a-list-item-meta>
-                        </a-col>
-                        <a-col :lg="24" :xl="12">
-                          <template>
-                            <a-input v-model="user.newUsername"></a-input>
-                          </template>
-                        </a-col>
-                      </a-row>
-                      <a-row style="padding: 10px 20px">
-                        <a-col :lg="24" :xl="12">
-                          <a-list-item-meta title='{{ i18n "pages.settings.newPassword"}}'></a-list-item-meta>
-                        </a-col>
-                        <a-col :lg="24" :xl="12">
-                          <template>
-                            <password-input autocomplete="new-password" v-model="user.newPassword"></password-input>
-                          </template>
-                        </a-col>
-                      </a-row>
-                      <a-space direction="horizontal" style="padding: 0 20px; padding-top: 20px;">
                         <a-button type="primary" @click="updateUser">{{ i18n "confirm" }}</a-button>
                       </a-space>
                     </a-list-item>
                   </a-collapse-panel>
                   <a-collapse-panel header='{{ i18n "pages.settings.security.secret"}}'>
+                    <a-setting-list-item paddings="small">
+                      <template #title>{{ i18n "pages.settings.security.loginSecurity" }}</template>
+                      <template #description>{{ i18n "pages.settings.security.loginSecurityDesc" }}</template>
+                      <template #control>
+                        <a-switch @change="toggleToken(allSetting.secretEnable)" v-model="allSetting.secretEnable"></a-switch>
+                        <a-icon style="margin-left: 1rem;" v-if="allSetting.secretEnable" :spin="this.changeSecret" type="sync" @click="getNewSecret"></a-icon>
+                      </template>
+                    </a-setting-list-item>
+                    <a-setting-list-item paddings="small">
+                      <template #title>{{ i18n "pages.settings.security.secretToken" }}</template>
+                      <template #description>{{ i18n "pages.settings.security.secretTokenDesc" }}</template>
+                      <template #control>
+                        <a-textarea type="text" :disabled="!allSetting.secretEnable" v-model="user.loginSecret"></a-textarea>
+                      </template>
+                    </a-setting-list-item>
                     <a-list-item>
-                      <a-row style="padding: 0 20px; padding-bottom: 10px;">
+                      <a-space direction="horizontal" style="padding: 0 20px;">
-                        <a-col :lg="24" :xl="12">
-                          <a-list-item-meta title='{{ i18n "pages.settings.security.loginSecurity" }}'
-                            description='{{ i18n "pages.settings.security.loginSecurityDesc" }}'>
-                          </a-list-item-meta>
-                        </a-col>
-                        <a-col :lg="24" :xl="12">
-                          <template>
-                            <a-switch @change="toggleToken(allSetting.secretEnable)" v-model="allSetting.secretEnable"></a-switch>
-                            <a-icon style="margin-left: 1rem;" v-if="allSetting.secretEnable" :spin="this.changeSecret" type="sync" @click="getNewSecret"></a-icon>
-                          </template>
-                        </a-col>
-                      </a-row>
-                      <a-row style="padding: 10px 20px">
-                        <a-col :lg="24" :xl="12">
-                          <a-list-item-meta title='{{ i18n "pages.settings.security.secretToken" }}'
-                            description='{{ i18n "pages.settings.security.secretTokenDesc" }}'>
-                          </a-list-item-meta>
-                        </a-col>
-                        <a-col :lg="24" :xl="12">
-                          <template>
-                            <a-textarea type="text" :disabled="!allSetting.secretEnable" v-model="user.loginSecret"></a-textarea>
-                          </template>
-                        </a-col>
-                      </a-row>
-                      <a-space direction="horizontal" style="padding: 0 20px; padding-top: 20px;">
                         <a-button type="primary" :loading="this.changeSecret" @click="updateSecret">{{ i18n "confirm" }}</a-button>
                       </a-space>
                     </a-list-item>
                   </a-collapse-panel>
                 </a-collapse>
-                <!--
-                <a-divider>{{ i18n "pages.settings.security.secret"}}</a-divider>
-                <a-form style="padding: 0 20px;">
-                  <a-list-item>
-                    <a-row>
-                      <a-col :lg="24" :xl="12">
-                        <a-list-item-meta title='{{ i18n "pages.settings.security.loginSecurity" }}'
-                          description='{{ i18n "pages.settings.security.loginSecurityDesc" }}'>
-                        </a-list-item-meta>
-                      </a-col>
-                      <a-col :lg="24" :xl="12">
-                        <template>
-                          <a-switch @change="toggleToken(allSetting.secretEnable)" v-model="allSetting.secretEnable"></a-switch>
-                          <a-icon style="margin-left: 1rem;" v-if="allSetting.secretEnable" :spin="this.changeSecret" type="sync" @click="getNewSecret"></a-icon>
-                        </template>
-                      </a-col>
-                    </a-row>
-                  </a-list-item>
-                  
-                  <a-button type="primary" :loading="this.changeSecret" @click="updateSecret">{{ i18n "confirm" }}</a-button>
-                </a-form> -->
               </a-tab-pane>
-              <a-tab-pane key="3" tab='{{ i18n "pages.settings.TGBotSettings"}}'>
+              <a-tab-pane key="3" tab='{{ i18n "pages.settings.TGBotSettings" }}' style="padding-top: 20px;">
-                <a-list item-layout="horizontal">
+                <a-collapse>
-                  <setting-list-item type="switch" title='{{ i18n "pages.settings.telegramBotEnable" }}' desc='{{ i18n "pages.settings.telegramBotEnableDesc" }}' v-model="allSetting.tgBotEnable"></setting-list-item>
+                  <a-collapse-panel header='{{ i18n "pages.xray.generalConfigs"}}'>
-                  <setting-list-item type="text" title='{{ i18n "pages.settings.telegramToken"}}' desc='{{ i18n "pages.settings.telegramTokenDesc"}}' v-model="allSetting.tgBotToken"></setting-list-item>
+                    <a-setting-list-item paddings="small">
-                  <setting-list-item type="text" title='{{ i18n "pages.settings.telegramChatId"}}' desc='{{ i18n "pages.settings.telegramChatIdDesc"}}' v-model="allSetting.tgBotChatId"></setting-list-item>
+                      <template #title>{{ i18n "pages.settings.telegramBotEnable" }}</template>
-                  <setting-list-item type="text" title='{{ i18n "pages.settings.telegramNotifyTime"}}' desc='{{ i18n "pages.settings.telegramNotifyTimeDesc"}}' v-model="allSetting.tgRunTime"></setting-list-item>
+                      <template #description>{{ i18n "pages.settings.telegramBotEnableDesc" }}</template>
-                  <setting-list-item type="switch" title='{{ i18n "pages.settings.tgNotifyBackup" }}' desc='{{ i18n "pages.settings.tgNotifyBackupDesc" }}' v-model="allSetting.tgBotBackup"></setting-list-item>
+                      <template #control>
-                  <setting-list-item type="switch" title='{{ i18n "pages.settings.tgNotifyLogin" }}' desc='{{ i18n "pages.settings.tgNotifyLoginDesc" }}' v-model="allSetting.tgBotLoginNotify"></setting-list-item>
+                        <a-switch v-model="allSetting.tgBotEnable"></a-switch>
-                  <setting-list-item type="number" title='{{ i18n "pages.settings.tgNotifyCpu" }}' desc='{{ i18n "pages.settings.tgNotifyCpuDesc" }}' v-model="allSetting.tgCpu" :min="0" :max="100"></setting-list-item>
+                      </template>
-                  <setting-list-item type="text" title='{{ i18n "pages.settings.telegramProxy"}}' desc='{{ i18n "pages.settings.telegramProxyDesc"}}' v-model="allSetting.tgBotProxy" placeholder="socks5://user:pass@host:port"></setting-list-item>
+                    </a-setting-list-item>
-                  <setting-list-item type="text" title='{{ i18n "pages.settings.telegramAPIServer"}}' desc='{{ i18n "pages.settings.telegramAPIServerDesc"}}' v-model="allSetting.tgBotAPIServer" placeholder="https://api.example.com"></setting-list-item>
+                    <a-setting-list-item paddings="small">
-                  <a-list-item>
+                      <template #title>{{ i18n "pages.settings.telegramToken"}}</template>
-                    <a-row style="padding: 20px">
+                      <template #description>{{ i18n "pages.settings.telegramTokenDesc"}}</template>
-                      <a-col :lg="24" :xl="12">
+                      <template #control>
-                        <a-list-item-meta title="Telegram Bot Language" />
+                        <a-input type="text" v-model="allSetting.tgBotToken"></a-input>
-                      </a-col>
+                      </template>
-                      <a-col :lg="24" :xl="12">
+                    </a-setting-list-item>
-                        <template>
+                    <a-setting-list-item paddings="small">
-                          <a-select ref="selectBotLang" v-model="allSetting.tgLang" :dropdown-class-name="themeSwitcher.currentTheme" style="width: 100%">
+                      <template #title>{{ i18n "pages.settings.telegramChatId"}}</template>
-                            <a-select-option :value="l.value" :label="l.value" v-for="l in supportLangs">
+                      <template #description>{{ i18n "pages.settings.telegramChatIdDesc"}}</template>
-                              <span role="img" :aria-label="l.name" v-text="l.icon"></span> &nbsp;&nbsp; <span v-text="l.name"></span>
+                      <template #control>
-                            </a-select-option>
+                        <a-input type="text" v-model="allSetting.tgBotChatId"></a-input>
-                          </a-select>
+                      </template>
-                        </template>
+                    </a-setting-list-item>
-                      </a-col>
+                    <a-setting-list-item paddings="small">
-                    </a-row>
+                      <template #title>{{ i18n "pages.settings.telegramBotLanguage"}}</template>
-                  </a-list-item>
+                      <template #control>
-                </a-list>
+                        <a-select ref="selectBotLang" v-model="allSetting.tgLang" :dropdown-class-name="themeSwitcher.currentTheme" style="width: 100%">
+                          <a-select-option :value="l.value" :label="l.value" v-for="l in LanguageManager.supportedLanguages">
+                            <span role="img" :aria-label="l.name" v-text="l.icon"></span> &nbsp;&nbsp; <span v-text="l.name"></span>
+                          </a-select-option>
+                        </a-select>
+                      </template>
+                    </a-setting-list-item>
+                  </a-collapse-panel>
+                  <a-collapse-panel header='{{ i18n "pages.settings.notifications" }}'>
+                    <a-setting-list-item paddings="small">
+                      <template #title>{{ i18n "pages.settings.telegramNotifyTime"}}</template>
+                      <template #description>{{ i18n "pages.settings.telegramNotifyTimeDesc"}}</template>
+                      <template #control>
+                        <a-input type="text" v-model="allSetting.tgRunTime"></a-input>
+                      </template>
+                    </a-setting-list-item>
+                    <a-setting-list-item paddings="small">
+                      <template #title>{{ i18n "pages.settings.tgNotifyBackup" }}</template>
+                      <template #description>{{ i18n "pages.settings.tgNotifyBackupDesc" }}</template>
+                      <template #control>
+                        <a-switch v-model="allSetting.tgBotBackup"></a-switch>
+                      </template>
+                    </a-setting-list-item>
+                    <a-setting-list-item paddings="small">
+                      <template #title>{{ i18n "pages.settings.tgNotifyLogin" }}</template>
+                      <template #description>{{ i18n "pages.settings.tgNotifyLoginDesc" }}</template>
+                      <template #control>
+                        <a-switch v-model="allSetting.tgBotLoginNotify"></a-switch>
+                      </template>
+                    </a-setting-list-item>
+                    <a-setting-list-item paddings="small">
+                      <template #title>{{ i18n "pages.settings.tgNotifyCpu" }}</template>
+                      <template #description>{{ i18n "pages.settings.tgNotifyCpuDesc" }}</template>
+                      <template #control>
+                        <a-input-number :min="0" :min="100" v-model="allSetting.tgCpu" style="width: 100%;"></a-switch>
+                      </template>
+                    </a-setting-list-item>
+                  </a-collapse-panel>
+                  <a-collapse-panel header='{{ i18n "pages.settings.proxyAndServer" }}'>
+                    <a-setting-list-item paddings="small">
+                      <template #title>{{ i18n "pages.settings.telegramProxy"}}</template>
+                      <template #description>{{ i18n "pages.settings.telegramProxyDesc"}}</template>
+                      <template #control>
+                        <a-input type="text" placeholder="socks5://user:pass@host:port" v-model="allSetting.tgBotProxy"></a-input>
+                      </template>
+                    </a-setting-list-item>
+                    <a-setting-list-item paddings="small">
+                      <template #title>{{ i18n "pages.settings.telegramAPIServer"}}</template>
+                      <template #description>{{ i18n "pages.settings.telegramAPIServerDesc"}}</template>
+                      <template #control>
+                        <a-input type="text" placeholder="https://api.example.com" v-model="allSetting.tgBotAPIServer"></a-input>
+                      </template>
+                    </a-setting-list-item>
+                  </a-collapse-panel>
+                </a-collapse>
               </a-tab-pane>
-              <a-tab-pane key="4" tab='{{ i18n "pages.settings.subSettings" }}'>
+              <a-tab-pane key="4" tab='{{ i18n "pages.settings.subSettings" }}' style="padding-top: 20px;">
-                <a-list item-layout="horizontal">
+                <a-collapse>
-                  <setting-list-item type="switch" title='{{ i18n "pages.settings.subEnable"}}' desc='{{ i18n "pages.settings.subEnableDesc"}}' v-model="allSetting.subEnable"></setting-list-item>
+                  <a-collapse-panel header='{{ i18n "pages.xray.generalConfigs"}}'>
-                  <setting-list-item type="switch" title='{{ i18n "pages.settings.subEncrypt"}}' desc='{{ i18n "pages.settings.subEncryptDesc"}}' v-model="allSetting.subEncrypt"></setting-list-item>
+                    <a-setting-list-item paddings="small">
-                  <setting-list-item type="switch" title='{{ i18n "pages.settings.subShowInfo"}}' desc='{{ i18n "pages.settings.subShowInfoDesc"}}' v-model="allSetting.subShowInfo"></setting-list-item>
+                      <template #title>{{ i18n "pages.settings.subEnable"}}</template>
-                  <setting-list-item type="text" title='{{ i18n "pages.settings.subListen"}}' desc='{{ i18n "pages.settings.subListenDesc"}}' v-model="allSetting.subListen"></setting-list-item>
+                      <template #description>{{ i18n "pages.settings.subEnableDesc"}}</template>
-                  <setting-list-item type="text" title='{{ i18n "pages.settings.subDomain"}}' desc='{{ i18n "pages.settings.subDomainDesc"}}' v-model="allSetting.subDomain"></setting-list-item>
+                      <template #control>
-                  <setting-list-item type="number" title='{{ i18n "pages.settings.subPort"}}' desc='{{ i18n "pages.settings.subPortDesc"}}' v-model.number="allSetting.subPort" :min="1" :max="65531"></setting-list-item>
+                        <a-switch v-model="allSetting.subEnable"></a-switch>
-                  <setting-list-item type="text" title='{{ i18n "pages.settings.subPath"}}' desc='{{ i18n "pages.settings.subPathDesc"}}' v-model="allSetting.subPath"></setting-list-item>
+                      </template>
-                  <setting-list-item type="text" title='{{ i18n "pages.settings.subCertPath"}}' desc='{{ i18n "pages.settings.subCertPathDesc"}}' v-model="allSetting.subCertFile"></setting-list-item>
+                    </a-setting-list-item>
-                  <setting-list-item type="text" title='{{ i18n "pages.settings.subKeyPath"}}' desc='{{ i18n "pages.settings.subKeyPathDesc"}}' v-model="allSetting.subKeyFile"></setting-list-item>
+                    <a-setting-list-item paddings="small">
-                  <setting-list-item type="text" title='{{ i18n "pages.settings.subURI"}}' desc='{{ i18n "pages.settings.subURIDesc"}}' v-model="allSetting.subURI" placeholder="(http|https)://domain[:port]/path/"></setting-list-item>
+                      <template #title>{{ i18n "pages.settings.subTitle"}}</template>
-                  <setting-list-item type="number" title='{{ i18n "pages.settings.subUpdates"}}' desc='{{ i18n "pages.settings.subUpdatesDesc"}}' v-model="allSetting.subUpdates" :min="1"></setting-list-item>
+                      <template #description>{{ i18n "pages.settings.subTitleDesc"}}</template>
-                </a-list>
+                      <template #control>
+                        <a-input type="text" v-model="allSetting.subTitle"></a-input>
+                      </template>
+                    </a-setting-list-item>
+                    <a-setting-list-item paddings="small">
+                      <template #title>{{ i18n "pages.settings.subListen"}}</template>
+                      <template #description>{{ i18n "pages.settings.subListenDesc"}}</template>
+                      <template #control>
+                        <a-input type="text" v-model="allSetting.subListen"></a-input>
+                      </template>
+                    </a-setting-list-item>
+                    <a-setting-list-item paddings="small">
+                      <template #title>{{ i18n "pages.settings.subDomain"}}</template>
+                      <template #description>{{ i18n "pages.settings.subDomainDesc"}}</template>
+                      <template #control>
+                        <a-input type="text" v-model="allSetting.subDomain"></a-input>
+                      </template>
+                    </a-setting-list-item>
+                    <a-setting-list-item paddings="small">
+                      <template #title>{{ i18n "pages.settings.subPort"}}</template>
+                      <template #description>{{ i18n "pages.settings.subPortDesc"}}</template>
+                      <template #control>
+                        <a-input-number v-model="allSetting.subPort" :min="1" :min="65531" style="width: 100%;"></a-input-number>
+                      </template>
+                    </a-setting-list-item>
+                    <a-setting-list-item paddings="small">
+                      <template #title>{{ i18n "pages.settings.subPath"}}</template>
+                      <template #description>{{ i18n "pages.settings.subPathDesc"}}</template>
+                      <template #control>
+                        <a-input type="text" v-model="allSetting.subPath"></a-input>
+                      </template>
+                    </a-setting-list-item>
+                    <a-setting-list-item paddings="small">
+                      <template #title>{{ i18n "pages.settings.subURI"}}</template>
+                      <template #description>{{ i18n "pages.settings.subURIDesc"}}</template>
+                      <template #control>
+                        <a-input type="text" placeholder="(http|https)://domain[:port]/path/" v-model="allSetting.subURI"></a-input>
+                      </template>
+                    </a-setting-list-item>
+                  </a-collapse-panel>
+                  <a-collapse-panel header='{{ i18n "pages.settings.information" }}'>
+                    <a-setting-list-item paddings="small">
+                      <template #title>{{ i18n "pages.settings.subEncrypt"}}</template>
+                      <template #description>{{ i18n "pages.settings.subEncryptDesc"}}</template>
+                      <template #control>
+                        <a-switch v-model="allSetting.subEncrypt"></a-switch>
+                      </template>
+                    </a-setting-list-item>
+                    <a-setting-list-item paddings="small">
+                      <template #title>{{ i18n "pages.settings.subShowInfo"}}</template>
+                      <template #description>{{ i18n "pages.settings.subShowInfoDesc"}}</template>
+                      <template #control>
+                        <a-switch v-model="allSetting.subShowInfo"></a-switch>
+                      </template>
+                    </a-setting-list-item>
+                  </a-collapse-panel>
+                  <a-collapse-panel header='{{ i18n "pages.settings.certs" }}'>
+                    <a-setting-list-item paddings="small">
+                      <template #title>{{ i18n "pages.settings.subCertPath"}}</template>
+                      <template #description>{{ i18n "pages.settings.subCertPathDesc"}}</template>
+                      <template #control>
+                        <a-input type="text" v-model="allSetting.subCertFile"></a-input>
+                      </template>
+                    </a-setting-list-item>
+                    <a-setting-list-item paddings="small">
+                      <template #title>{{ i18n "pages.settings.subKeyPath"}}</template>
+                      <template #description>{{ i18n "pages.settings.subKeyPathDesc"}}</template>
+                      <template #control>
+                        <a-input type="text" v-model="allSetting.subKeyFile"></a-input>
+                      </template>
+                    </a-setting-list-item>
+                  </a-collapse-panel>
+                  <a-collapse-panel header='{{ i18n "pages.settings.intervals"}}'>
+                    <a-setting-list-item paddings="small">
+                      <template #title>{{ i18n "pages.settings.subUpdates"}}</template>
+                      <template #description>{{ i18n "pages.settings.subUpdatesDesc"}}</template>
+                      <template #control>
+                        <a-input-number :min="1" v-model="allSetting.subUpdates" style="width: 100%;"></a-input-number>
+                      </template>
+                    </a-setting-list-item>
+                  </a-collapse-panel>
+                </a-collapse>
               </a-tab-pane>
-              <a-tab-pane key="5" tab='{{ i18n "pages.settings.subSettings" }} Json' v-if="allSetting.subEnable">
+              <a-tab-pane key="5" tab='{{ i18n "pages.settings.subSettings" }} Json' v-if="allSetting.subEnable" style="padding-top: 20px;">
-                <a-list item-layout="horizontal">
+                <a-collapse>
-                  <setting-list-item type="text" title='{{ i18n "pages.settings.subPath"}}' desc='{{ i18n "pages.settings.subPathDesc"}}' v-model="allSetting.subJsonPath"></setting-list-item>
+                  <a-collapse-panel header='{{ i18n "pages.xray.generalConfigs"}}'>
-                  <setting-list-item type="text" title='{{ i18n "pages.settings.subURI"}}' desc='{{ i18n "pages.settings.subURIDesc"}}' v-model="allSetting.subJsonURI" placeholder="(http|https)://domain[:port]/path/"></setting-list-item>
+                    <a-setting-list-item paddings="small">
-                  <a-list-item style="padding: 20px">
+                      <template #title>{{ i18n "pages.settings.subPath"}}</template>
-                    <a-row>
+                      <template #description>{{ i18n "pages.settings.subPathDesc"}}</template>
-                      <a-col :lg="24" :xl="12">
+                      <template #control>
-                        <a-list-item-meta title='{{ i18n "pages.settings.fragment"}}'>
+                        <a-input type="text" v-model="allSetting.subJsonPath"></a-input>
-                          <template slot="description">{{ i18n "pages.settings.fragmentDesc"}}</template>
+                      </template>
-                        </a-list-item-meta>
+                    </a-setting-list-item>
-                      </a-col>
+                    <a-setting-list-item paddings="small">
-                      <a-col :lg="24" :xl="12">
+                      <template #title>{{ i18n "pages.settings.subURI"}}</template>
+                      <template #description>{{ i18n "pages.settings.subURIDesc"}}</template>
+                      <template #control>
+                        <a-input type="text" placeholder="(http|https)://domain[:port]/path/" v-model="allSetting.subJsonURI"></a-input>
+                      </template>
+                    </a-setting-list-item>
+                  </a-collapse-panel>
+                  <a-collapse-panel header='{{ i18n "pages.settings.fragment"}}'>
+                    <a-setting-list-item paddings="small">
+                      <template #title>{{ i18n "pages.settings.fragment"}}</template>
+                      <template #description>{{ i18n "pages.settings.fragmentDesc"}}</template>
+                      <template #control>
                         <a-switch v-model="fragment"></a-switch>
-                      </a-col>
+                      </template>
-                    </a-row>
+                    </a-setting-list-item>
-                    <a-collapse v-if="fragment" style="margin-top: 14px;">
+                    <a-list-item v-if="fragment" style="padding: 10px 20px;">
-                      <a-collapse-panel header='{{ i18n "pages.settings.fragmentSett"}}' v-if="fragment">
+                      <a-collapse>
-                        <setting-list-item style="padding: 10px 20px" type="text" title='Packets' v-model="fragmentPackets" placeholder="1-1 | 1-3 | tlshello | ..."></setting-list-item>
+                        <a-collapse-panel header='{{ i18n "pages.settings.fragmentSett"}}' v-if="fragment">
-                        <setting-list-item style="padding: 10px 20px" type="text" title='Length' v-model="fragmentLength" placeholder="100-200"></setting-list-item>
+                          <a-setting-list-item paddings="small">
-                        <setting-list-item style="padding: 10px 20px" type="text" title='Interval' v-model="fragmentInterval" placeholder="10-20"></setting-list-item>
+                            <template #title>Packets</template>
-                      </a-collapse-panel>
+                            <template #control>
-                    </a-collapse>
+                              <a-input type="text" v-model="fragmentPackets" placeholder="1-1 | 1-3 | tlshello | ..."></a-input>
-                  </a-list-item>
+                            </template>
-                  <a-list-item style="padding: 20px">
+                          </a-setting-list-item>
-                    <a-row>
+                          <a-setting-list-item paddings="small">
-                      <a-col :lg="24" :xl="12">
+                            <template #title>Length</template>
-                        <a-list-item-meta title='Noises'>
+                            <template #control>
-                          <template slot="description">{{ i18n "pages.settings.noisesDesc"}}</template>
+                              <a-input type="text" v-model="fragmentLength" placeholder="100-200"></a-input>
-                        </a-list-item-meta>
+                            </template>
-                      </a-col>
+                          </a-setting-list-item>
-                      <a-col :lg="24" :xl="12">
+                          <a-setting-list-item paddings="small">
+                            <template #title>Interval</template>
+                            <template #control>
+                              <a-input type="text" v-model="fragmentInterval" placeholder="10-20"></a-input>
+                            </template>
+                          </a-setting-list-item>
+                        </a-collapse-panel>
+                      </a-collapse>
+                    </a-list-item>
+                  </a-collapse-panel>
+                  <a-collapse-panel header="Noises">
+                    <a-setting-list-item paddings="small">
+                      <template #title>Noises</template>
+                      <template #description>{{ i18n "pages.settings.noisesDesc"}}</template>
+                      <template #control>
                         <a-switch v-model="noises"></a-switch>
-                      </a-col>
+                      </template>
-                    </a-row>
+                    </a-setting-list-item>
-                    <a-collapse v-if="noises" style="margin-top: 14px;">
+                    <a-list-item v-if="noises" style="padding: 10px 20px;">
-                      <a-collapse-panel v-for="(noise, index) in noisesArray" :key="index" :header="`Noise ${index + 1}`">
+                      <a-collapse>
-                        <a-list-item style="padding: 10px 20px">
+                        <a-collapse-panel v-for="(noise, index) in noisesArray" :key="index" :header="`Noise №${index + 1}`">
-                          <a-row>
+                          <a-setting-list-item paddings="small">
-                            <a-col :lg="24" :xl="12">
+                            <template #title>Type</template>
-                              <a-list-item-meta title='Type'></a-list-item-meta>
+                            <template #control>
-                            </a-col>
-                            <a-col :lg="24" :xl="12">
                               <a-select :value="noise.type" style="width: 100%" :dropdown-class-name="themeSwitcher.currentTheme"
                                 @change="(value) => updateNoiseType(index, value)">
                                 <a-select-option :value="p" :label="p" v-for="p in ['rand', 'base64', 'str', 'hex']" :key="p">
                                   [[ p ]] </a-select-option>
                               </a-select>
-                            </a-col>
+                            </template>
-                          </a-row>
+                          </a-setting-list-item>
-                        </a-list-item>
+                          <a-setting-list-item paddings="small">
-                        <setting-list-item style="padding: 10px 20px" type="text" title='Packet' :value="noise.packet"
+                            <template #title>Packet</template>
-                          @input="(value) => updateNoisePacket(index, value)" placeholder="5-10"></setting-list-item>
+                            <template #control>
-                        <setting-list-item style="padding: 10px 20px" type="text" title='Delay (ms)' :value="noise.delay"
+                              <a-input type="text" :value="noise.packet" @input="(value) => updateNoisePacket(index, event.target.value)" placeholder="5-10"></a-input>
-                          @input="(value) => updateNoiseDelay(index, value)" placeholder="10-20"></setting-list-item>
+                            </template>
-                        <a-button v-if="noisesArray.length > 1" type="danger" @click="removeNoise(index)">Remove</a-button>
+                          </a-setting-list-item>
-                      </a-collapse-panel>
+                          <a-setting-list-item paddings="small">
-                    </a-collapse>
+                            <template #title>Delay (ms)</template>
-                    <a-button v-if="noises" type="primary" @click="addNoise" style="margin-top: 10px">Add Noise</a-button>
+                            <template #control>
-                  </a-list-item>
+                              <a-input type="text" :value="noise.delay" @input="(value) => updateNoiseDelay(index, event.target.value)" placeholder="10-20"></a-input>
-                  <a-list-item style="padding: 20px">
+                            </template>
-                    <a-row>
+                          </a-setting-list-item>
-                      <a-col :lg="24" :xl="12">
+                          <a-space direction="horizontal" style="padding: 10px 20px;">
-                        <a-list-item-meta title='{{ i18n "pages.settings.mux"}}'>
+                            <a-button v-if="noisesArray.length > 1" type="danger" @click="removeNoise(index)">Remove</a-button>
-                          <template slot="description">{{ i18n "pages.settings.muxDesc"}}</template>
+                          </a-space>
-                        </a-list-item-meta>
+                        </a-collapse-panel>
-                      </a-col>
+                      </a-collapse>
-                      <a-col :lg="24" :xl="12">
+                      <a-button v-if="noises" type="primary" @click="addNoise" style="margin-top: 10px">Add Noise</a-button>
+                    </a-list-item>
+                  </a-collapse-panel>
+                  <a-collapse-panel header='{{ i18n "pages.settings.mux"}}'>
+                    <a-setting-list-item paddings="small">
+                      <template #title>{{ i18n "pages.settings.mux"}}</template>
+                      <template #description>{{ i18n "pages.settings.muxDesc"}}</template>
+                      <template #control>
                         <a-switch v-model="enableMux"></a-switch>
-                      </a-col>
+                      </template>
-                    </a-row>
+                    </a-setting-list-item>
-                    <a-collapse v-if="enableMux" style="margin-top: 14px;">
+                    <a-list-item v-if="enableMux" style="padding: 10px 20px;">
-                      <a-collapse-panel header='{{ i18n "pages.settings.muxSett"}}'>
+                      <a-collapse>
-                        <setting-list-item style="padding: 10px 20px" type="number" title='Concurrency' v-model="muxConcurrency" :min="-1" :max="1024"></setting-list-item>
+                        <a-collapse-panel header='{{ i18n "pages.settings.muxSett"}}'>
-                        <setting-list-item style="padding: 10px 20px" type="number" title='xudp Concurrency' v-model="muxXudpConcurrency" :min="-1" :max="1024"></setting-list-item>
+                          <a-setting-list-item paddings="small">
-                        <a-list-item style="padding: 10px 20px">
+                            <template #title>Concurrency</template>
-                          <a-row>
+                            <template #control>
-                            <a-col :lg="24" :xl="12">
+                              <a-input-number v-model="muxConcurrency" :min="-1" :max="1024" style="width: 100%;"></a-input-number>
-                              <a-list-item-meta title='xudp UDP 443'></a-list-item-meta>
+                            </template>
-                            </a-col>
+                          </a-setting-list-item>
-                            <a-col :lg="24" :xl="12">
+                          <a-setting-list-item paddings="small">
+                            <template #title>xudp Concurrency</template>
+                            <template #control>
+                              <a-input-number v-model="muxXudpConcurrency" :min="-1" :max="1024" style="width: 100%;"></a-input-number>
+                            </template>
+                          </a-setting-list-item>
+                          <a-setting-list-item paddings="small">
+                            <template #title>xudp UDP 443</template>
+                            <template #control>
                               <a-select v-model="muxXudpProxyUDP443" style="width: 100%" :dropdown-class-name="themeSwitcher.currentTheme">
                                 <a-select-option :value="p" :label="p" v-for="p in ['reject', 'allow', 'skip']"> [[ p ]] </a-select-option>
                               </a-select>
-                            </a-col>
+                            </template>
-                          </a-row>
+                          </a-setting-list-item>
-                        </a-list-item>
+                        </a-collapse-panel>
-                      </a-collapse-panel>
+                      </a-collapse>
-                    </a-collapse>
+                    </a-list-item>
-                  </a-list-item>
+                  </a-collapse-panel>
-                  <a-list-item style="padding: 20px">
+                  <a-collapse-panel header='{{ i18n "pages.settings.direct" }}'>
-                    <a-row>
+                    <a-setting-list-item paddings="small">
-                      <a-col :lg="24" :xl="12">
+                      <template #title>{{ i18n "pages.settings.direct"}}</template>
-                        <a-list-item-meta title='{{ i18n "pages.settings.direct"}}'>
+                      <template #description>{{ i18n "pages.settings.directDesc"}}</template>
-                          <template slot="description">{{ i18n "pages.settings.directDesc"}}</template>
+                      <template #control>
-                        </a-list-item-meta>
-                      </a-col>
-                      <a-col :lg="24" :xl="12">
                         <a-switch v-model="enableDirect"></a-switch>
-                      </a-col>
+                      </template>
-                    </a-row>
+                    </a-setting-list-item>
-                    <a-collapse v-if="enableDirect" style="margin-top: 14px;">
+                    <a-list-item v-if="enableDirect" style="padding: 10px 20px;">
-                      <a-collapse-panel header='{{ i18n "pages.settings.direct"}}'>
+                      <a-collapse>
-                        <a-list-item>
+                        <a-collapse-panel header='{{ i18n "pages.settings.direct"}}'>
-                            <a-row style="padding: 0 20px">
+                          <a-setting-list-item paddings="small">
-                                <a-col :lg="24" :xl="12">
+                            <template #title>{{ i18n "pages.xray.directips" }}</template>
-                                    <a-list-item-meta 
+                            <template #control>
-                                        title='{{ i18n "pages.xray.directips" }}'/>
+                              <a-select mode="tags" style="width: 100%" v-model="directIPs" :dropdown-class-name="themeSwitcher.currentTheme">
-                                </a-col>
+                                <a-select-option :value="p.value" :label="p.label" v-for="p in directIPsOptions">[[ p.label ]]</a-select-option>
-                                <a-col :lg="24" :xl="12">
+                              </a-select>
-                                    <a-select mode="tags" style="width: 100%"
+                            </template>
-                                    v-model="directIPs"
+                          </a-setting-list-item>
-                                    :dropdown-class-name="themeSwitcher.currentTheme">
+                          <a-setting-list-item paddings="small">
-                                        <a-select-option :value="p.value" :label="p.label"
+                            <template #title>{{ i18n "pages.xray.directdomains" }}</template>
-                                            v-for="p in directIPsOptions"> [[ p.label ]]
+                            <template #control>
-                                        </a-select-option>
+                              <a-select mode="tags" style="width: 100%" v-model="directDomains" :dropdown-class-name="themeSwitcher.currentTheme">
-                                    </a-select>
+                                <a-select-option :value="p.value" :label="p.label" v-for="p in diretDomainsOptions">[[ p.label ]]</a-select-option>
-                                </a-col>
+                              </a-select>
-                            </a-row>
+                            </template>
-                        </a-list-item>
+                          </a-setting-list-item>
-                        <a-list-item>
+                        </a-collapse-panel>
-                            <a-row style="padding: 0 20px">
+                      </a-collapse>
-                                <a-col :lg="24" :xl="12">
+                    </a-list-item>
-                                    <a-list-item-meta 
+                  </a-collapse-panel>
-                                        title='{{ i18n "pages.xray.directdomains" }}'/>
+                </a-collapse>
-                                </a-col>
-                                <a-col :lg="24" :xl="12">
-                                    <a-select mode="tags" style="width: 100%"
-                                    v-model="directDomains"
-                                    :dropdown-class-name="themeSwitcher.currentTheme">
-                                        <a-select-option :value="p.value" :label="p.label"
-                                            v-for="p in diretDomainsOptions"> [[ p.label ]]
-                                        </a-select-option>
-                                    </a-select>
-                                </a-col>
-                            </a-row>
-                        </a-list-item>
-                      </a-collapse-panel>
-                    </a-collapse>
-                  </a-list-item>
-                </a-list>
               </a-tab-pane>
             </a-tabs>
           </a-space>
@@ -482,9 +663,9 @@
   </a-layout>
 {{template "js" .}}
 <script src="{{ .base_path }}assets/js/model/setting.js?{{ .cur_ver }}"></script>
-{{template "component/themeSwitcher" .}}
+{{template "component/aThemeSwitch" .}}
-{{template "component/password" .}}
+{{template "component/aPasswordInput" .}}
-{{template "component/setting"}}
+{{template "component/aSettingListItem" .}}
 <script>
   const app = new Vue({
     delimiters: ['[[', ']]'],
@@ -498,7 +679,7 @@
       allSetting: new AllSetting(),
       saveBtnDisable: true,
       user: {},
-      lang: getLang(),
+      lang: LanguageManager.getLanguage(),
       remarkModels: { i: 'Inbound', e: 'Email', o: 'Other' },
       remarkSeparators: [' ', '-', '_', '@', ':', '~', '|', ',', '.', '/'],
       datepickerList: [{ name: 'Gregorian (Standard)', value: 'gregorian' }, { name: 'Jalalian (شمسی)', value: 'jalalian' }],
@@ -658,7 +839,7 @@
           if (host == this.oldAllSetting.webDomain) host = null;
           if (port == this.oldAllSetting.webPort) port = null;
           const isTLS = webCertFile !== "" || webKeyFile !== "";
-          const url = buildURL({ host, port, isTLS, base, path: "panel/settings" });
+          const url = URLBuilder.buildURL({ host, port, isTLS, base, path: "panel/settings" });
           window.location.replace(url);
         }
       },

web/html/xui/warp_modal.html

@@ -65,15 +65,15 @@
                     </tr>
                     <tr>
                         <td>WARP+ Data</td>
-                        <td>[[ sizeFormat(warpModal.warpConfig.account.premium_data) ]]</td>
+                        <td>[[ SizeFormatter.sizeFormat(warpModal.warpConfig.account.premium_data) ]]</td>
                     </tr>
                     <tr class="client-table-odd-row">
                         <td>Quota</td>
-                        <td>[[ sizeFormat(warpModal.warpConfig.account.quota) ]]</td>
+                        <td>[[ SizeFormatter.sizeFormat(warpModal.warpConfig.account.quota) ]]</td>
                     </tr>
                     <tr v-if="!ObjectUtil.isEmpty(warpModal.warpConfig.account.usage)">
                         <td>Usage</td>
-                        <td>[[ sizeFormat(warpModal.warpConfig.account.usage) ]]</td>
+                        <td>[[ SizeFormatter.sizeFormat(warpModal.warpConfig.account.usage) ]]</td>
                     </tr>
                 </template>
             </table>
@@ -176,10 +176,10 @@
             },
             async register() {
                 warpModal.loading(true);
-                keys = Wireguard.generateKeypair();
+                const keys = Wireguard.generateKeypair();
                 const msg = await HttpUtil.post('/panel/xray/warp/reg', keys);
                 if (msg.success) {
-                    resp = JSON.parse(msg.obj);
+                    const resp = JSON.parse(msg.obj);
                     warpModal.warpData = resp.data;
                     warpModal.warpConfig = resp.config;
                     this.collectConfig();

web/job/check_client_ip_job.go

@@ -11,6 +11,7 @@ import (
 	"sort"
 	"time"
 
+	"slices"
 	"x-ui/database"
 	"x-ui/database/model"
 	"x-ui/logger"
@@ -193,13 +194,7 @@ func (j *CheckClientIpJob) checkError(e error) {
 }
 
 func (j *CheckClientIpJob) contains(s []string, str string) bool {
-	for _, v := range s {
+	return slices.Contains(s, str)
-		if v == str {
-			return true
-		}
-	}
-
-	return false
 }
 
 func (j *CheckClientIpJob) getInboundClientIps(clientEmail string) (*model.InboundClientIps, error) {

web/job/check_cpu_usage.go

@@ -23,7 +23,7 @@ func (j *CheckCpuJob) Run() {
 	threshold, _ := j.settingService.GetTgCpu()
 
 	// get latest status of server
-	percent, err := cpu.Percent(1*time.Second, false)
+	percent, err := cpu.Percent(1*time.Minute, false)
 	if err == nil && percent[0] > float64(threshold) {
 		msg := j.tgbotService.I18nBot("tgbot.messages.cpuThreshold",
 			"Percent=="+strconv.FormatFloat(percent[0], 'f', 2, 64),

web/job/xray_traffic_job.go

@@ -52,7 +52,7 @@ func (j *XrayTrafficJob) informTrafficToExternalAPI(inboundTraffics []*xray.Traf
 		logger.Warning("get ExternalTrafficInformURI failed:", err)
 		return
 	}
-	requestBody, err := json.Marshal(map[string]interface{}{"clientTraffics": clientTraffics, "inboundTraffics": inboundTraffics})
+	requestBody, err := json.Marshal(map[string]any{"clientTraffics": clientTraffics, "inboundTraffics": inboundTraffics})
 	if err != nil {
 		logger.Warning("parse client/inbound traffic failed:", err)
 		return

web/locale/locale.go

@@ -48,13 +48,13 @@ func InitLocalizer(i18nFS embed.FS, settingService SettingService) error {
 	return nil
 }
 
-func createTemplateData(params []string, seperator ...string) map[string]interface{} {
+func createTemplateData(params []string, seperator ...string) map[string]any {
 	var sep string = "=="
 	if len(seperator) > 0 {
 		sep = seperator[0]
 	}
 
-	templateData := make(map[string]interface{})
+	templateData := make(map[string]any)
 	for _, param := range params {
 		parts := strings.SplitN(param, sep, 2)
 		templateData[parts[0]] = parts[1]

web/service/inbound.go

@@ -413,13 +413,13 @@ func (s *InboundService) AddInboundClient(data *model.Inbound) (bool, error) {
 		return false, err
 	}
 
-	var settings map[string]interface{}
+	var settings map[string]any
 	err = json.Unmarshal([]byte(data.Settings), &settings)
 	if err != nil {
 		return false, err
 	}
 
-	interfaceClients := settings["clients"].([]interface{})
+	interfaceClients := settings["clients"].([]any)
 	existEmail, err := s.checkEmailsExistForClients(clients)
 	if err != nil {
 		return false, err
@@ -450,13 +450,13 @@ func (s *InboundService) AddInboundClient(data *model.Inbound) (bool, error) {
 		}
 	}
 
-	var oldSettings map[string]interface{}
+	var oldSettings map[string]any
 	err = json.Unmarshal([]byte(oldInbound.Settings), &oldSettings)
 	if err != nil {
 		return false, err
 	}
 
-	oldClients := oldSettings["clients"].([]interface{})
+	oldClients := oldSettings["clients"].([]any)
 	oldClients = append(oldClients, interfaceClients...)
 
 	oldSettings["clients"] = oldClients
@@ -489,7 +489,7 @@ func (s *InboundService) AddInboundClient(data *model.Inbound) (bool, error) {
 				if oldInbound.Protocol == "shadowsocks" {
 					cipher = oldSettings["method"].(string)
 				}
-				err1 := s.xrayApi.AddUser(string(oldInbound.Protocol), oldInbound.Tag, map[string]interface{}{
+				err1 := s.xrayApi.AddUser(string(oldInbound.Protocol), oldInbound.Tag, map[string]any{
 					"email":    client.Email,
 					"id":       client.ID,
 					"security": client.Security,
@@ -519,7 +519,7 @@ func (s *InboundService) DelInboundClient(inboundId int, clientId string) (bool,
 		logger.Error("Load Old Data Error")
 		return false, err
 	}
-	var settings map[string]interface{}
+	var settings map[string]any
 	err = json.Unmarshal([]byte(oldInbound.Settings), &settings)
 	if err != nil {
 		return false, err
@@ -534,11 +534,11 @@ func (s *InboundService) DelInboundClient(inboundId int, clientId string) (bool,
 		client_key = "email"
 	}
 
-	interfaceClients := settings["clients"].([]interface{})
+	interfaceClients := settings["clients"].([]any)
-	var newClients []interface{}
+	var newClients []any
 	needApiDel := false
 	for _, client := range interfaceClients {
-		c := client.(map[string]interface{})
+		c := client.(map[string]any)
 		c_id := c[client_key].(string)
 		if c_id == clientId {
 			email, _ = c["email"].(string)
@@ -607,13 +607,13 @@ func (s *InboundService) UpdateInboundClient(data *model.Inbound, clientId strin
 		return false, err
 	}
 
-	var settings map[string]interface{}
+	var settings map[string]any
 	err = json.Unmarshal([]byte(data.Settings), &settings)
 	if err != nil {
 		return false, err
 	}
 
-	interfaceClients := settings["clients"].([]interface{})
+	interfaceClients := settings["clients"].([]any)
 
 	oldInbound, err := s.GetInbound(data.Id)
 	if err != nil {
@@ -662,12 +662,12 @@ func (s *InboundService) UpdateInboundClient(data *model.Inbound, clientId strin
 		}
 	}
 
-	var oldSettings map[string]interface{}
+	var oldSettings map[string]any
 	err = json.Unmarshal([]byte(oldInbound.Settings), &oldSettings)
 	if err != nil {
 		return false, err
 	}
-	settingsClients := oldSettings["clients"].([]interface{})
+	settingsClients := oldSettings["clients"].([]any)
 	settingsClients[clientIndex] = interfaceClients[0]
 	oldSettings["clients"] = settingsClients
 
@@ -732,7 +732,7 @@ func (s *InboundService) UpdateInboundClient(data *model.Inbound, clientId strin
 			if oldInbound.Protocol == "shadowsocks" {
 				cipher = oldSettings["method"].(string)
 			}
-			err1 := s.xrayApi.AddUser(string(oldInbound.Protocol), oldInbound.Tag, map[string]interface{}{
+			err1 := s.xrayApi.AddUser(string(oldInbound.Protocol), oldInbound.Tag, map[string]any{
 				"email":    clients[0].Email,
 				"id":       clients[0].ID,
 				"security": clients[0].Security,
@@ -809,7 +809,7 @@ func (s *InboundService) addInboundTraffic(tx *gorm.DB, traffics []*xray.Traffic
 	for _, traffic := range traffics {
 		if traffic.IsInbound {
 			err = tx.Model(&model.Inbound{}).Where("tag = ?", traffic.Tag).
-				Updates(map[string]interface{}{
+				Updates(map[string]any{
 					"up":   gorm.Expr("up + ?", traffic.Up),
 					"down": gorm.Expr("down + ?", traffic.Down),
 				}).Error
@@ -893,13 +893,13 @@ func (s *InboundService) adjustTraffics(tx *gorm.DB, dbClientTraffics []*xray.Cl
 			return nil, err
 		}
 		for inbound_index := range inbounds {
-			settings := map[string]interface{}{}
+			settings := map[string]any{}
 			json.Unmarshal([]byte(inbounds[inbound_index].Settings), &settings)
-			clients, ok := settings["clients"].([]interface{})
+			clients, ok := settings["clients"].([]any)
 			if ok {
-				var newClients []interface{}
+				var newClients []any
 				for client_index := range clients {
-					c := clients[client_index].(map[string]interface{})
+					c := clients[client_index].(map[string]any)
 					for traffic_index := range dbClientTraffics {
 						if dbClientTraffics[traffic_index].ExpiryTime < 0 && c["email"] == dbClientTraffics[traffic_index].Email {
 							oldExpiryTime := c["expiryTime"].(float64)
@@ -909,7 +909,7 @@ func (s *InboundService) adjustTraffics(tx *gorm.DB, dbClientTraffics []*xray.Cl
 							break
 						}
 					}
-					newClients = append(newClients, interface{}(c))
+					newClients = append(newClients, any(c))
 				}
 				settings["clients"] = newClients
 				modifiedSettings, err := json.MarshalIndent(settings, "", "  ")
@@ -951,7 +951,7 @@ func (s *InboundService) autoRenewClients(tx *gorm.DB) (bool, int64, error) {
 	var clientsToAdd []struct {
 		protocol string
 		tag      string
-		client   map[string]interface{}
+		client   map[string]any
 	}
 
 	for _, traffic := range traffics {
@@ -962,11 +962,11 @@ func (s *InboundService) autoRenewClients(tx *gorm.DB) (bool, int64, error) {
 		return false, 0, err
 	}
 	for inbound_index := range inbounds {
-		settings := map[string]interface{}{}
+		settings := map[string]any{}
 		json.Unmarshal([]byte(inbounds[inbound_index].Settings), &settings)
-		clients := settings["clients"].([]interface{})
+		clients := settings["clients"].([]any)
 		for client_index := range clients {
-			c := clients[client_index].(map[string]interface{})
+			c := clients[client_index].(map[string]any)
 			for traffic_index, traffic := range traffics {
 				if traffic.Email == c["email"].(string) {
 					newExpiryTime := traffic.ExpiryTime
@@ -983,14 +983,14 @@ func (s *InboundService) autoRenewClients(tx *gorm.DB) (bool, int64, error) {
 							struct {
 								protocol string
 								tag      string
-								client   map[string]interface{}
+								client   map[string]any
 							}{
 								protocol: string(inbounds[inbound_index].Protocol),
 								tag:      inbounds[inbound_index].Tag,
 								client:   c,
 							})
 					}
-					clients[client_index] = interface{}(c)
+					clients[client_index] = any(c)
 					break
 				}
 			}
@@ -1147,7 +1147,7 @@ func (s *InboundService) AddClientStat(tx *gorm.DB, inboundId int, client *model
 func (s *InboundService) UpdateClientStat(tx *gorm.DB, email string, client *model.Client) error {
 	result := tx.Model(xray.ClientTraffic{}).
 		Where("email = ?", email).
-		Updates(map[string]interface{}{
+		Updates(map[string]any{
 			"enable":      true,
 			"email":       client.Email,
 			"total":       client.TotalGB,
@@ -1258,18 +1258,18 @@ func (s *InboundService) SetClientTelegramUserID(trafficId int, tgId int64) (boo
 		return false, common.NewError("Client Not Found For Email:", clientEmail)
 	}
 
-	var settings map[string]interface{}
+	var settings map[string]any
 	err = json.Unmarshal([]byte(inbound.Settings), &settings)
 	if err != nil {
 		return false, err
 	}
-	clients := settings["clients"].([]interface{})
+	clients := settings["clients"].([]any)
-	var newClients []interface{}
+	var newClients []any
 	for client_index := range clients {
-		c := clients[client_index].(map[string]interface{})
+		c := clients[client_index].(map[string]any)
 		if c["email"] == clientEmail {
 			c["tgId"] = tgId
-			newClients = append(newClients, interface{}(c))
+			newClients = append(newClients, any(c))
 		}
 	}
 	settings["clients"] = newClients
@@ -1343,18 +1343,18 @@ func (s *InboundService) ToggleClientEnableByEmail(clientEmail string) (bool, bo
 		return false, false, common.NewError("Client Not Found For Email:", clientEmail)
 	}
 
-	var settings map[string]interface{}
+	var settings map[string]any
 	err = json.Unmarshal([]byte(inbound.Settings), &settings)
 	if err != nil {
 		return false, false, err
 	}
-	clients := settings["clients"].([]interface{})
+	clients := settings["clients"].([]any)
-	var newClients []interface{}
+	var newClients []any
 	for client_index := range clients {
-		c := clients[client_index].(map[string]interface{})
+		c := clients[client_index].(map[string]any)
 		if c["email"] == clientEmail {
 			c["enable"] = !clientOldEnabled
-			newClients = append(newClients, interface{}(c))
+			newClients = append(newClients, any(c))
 		}
 	}
 	settings["clients"] = newClients
@@ -1405,18 +1405,18 @@ func (s *InboundService) ResetClientIpLimitByEmail(clientEmail string, count int
 		return false, common.NewError("Client Not Found For Email:", clientEmail)
 	}
 
-	var settings map[string]interface{}
+	var settings map[string]any
 	err = json.Unmarshal([]byte(inbound.Settings), &settings)
 	if err != nil {
 		return false, err
 	}
-	clients := settings["clients"].([]interface{})
+	clients := settings["clients"].([]any)
-	var newClients []interface{}
+	var newClients []any
 	for client_index := range clients {
-		c := clients[client_index].(map[string]interface{})
+		c := clients[client_index].(map[string]any)
 		if c["email"] == clientEmail {
 			c["limitIp"] = count
-			newClients = append(newClients, interface{}(c))
+			newClients = append(newClients, any(c))
 		}
 	}
 	settings["clients"] = newClients
@@ -1462,18 +1462,18 @@ func (s *InboundService) ResetClientExpiryTimeByEmail(clientEmail string, expiry
 		return false, common.NewError("Client Not Found For Email:", clientEmail)
 	}
 
-	var settings map[string]interface{}
+	var settings map[string]any
 	err = json.Unmarshal([]byte(inbound.Settings), &settings)
 	if err != nil {
 		return false, err
 	}
-	clients := settings["clients"].([]interface{})
+	clients := settings["clients"].([]any)
-	var newClients []interface{}
+	var newClients []any
 	for client_index := range clients {
-		c := clients[client_index].(map[string]interface{})
+		c := clients[client_index].(map[string]any)
 		if c["email"] == clientEmail {
 			c["expiryTime"] = expiry_time
-			newClients = append(newClients, interface{}(c))
+			newClients = append(newClients, any(c))
 		}
 	}
 	settings["clients"] = newClients
@@ -1522,18 +1522,18 @@ func (s *InboundService) ResetClientTrafficLimitByEmail(clientEmail string, tota
 		return false, common.NewError("Client Not Found For Email:", clientEmail)
 	}
 
-	var settings map[string]interface{}
+	var settings map[string]any
 	err = json.Unmarshal([]byte(inbound.Settings), &settings)
 	if err != nil {
 		return false, err
 	}
-	clients := settings["clients"].([]interface{})
+	clients := settings["clients"].([]any)
-	var newClients []interface{}
+	var newClients []any
 	for client_index := range clients {
-		c := clients[client_index].(map[string]interface{})
+		c := clients[client_index].(map[string]any)
 		if c["email"] == clientEmail {
 			c["totalGB"] = totalGB * 1024 * 1024 * 1024
-			newClients = append(newClients, interface{}(c))
+			newClients = append(newClients, any(c))
 		}
 	}
 	settings["clients"] = newClients
@@ -1551,7 +1551,7 @@ func (s *InboundService) ResetClientTrafficByEmail(clientEmail string) error {
 
 	result := db.Model(xray.ClientTraffic{}).
 		Where("email = ?", clientEmail).
-		Updates(map[string]interface{}{"enable": true, "up": 0, "down": 0})
+		Updates(map[string]any{"enable": true, "up": 0, "down": 0})
 
 	err := result.Error
 	if err != nil {
@@ -1582,14 +1582,14 @@ func (s *InboundService) ResetClientTraffic(id int, clientEmail string) (bool, e
 				s.xrayApi.Init(p.GetAPIPort())
 				cipher := ""
 				if string(inbound.Protocol) == "shadowsocks" {
-					var oldSettings map[string]interface{}
+					var oldSettings map[string]any
 					err = json.Unmarshal([]byte(inbound.Settings), &oldSettings)
 					if err != nil {
 						return false, err
 					}
 					cipher = oldSettings["method"].(string)
 				}
-				err1 := s.xrayApi.AddUser(string(inbound.Protocol), inbound.Tag, map[string]interface{}{
+				err1 := s.xrayApi.AddUser(string(inbound.Protocol), inbound.Tag, map[string]any{
 					"email":    client.Email,
 					"id":       client.ID,
 					"security": client.Security,
@@ -1634,7 +1634,7 @@ func (s *InboundService) ResetAllClientTraffics(id int) error {
 
 	result := db.Model(xray.ClientTraffic{}).
 		Where(whereText, id).
-		Updates(map[string]interface{}{"enable": true, "up": 0, "down": 0})
+		Updates(map[string]any{"enable": true, "up": 0, "down": 0})
 
 	err := result.Error
 	return err
@@ -1645,7 +1645,7 @@ func (s *InboundService) ResetAllTraffics() error {
 
 	result := db.Model(model.Inbound{}).
 		Where("user_id > ?", 0).
-		Updates(map[string]interface{}{"up": 0, "down": 0})
+		Updates(map[string]any{"up": 0, "down": 0})
 
 	err := result.Error
 	return err
@@ -1681,17 +1681,17 @@ func (s *InboundService) DelDepletedClients(id int) (err error) {
 		if err != nil {
 			return err
 		}
-		var oldSettings map[string]interface{}
+		var oldSettings map[string]any
 		err = json.Unmarshal([]byte(oldInbound.Settings), &oldSettings)
 		if err != nil {
 			return err
 		}
 
-		oldClients := oldSettings["clients"].([]interface{})
+		oldClients := oldSettings["clients"].([]any)
-		var newClients []interface{}
+		var newClients []any
 		for _, client := range oldClients {
 			deplete := false
-			c := client.(map[string]interface{})
+			c := client.(map[string]any)
 			for _, email := range emails {
 				if email == c["email"].(string) {
 					deplete = true
@@ -1907,14 +1907,14 @@ func (s *InboundService) MigrationRequirements() {
 		return
 	}
 	for inbound_index := range inbounds {
-		settings := map[string]interface{}{}
+		settings := map[string]any{}
 		json.Unmarshal([]byte(inbounds[inbound_index].Settings), &settings)
-		clients, ok := settings["clients"].([]interface{})
+		clients, ok := settings["clients"].([]any)
 		if ok {
 			// Fix Client configuration problems
-			var newClients []interface{}
+			var newClients []any
 			for client_index := range clients {
-				c := clients[client_index].(map[string]interface{})
+				c := clients[client_index].(map[string]any)
 
 				// Add email='' if it is not exists
 				if _, ok := c["email"]; !ok {
@@ -1923,7 +1923,7 @@ func (s *InboundService) MigrationRequirements() {
 
 				// Convert string tgId to int64
 				if _, ok := c["tgId"]; ok {
-					var tgId interface{} = c["tgId"]
+					var tgId any = c["tgId"]
 					if tgIdStr, ok2 := tgId.(string); ok2 {
 						tgIdInt64, err := strconv.ParseInt(strings.ReplaceAll(tgIdStr, " ", ""), 10, 64)
 						if err == nil {
@@ -1938,7 +1938,7 @@ func (s *InboundService) MigrationRequirements() {
 						c["flow"] = ""
 					}
 				}
-				newClients = append(newClients, interface{}(c))
+				newClients = append(newClients, any(c))
 			}
 			settings["clients"] = newClients
 			modifiedSettings, err := json.MarshalIndent(settings, "", "  ")
@@ -1985,14 +1985,14 @@ func (s *InboundService) MigrationRequirements() {
 	}
 
 	for _, ep := range externalProxy {
-		var reverses interface{}
+		var reverses any
-		var stream map[string]interface{}
+		var stream map[string]any
 		json.Unmarshal(ep.StreamSettings, &stream)
-		if tlsSettings, ok := stream["tlsSettings"].(map[string]interface{}); ok {
+		if tlsSettings, ok := stream["tlsSettings"].(map[string]any); ok {
-			if settings, ok := tlsSettings["settings"].(map[string]interface{}); ok {
+			if settings, ok := tlsSettings["settings"].(map[string]any); ok {
-				if domains, ok := settings["domains"].([]interface{}); ok {
+				if domains, ok := settings["domains"].([]any); ok {
 					for _, domain := range domains {
-						if domainMap, ok := domain.(map[string]interface{}); ok {
+						if domainMap, ok := domain.(map[string]any); ok {
 							domainMap["forceTls"] = "same"
 							domainMap["port"] = ep.Port
 							domainMap["dest"] = domainMap["domain"].(string)

web/service/outbound.go

@@ -89,7 +89,7 @@ func (s *OutboundService) ResetOutboundTraffic(tag string) error {
 
 	result := db.Model(model.OutboundTraffics{}).
 		Where(whereText, tag).
-		Updates(map[string]interface{}{"up": 0, "down": 0, "total": 0})
+		Updates(map[string]any{"up": 0, "down": 0, "total": 0})
 
 	err := result.Error
 	if err != nil {

web/service/server.go

@@ -92,6 +92,8 @@ type Release struct {
 type ServerService struct {
 	xrayService    XrayService
 	inboundService InboundService
+	cachedIPv4     string
+	cachedIPv6     string
 }
 
 func getPublicIP(url string) string {
@@ -120,6 +122,7 @@ func (s *ServerService) GetStatus(lastStatus *Status) *Status {
 		T: now,
 	}
 
+	// CPU stats
 	percents, err := cpu.Percent(0, false)
 	if err != nil {
 		logger.Warning("get cpu percent failed:", err)
@@ -133,22 +136,17 @@ func (s *ServerService) GetStatus(lastStatus *Status) *Status {
 	}
 
 	status.LogicalPro = runtime.NumCPU()
-	if p != nil && p.IsRunning() {
-		status.AppStats.Uptime = p.GetUptime()
-	} else {
-		status.AppStats.Uptime = 0
-	}
 
 	cpuInfos, err := cpu.Info()
 	if err != nil {
 		logger.Warning("get cpu info failed:", err)
 	} else if len(cpuInfos) > 0 {
-		cpuInfo := cpuInfos[0]
+		status.CpuSpeedMhz = cpuInfos[0].Mhz
-		status.CpuSpeedMhz = cpuInfo.Mhz // setting CPU speed in MHz
 	} else {
 		logger.Warning("could not find cpu info")
 	}
 
+	// Uptime
 	upTime, err := host.Uptime()
 	if err != nil {
 		logger.Warning("get uptime failed:", err)
@@ -156,6 +154,7 @@ func (s *ServerService) GetStatus(lastStatus *Status) *Status {
 		status.Uptime = upTime
 	}
 
+	// Memory stats
 	memInfo, err := mem.VirtualMemory()
 	if err != nil {
 		logger.Warning("get virtual memory failed:", err)
@@ -172,14 +171,16 @@ func (s *ServerService) GetStatus(lastStatus *Status) *Status {
 		status.Swap.Total = swapInfo.Total
 	}
 
-	distInfo, err := disk.Usage("/")
+	// Disk stats
+	diskInfo, err := disk.Usage("/")
 	if err != nil {
-		logger.Warning("get dist usage failed:", err)
+		logger.Warning("get disk usage failed:", err)
 	} else {
-		status.Disk.Current = distInfo.Used
+		status.Disk.Current = diskInfo.Used
-		status.Disk.Total = distInfo.Total
+		status.Disk.Total = diskInfo.Total
 	}
 
+	// Load averages
 	avgState, err := load.Avg()
 	if err != nil {
 		logger.Warning("get load avg failed:", err)
@@ -187,6 +188,7 @@ func (s *ServerService) GetStatus(lastStatus *Status) *Status {
 		status.Loads = []float64{avgState.Load1, avgState.Load5, avgState.Load15}
 	}
 
+	// Network stats
 	ioStats, err := net.IOCounters(false)
 	if err != nil {
 		logger.Warning("get io counters failed:", err)
@@ -207,6 +209,7 @@ func (s *ServerService) GetStatus(lastStatus *Status) *Status {
 		logger.Warning("can not find io counters")
 	}
 
+	// TCP/UDP connections
 	status.TcpCount, err = sys.GetTCPCount()
 	if err != nil {
 		logger.Warning("get tcp connections failed:", err)
@@ -217,9 +220,15 @@ func (s *ServerService) GetStatus(lastStatus *Status) *Status {
 		logger.Warning("get udp connections failed:", err)
 	}
 
-	status.PublicIP.IPv4 = getPublicIP("https://api.ipify.org")
+	// IP fetching with caching
-	status.PublicIP.IPv6 = getPublicIP("https://api6.ipify.org")
+	if s.cachedIPv4 == "" || s.cachedIPv6 == "" {
+		s.cachedIPv4 = getPublicIP("https://api.ipify.org")
+		s.cachedIPv6 = getPublicIP("https://api6.ipify.org")
+	}
+	status.PublicIP.IPv4 = s.cachedIPv4
+	status.PublicIP.IPv6 = s.cachedIPv6
 
+	// Xray status
 	if s.xrayService.IsXrayRunning() {
 		status.Xray.State = Running
 		status.Xray.ErrorMsg = ""
@@ -233,9 +242,10 @@ func (s *ServerService) GetStatus(lastStatus *Status) *Status {
 		status.Xray.ErrorMsg = s.xrayService.GetXrayResult()
 	}
 	status.Xray.Version = s.xrayService.GetXrayVersion()
+
+	// Application stats
 	var rtm runtime.MemStats
 	runtime.ReadMemStats(&rtm)
-
 	status.AppStats.Mem = rtm.Sys
 	status.AppStats.Threads = uint32(runtime.NumGoroutine())
 	if p != nil && p.IsRunning() {
@@ -440,7 +450,7 @@ func (s *ServerService) GetLogs(count string, level string, syslog string) []str
 	return lines
 }
 
-func (s *ServerService) GetConfigJson() (interface{}, error) {
+func (s *ServerService) GetConfigJson() (any, error) {
 	config, err := s.xrayService.GetXrayConfig()
 	if err != nil {
 		return nil, err
@@ -450,7 +460,7 @@ func (s *ServerService) GetConfigJson() (interface{}, error) {
 		return nil, err
 	}
 
-	var jsonData interface{}
+	var jsonData any
 	err = json.Unmarshal(contents, &jsonData)
 	if err != nil {
 		return nil, err
@@ -581,7 +591,7 @@ func (s *ServerService) ImportDB(file multipart.File) error {
 	return nil
 }
 
-func (s *ServerService) GetNewX25519Cert() (interface{}, error) {
+func (s *ServerService) GetNewX25519Cert() (any, error) {
 	// Run the command
 	cmd := exec.Command(xray.GetBinaryPath(), "x25519")
 	var out bytes.Buffer
@@ -599,7 +609,7 @@ func (s *ServerService) GetNewX25519Cert() (interface{}, error) {
 	privateKey := strings.TrimSpace(privateKeyLine[1])
 	publicKey := strings.TrimSpace(publicKeyLine[1])
 
-	keyPair := map[string]interface{}{
+	keyPair := map[string]any{
 		"privateKey": privateKey,
 		"publicKey":  publicKey,
 	}

web/service/setting.go

@@ -50,6 +50,7 @@ var defaultValueMap = map[string]string{
 	"tgLang":                      "en-US",
 	"secretEnable":                "false",
 	"subEnable":                   "false",
+	"subTitle":                    "",
 	"subListen":                   "",
 	"subPort":                     "2096",
 	"subPath":                     "/sub/",
@@ -74,8 +75,8 @@ var defaultValueMap = map[string]string{
 
 type SettingService struct{}
 
-func (s *SettingService) GetDefaultJsonConfig() (interface{}, error) {
+func (s *SettingService) GetDefaultJsonConfig() (any, error) {
-	var jsonData interface{}
+	var jsonData any
 	err := json.Unmarshal([]byte(xrayTemplateConfig), &jsonData)
 	if err != nil {
 		return nil, err
@@ -418,6 +419,10 @@ func (s *SettingService) GetSubEnable() (bool, error) {
 	return s.getBool("subEnable")
 }
 
+func (s *SettingService) GetSubTitle() (string, error) {
+	return s.getString("subTitle")
+}
+
 func (s *SettingService) GetSubListen() (string, error) {
 	return s.getString("subListen")
 }
@@ -543,8 +548,8 @@ func (s *SettingService) UpdateAllSetting(allSetting *entity.AllSetting) error {
 	return common.Combine(errs...)
 }
 
-func (s *SettingService) GetDefaultXrayConfig() (interface{}, error) {
+func (s *SettingService) GetDefaultXrayConfig() (any, error) {
-	var jsonData interface{}
+	var jsonData any
 	err := json.Unmarshal([]byte(xrayTemplateConfig), &jsonData)
 	if err != nil {
 		return nil, err
@@ -552,24 +557,25 @@ func (s *SettingService) GetDefaultXrayConfig() (interface{}, error) {
 	return jsonData, nil
 }
 
-func (s *SettingService) GetDefaultSettings(host string) (interface{}, error) {
+func (s *SettingService) GetDefaultSettings(host string) (any, error) {
-	type settingFunc func() (interface{}, error)
+	type settingFunc func() (any, error)
 	settings := map[string]settingFunc{
-		"expireDiff":    func() (interface{}, error) { return s.GetExpireDiff() },
+		"expireDiff":    func() (any, error) { return s.GetExpireDiff() },
-		"trafficDiff":   func() (interface{}, error) { return s.GetTrafficDiff() },
+		"trafficDiff":   func() (any, error) { return s.GetTrafficDiff() },
-		"pageSize":      func() (interface{}, error) { return s.GetPageSize() },
+		"pageSize":      func() (any, error) { return s.GetPageSize() },
-		"defaultCert":   func() (interface{}, error) { return s.GetCertFile() },
+		"defaultCert":   func() (any, error) { return s.GetCertFile() },
-		"defaultKey":    func() (interface{}, error) { return s.GetKeyFile() },
+		"defaultKey":    func() (any, error) { return s.GetKeyFile() },
-		"tgBotEnable":   func() (interface{}, error) { return s.GetTgbotEnabled() },
+		"tgBotEnable":   func() (any, error) { return s.GetTgbotEnabled() },
-		"subEnable":     func() (interface{}, error) { return s.GetSubEnable() },
+		"subEnable":     func() (any, error) { return s.GetSubEnable() },
-		"subURI":        func() (interface{}, error) { return s.GetSubURI() },
+		"subTitle":      func() (any, error) { return s.GetSubTitle() },
-		"subJsonURI":    func() (interface{}, error) { return s.GetSubJsonURI() },
+		"subURI":        func() (any, error) { return s.GetSubURI() },
-		"remarkModel":   func() (interface{}, error) { return s.GetRemarkModel() },
+		"subJsonURI":    func() (any, error) { return s.GetSubJsonURI() },
-		"datepicker":    func() (interface{}, error) { return s.GetDatepicker() },
+		"remarkModel":   func() (any, error) { return s.GetRemarkModel() },
-		"ipLimitEnable": func() (interface{}, error) { return s.GetIpLimitEnable() },
+		"datepicker":    func() (any, error) { return s.GetDatepicker() },
+		"ipLimitEnable": func() (any, error) { return s.GetIpLimitEnable() },
 	}
 
-	result := make(map[string]interface{})
+	result := make(map[string]any)
 
 	for key, fn := range settings {
 		value, err := fn()
@@ -581,6 +587,7 @@ func (s *SettingService) GetDefaultSettings(host string) (interface{}, error) {
 
 	if result["subEnable"].(bool) && (result["subURI"].(string) == "" || result["subJsonURI"].(string) == "") {
 		subURI := ""
+		subTitle, _ := s.GetSubTitle()
 		subPort, _ := s.GetSubPort()
 		subPath, _ := s.GetSubPath()
 		subJsonPath, _ := s.GetSubJsonPath()
@@ -607,6 +614,9 @@ func (s *SettingService) GetDefaultSettings(host string) (interface{}, error) {
 		if result["subURI"].(string) == "" {
 			result["subURI"] = subURI + subPath
 		}
+		if result["subTitle"].(string) == "" {
+			result["subTitle"] = subTitle
+		}
 		if result["subJsonURI"].(string) == "" {
 			result["subJsonURI"] = subURI + subJsonPath
 		}

web/service/tgbot.go

@@ -20,6 +20,8 @@ import (
 	"x-ui/web/locale"
 	"x-ui/xray"
 
+	"slices"
+
 	"github.com/mymmrac/telego"
 	th "github.com/mymmrac/telego/telegohandler"
 	tu "github.com/mymmrac/telego/telegoutil"
@@ -307,8 +309,6 @@ func (t *Tgbot) answerCommand(message *telego.Message, chatId int64, isAdmin boo
 		onlyMessage = true
 		if isAdmin {
 			if len(commandArgs) == 0 {
-				msg += t.I18nBot("tgbot.commands.restartUsage")
-			} else if strings.ToLower(commandArgs[0]) == "force" {
 				if t.xrayService.IsXrayRunning() {
 					err := t.xrayService.RestartXray(true)
 					if err != nil {
@@ -896,12 +896,7 @@ func (t *Tgbot) answerCallback(callbackQuery *telego.CallbackQuery, isAdmin bool
 }
 
 func checkAdmin(tgId int64) bool {
-	for _, adminId := range adminIds {
+	return slices.Contains(adminIds, tgId)
-		if adminId == tgId {
-			return true
-		}
-	}
-	return false
 }
 
 func (t *Tgbot) SendAnswer(chatId int64, msg string, isAdmin bool) {
@@ -1694,12 +1689,7 @@ func (t *Tgbot) notifyExhausted() {
 }
 
 func int64Contains(slice []int64, item int64) bool {
-	for _, s := range slice {
+	return slices.Contains(slice, item)
-		if s == item {
-			return true
-		}
-	}
-	return false
 }
 
 func (t *Tgbot) onlineClients(chatId int64, messageID ...int) {

web/service/user.go

@@ -46,7 +46,7 @@ func (s *UserService) UpdateUser(id int, username string, password string) error
 	db := database.GetDB()
 	return db.Model(model.User{}).
 		Where("id = ?", id).
-		Updates(map[string]interface{}{"username": username, "password": password}).
+		Updates(map[string]any{"username": username, "password": password}).
 		Error
 }
 

web/service/warp.go

@@ -56,8 +56,7 @@ func (s *WarpService) GetWarpConfig() (string, error) {
 		return "", err
 	}
 	defer resp.Body.Close()
-	buffer := bytes.NewBuffer(make([]byte, 8192))
+	buffer := &bytes.Buffer{}
-	buffer.Reset()
 	_, err = buffer.ReadFrom(resp.Body)
 	if err != nil {
 		return "", err
@@ -87,14 +86,13 @@ func (s *WarpService) RegWarp(secretKey string, publicKey string) (string, error
 		return "", err
 	}
 	defer resp.Body.Close()
-	buffer := bytes.NewBuffer(make([]byte, 8192))
+	buffer := &bytes.Buffer{}
-	buffer.Reset()
 	_, err = buffer.ReadFrom(resp.Body)
 	if err != nil {
 		return "", err
 	}
 
-	var rspData map[string]interface{}
+	var rspData map[string]any
 	err = json.Unmarshal(buffer.Bytes(), &rspData)
 	if err != nil {
 		return "", err
@@ -102,7 +100,7 @@ func (s *WarpService) RegWarp(secretKey string, publicKey string) (string, error
 
 	deviceId := rspData["id"].(string)
 	token := rspData["token"].(string)
-	license, ok := rspData["account"].(map[string]interface{})["license"].(string)
+	license, ok := rspData["account"].(map[string]any)["license"].(string)
 	if !ok {
 		logger.Debug("Error accessing license value.")
 		return "", err
@@ -144,21 +142,20 @@ func (s *WarpService) SetWarpLicense(license string) (string, error) {
 		return "", err
 	}
 	defer resp.Body.Close()
-	buffer := bytes.NewBuffer(make([]byte, 8192))
+	buffer := &bytes.Buffer{}
-	buffer.Reset()
 	_, err = buffer.ReadFrom(resp.Body)
 	if err != nil {
 		return "", err
 	}
 
-	var response map[string]interface{}
+	var response map[string]any
 	err = json.Unmarshal(buffer.Bytes(), &response)
 	if err != nil {
 		return "", err
 	}
 	if response["success"] == false {
-		errorArr, _ := response["errors"].([]interface{})
+		errorArr, _ := response["errors"].([]any)
-		errorObj := errorArr[0].(map[string]interface{})
+		errorObj := errorArr[0].(map[string]any)
 		return "", common.NewError(errorObj["code"], errorObj["message"])
 	}
 

web/service/xray.go

@@ -56,7 +56,7 @@ func (s *XrayService) GetXrayVersion() string {
 	return p.GetVersion()
 }
 
-func RemoveIndex(s []interface{}, index int) []interface{} {
+func RemoveIndex(s []any, index int) []any {
 	return append(s[:index], s[index+1:]...)
 }
 
@@ -83,16 +83,16 @@ func (s *XrayService) GetXrayConfig() (*xray.Config, error) {
 			continue
 		}
 		// get settings clients
-		settings := map[string]interface{}{}
+		settings := map[string]any{}
 		json.Unmarshal([]byte(inbound.Settings), &settings)
-		clients, ok := settings["clients"].([]interface{})
+		clients, ok := settings["clients"].([]any)
 		if ok {
 			// check users active or not
 			clientStats := inbound.ClientStats
 			for _, clientTraffic := range clientStats {
 				indexDecrease := 0
 				for index, client := range clients {
-					c := client.(map[string]interface{})
+					c := client.(map[string]any)
 					if c["email"] == clientTraffic.Email {
 						if !clientTraffic.Enable {
 							clients = RemoveIndex(clients, index-indexDecrease)
@@ -104,9 +104,9 @@ func (s *XrayService) GetXrayConfig() (*xray.Config, error) {
 			}
 
 			// clear client config for additional parameters
-			var final_clients []interface{}
+			var final_clients []any
 			for _, client := range clients {
-				c := client.(map[string]interface{})
+				c := client.(map[string]any)
 				if c["enable"] != nil {
 					if enable, ok := c["enable"].(bool); ok && !enable {
 						continue
@@ -120,7 +120,7 @@ func (s *XrayService) GetXrayConfig() (*xray.Config, error) {
 						c["flow"] = "xtls-rprx-vision"
 					}
 				}
-				final_clients = append(final_clients, interface{}(c))
+				final_clients = append(final_clients, any(c))
 			}
 
 			settings["clients"] = final_clients
@@ -134,12 +134,12 @@ func (s *XrayService) GetXrayConfig() (*xray.Config, error) {
 
 		if len(inbound.StreamSettings) > 0 {
 			// Unmarshal stream JSON
-			var stream map[string]interface{}
+			var stream map[string]any
 			json.Unmarshal([]byte(inbound.StreamSettings), &stream)
 
 			// Remove the "settings" field under "tlsSettings" and "realitySettings"
-			tlsSettings, ok1 := stream["tlsSettings"].(map[string]interface{})
+			tlsSettings, ok1 := stream["tlsSettings"].(map[string]any)
-			realitySettings, ok2 := stream["realitySettings"].(map[string]interface{})
+			realitySettings, ok2 := stream["realitySettings"].(map[string]any)
 			if ok1 || ok2 {
 				if ok1 {
 					delete(tlsSettings, "settings")

web/translation/translate.en_US.toml

@@ -61,8 +61,15 @@
 "secAlertPanelURI" = "Panel default URI path is insecure. Please configure a complex URI path."
 "secAlertSubURI" = "Subscription default URI path is insecure. Please configure a complex URI path."
 "secAlertSubJsonURI" = "Subscription JSON default URI path is insecure. Please configure a complex URI path."
+"emptyDnsDesc" = "No added DNS servers."
+"emptyFakeDnsDesc" = "No added Fake DNS servers."
+"emptyBalancersDesc" = "No added balancers."
+"emptyReverseDesc" = "No added reverse proxies."
 
 [menu]
+"theme" = "Theme"
+"dark" = "Dark"
+"ultraDark" = "Ultra Dark"
 "dashboard" = "Overview"
 "inbounds" = "Inbounds"
 "settings" = "Panel Settings"
@@ -95,23 +102,26 @@
 "operationHours" = "Uptime"
 "systemLoad" = "System Load"
 "systemLoadDesc" = "System load average for the past 1, 5, and 15 minutes"
-"connectionTcpCountDesc" = "Total TCP connections across the system"
-"connectionUdpCountDesc" = "Total UDP connections across the system"
 "connectionCount" = "Connection Stats"
-"upSpeed" = "Overall upload speed across the system"
+"ipAddresses" = "IP Addresses"
-"downSpeed" = "Overall download speed across the system"
+"toggleIpVisibility" = "Toggle visibility of the IP"
-"totalSent" = "Total data sent across the system since OS startup"
+"overallSpeed" = "Overall Speed"
-"totalReceive" = "Total data received across the system since OS startup"
+"upload" = "Upload"
+"download" = "Download"
+"totalData" = "Total Data"
+"sent" = "Sent"
+"received" = "Received"
 "xraySwitchVersionDialog" = "Change Xray Version"
 "xraySwitchVersionDialogDesc" = "Are you sure you want to change the Xray version to"
 "dontRefresh" = "Installation is in progress, please do not refresh this page"
 "logs" = "Logs"
 "config" = "Config"
-"backup" = "Backup & Restore"
+"backup" = "Backup"
 "backupTitle" = "Database Backup & Restore"
-"backupDescription" = "It is recommended to make a backup before restoring a database."
 "exportDatabase" = "Back Up"
+"exportDatabaseDesc" = "Click to download a .db file containing a backup of your current database to your device."
 "importDatabase" = "Restore"
+"importDatabaseDesc" = "Click to select and upload a .db file from your device to restore your database from a backup."
 
 [pages.inbounds]
 "title" = "Inbounds"
@@ -130,6 +140,8 @@
 "resetTraffic" = "Reset Traffic"
 "addInbound" = "Add Inbound"
 "generalActions" = "General Actions"
+"autoRefresh" = "Auto-refresh"
+"autoRefreshInterval" = "Interval"
 "create" = "Create"
 "update" = "Update"
 "modifyInbound" = "Modify Inbound"
@@ -287,6 +299,8 @@
 "subSettings" = "Subscription"
 "subEnable" = "Enable Subscription Service"
 "subEnableDesc" = "Enables the subscription service."
+"subTitle" = "Subscription Title"
+ "subTitleDesc" = "Title shown in VPN client"
 "subListen" = "Listen IP"
 "subListenDesc" = "The IP address for the subscription service. (leave blank to listen on all IPs)"
 "subPort" = "Listen Port"
@@ -321,7 +335,15 @@
 "muxSett" = "Mux Settings"
 "direct" = "Direct Connection"
 "directDesc" = "Directly establishes connections with domains or IP ranges of a specific country."
-
+"notifications" = "Notifications"
+"certs" = "Certificaties"
+"externalTraffic" = "External Traffic"
+"dateAndTime" = "Date and Time"
+"proxyAndServer" = "Proxy and Server"
+"intervals" = "Intervals"
+"information" = "Information"
+"language" = "Language"
+"telegramBotLanguage" = "Telegram Bot Language"
 
 [pages.xray]
 "title" = "Xray Configs"
@@ -412,6 +434,7 @@
 "type" = "Type"
 "bridge" = "Bridge"
 "portal" = "Portal"
+"link" = "Link"
 "intercon" = "Interconnection"
 "settings" = "Settings"
 "accountInfo" = "Account Information"
@@ -462,7 +485,7 @@
 "poolSize" = "Pool Size"
 
 [pages.settings.security]
-"admin" = "Admin"
+"admin" = "Admin credentials"
 "secret" = "Secret Token"
 "loginSecurity" = "Secure Login"
 "loginSecurityDesc" = "Adds an additional layer of authentication to provide more security."
@@ -505,9 +528,9 @@
 "status" = "✅ Bot is OK!"
 "usage" = "❗ Please provide a text to search!"
 "getID" = "🆔 Your ID: <code>{{ .ID }}</code>"
-"helpAdminCommands" = "To restart Xray Core:\r\n<code>/restart force</code>\r\n\r\nTo search for a client email:\r\n<code>/usage [Email]</code>\r\n\r\nTo search for inbounds (with client stats):\r\n<code>/inbound [Remark]</code>\r\n\r\nTelegram Chat ID:\r\n<code>/id</code>"
+"helpAdminCommands" = "To restart Xray Core:\r\n<code>/restart</code>\r\n\r\nTo search for a client email:\r\n<code>/usage [Email]</code>\r\n\r\nTo search for inbounds (with client stats):\r\n<code>/inbound [Remark]</code>\r\n\r\nTelegram Chat ID:\r\n<code>/id</code>"
 "helpClientCommands" = "To search for statistics, use the following command:\r\n\r\n<code>/usage [Email]</code>\r\n\r\nTelegram Chat ID:\r\n<code>/id</code>"
-"restartUsage" = "\r\n\r\n<code>/restart force</code>"
+"restartUsage" = "\r\n\r\n<code>/restart</code>"
 "restartSuccess" = "✅ Operation successful!"
 "restartFailed" = "❗ Error in operation.\r\n\r\n<code>Error: {{ .Error }}</code>."
 "xrayNotRunning" = "❗ Xray Core is not running."

web/translation/translate.es_ES.toml

@@ -61,8 +61,15 @@
 "secAlertPanelURI" = "La ruta URI predeterminada del panel no es segura. Por favor, configure una ruta URI compleja."
 "secAlertSubURI" = "La ruta URI predeterminada de la suscripción no es segura. Por favor, configure una ruta URI compleja."
 "secAlertSubJsonURI" = "La ruta URI JSON predeterminada de la suscripción no es segura. Por favor, configure una ruta URI compleja."
+"emptyDnsDesc" = "No hay servidores DNS añadidos."
+"emptyFakeDnsDesc" = "No hay servidores Fake DNS añadidos."
+"emptyBalancersDesc" = "No hay balanceadores añadidos."
+"emptyReverseDesc" = "No hay proxies inversos añadidos."
 
 [menu]
+"theme" = "Tema"
+"dark" = "Oscuro"
+"ultraDark" = "Ultra Oscuro"
 "dashboard" = "Estado del Sistema"
 "inbounds" = "Entradas"
 "settings" = "Configuraciones"
@@ -98,20 +105,25 @@
 "connectionTcpCountDesc" = "Conexiones TCP totales en todas las tarjetas de red."
 "connectionUdpCountDesc" = "Conexiones UDP totales en todas las tarjetas de red."
 "connectionCount" = "Número de Conexiones"
-"upSpeed" = "Velocidad de Subida Total para Todas las Tarjetas de Red."
+"ipAddresses" = "Direcciones IP"
-"downSpeed" = "Velocidad de Bajada Total para Todas las Tarjetas de Red."
+"toggleIpVisibility" = "Alternar visibilidad de la IP"
-"totalSent" = "Tráfico Total de Subida de Todas las Tarjetas de Red desde el inicio del sistema."
+"overallSpeed" = "Velocidad general"
-"totalReceive" = "Datos Descargados Totales en Todas las Tarjetas de Red desde el inicio del sistema."
+"upload" = "Subida"
+"download" = "Descarga"
+"totalData" = "Datos totales"
+"sent" = "Enviado"
+"received" = "Recibido"
 "xraySwitchVersionDialog" = "Cambiar Versión de Xray"
 "xraySwitchVersionDialogDesc" = "¿Estás seguro de que deseas cambiar la versión de Xray a"
 "dontRefresh" = "La instalación está en progreso, por favor no actualices esta página."
 "logs" = "Registros"
 "config" = "Configuración"
-"backup" = "Copia de Seguridad y Restauración"
+"backup" = "Сopia de Seguridad"
 "backupTitle" = "Copia de Seguridad y Restauración de la Base de Datos"
-"backupDescription" = "Recuerda hacer una copia de seguridad antes de importar una nueva base de datos."
+"exportDatabase" = "Copia de seguridad"
-"exportDatabase" = "Descargar Base de Datos"
+"exportDatabaseDesc" = "Haz clic para descargar un archivo .db que contiene una copia de seguridad de tu base de datos actual en tu dispositivo."
-"importDatabase" = "Cargar Base de Datos"
+"importDatabase" = "Restaurar"
+"importDatabaseDesc" = "Haz clic para seleccionar y cargar un archivo .db desde tu dispositivo para restaurar tu base de datos desde una copia de seguridad."
 
 [pages.inbounds]
 "title" = "Entradas"
@@ -130,6 +142,8 @@
 "resetTraffic" = "Restablecer Tráfico"
 "addInbound" = "Agregar Entrada"
 "generalActions" = "Acciones Generales"
+"autoRefresh" = "Auto-actualizar"
+"autoRefreshInterval" = "Intervalo"
 "create" = "Crear"
 "update" = "Actualizar"
 "modifyInbound" = "Modificar Entrada"
@@ -287,6 +301,8 @@
 "subSettings" = "Suscripción"
 "subEnable" = "Habilitar Servicio"
 "subEnableDesc" = "Función de suscripción con configuración separada."
+"subTitle" = "Título de la Suscripción"
+"subTitleDesc" = "Título mostrado en el cliente de VPN"
 "subListen" = "Listening IP"
 "subListenDesc" = "Dejar en blanco por defecto para monitorear todas las IPs."
 "subPort" = "Puerto de Suscripción"
@@ -321,7 +337,15 @@
 "muxSett" = "Configuración Mux"
 "direct" = "Conexión Directa"
 "directDesc" = "Establece conexiones directas con dominios o rangos de IP de un país específico."
-
+"notifications" = "Notificaciones"
+"certs" = "Certificados"
+"externalTraffic" = "Tráfico Externo"
+"dateAndTime" = "Fecha y Hora"
+"proxyAndServer" = "Proxy y Servidor"
+"intervals" = "Intervalos"
+"information" = "Información"
+"language" = "Idioma"
+"telegramBotLanguage" = "Idioma del Bot de Telegram"
 
 [pages.xray]
 "title" = "Xray Configuración"
@@ -412,6 +436,7 @@
 "type" = "Tipo"
 "bridge" = "puente"
 "portal" = "portal"
+"link" = "Enlace"
 "intercon" = "Interconexión"
 "settings" = "Configuración"
 "accountInfo" = "Información de la Cuenta"
@@ -462,7 +487,7 @@
 "poolSize" = "Tamaño del grupo"
 
 [pages.settings.security]
-"admin" = "Administrador"
+"admin" = "Credenciales de administrador"
 "secret" = "Token Secreto"
 "loginSecurity" = "Seguridad de Inicio de Sesión"
 "loginSecurityDesc" = "Habilitar un paso adicional de seguridad para el inicio de sesión de usuarios."
@@ -505,9 +530,9 @@
 "status" = "✅ ¡El bot está bien!"
 "usage" = "❗ ¡Por favor proporciona un texto para buscar!"
 "getID" = "🆔 Tu ID: <code>{{ .ID }}</code>"
-"helpAdminCommands" = "Para reiniciar Xray Core:\r\n<code>/restart force</code>\r\n\r\nPara buscar un correo electrónico de cliente:\r\n<code>/usage [Correo electrónico]</code>\r\n\r\nPara buscar entradas (con estadísticas de cliente):\r\n<code>/inbound [Observación]</code>\r\n\r\nID de Chat de Telegram:\r\n<code>/id</code>"
+"helpAdminCommands" = "Para reiniciar Xray Core:\r\n<code>/restart</code>\r\n\r\nPara buscar un correo electrónico de cliente:\r\n<code>/usage [Correo electrónico]</code>\r\n\r\nPara buscar entradas (con estadísticas de cliente):\r\n<code>/inbound [Observación]</code>\r\n\r\nID de Chat de Telegram:\r\n<code>/id</code>"
 "helpClientCommands" = "Para buscar estadísticas, utiliza el siguiente comando:\r\n<code>/usage [Correo electrónico]</code>\r\n\r\nID de Chat de Telegram:\r\n<code>/id</code>"
-"restartUsage" = "\r\n\r\n<code>/restart force</code>"
+"restartUsage" = "\r\n\r\n<code>/restart</code>"
 "restartSuccess" = "✅ ¡Operación exitosa!"
 "restartFailed" = "❗ Error en la operación.\r\n\r\n<code>Error: {{ .Error }}</code>."
 "xrayNotRunning" = "❗ Xray Core no está en ejecución."

web/translation/translate.fa_IR.toml

@@ -61,8 +61,15 @@
 "secAlertPanelURI" = "مسیر پیش‌فرض لینک پنل ناامن است. لطفاً یک مسیر پیچیده تنظیم کنید"
 "secAlertSubURI" = "مسیر پیش‌فرض لینک سابسکریپشن ناامن است. لطفاً یک مسیر پیچیده تنظیم کنید"
 "secAlertSubJsonURI" = "مسیر پیش‌فرض لینک سابسکریپشن جیسون ناامن است. لطفاً یک مسیر پیچیده تنظیم کنید"
+"emptyDnsDesc" = "هیچ سرور DNS اضافه نشده است."
+"emptyFakeDnsDesc" = "هیچ سرور Fake DNS اضافه نشده است."
+"emptyBalancersDesc" = "هیچ بالانسر اضافه نشده است."
+"emptyReverseDesc" = "هیچ پروکسی معکوس اضافه نشده است."
 
 [menu]
+"theme" = "تم"
+"dark" = "تیره"
+"ultraDark" = "فوق تیره"
 "dashboard" = "نمای کلی"
 "inbounds" = "ورودی‌ها"
 "settings" = "تنظیمات پنل"
@@ -98,10 +105,14 @@
 "connectionTcpCountDesc" = "در تمام‌شبکه‌ها TCP مجموع‌اتصالات"
 "connectionUdpCountDesc" = "در تمام‌شبکه‌ها UDP مجموع‌اتصالات"
 "connectionCount" = "تعداد کانکشن ها"
-"upSpeed" = "سرعت کلی آپلود در تمام‌شبکه‌ها"
+"ipAddresses" = "آدرس‌های IP"
-"downSpeed" = "‌سرعت کلی دانلود در تمام‌شبکه‌ها"
+"toggleIpVisibility" = "تغییر وضعیت نمایش IP"
-"totalSent" = "مجموع ترافیک ارسال‌‌شده پس‌از شروع‌به‌کار سیستم‌عامل"
+"overallSpeed" = "سرعت کلی"
-"totalReceive" = "مجموع ترافیک دریافت‌شده پس‌از شروع‌به‌کار سیستم‌عامل"
+"upload" = "آپلود"
+"download" = "دانلود"
+"totalData" = "داده‌های کل"
+"sent" = "ارسال شده"
+"received" = "دریافت شده"
 "xraySwitchVersionDialog" = "تغییر نسخه ایکس‌ری"
 "xraySwitchVersionDialogDesc" = "آیا از تغییر نسخه‌ مطمئن هستید؟"
 "dontRefresh" = "در حال نصب، لطفا صفحه را رفرش نکنید"
@@ -109,9 +120,10 @@
 "config" = "پیکربندی"
 "backup" = "پشتیبان‌گیری"
 "backupTitle" = "پشتیبان‌گیری دیتابیس"
-"backupDescription" = "توصیه‌می‌شود قبل‌از واردکردن یک دیتابیس جدید، نسخه پشتیبان تهیه ‌کنید"
 "exportDatabase" = "پشتیبان‌گیری"
-"importDatabase" = "بازگرداندن"
+"exportDatabaseDesc" = "برای دانلود یک فایل .db حاوی پشتیبان از پایگاه داده فعلی خود به دستگاهتان کلیک کنید."
+"importDatabase" = "بازیابی"
+"importDatabaseDesc" = "برای انتخاب و آپلود یک فایل .db از دستگاهتان و بازیابی پایگاه داده از یک پشتیبان کلیک کنید."
 
 [pages.inbounds]
 "title" = "کاربران"
@@ -130,6 +142,8 @@
 "resetTraffic" = "ریست ترافیک"
 "addInbound" = "افزودن ورودی"
 "generalActions" = "عملیات کلی"
+"autoRefresh" = "تازه‌سازی خودکار"
+"autoRefreshInterval" = "فاصله"
 "create" = "افزودن"
 "update" = "ویرایش"
 "modifyInbound" = "ویرایش ورودی"
@@ -287,6 +301,8 @@
 "subSettings" = "سابسکریپشن"
 "subEnable" = "فعال‌سازی سرویس سابسکریپشن"
 "subEnableDesc" = "سرویس سابسکریپشن‌ را فعال‌می‌کند"
+"subTitle" = "عنوان اشتراک"
+"subTitleDesc" = "عنوان نمایش داده شده در کلاینت VPN"
 "subListen" = "آدرس آی‌پی"
 "subListenDesc" = "آدرس آی‌پی برای سرویس سابسکریپشن. برای گوش دادن به‌تمام آی‌پی‌ها خالی‌بگذارید"
 "subPort" = "پورت"
@@ -321,7 +337,15 @@
 "muxSett" = "تنظیمات ماکس"
 "direct" = "اتصال مستقیم"
 "directDesc" = "به طور مستقیم با دامنه ها یا محدوده آی‌پی یک کشور خاص ارتباط برقرار می کند"
-
+"notifications" = "اعلان‌ها"
+"certs" = "گواهی‌ها"
+"externalTraffic" = "ترافیک خارجی"
+"dateAndTime" = "تاریخ و زمان"
+"proxyAndServer" = "پراکسی و سرور"
+"intervals" = "فواصل"
+"information" = "اطلاعات"
+"language" = "زبان"
+"telegramBotLanguage" = "زبان ربات تلگرام"
 
 [pages.xray]
 "title" = "پیکربندی ایکس‌ری"
@@ -412,6 +436,7 @@
 "type" = "نوع"
 "bridge" = "پل"
 "portal" = "پورتال"
+"link" = "لینک"
 "intercon" = "اتصال میانی"
 "settings" = "تنظیمات"
 "accountInfo" = "اطلاعات حساب"
@@ -462,7 +487,7 @@
 "poolSize" = "اندازه استخر"
 
 [pages.settings.security]
-"admin" = "مدیر"
+"admin" = "اعتبارنامه‌های ادمین"
 "secret" = "توکن مخفی"
 "loginSecurity" = "ورود ایمن"
 "loginSecurityDesc" = "یک لایه اضافی از احراز هویت برای ایجاد امنیت بیشتر اضافه می کند"
@@ -505,9 +530,9 @@
 "status" = "✅ ربات در حالت عادی است!"
 "usage" = "❗ لطفاً یک متن برای جستجو وارد کنید!"
 "getID" = "🆔 شناسه شما: <code>{{ .ID }}</code>"
-"helpAdminCommands" = "برای راه‌اندازی مجدد Xray Core:\r\n<code>/restart force</code>\r\n\r\nبرای جستجوی ایمیل مشتری:\r\n<code>/usage [ایمیل]</code>\r\n\r\nبرای جستجوی ورودی‌ها (با آمار مشتری):\r\n<code>/inbound [توضیحات]</code>\r\n\r\nشناسه گفتگوی تلگرام:\r\n<code>/id</code>"
+"helpAdminCommands" = "برای راه‌اندازی مجدد Xray Core:\r\n<code>/restart</code>\r\n\r\nبرای جستجوی ایمیل مشتری:\r\n<code>/usage [ایمیل]</code>\r\n\r\nبرای جستجوی ورودی‌ها (با آمار مشتری):\r\n<code>/inbound [توضیحات]</code>\r\n\r\nشناسه گفتگوی تلگرام:\r\n<code>/id</code>"
 "helpClientCommands" = "برای جستجوی آمار، از دستور زیر استفاده کنید:\r\n<code>/usage [ایمیل]</code>\r\n\r\nشناسه گفتگوی تلگرام:\r\n<code>/id</code>"
-"restartUsage" = "\r\n\r\n<code>/restart force</code>"
+"restartUsage" = "\r\n\r\n<code>/restart</code>"
 "restartSuccess" = "✅ عملیات با موفقیت انجام شد!"
 "restartFailed" = "❗ خطا در عملیات.\r\n\r\n<code>خطا: {{ .Error }}</code>."
 "xrayNotRunning" = "❗ Xray Core در حال اجرا نیست."

web/translation/translate.id_ID.toml

@@ -61,8 +61,15 @@
 "secAlertPanelURI" = "Jalur URI default panel tidak aman. Harap konfigurasi jalur URI kompleks."
 "secAlertSubURI" = "Jalur URI default langganan tidak aman. Harap konfigurasi jalur URI kompleks."
 "secAlertSubJsonURI" = "Jalur URI default JSON langganan tidak aman. Harap konfigurasikan jalur URI kompleks."
+"emptyDnsDesc" = "Tidak ada server DNS yang ditambahkan."
+"emptyFakeDnsDesc" = "Tidak ada server Fake DNS yang ditambahkan."
+"emptyBalancersDesc" = "Tidak ada penyeimbang yang ditambahkan."
+"emptyReverseDesc" = "Tidak ada proxy terbalik yang ditambahkan."
 
 [menu]
+"theme" = "Tema"
+"dark" = "Gelap"
+"ultraDark" = "Sangat Gelap"
 "dashboard" = "Ikhtisar"
 "inbounds" = "Masuk"
 "settings" = "Pengaturan Panel"
@@ -98,20 +105,25 @@
 "connectionTcpCountDesc" = "Total koneksi TCP di seluruh sistem"
 "connectionUdpCountDesc" = "Total koneksi UDP di seluruh sistem"
 "connectionCount" = "Statistik Koneksi"
-"upSpeed" = "Kecepatan unggah keseluruhan di seluruh sistem"
+"ipAddresses" = "Alamat IP"
-"downSpeed" = "Kecepatan unduh keseluruhan di seluruh sistem"
+"toggleIpVisibility" = "Alihkan visibilitas IP"
-"totalSent" = "Total data terkirim di seluruh sistem sejak startup OS"
+"overallSpeed" = "Kecepatan keseluruhan"
-"totalReceive" = "Total data diterima di seluruh sistem sejak startup OS"
+"upload" = "Unggah"
+"download" = "Unduh"
+"totalData" = "Total data"
+"sent" = "Dikirim"
+"received" = "Diterima"
 "xraySwitchVersionDialog" = "Ganti Versi Xray"
 "xraySwitchVersionDialogDesc" = "Apakah Anda yakin ingin mengubah versi Xray menjadi"
 "dontRefresh" = "Instalasi sedang berlangsung, harap jangan menyegarkan halaman ini"
 "logs" = "Log"
 "config" = "Konfigurasi"
-"backup" = "Cadangan & Pulihkan"
+"backup" = "Cadangan"
 "backupTitle" = "Cadangan & Pulihkan Database"
-"backupDescription" = "Disarankan untuk membuat cadangan sebelum memulihkan database."
 "exportDatabase" = "Cadangkan"
+"exportDatabaseDesc" = "Klik untuk mengunduh file .db yang berisi cadangan dari database Anda saat ini ke perangkat Anda."
 "importDatabase" = "Pulihkan"
+"importDatabaseDesc" = "Klik untuk memilih dan mengunggah file .db dari perangkat Anda untuk memulihkan database dari cadangan."
 
 [pages.inbounds]
 "title" = "Masuk"
@@ -130,6 +142,8 @@
 "resetTraffic" = "Reset Traffic"
 "addInbound" = "Tambahkan Masuk"
 "generalActions" = "Tindakan Umum"
+"autoRefresh" = "Pembaruan otomatis"
+"autoRefreshInterval" = "Interval"
 "create" = "Buat"
 "update" = "Perbarui"
 "modifyInbound" = "Ubah Masuk"
@@ -287,6 +301,8 @@
 "subSettings" = "Langganan"
 "subEnable" = "Aktifkan Layanan Langganan"
 "subEnableDesc" = "Mengaktifkan layanan langganan."
+"subTitle" = "Judul Langganan"
+"subTitleDesc" = "Judul yang ditampilkan di klien VPN"
 "subListen" = "IP Pendengar"
 "subListenDesc" = "Alamat IP untuk layanan langganan. (biarkan kosong untuk mendengarkan semua IP)"
 "subPort" = "Port Pendengar"
@@ -320,7 +336,15 @@
 "muxSett" = "Pengaturan Mux"
 "direct" = "Koneksi langsung"
 "directDesc" = "Secara langsung membuat koneksi dengan domain atau rentang IP negara tertentu."
-
+"notifications" = "Notifikasi"
+"certs" = "Sertifikat"
+"externalTraffic" = "Lalu Lintas Eksternal"
+"dateAndTime" = "Tanggal dan Waktu"
+"proxyAndServer" = "Proxy dan Server"
+"intervals" = "Interval"
+"information" = "Informasi"
+"language" = "Bahasa"
+"telegramBotLanguage" = "Bahasa Bot Telegram"
 
 [pages.xray]
 "title" = "Konfigurasi Xray"
@@ -411,6 +435,7 @@
 "type" = "Tipe"
 "bridge" = "Jembatan"
 "portal" = "Portal"
+"link" = "Tautan"
 "intercon" = "Interkoneksi"
 "settings" = "Pengaturan"
 "accountInfo" = "Informasi Akun"
@@ -461,7 +486,7 @@
 "poolSize" = "Ukuran Kolam"
 
 [pages.settings.security]
-"admin" = "Admin"
+"admin" = "Kredensial admin"
 "secret" = "Token Rahasia"
 "loginSecurity" = "Login Aman"
 "loginSecurityDesc" = "Menambahkan lapisan otentikasi tambahan untuk memberikan keamanan lebih."
@@ -504,9 +529,9 @@
 "status" = "✅ Bot dalam keadaan baik!"
 "usage" = "❗ Harap berikan teks untuk mencari!"
 "getID" = "🆔 ID Anda: <code>{{ .ID }}</code>"
-"helpAdminCommands" = "Untuk memulai ulang Xray Core:\r\n<code>/restart force</code>\r\n\r\nUntuk mencari email klien:\r\n<code>/usage [Email]</code>\r\n\r\nUntuk mencari inbound (dengan statistik klien):\r\n<code>/inbound [Catatan]</code>\r\n\r\nID Obrolan Telegram:\r\n<code>/id</code>"
+"helpAdminCommands" = "Untuk memulai ulang Xray Core:\r\n<code>/restart</code>\r\n\r\nUntuk mencari email klien:\r\n<code>/usage [Email]</code>\r\n\r\nUntuk mencari inbound (dengan statistik klien):\r\n<code>/inbound [Catatan]</code>\r\n\r\nID Obrolan Telegram:\r\n<code>/id</code>"
 "helpClientCommands" = "Untuk mencari statistik, gunakan perintah berikut:\r\n<code>/usage [Email]</code>\r\n\r\nID Obrolan Telegram:\r\n<code>/id</code>"
-"restartUsage" = "\r\n\r\n<code>/restart force</code>"
+"restartUsage" = "\r\n\r\n<code>/restart</code>"
 "restartSuccess" = "✅ Operasi berhasil!"
 "restartFailed" = "❗ Kesalahan dalam operasi.\r\n\r\n<code>Error: {{ .Error }}</code>."
 "xrayNotRunning" = "❗ Xray Core tidak berjalan."

web/translation/translate.ja_JP.toml

@@ -61,8 +61,15 @@
 "secAlertPanelURI" = "デフォルトのURIパスは安全ではありません。複雑なURIパスを設定してください。"
 "secAlertSubURI" = "サブスクリプションのデフォルトURIパスは安全ではありません。複雑なURIパスを設定してください。"
 "secAlertSubJsonURI" = "JSONサブスクリプションのデフォルトURIパスは安全ではありません。複雑なURIパスを設定してください。"
+"emptyDnsDesc" = "追加されたDNSサーバーはありません。"
+"emptyFakeDnsDesc" = "追加されたFake DNSサーバーはありません。"
+"emptyBalancersDesc" = "追加されたバランサーはありません。"
+"emptyReverseDesc" = "追加されたリバースプロキシはありません。"
 
 [menu]
+"theme" = "テーマ"
+"dark" = "ダーク"
+"ultraDark" = "ウルトラダーク"
 "dashboard" = "ダッシュボード"
 "inbounds" = "インバウンド一覧"
 "settings" = "パネル設定"
@@ -98,20 +105,25 @@
 "connectionTcpCountDesc" = "システム内のすべてのTCP接続数"
 "connectionUdpCountDesc" = "システム内のすべてのUDP接続数"
 "connectionCount" = "接続数"
-"upSpeed" = "総アップロード速度"
+"ipAddresses" = "IPアドレス"
-"downSpeed" = "総ダウンロード速度"
+"toggleIpVisibility" = "IPの表示を切り替える"
-"totalSent" = "システム起動以降の送信データ量"
+"overallSpeed" = "全体の速度"
-"totalReceive" = "システム起動以降の受信データ量"
+"upload" = "アップロード"
+"download" = "ダウンロード"
+"totalData" = "総データ量"
+"sent" = "送信"
+"received" = "受信"
 "xraySwitchVersionDialog" = "Xrayバージョン切り替え"
 "xraySwitchVersionDialogDesc" = "Xrayのバージョンを切り替えますか？"
 "dontRefresh" = "インストール中、このページをリロードしないでください"
 "logs" = "ログ"
 "config" = "設定"
-"backup" = "バックアップと復元"
+"backup" = "バックアップ"
 "backupTitle" = "データベースのバックアップと復元"
-"backupDescription" = "データベースを復元する前にバックアップすることをお勧めします"
 "exportDatabase" = "バックアップ"
+"exportDatabaseDesc" = "クリックして、現在のデータベースのバックアップを含む .db ファイルをデバイスにダウンロードします。"
 "importDatabase" = "復元"
+"importDatabaseDesc" = "クリックして、デバイスから .db ファイルを選択し、アップロードしてバックアップからデータベースを復元します。"
 
 [pages.inbounds]
 "title" = "インバウンド一覧"
@@ -130,6 +142,8 @@
 "resetTraffic" = "トラフィックリセット"
 "addInbound" = "インバウンド追加"
 "generalActions" = "一般操作"
+"autoRefresh" = "自動更新"
+"autoRefreshInterval" = "間隔"
 "create" = "追加"
 "update" = "更新"
 "modifyInbound" = "インバウンド修正"
@@ -287,6 +301,8 @@
 "subSettings" = "サブスクリプション設定"
 "subEnable" = "サブスクリプションサービスを有効にする"
 "subEnableDesc" = "サブスクリプションサービス機能を有効にする"
+"subTitle" = "サブスクリプションタイトル"
+"subTitleDesc" = "VPNクライアントに表示されるタイトル"
 "subListen" = "監視IP"
 "subListenDesc" = "サブスクリプションサービスが監視するIPアドレス（空白にするとすべてのIPを監視）"
 "subPort" = "監視ポート"
@@ -321,7 +337,15 @@
 "muxSett" = "マルチプレクサ設定"
 "direct" = "直接接続"
 "directDesc" = "特定の国のドメインまたはIP範囲に直接接続する"
-
+"notifications" = "通知"
+"certs" = "証明書"
+"externalTraffic" = "外部トラフィック"
+"dateAndTime" = "日付と時刻"
+"proxyAndServer" = "プロキシとサーバー"
+"intervals" = "間隔"
+"information" = "情報"
+"language" = "言語"
+"telegramBotLanguage" = "Telegram Botの言語"
 
 [pages.xray]
 "title" = "Xray 設定"
@@ -412,6 +436,7 @@
 "type" = "タイプ"
 "bridge" = "ブリッジ"
 "portal" = "ポータル"
+"link" = "リンク"
 "intercon" = "インターコネクション"
 "settings" = "設定"
 "accountInfo" = "アカウント情報"
@@ -462,7 +487,7 @@
 "poolSize" = "プールサイズ"
 
 [pages.settings.security]
-"admin" = "管理者"
+"admin" = "管理者の資格情報"
 "secret" = "セキュリティトークン"
 "loginSecurity" = "ログインセキュリティ"
 "loginSecurityDesc" = "追加の認証を追加してセキュリティを向上させる"
@@ -505,9 +530,9 @@
 "status" = "✅ ボットは正常に動作しています！"
 "usage" = "❗ 検索するテキストを入力してください！"
 "getID" = "🆔 あなたのIDは：<code>{{ .ID }}</code>"
-"helpAdminCommands" = "Xray Coreを再起動するには：\r\n<code>/restart force</code>\r\n\r\nクライアントの電子メールを検索するには：\r\n<code>/usage [電子メール]</code>\r\n\r\nインバウンド（クライアントの統計情報を含む）を検索するには：\r\n<code>/inbound [備考]</code>\r\n\r\nTelegramチャットID：\r\n<code>/id</code>"
+"helpAdminCommands" = "Xray Coreを再起動するには：\r\n<code>/restart</code>\r\n\r\nクライアントの電子メールを検索するには：\r\n<code>/usage [電子メール]</code>\r\n\r\nインバウンド（クライアントの統計情報を含む）を検索するには：\r\n<code>/inbound [備考]</code>\r\n\r\nTelegramチャットID：\r\n<code>/id</code>"
 "helpClientCommands" = "統計情報を検索するには、次のコマンドを使用してください：\r\n<code>/usage [電子メール]</code>\r\n\r\nTelegramチャットID：\r\n<code>/id</code>"
-"restartUsage" = "\r\n\r\n<code>/restart force</code>"
+"restartUsage" = "\r\n\r\n<code>/restart</code>"
 "restartSuccess" = "✅ 操作成功！"
 "restartFailed" = "❗ 操作エラー。\r\n\r\n<code>エラー: {{ .Error }}</code>"
 "xrayNotRunning" = "❗ Xray Core は動作していません。"

web/translation/translate.pt_BR.toml

@@ -61,8 +61,15 @@
 "secAlertPanelURI" = "O caminho URI padrão do painel não é seguro. Configure um caminho URI complexo."
 "secAlertSubURI" = "O caminho URI padrão de inscrição não é seguro. Configure um caminho URI complexo."
 "secAlertSubJsonURI" = "O caminho URI JSON de inscrição padrão não é seguro. Configure um caminho URI complexo."
+"emptyDnsDesc" = "Nenhum servidor DNS adicionado."
+"emptyFakeDnsDesc" = "Nenhum servidor Fake DNS adicionado."
+"emptyBalancersDesc" = "Nenhum balanceador adicionado."
+"emptyReverseDesc" = "Nenhum proxy reverso adicionado."
 
 [menu]
+"theme" = "Tema"
+"dark" = "Escuro"
+"ultraDark" = "Ultra Escuro"
 "dashboard" = "Visão Geral"
 "inbounds" = "Inbounds"
 "settings" = "Panel Settings"
@@ -98,20 +105,25 @@
 "connectionTcpCountDesc" = "Total de conexões TCP no sistema"
 "connectionUdpCountDesc" = "Total de conexões UDP no sistema"
 "connectionCount" = "Estatísticas de Conexão"
-"upSpeed" = "Velocidade total de upload no sistema"
+"ipAddresses" = "Endereços IP"
-"downSpeed" = "Velocidade total de download no sistema"
+"toggleIpVisibility" = "Alternar visibilidade do IP"
-"totalSent" = "Dados totais enviados desde a inicialização do sistema"
+"overallSpeed" = "Velocidade geral"
-"totalReceive" = "Dados totais recebidos desde a inicialização do sistema"
+"upload" = "Upload"
+"download" = "Download"
+"totalData" = "Dados totais"
+"sent" = "Enviado"
+"received" = "Recebido"
 "xraySwitchVersionDialog" = "Alterar Versão do Xray"
 "xraySwitchVersionDialogDesc" = "Tem certeza de que deseja alterar a versão do Xray para"
 "dontRefresh" = "Instalação em andamento, por favor não atualize a página"
 "logs" = "Logs"
 "config" = "Configuração"
-"backup" = "Backup e Restauração"
+"backup" = "Backup"
 "backupTitle" = "Backup e Restauração do Banco de Dados"
-"backupDescription" = "É recomendado fazer um backup antes de restaurar o banco de dados."
+"exportDatabase" = "Backup"
-"exportDatabase" = "Fazer Backup"
+"exportDatabaseDesc" = "Clique para baixar um arquivo .db contendo um backup do seu banco de dados atual para o seu dispositivo."
 "importDatabase" = "Restaurar"
+"importDatabaseDesc" = "Clique para selecionar e enviar um arquivo .db do seu dispositivo para restaurar seu banco de dados a partir de um backup."
 
 [pages.inbounds]
 "title" = "Inbounds"
@@ -130,6 +142,8 @@
 "resetTraffic" = "Redefinir Tráfego"
 "addInbound" = "Adicionar Inbound"
 "generalActions" = "Ações Gerais"
+"autoRefresh" = "Atualização automática"
+"autoRefreshInterval" = "Intervalo"
 "create" = "Criar"
 "update" = "Atualizar"
 "modifyInbound" = "Modificar Inbound"
@@ -287,6 +301,8 @@
 "subSettings" = "Assinatura"
 "subEnable" = "Ativar Serviço de Assinatura"
 "subEnableDesc" = "Ativa o serviço de assinatura."
+"subTitle" = "Título da Assinatura"
+"subTitleDesc" = "Título exibido no cliente VPN"
 "subListen" = "IP de Escuta"
 "subListenDesc" = "O endereço IP para o serviço de assinatura. (deixe em branco para escutar em todos os IPs)"
 "subPort" = "Porta de Escuta"
@@ -321,7 +337,15 @@
 "muxSett" = "Configurações de Mux"
 "direct" = "Conexão Direta"
 "directDesc" = "Estabelece conexões diretamente com domínios ou intervalos de IP de um país específico."
-
+"notifications" = "Notificações"
+"certs" = "Certificados"
+"externalTraffic" = "Tráfego Externo"
+"dateAndTime" = "Data e Hora"
+"proxyAndServer" = "Proxy e Servidor"
+"intervals" = "Intervalos"
+"information" = "Informação"
+"language" = "Idioma"
+"telegramBotLanguage" = "Idioma do Bot do Telegram"
 
 [pages.xray]
 "title" = "Configurações Xray"
@@ -412,6 +436,7 @@
 "type" = "Tipo"
 "bridge" = "Ponte"
 "portal" = "Portal"
+"link" = "Link"
 "intercon" = "Interconexão"
 "settings" = "Configurações"
 "accountInfo" = "Informações da Conta"
@@ -462,7 +487,7 @@
 "poolSize" = "Tamanho do Pool"
 
 [pages.settings.security]
-"admin" = "Admin"
+"admin" = "Credenciais de administrador"
 "secret" = "Token Secreto"
 "loginSecurity" = "Login Seguro"
 "loginSecurityDesc" = "Adiciona uma camada extra de autenticação para fornecer mais segurança."
@@ -505,9 +530,9 @@
 "status" = "✅ Bot está OK!"
 "usage" = "❗ Por favor, forneça um texto para pesquisar!"
 "getID" = "🆔 Seu ID: <code>{{ .ID }}</code>"
-"helpAdminCommands" = "Para reiniciar o Xray Core:\r\n<code>/restart force</code>\r\n\r\nPara pesquisar por um email de cliente:\r\n<code>/usage [Email]</code>\r\n\r\nPara pesquisar por inbounds (com estatísticas do cliente):\r\n<code>/inbound [Remark]</code>\r\n\r\nTelegram Chat ID:\r\n<code>/id</code>"
+"helpAdminCommands" = "Para reiniciar o Xray Core:\r\n<code>/restart</code>\r\n\r\nPara pesquisar por um email de cliente:\r\n<code>/usage [Email]</code>\r\n\r\nPara pesquisar por inbounds (com estatísticas do cliente):\r\n<code>/inbound [Remark]</code>\r\n\r\nTelegram Chat ID:\r\n<code>/id</code>"
 "helpClientCommands" = "Para pesquisar por estatísticas, use o seguinte comando:\r\n\r\n<code>/usage [Email]</code>\r\n\r\nTelegram Chat ID:\r\n<code>/id</code>"
-"restartUsage" = "\r\n\r\n<code>/restart force</code>"
+"restartUsage" = "\r\n\r\n<code>/restart</code>"
 "restartSuccess" = "✅ Operação bem-sucedida!"
 "restartFailed" = "❗ Erro na operação.\r\n\r\n<code>Erro: {{ .Error }}</code>."
 "xrayNotRunning" = "❗ Xray Core não está em execução."

web/translation/translate.ru_RU.toml

@@ -41,7 +41,7 @@
 "offline" = "Офлайн"
 "online" = "Онлайн"
 "domainName" = "Домен"
-"monitor" = "Слушать IP"
+"monitor" = "Мониторинг IP"
 "certificate" = "Цифровой сертификат"
 "fail" = "Ошибка"
 "comment" = "Комментарий"
@@ -61,8 +61,15 @@
 "secAlertPanelURI" = "URI-путь по умолчанию панели небезопасен. Пожалуйста, настройте сложный URI-путь."
 "secAlertSubURI" = "URI-путь по умолчанию подписки небезопасен. Пожалуйста, настройте сложный URI-путь."
 "secAlertSubJsonURI" = "URI-путь по умолчанию для JSON подписки небезопасен. Пожалуйста, настройте сложный URI-путь."
+"emptyDnsDesc" = "Нет добавленных DNS-серверов."
+"emptyFakeDnsDesc" = "Нет добавленных Fake DNS-серверов."
+"emptyBalancersDesc" = "Нет добавленных балансировщиков."
+"emptyReverseDesc" = "Нет добавленных обратных прокси."
 
 [menu]
+"theme" = "Тема"
+"dark" = "Темная"
+"ultraDark" = "Ультра темная"
 "dashboard" = "Статус системы"
 "inbounds" = "Подключения"
 "settings" = "Настройки панели"
@@ -98,20 +105,25 @@
 "connectionTcpCountDesc" = "Общее количество подключений TCP по всем сетевым картам."
 "connectionUdpCountDesc" = "Общее количество подключений UDP по всем сетевым картам."
 "connectionCount" = "Количество соединений"
-"upSpeed" = "Общая скорость отправки для всех сетей"
+"ipAddresses" = "IP-адреса"
-"downSpeed" = "Общая скорость загрузки для всех сетей"
+"toggleIpVisibility" = "Переключить видимость IP"
-"totalSent" = "Общий объем отправляемых данных с момента запуска системы"
+"overallSpeed" = "Общая скорость"
-"totalReceive" = "Общий объем полученных данных для всех сетей с момента запуска системы."
+"upload" = "Отправка"
+"download" = "Загрузка"
+"totalData" = "Общий объем данных"
+"sent" = "Отправлено"
+"received" = "Получено"
 "xraySwitchVersionDialog" = "Переключить версию Xray"
 "xraySwitchVersionDialogDesc" = "Вы точно хотите сменить версию Xray?"
 "dontRefresh" = "Установка в процессе. Не обновляйте страницу"
 "logs" = "Логи"
 "config" = "Конфигурация"
-"backup" = "Резервное копирование и восстановление"
+"backup" = "Резервная копия"
 "backupTitle" = "База данных резервных копий"
-"backupDescription" = "Рекомендуется сделать резервную копию перед восстановлением базы данных."
 "exportDatabase" = "Экспорт базы данных"
+"exportDatabaseDesc" = "Нажмите, чтобы скачать файл .db, содержащий резервную копию вашей текущей базы данных на ваше устройство."
 "importDatabase" = "Импорт базы данных"
+"importDatabaseDesc" = "Нажмите, чтобы выбрать и загрузить файл .db с вашего устройства для восстановления базы данных из резервной копии."
 
 [pages.inbounds]
 "title" = "Подключения"
@@ -130,6 +142,8 @@
 "resetTraffic" = "Сбросить трафик"
 "addInbound" = "Добавить подключение"
 "generalActions" = "Общие действия"
+"autoRefresh" = "Автообновление"
+"autoRefreshInterval" = "Интервал"
 "create" = "Создать"
 "update" = "Обновить"
 "modifyInbound" = "Изменить подключение"
@@ -175,7 +189,7 @@
 "emailDesc" = "Пожалуйста, укажите уникальный Email"
 "IPLimit" = "Лимит по IP"
 "IPLimitDesc" = "Ограничение количества подключений с одного IP (0 – отключить)"
-"IPLimitlog" = "IP лог"
+"IPLimitlog" = "Лог IP-адресов"
 "IPLimitlogDesc" = "Лог IP-адресов (перед включением лога IP-адресов, вы должны очистить список)"
 "IPLimitlogclear" = "Очистить лог"
 "setDefaultCert" = "Установить сертификат с панели"
@@ -246,7 +260,7 @@
 "privateKeyPath" = "Путь к файлу приватного ключа сертификата панели"
 "privateKeyPathDesc" = "Введите полный путь, начинающийся с '/'"
 "panelUrlPath" = "Корневой путь URL адреса панели"
-"panelUrlPathDesc" = "Должен начинаться с '/' и заканчиваться на '/'"
+"panelUrlPathDesc" = "Должен начинаться с '/' и заканчиваться '/'"
 "pageSize" = "Размер нумерации страниц"
 "pageSizeDesc" = "Определить размер страницы для входящей таблицы. Установите 0, чтобы отключить"
 "remarkModel" = "Модель примечания и символ разделения"
@@ -267,7 +281,7 @@
 "telegramAPIServer" = "API-сервер Telegram"
 "telegramAPIServerDesc" = "Используемый API-сервер Telegram. Оставьте пустым, чтобы использовать сервер по умолчанию."
 "telegramChatId" = "Идентификатор Telegram администратора бота"
-"telegramChatIdDesc" = "Один или несколько идентификаторов администратора бота. Чтобы получить идентификатор, используйте @userinfobot или команду '/id' в боте."
+"telegramChatIdDesc" = "Один или несколько идентификаторов администратора бота. Для получения идентификатора используйте @userinfobot или команду '/id' в боте."
 "telegramNotifyTime" = "Частота уведомлений бота Telegram"
 "telegramNotifyTimeDesc" = "Укажите интервал уведомлений в формате Crontab"
 "tgNotifyBackup" = "Резервное копирование базы данных"
@@ -285,8 +299,10 @@
 "timeZone" = "Часовой пояс"
 "timeZoneDesc" = "Запланированные задачи выполняются в соответствии со временем в этом часовом поясе"
 "subSettings" = "Подписка"
-"subEnable" = "Включить службу"
+"subEnable" = "Включить подписку"
 "subEnableDesc" = "Функция подписки с отдельной конфигурацией"
+"subTitle" = "Заголовок подписки"
+ "subTitleDesc" = "Название подписки, которое видит клиент в VPN клиенте"
 "subListen" = "Прослушивание IP"
 "subListenDesc" = "Оставьте пустым по умолчанию, чтобы отслеживать все IP-адреса"
 "subPort" = "Порт подписки"
@@ -321,7 +337,15 @@
 "muxSett" = "Mux Настройки"
 "direct" = "Прямая связь"
 "directDesc" = "Устанавливает прямые соединения с доменами или IP-адресами определённой страны."
-
+"notifications" = "Уведомления"
+"certs" = "Сертификаты"
+"externalTraffic" = "Внешний трафик"
+"dateAndTime" = "Дата и время"
+"proxyAndServer" = "Прокси и сервер"
+"intervals" = "Интервалы"
+"information" = "Информация"
+"language" = "Язык"
+"telegramBotLanguage" = "Язык Telegram-бота"
 
 [pages.xray]
 "title" = "Настройки Xray"
@@ -338,9 +362,9 @@
 "basicRouting" = "Базовые соединения"
 "blockConnectionsConfigsDesc" = "Эти параметры будут блокировать трафик в зависимости от запрашиваемой страны."
 "directConnectionsConfigsDesc" = "Прямое соединение гарантирует, что определенный трафик не будет перенаправлен через другой сервер."
-"blockips" = "Блокировать IP"
+"blockips" = "Блокировать IP-адреса"
 "blockdomains" = "Блокировать домены"
-"directips" = "Прямые IP"
+"directips" = "Прямые IP-адреса"
 "directdomains" = "Прямые домены"
 "ipv4Routing" = "Правила IPv4"
 "ipv4RoutingDesc" = "Эти параметры позволят пользователям маршрутизироваться к целевым доменам только через IPv4"
@@ -397,7 +421,7 @@
 "info" = "Информация"
 "add" = "Добавить правило"
 "edit" = "Редактировать правило"
-"useComma" = "Элементы, разделенные запятыми"
+"useComma" = "Элементы, разделённые запятыми"
 
 [pages.xray.outbound]
 "addOutbound" = "Добавить исходящий"
@@ -412,6 +436,7 @@
 "type" = "Тип"
 "bridge" = "Мост"
 "portal" = "Портал"
+"link" = "Ссылка"
 "intercon" = "Соединение"
 "settings" = "Настройки"
 "accountInfo" = "Информация об учетной записи"
@@ -462,7 +487,7 @@
 "poolSize" = "Размер пула"
 
 [pages.settings.security]
-"admin" = "Админ"
+"admin" = "Учетные данные администратора"
 "secret" = "Секретный токен"
 "loginSecurity" = "Безопасность входа"
 "loginSecurityDesc" = "Включить дополнительные меры безопасности входа пользователя"
@@ -505,9 +530,9 @@
 "status" = "✅ Бот работает нормально!"
 "usage" = "❗ Пожалуйста, укажите текст для поиска!"
 "getID" = "🆔 Ваш ID: <code>{{ .ID }}</code>"
-"helpAdminCommands" = "Для перезапуска Xray Core:\r\n<code>/restart force</code>\r\n\r\nДля поиска электронной почты клиента:\r\n<code>/usage [Email]</code>\r\n\r\nДля поиска входящих (со статистикой клиента):\r\n<code>/inbound [Примечание]</code>\r\n\r\nID чата Telegram:\r\n<code>/id</code>"
+"helpAdminCommands" = "Для перезапуска Xray Core:\r\n<code>/restart</code>\r\n\r\nДля поиска электронной почты клиента:\r\n<code>/usage [Email]</code>\r\n\r\nДля поиска входящих (со статистикой клиента):\r\n<code>/inbound [Примечание]</code>\r\n\r\nID чата Telegram:\r\n<code>/id</code>"
-"helpClientCommands" = "Для поиска статистики используйте следующую команду:\r\n<code>/usage [Email]</code>\r\n\r\nID чата Telegram:\r\n<code>/id</code>"
+"helpClientCommands" = "Для поиска статистики используйте команду:\r\n<code>/usage [Email]</code>\r\n\r\nID чата Telegram:\r\n<code>/id</code>"
-"restartUsage" = "\r\n\r\n<code>/restart force</code>"
+"restartUsage" = "\r\n\r\n<code>/restart</code>"
 "restartSuccess" = "✅ Операция успешно завершена!"
 "restartFailed" = "❗ Ошибка в операции.\r\n\r\n<code>Ошибка: {{ .Error }}</code>."
 "xrayNotRunning" = "❗ Xray Core не запущен."

web/translation/translate.tr_TR.toml

@@ -61,8 +61,15 @@
 "secAlertPanelURI" = "Panel varsayılan URI yolu güvensiz. Karmaşık bir URI yolu yapılandırın."
 "secAlertSubURI" = "Abonelik varsayılan URI yolu güvensiz. Karmaşık bir URI yolu yapılandırın."
 "secAlertSubJsonURI" = "Abonelik JSON varsayılan URI yolu güvensiz. Karmaşık bir URI yolu yapılandırın."
+"emptyDnsDesc" = "Eklenmiş DNS sunucusu yok."
+"emptyFakeDnsDesc" = "Eklenmiş Fake DNS sunucusu yok."
+"emptyBalancersDesc" = "Eklenmiş dengeleyici yok."
+"emptyReverseDesc" = "Eklenmiş ters proxy yok."
 
 [menu]
+"theme" = "Tema"
+"dark" = "Koyu"
+"ultraDark" = "Ultra Koyu"
 "dashboard" = "Genel Bakış"
 "inbounds" = "Gelenler"
 "settings" = "Panel Ayarları"
@@ -98,20 +105,25 @@
 "connectionTcpCountDesc" = "Sistem genelinde toplam TCP bağlantıları"
 "connectionUdpCountDesc" = "Sistem genelinde toplam UDP bağlantıları"
 "connectionCount" = "Bağlantı İstatistikleri"
-"upSpeed" = "Sistem genelinde toplam yükleme hızı"
+"ipAddresses" = "IP adresleri"
-"downSpeed" = "Sistem genelinde toplam indirme hızı"
+"toggleIpVisibility" = "IP görünürlüğünü değiştir"
-"totalSent" = "İşletim sistemi başlatıldığından beri sistem genelinde gönderilen toplam veri"
+"overallSpeed" = "Genel hız"
-"totalReceive" = "İşletim sistemi başlatıldığından beri sistem genelinde alınan toplam veri"
+"upload" = "Yükleme"
+"download" = "İndirme"
+"totalData" = "Toplam veri"
+"sent" = "Gönderilen"
+"received" = "Alınan"
 "xraySwitchVersionDialog" = "Xray Sürümünü Değiştir"
 "xraySwitchVersionDialogDesc" = "Xray sürümünü değiştirmek istediğinizden emin misiniz"
 "dontRefresh" = "Kurulum devam ediyor, lütfen bu sayfayı yenilemeyin"
 "logs" = "Günlükler"
 "config" = "Yapılandırma"
-"backup" = "Yedekle & Geri Yükle"
+"backup" = "Yedek"
 "backupTitle" = "Veritabanı Yedekleme & Geri Yükleme"
-"backupDescription" = "Veritabanını geri yüklemeden önce yedek almanız önerilir."
 "exportDatabase" = "Yedekle"
+"exportDatabaseDesc" = "Mevcut veritabanınızın yedeğini içeren bir .db dosyasını cihazınıza indirmek için tıklayın."
 "importDatabase" = "Geri Yükle"
+"importDatabaseDesc" = "Cihazınızdan bir .db dosyası seçip yükleyerek veritabanınızı yedekten geri yüklemek için tıklayın."
 
 [pages.inbounds]
 "title" = "Gelenler"
@@ -130,6 +142,8 @@
 "resetTraffic" = "Trafiği Sıfırla"
 "addInbound" = "Gelen Ekle"
 "generalActions" = "Genel Eylemler"
+"autoRefresh" = "Otomatik yenileme"
+"autoRefreshInterval" = "Aralık"
 "create" = "Oluştur"
 "update" = "Güncelle"
 "modifyInbound" = "Geleni Düzenle"
@@ -287,6 +301,8 @@
 "subSettings" = "Abonelik"
 "subEnable" = "Abonelik Hizmetini Etkinleştir"
 "subEnableDesc" = "Abonelik hizmetini etkinleştirir."
+"subTitle" = "Abonelik Başlığı"
+"subTitleDesc" = "VPN istemcisinde gösterilen başlık"
 "subListen" = "Dinleme IP"
 "subListenDesc" = "Abonelik hizmeti için IP adresi. (tüm IP'leri dinlemek için boş bırakın)"
 "subPort" = "Dinleme Portu"
@@ -321,7 +337,15 @@
 "muxSett" = "Mux Ayarları"
 "direct" = "Doğrudan Bağlantı"
 "directDesc" = "Belirli bir ülkenin alan adları veya IP aralıkları ile doğrudan bağlantı kurar."
-
+"notifications" = "Bildirimler"
+"certs" = "Sertifikalar"
+"externalTraffic" = "Harici Trafik"
+"dateAndTime" = "Tarih ve Saat"
+"proxyAndServer" = "Proxy ve Sunucu"
+"intervals" = "Aralıklar"
+"information" = "Bilgi"
+"language" = "Dil"
+"telegramBotLanguage" = "Telegram Bot Dili"
 
 [pages.xray]
 "title" = "Xray Yapılandırmaları"
@@ -412,6 +436,7 @@
 "type" = "Tür"
 "bridge" = "Köprü"
 "portal" = "Portal"
+"link" = "Bağlantı"
 "intercon" = "Bağlantı"
 "settings" = "Ayarlar"
 "accountInfo" = "Hesap Bilgileri"
@@ -462,7 +487,7 @@
 "poolSize" = "Havuz Boyutu"
 
 [pages.settings.security]
-"admin" = "Yönetici"
+"admin" = "Yönetici kimlik bilgileri"
 "secret" = "Gizli Anahtar"
 "loginSecurity" = "Güvenli Giriş"
 "loginSecurityDesc" = "Daha fazla güvenlik sağlamak için ek bir kimlik doğrulama katmanı ekler."
@@ -505,9 +530,9 @@
 "status" = "✅ Bot çalışıyor!"
 "usage" = "❗ Lütfen aramak için bir metin sağlayın!"
 "getID" = "🆔 Kimliğiniz: <code>{{ .ID }}</code>"
-"helpAdminCommands" = "Xray Core'u yeniden başlatmak için:\r\n<code>/restart force</code>\r\n\r\nBir müşteri e-postasını aramak için:\r\n<code>/usage [E-posta]</code>\r\n\r\nGelenleri aramak için (müşteri istatistikleri ile):\r\n<code>/inbound [Açıklama]</code>\r\n\r\nTelegram Sohbet Kimliği:\r\n<code>/id</code>"
+"helpAdminCommands" = "Xray Core'u yeniden başlatmak için:\r\n<code>/restart</code>\r\n\r\nBir müşteri e-postasını aramak için:\r\n<code>/usage [E-posta]</code>\r\n\r\nGelenleri aramak için (müşteri istatistikleri ile):\r\n<code>/inbound [Açıklama]</code>\r\n\r\nTelegram Sohbet Kimliği:\r\n<code>/id</code>"
 "helpClientCommands" = "İstatistikleri aramak için şu komutu kullanın:\r\n\r\n<code>/usage [E-posta]</code>\r\n\r\nTelegram Sohbet Kimliği:\r\n<code>/id</code>"
-"restartUsage" = "\r\n\r\n<code>/restart force</code>"
+"restartUsage" = "\r\n\r\n<code>/restart</code>"
 "restartSuccess" = "✅ İşlem başarılı!"
 "restartFailed" = "❗ İşlem hatası.\r\n\r\n<code>Hata: {{ .Error }}</code>."
 "xrayNotRunning" = "❗ Xray Core çalışmıyor."

web/translation/translate.uk_UA.toml

@@ -61,8 +61,15 @@
 "secAlertPanelURI" = "Стандартний URI-шлях панелі небезпечний. Будь ласка, сконфігуруйте складний URI-шлях."
 "secAlertSubURI" = "Стандартний URI-шлях підписки небезпечний. Будь ласка, сконфігуруйте складний URI-шлях."
 "secAlertSubJsonURI" = "Стандартний URI-шлях JSON підписки небезпечний. Будь ласка, сконфігуруйте складний URI-шлях."
+"emptyDnsDesc" = "Немає доданих DNS-серверів."
+"emptyFakeDnsDesc" = "Немає доданих Fake DNS-серверів."
+"emptyBalancersDesc" = "Немає доданих балансувальників."
+"emptyReverseDesc" = "Немає доданих зворотних проксі."
 
 [menu]
+"theme" = "Тема"
+"dark" = "Темна"
+"ultraDark" = "Ультра темна"
 "dashboard" = "Огляд"
 "inbounds" = "Вхідні"
 "settings" = "Параметри панелі"
@@ -98,20 +105,25 @@
 "connectionTcpCountDesc" = "Загальна кількість TCP-з'єднань у системі"
 "connectionUdpCountDesc" = "Загальна кількість UDP-з'єднань у системі"
 "connectionCount" = "Статистика з'єднання"
-"upSpeed" = "Загальна швидкість завантаження в системі"
+"ipAddresses" = "IP-адреси"
-"downSpeed" = "Загальна швидкість завантаження в системі"
+"toggleIpVisibility" = "Перемкнути видимість IP"
-"totalSent" = "Загальна кількість даних, надісланих через систему з моменту запуску ОС"
+"overallSpeed" = "Загальна швидкість"
-"totalReceive" = "Загальна кількість даних, отриманих системою з моменту запуску ОС"
+"upload" = "Відправка"
+"download" = "Завантаження"
+"totalData" = "Загальний обсяг даних"
+"sent" = "Відправлено"
+"received" = "Отримано"
 "xraySwitchVersionDialog" = "Змінити версію Xray"
 "xraySwitchVersionDialogDesc" = "Ви впевнені, що бажаєте змінити версію Xray на"
 "dontRefresh" = "Інсталяція триває, будь ласка, не оновлюйте цю сторінку"
 "logs" = "Журнали"
 "config" = "Конфігурація"
-"backup" = "Резервне копіювання та відновлення"
+"backup" = "Резервна копія"
 "backupTitle" = "Резервне копіювання та відновлення бази даних"
-"backupDescription" = "Рекомендується зробити резервну копію перед відновленням бази даних."
+"exportDatabase" = "Резервна копія"
-"exportDatabase" = "Резервне копіювання"
+"exportDatabaseDesc" = "Натисніть, щоб завантажити файл .db, що містить резервну копію вашої поточної бази даних на ваш пристрій."
 "importDatabase" = "Відновити"
+"importDatabaseDesc" = "Натисніть, щоб вибрати та завантажити файл .db з вашого пристрою для відновлення бази даних з резервної копії."
 
 [pages.inbounds]
 "title" = "Вхідні"
@@ -130,6 +142,8 @@
 "resetTraffic" = "Скинути трафік"
 "addInbound" = "Додати вхідний"
 "generalActions" = "Загальні дії"
+"autoRefresh" = "Автооновлення"
+"autoRefreshInterval" = "Інтервал"
 "create" = "Створити"
 "update" = "Оновити"
 "modifyInbound" = "Змінити вхідний"
@@ -287,6 +301,8 @@
 "subSettings" = "Підписка"
 "subEnable" = "Увімкнути службу підписки"
 "subEnableDesc" = "Вмикає службу підписки."
+"subTitle" = "Назва Підписки"
+"subTitleDesc" = "Назва, яка відображається у VPN-клієнті"
 "subListen" = "Слухати IP"
 "subListenDesc" = "IP-адреса для служби підписки. (залиште порожнім, щоб слухати всі IP-адреси)"
 "subPort" = "Слухати порт"
@@ -321,7 +337,15 @@
 "muxSett" = "Налаштування Mux"
 "direct" = "Пряме підключення"
 "directDesc" = "Безпосередньо встановлює з’єднання з доменами або діапазонами IP певної країни."
-
+"notifications" = "Сповіщення"
+"certs" = "Сертифікати"
+"externalTraffic" = "Зовнішній трафік"
+"dateAndTime" = "Дата та час"
+"proxyAndServer" = "Проксі та сервер"
+"intervals" = "Інтервали"
+"information" = "Інформація"
+"language" = "Мова"
+"telegramBotLanguage" = "Мова Telegram-бота"
 
 [pages.xray]
 "title" = "Xray конфігурації"
@@ -412,6 +436,7 @@
 "type" = "Тип"
 "bridge" = "Міст"
 "portal" = "Портал"
+"link" = "Посилання"
 "intercon" = "Взаємозв'язок"
 "settings" = "Налаштування"
 "accountInfo" = "Інформація про обліковий запис"
@@ -462,7 +487,7 @@
 "poolSize" = "Розмір пулу"
 
 [pages.settings.security]
-"admin" = "Адміністратор"
+"admin" = "Облікові дані адміністратора"
 "secret" = "Секретний маркер"
 "loginSecurity" = "Безпечний вхід"
 "loginSecurityDesc" = "Додає додатковий рівень автентифікації для забезпечення більшої безпеки."
@@ -505,9 +530,9 @@
 "status" = "✅ Бот в порядку!"
 "usage" = "❗ Введіть текст для пошуку!"
 "getID" = "🆔 Ваш ідентифікатор: <code>{{ .ID }}</code>"
-"helpAdminCommands" = "Для перезапуску Xray Core:\r\n<code>/restart force</code>\r\n\r\nДля пошуку електронної пошти клієнта:\r\n<code>/usage [Електронна пошта]</code>\r\n\r\nДля пошуку вхідних (зі статистикою клієнта):\r\n<code>/inbound [Примітка]</code>\r\n\r\nID чату Telegram:\r\n<code>/id</code>"
+"helpAdminCommands" = "Для перезапуску Xray Core:\r\n<code>/restart</code>\r\n\r\nДля пошуку електронної пошти клієнта:\r\n<code>/usage [Електронна пошта]</code>\r\n\r\nДля пошуку вхідних (зі статистикою клієнта):\r\n<code>/inbound [Примітка]</code>\r\n\r\nID чату Telegram:\r\n<code>/id</code>"
 "helpClientCommands" = "Для пошуку статистики використовуйте наступну команду:\r\n<code>/usage [Електронна пошта]</code>\r\n\r\nID чату Telegram:\r\n<code>/id</code>"
-"restartUsage" = "\r\n\r\n<code>/restart force</code>"
+"restartUsage" = "\r\n\r\n<code>/restart</code>"
 "restartSuccess" = "✅ Операція успішна!"
 "restartFailed" = "❗ Помилка в операції.\r\n\r\n<code>Помилка: {{ .Error }}</code>."
 "xrayNotRunning" = "❗ Xray Core не запущений."

web/translation/translate.vi_VN.toml

@@ -61,8 +61,15 @@
 "secAlertPanelURI" = "Đường dẫn URI mặc định của bảng điều khiển không an toàn. Vui lòng cấu hình một đường dẫn URI phức tạp."
 "secAlertSubURI" = "Đường dẫn URI mặc định của đăng ký không an toàn. Vui lòng cấu hình một đường dẫn URI phức tạp."
 "secAlertSubJsonURI" = "Đường dẫn URI JSON mặc định của đăng ký không an toàn. Vui lòng cấu hình một đường dẫn URI phức tạp."
+"emptyDnsDesc" = "Không có máy chủ DNS nào được thêm."
+"emptyFakeDnsDesc" = "Không có máy chủ Fake DNS nào được thêm."
+"emptyBalancersDesc" = "Không có bộ cân bằng tải nào được thêm."
+"emptyReverseDesc" = "Không có proxy ngược nào được thêm."
 
 [menu]
+"theme" = "Chủ đề"
+"dark" = "Tối"
+"ultraDark" = "Siêu tối"
 "dashboard" = "Trạng thái hệ thống"
 "inbounds" = "Đầu vào khách hàng"
 "settings" = "Cài đặt bảng điều khiển"
@@ -98,20 +105,25 @@
 "connectionTcpCountDesc" = "Tổng số kết nối TCP trên tất cả các thẻ mạng."
 "connectionUdpCountDesc" = "Tổng số kết nối UDP trên tất cả các thẻ mạng."
 "connectionCount" = "Số lượng kết nối"
-"upSpeed" = "Tổng tốc độ tải lên cho tất cả các thẻ mạng."
+"ipAddresses" = "Địa chỉ IP"
-"downSpeed" = "Tổng tốc độ tải xuống cho tất cả các thẻ mạng."
+"toggleIpVisibility" = "Chuyển đổi hiển thị IP"
-"totalSent" = "Tổng lưu lượng tải lên của tất cả các thẻ mạng kể từ khi hệ thống khởi động."
+"overallSpeed" = "Tốc độ tổng thể"
-"totalReceive" = "Tổng lưu lượng tải xuống trên tất cả các thẻ mạng kể từ khi hệ thống khởi động."
+"upload" = "Tải lên"
+"download" = "Tải xuống"
+"totalData" = "Tổng dữ liệu"
+"sent" = "Đã gửi"
+"received" = "Đã nhận"
 "xraySwitchVersionDialog" = "Chuyển đổi Phiên bản Xray"
 "xraySwitchVersionDialogDesc" = "Bạn có chắc chắn muốn chuyển đổi phiên bản Xray sang"
 "dontRefresh" = "Đang tiến hành cài đặt, vui lòng không làm mới trang này."
 "logs" = "Nhật ký"
 "config" = "Cấu hình"
-"backup" = "Sao lưu & Khôi phục"
+"backup" = "Sao lưu"
 "backupTitle" = "Sao lưu & Khôi phục Cơ sở dữ liệu"
-"backupDescription" = "Hãy nhớ sao lưu trước khi nhập cơ sở dữ liệu mới."
+"exportDatabase" = "Sao lưu"
-"exportDatabase" = "Tải về Cơ sở dữ liệu"
+"exportDatabaseDesc" = "Nhấp để tải xuống tệp .db chứa bản sao lưu cơ sở dữ liệu hiện tại của bạn vào thiết bị."
-"importDatabase" = "Tải lên Cơ sở dữ liệu"
+"importDatabase" = "Khôi phục"
+"importDatabaseDesc" = "Nhấp để chọn và tải lên tệp .db từ thiết bị của bạn để khôi phục cơ sở dữ liệu từ bản sao lưu."
 
 [pages.inbounds]
 "title" = "Điểm vào (Inbounds)"
@@ -130,6 +142,8 @@
 "resetTraffic" = "Đặt lại lưu lượng"
 "addInbound" = "Thêm điểm vào"
 "generalActions" = "Hành động chung"
+"autoRefresh" = "Tự động làm mới"
+"autoRefreshInterval" = "Khoảng thời gian"
 "create" = "Tạo mới"
 "update" = "Cập nhật"
 "modifyInbound" = "Chỉnh sửa điểm vào (Inbound)"
@@ -287,6 +301,8 @@
 "subSettings" = "Gói đăng ký"
 "subEnable" = "Bật dịch vụ"
 "subEnableDesc" = "Tính năng gói đăng ký với cấu hình riêng"
+"subTitle" = "Tiêu đề Đăng ký"
+"subTitleDesc" = "Tiêu đề hiển thị trong ứng dụng VPN"
 "subListen" = "Listening IP"
 "subListenDesc" = "Mặc định để trống để nghe tất cả các IP"
 "subPort" = "Cổng gói đăng ký"
@@ -321,7 +337,15 @@
 "muxSett" = "Mux Cài đặt"
 "direct" = "Kết nối trực tiếp"
 "directDesc" = "Trực tiếp thiết lập kết nối với tên miền hoặc dải IP của một quốc gia cụ thể."
-
+"notifications" = "Thông báo"
+"certs" = "Chứng chỉ"
+"externalTraffic" = "Lưu lượng bên ngoài"
+"dateAndTime" = "Ngày và giờ"
+"proxyAndServer" = "Proxy và máy chủ"
+"intervals" = "Khoảng thời gian"
+"information" = "Thông tin"
+"language" = "Ngôn ngữ"
+"telegramBotLanguage" = "Ngôn ngữ của Bot Telegram"
 
 [pages.xray]
 "title" = "Cài đặt Xray"
@@ -412,6 +436,7 @@
 "type" = "Loại"
 "bridge" = "Cầu"
 "portal" = "Cổng thông tin"
+"link" = "Liên kết"
 "intercon" = "Kết nối"
 "settings" = "cài đặt"
 "accountInfo" = "Thông tin tài khoản"
@@ -462,7 +487,7 @@
 "poolSize" = "Kích thước bể bơi"
 
 [pages.settings.security]
-"admin" = "Quản trị viên"
+"admin" = "Thông tin đăng nhập quản trị viên"
 "secret" = "Mã thông báo bí mật"
 "loginSecurity" = "Bảo mật đăng nhập"
 "loginSecurityDesc" = "Bật bước bảo mật đăng nhập bổ sung cho người dùng"
@@ -505,9 +530,9 @@
 "status" = "✅ Bot hoạt động bình thường!"
 "usage" = "❗ Vui lòng cung cấp văn bản để tìm kiếm!"
 "getID" = "🆔 ID của bạn: <code>{{ .ID }}</code>"
-"helpAdminCommands" = "Để khởi động lại Xray Core:\r\n<code>/restart force</code>\r\n\r\nĐể tìm kiếm email của khách hàng:\r\n<code>/usage [Email]</code>\r\n\r\nĐể tìm kiếm các nhập (với số liệu thống kê của khách hàng):\r\n<code>/inbound [Ghi chú]</code>\r\n\r\nID Trò chuyện Telegram:\r\n<code>/id</code>"
+"helpAdminCommands" = "Để khởi động lại Xray Core:\r\n<code>/restart</code>\r\n\r\nĐể tìm kiếm email của khách hàng:\r\n<code>/usage [Email]</code>\r\n\r\nĐể tìm kiếm các nhập (với số liệu thống kê của khách hàng):\r\n<code>/inbound [Ghi chú]</code>\r\n\r\nID Trò chuyện Telegram:\r\n<code>/id</code>"
 "helpClientCommands" = "Để tìm kiếm thống kê, sử dụng lệnh sau:\r\n<code>/usage [Email]</code>\r\n\r\nID Trò chuyện Telegram:\r\n<code>/id</code>"
-"restartUsage" = "\r\n\r\n<code>/restart force</code>"
+"restartUsage" = "\r\n\r\n<code>/restart</code>"
 "restartSuccess" = "✅ Hoạt động thành công!"
 "restartFailed" = "❗ Lỗi trong quá trình hoạt động.\r\n\r\n<code>Lỗi: {{ .Error }}</code>."
 "xrayNotRunning" = "❗ Xray Core không chạy."

web/translation/translate.zh_CN.toml

@@ -61,8 +61,15 @@
 "secAlertPanelURI" = "面板默认 URI 路径不安全。请配置复杂的 URI 路径。"
 "secAlertSubURI" = "订阅默认 URI 路径不安全。请配置复杂的 URI 路径。"
 "secAlertSubJsonURI" = "订阅 JSON 默认 URI 路径不安全。请配置复杂的 URI 路径。"
+"emptyDnsDesc" = "未添加DNS服务器。"
+"emptyFakeDnsDesc" = "未添加Fake DNS服务器。"
+"emptyBalancersDesc" = "未添加负载均衡器。"
+"emptyReverseDesc" = "未添加反向代理。"
 
 [menu]
+"theme" = "主题"
+"dark" = "暗色"
+"ultraDark" = "超暗色"
 "dashboard" = "系统状态"
 "inbounds" = "入站列表"
 "settings" = "面板设置"
@@ -98,20 +105,25 @@
 "connectionTcpCountDesc" = "系统中所有 TCP 连接数"
 "connectionUdpCountDesc" = "系统中所有 UDP 连接数"
 "connectionCount" = "连接数"
-"upSpeed" = "总上传速度"
+"ipAddresses" = "IP地址"
-"downSpeed" = "总下载速度"
+"toggleIpVisibility" = "切换IP可见性"
-"totalSent" = "系统启动以来发送的总数据量"
+"overallSpeed" = "整体速度"
-"totalReceive" = "系统启动以来接收的总数据量"
+"upload" = "上传"
+"download" = "下载"
+"totalData" = "总数据"
+"sent" = "已发送"
+"received" = "已接收"
 "xraySwitchVersionDialog" = "切换 Xray 版本"
 "xraySwitchVersionDialogDesc" = "是否切换 Xray 版本至"
 "dontRefresh" = "安装中，请勿刷新此页面"
 "logs" = "日志"
 "config" = "配置"
-"backup" = "备份和恢复"
+"backup" = "备份"
 "backupTitle" = "备份和恢复数据库"
-"backupDescription" = "恢复数据库之前建议进行备份"
 "exportDatabase" = "备份"
+"exportDatabaseDesc" = "点击下载包含当前数据库备份的 .db 文件到您的设备。"
 "importDatabase" = "恢复"
+"importDatabaseDesc" = "点击选择并上传设备中的 .db 文件以从备份恢复数据库。"
 
 [pages.inbounds]
 "title" = "入站列表"
@@ -130,6 +142,8 @@
 "resetTraffic" = "重置流量"
 "addInbound" = "添加入站"
 "generalActions" = "通用操作"
+"autoRefresh" = "自动刷新"
+"autoRefreshInterval" = "间隔"
 "create" = "添加"
 "update" = "修改"
 "modifyInbound" = "修改入站"
@@ -287,6 +301,8 @@
 "subSettings" = "订阅设置"
 "subEnable" = "启用订阅服务"
 "subEnableDesc" = "启用订阅服务功能"
+"subTitle" = "订阅标题"
+"subTitleDesc" = "在VPN客户端中显示的标题"
 "subListen" = "监听 IP"
 "subListenDesc" = "订阅服务监听的 IP 地址（留空表示监听所有 IP）"
 "subPort" = "监听端口"
@@ -321,7 +337,15 @@
 "muxSett" = "复用器设置"
 "direct" = "直接连接"
 "directDesc" = "直接与特定国家的域或IP范围建立连接"
-
+"notifications" = "通知"
+"certs" = "证书"
+"externalTraffic" = "外部流量"
+"dateAndTime" = "日期和时间"
+"proxyAndServer" = "代理和服务器"
+"intervals" = "间隔"
+"information" = "信息"
+"language" = "语言"
+"telegramBotLanguage" = "Telegram 机器人语言"
 
 [pages.xray]
 "title" = "Xray 配置"
@@ -412,6 +436,7 @@
 "type" = "类型"
 "bridge" = "Bridge"
 "portal" = "Portal"
+"link" = "链接"
 "intercon" = "互连"
 "settings" = "设置"
 "accountInfo" = "帐户信息"
@@ -462,7 +487,7 @@
 "poolSize" = "池大小"
 
 [pages.settings.security]
-"admin" = "管理员"
+"admin" = "管理员凭据"
 "secret" = "安全令牌"
 "loginSecurity" = "登录安全"
 "loginSecurityDesc" = "添加额外的身份验证以提高安全性"
@@ -505,9 +530,9 @@
 "status" = "✅ 机器人正常运行！"
 "usage" = "❗ 请输入要搜索的文本！"
 "getID" = "🆔 您的 ID 为：<code>{{ .ID }}</code>"
-"helpAdminCommands" = "要重新启动 Xray Core：\r\n<code>/restart force</code>\r\n\r\n要搜索客户电子邮件：\r\n<code>/usage [电子邮件]</code>\r\n\r\n要搜索入站（带有客户统计数据）：\r\n<code>/inbound [备注]</code>\r\n\r\nTelegram聊天ID：\r\n<code>/id</code>"
+"helpAdminCommands" = "要重新启动 Xray Core：\r\n<code>/restart</code>\r\n\r\n要搜索客户电子邮件：\r\n<code>/usage [电子邮件]</code>\r\n\r\n要搜索入站（带有客户统计数据）：\r\n<code>/inbound [备注]</code>\r\n\r\nTelegram聊天ID：\r\n<code>/id</code>"
 "helpClientCommands" = "要搜索统计数据，请使用以下命令：\r\n<code>/usage [电子邮件]</code>\r\n\r\nTelegram聊天ID：\r\n<code>/id</code>"
-"restartUsage" = "\r\n\r\n<code>/restart force</code>"
+"restartUsage" = "\r\n\r\n<code>/restart</code>"
 "restartSuccess" = "✅ 操作成功!"
 "restartFailed" = "❗ 操作错误。\r\n\r\n<code>错误: {{ .Error }}</code>."
 "xrayNotRunning" = "❗ Xray Core 未运行。"

web/translation/translate.zh_TW.toml

@@ -61,8 +61,15 @@
 "secAlertPanelURI" = "面板預設 URI 路徑不安全。請配置複雜的 URI 路徑。"
 "secAlertSubURI" = "訂閱預設 URI 路徑不安全。請配置複雜的 URI 路徑。"
 "secAlertSubJsonURI" = "訂閱 JSON 預設 URI 路徑不安全。請配置複雜的 URI 路徑。"
+"emptyDnsDesc" = "未添加DNS伺服器。"
+"emptyFakeDnsDesc" = "未添加Fake DNS伺服器。"
+"emptyBalancersDesc" = "未添加負載平衡器。"
+"emptyReverseDesc" = "未添加反向代理。"
 
 [menu]
+"theme" = "主題"
+"dark" = "深色"
+"ultraDark" = "超深色"
 "dashboard" = "系統狀態"
 "inbounds" = "入站列表"
 "settings" = "面板設定"
@@ -98,10 +105,14 @@
 "connectionTcpCountDesc" = "系統中所有 TCP 連線數"
 "connectionUdpCountDesc" = "系統中所有 UDP 連線數"
 "connectionCount" = "連線數"
-"upSpeed" = "總上傳速度"
+"ipAddresses" = "IP地址"
-"downSpeed" = "總下載速度"
+"toggleIpVisibility" = "切換IP可見性"
-"totalSent" = "系統啟動以來傳送的總資料量"
+"overallSpeed" = "整體速度"
-"totalReceive" = "系統啟動以來接收的總資料量"
+"upload" = "上傳"
+"download" = "下載"
+"totalData" = "總數據"
+"sent" = "已發送"
+"received" = "已接收"
 "xraySwitchVersionDialog" = "切換 Xray 版本"
 "xraySwitchVersionDialogDesc" = "是否切換 Xray 版本至"
 "dontRefresh" = "安裝中，請勿重新整理此頁面"
@@ -109,9 +120,10 @@
 "config" = "配置"
 "backup" = "備份和恢復"
 "backupTitle" = "備份和恢復資料庫"
-"backupDescription" = "恢復資料庫之前建議進行備份"
 "exportDatabase" = "備份"
+"exportDatabaseDesc" = "點擊下載包含當前資料庫備份的 .db 文件到您的設備。"
 "importDatabase" = "恢復"
+"importDatabaseDesc" = "點擊選擇並上傳設備中的 .db 文件以從備份恢復資料庫。"
 
 [pages.inbounds]
 "title" = "入站列表"
@@ -130,6 +142,8 @@
 "resetTraffic" = "重置流量"
 "addInbound" = "新增入站"
 "generalActions" = "通用操作"
+"autoRefresh" = "自動刷新"
+"autoRefreshInterval" = "間隔"
 "create" = "新增"
 "update" = "修改"
 "modifyInbound" = "修改入站"
@@ -287,6 +301,8 @@
 "subSettings" = "訂閱設定"
 "subEnable" = "啟用訂閱服務"
 "subEnableDesc" = "啟用訂閱服務功能"
+"subTitle" = "訂閱標題"
+"subTitleDesc" = "在VPN客戶端中顯示的標題"
 "subListen" = "監聽 IP"
 "subListenDesc" = "訂閱服務監聽的 IP 地址（留空表示監聽所有 IP）"
 "subPort" = "監聽埠"
@@ -321,7 +337,15 @@
 "muxSett" = "複用器設定"
 "direct" = "直接連線"
 "directDesc" = "直接與特定國家的域或IP範圍建立連線"
-
+"notifications" = "通知"
+"certs" = "證書"
+"externalTraffic" = "外部流量"
+"dateAndTime" = "日期和時間"
+"proxyAndServer" = "代理和伺服器"
+"intervals" = "間隔"
+"information" = "資訊"
+"language" = "語言"
+"telegramBotLanguage" = "Telegram 機器人語言"
 
 [pages.xray]
 "title" = "Xray 配置"
@@ -412,6 +436,7 @@
 "type" = "類型"
 "bridge" = "Bridge"
 "portal" = "Portal"
+"link" = "連結"
 "intercon" = "互連"
 "settings" = "設定"
 "accountInfo" = "帳戶資訊"
@@ -462,7 +487,7 @@
 "poolSize" = "池大小"
 
 [pages.settings.security]
-"admin" = "管理員"
+"admin" = "管理員憑證"
 "secret" = "安全令牌"
 "loginSecurity" = "登入安全"
 "loginSecurityDesc" = "新增額外的身份驗證以提高安全性"
@@ -505,9 +530,9 @@
 "status" = "✅ 機器人正常執行！"
 "usage" = "❗ 請輸入要搜尋的文字！"
 "getID" = "🆔 您的 ID 為：<code>{{ .ID }}</code>"
-"helpAdminCommands" = "要重新啟動 Xray Core：\r\n<code>/restart force</code>\r\n\r\n要搜尋客戶電子郵件：\r\n<code>/usage [電子郵件]</code>\r\n\r\n要搜尋入站（帶有客戶統計資料）：\r\n<code>/inbound [備註]</code>\r\n\r\nTelegram聊天ID：\r\n<code>/id</code>"
+"helpAdminCommands" = "要重新啟動 Xray Core：\r\n<code>/restart</code>\r\n\r\n要搜尋客戶電子郵件：\r\n<code>/usage [電子郵件]</code>\r\n\r\n要搜尋入站（帶有客戶統計資料）：\r\n<code>/inbound [備註]</code>\r\n\r\nTelegram聊天ID：\r\n<code>/id</code>"
 "helpClientCommands" = "要搜尋統計資料，請使用以下命令：\r\n<code>/usage [電子郵件]</code>\r\n\r\nTelegram聊天ID：\r\n<code>/id</code>"
-"restartUsage" = "\r\n\r\n<code>/restart force</code>"
+"restartUsage" = "\r\n\r\n<code>/restart</code>"
 "restartSuccess" = "✅ 操作成功!"
 "restartFailed" = "❗ 操作錯誤。\r\n\r\n<code>錯誤: {{ .Error }}</code>."
 "xrayNotRunning" = "❗ Xray Core 未運行。"

x-ui.sh

@@ -60,8 +60,8 @@ elif [[ "${release}" == "centos" ]]; then
         echo -e "${red} Please use CentOS 8 or higher ${plain}\n" && exit 1
     fi
 elif [[ "${release}" == "ubuntu" ]]; then
-    if [[ ${os_version} -lt 2004 ]]; then
+    if [[ ${os_version} -lt 2204 ]]; then
-        echo -e "${red} Please use Ubuntu 20 or higher version!${plain}\n" && exit 1
+        echo -e "${red} Please use Ubuntu 22 or higher version!${plain}\n" && exit 1
     fi
 elif [[ "${release}" == "fedora" ]]; then
     if [[ ${os_version} -lt 36 ]]; then
@@ -94,7 +94,7 @@ elif [[ "${release}" == "virtuozzo" ]]; then
 else
     echo -e "${red}Your operating system is not supported by this script.${plain}\n"
     echo "Please ensure you are using one of the following supported operating systems:"
-    echo "- Ubuntu 20.04+"
+    echo "- Ubuntu 22.04+"
     echo "- Debian 11+"
     echo "- CentOS 8+"
     echo "- OpenEuler 22.03+"
@@ -1127,7 +1127,7 @@ ssl_cert_issue() {
 
     # issue the certificate
     ~/.acme.sh/acme.sh --set-default-ca --server letsencrypt
-    ~/.acme.sh/acme.sh --issue -d ${domain} --listen-v6 --standalone --httpport ${WebPort}
+    ~/.acme.sh/acme.sh --issue -d ${domain} --listen-v6 --standalone --httpport ${WebPort} --force
     if [ $? -ne 0 ]; then
         LOGE "Issuing certificate failed, please check logs."
         rm -rf ~/.acme.sh/${domain}
@@ -1136,10 +1136,36 @@ ssl_cert_issue() {
         LOGE "Issuing certificate succeeded, installing certificates..."
     fi
 
+    reloadCmd="x-ui restart"
+
+    LOGI "Default --reloadcmd for ACME is: ${yellow}x-ui restart"
+    LOGI "This command will run on every certificate issue and renew."
+    read -p "Would you like to modify --reloadcmd for ACME? (y/n): " setReloadcmd
+    if [[ "$setReloadcmd" == "y" || "$setReloadcmd" == "Y" ]]; then
+        echo -e "\n${green}\t1.${plain} Preset: systemctl reload nginx ; x-ui restart"
+        echo -e "${green}\t2.${plain} Input your own command"
+        echo -e "${green}\t0.${plain} Keep default reloadcmd"
+        read -p "Choose an option: " choice
+        case "$choice" in
+        1)
+            LOGI "Reloadcmd is: systemctl reload nginx ; x-ui restart"
+            reloadCmd="systemctl reload nginx ; x-ui restart"
+            ;;
+        2)  
+            LOGD "It's recommended to put x-ui restart at the end, so it won't raise an error if other services fails"
+            read -p "Please enter your reloadcmd (example: systemctl reload nginx ; x-ui restart): " reloadCmd
+            LOGI "Your reloadcmd is: ${reloadCmd}"
+            ;;
+        *)
+            LOGI "Keep default reloadcmd"
+            ;;
+        esac
+    fi
+
     # install the certificate
     ~/.acme.sh/acme.sh --installcert -d ${domain} \
         --key-file /root/cert/${domain}/privkey.pem \
-        --fullchain-file /root/cert/${domain}/fullchain.pem
+        --fullchain-file /root/cert/${domain}/fullchain.pem --reloadcmd "${reloadCmd}"
 
     if [ $? -ne 0 ]; then
         LOGE "Installing certificate failed, exiting."
@@ -1208,13 +1234,6 @@ ssl_cert_issue_CF() {
         fi
 
         CF_Domain=""
-        certPath="/root/cert-CF"
-        if [ ! -d "$certPath" ]; then
-            mkdir -p $certPath
-        else
-            rm -rf $certPath
-            mkdir -p $certPath
-        fi
 
         LOGD "Please set a domain name:"
         read -p "Input your domain here: " CF_Domain
@@ -1242,7 +1261,7 @@ ssl_cert_issue_CF() {
         export CF_Email="${CF_AccountEmail}"
 
         # Issue the certificate using Cloudflare DNS
-        ~/.acme.sh/acme.sh --issue --dns dns_cf -d ${CF_Domain} -d *.${CF_Domain} --log
+        ~/.acme.sh/acme.sh --issue --dns dns_cf -d ${CF_Domain} -d *.${CF_Domain} --log --force
         if [ $? -ne 0 ]; then
             LOGE "Certificate issuance failed, script exiting..."
             exit 1
@@ -1250,17 +1269,47 @@ ssl_cert_issue_CF() {
             LOGI "Certificate issued successfully, Installing..."
         fi
 
-        # Install the certificate
+         # Install the certificate
-        mkdir -p ${certPath}/${CF_Domain}
+        certPath="/root/cert/${CF_Domain}"
+        if [ -d "$certPath" ]; then
+            rm -rf ${certPath}
+        fi
+
+        mkdir -p ${certPath}
         if [ $? -ne 0 ]; then
-            LOGE "Failed to create directory: ${certPath}/${CF_Domain}"
+            LOGE "Failed to create directory: ${certPath}"
             exit 1
         fi
 
-        ~/.acme.sh/acme.sh --installcert -d ${CF_Domain} -d *.${CF_Domain} \
+        reloadCmd="x-ui restart"
-            --fullchain-file ${certPath}/${CF_Domain}/fullchain.pem \
-            --key-file ${certPath}/${CF_Domain}/privkey.pem
 
+        LOGI "Default --reloadcmd for ACME is: ${yellow}x-ui restart"
+        LOGI "This command will run on every certificate issue and renew."
+        read -p "Would you like to modify --reloadcmd for ACME? (y/n): " setReloadcmd
+        if [[ "$setReloadcmd" == "y" || "$setReloadcmd" == "Y" ]]; then
+            echo -e "\n${green}\t1.${plain} Preset: systemctl reload nginx ; x-ui restart"
+            echo -e "${green}\t2.${plain} Input your own command"
+            echo -e "${green}\t0.${plain} Keep default reloadcmd"
+            read -p "Choose an option: " choice
+            case "$choice" in
+            1)
+                LOGI "Reloadcmd is: systemctl reload nginx ; x-ui restart"
+                reloadCmd="systemctl reload nginx ; x-ui restart"
+                ;;
+            2)  
+                LOGD "It's recommended to put x-ui restart at the end, so it won't raise an error if other services fails"
+                read -p "Please enter your reloadcmd (example: systemctl reload nginx ; x-ui restart): " reloadCmd
+                LOGI "Your reloadcmd is: ${reloadCmd}"
+                ;;
+            *)
+                LOGI "Keep default reloadcmd"
+                ;;
+            esac
+        fi
+        ~/.acme.sh/acme.sh --installcert -d ${CF_Domain} -d *.${CF_Domain} \
+            --key-file ${certPath}/privkey.pem \
+            --fullchain-file ${certPath}/fullchain.pem --reloadcmd "${reloadCmd}"
+        
         if [ $? -ne 0 ]; then
             LOGE "Certificate installation failed, script exiting..."
             exit 1
@@ -1275,15 +1324,15 @@ ssl_cert_issue_CF() {
             exit 1
         else
             LOGI "The certificate is installed and auto-renewal is turned on. Specific information is as follows:"
-            ls -lah ${certPath}/${CF_Domain}
+            ls -lah ${certPath}/*
-            chmod 755 ${certPath}/${CF_Domain}
+            chmod 755 ${certPath}/*
         fi
 
         # Prompt user to set panel paths after successful certificate installation
         read -p "Would you like to set this certificate for the panel? (y/n): " setPanel
         if [[ "$setPanel" == "y" || "$setPanel" == "Y" ]]; then
-            local webCertFile="${certPath}/${CF_Domain}/fullchain.pem"
+            local webCertFile="${certPath}/fullchain.pem"
-            local webKeyFile="${certPath}/${CF_Domain}/privkey.pem"
+            local webKeyFile="${certPath}/privkey.pem"
 
             if [[ -f "$webCertFile" && -f "$webKeyFile" ]]; then
                 /usr/local/x-ui/x-ui cert -webCert "$webCertFile" -webCertKey "$webKeyFile"
@@ -1585,7 +1634,6 @@ install_iplimit() {
     # Launching fail2ban
     if ! systemctl is-active --quiet fail2ban; then
         systemctl start fail2ban
-        systemctl enable fail2ban
     else
         systemctl restart fail2ban
     fi

xray/api.go

@@ -92,7 +92,7 @@ func (x *XrayAPI) DelInbound(tag string) error {
 	return err
 }
 
-func (x *XrayAPI) AddUser(Protocol string, inboundTag string, user map[string]interface{}) error {
+func (x *XrayAPI) AddUser(Protocol string, inboundTag string, user map[string]any) error {
 	var account *serial.TypedMessage
 	switch Protocol {
 	case "vmess":

xray/log_writer.go

@@ -32,32 +32,56 @@ func (lw *LogWriter) Write(m []byte) (n int, err error) {
 		return len(m), nil
 	}
 
-	regex := regexp.MustCompile(`^(\d{4}/\d{2}/\d{2} \d{2}:\d{2}:\d{2}) \[([^\]]+)\] (.+)$`)
+	regex := regexp.MustCompile(`^(\d{4}/\d{2}/\d{2} \d{2}:\d{2}:\d{2}\.\d{6}) \[([^\]]+)\] (.+)$`)
-	messages := strings.Split(message, "\n")
+	messages := strings.SplitSeq(message, "\n")
 
-	for _, msg := range messages {
+	for msg := range messages {
 		matches := regex.FindStringSubmatch(msg)
 
 		if len(matches) > 3 {
 			level := matches[2]
 			msgBody := matches[3]
+			msgBodyLower := strings.ToLower(msgBody)
 
-			// Map the level to the appropriate logger function
+			if strings.Contains(msgBodyLower, "tls handshake error") ||
-			switch level {
+				strings.Contains(msgBodyLower, "connection ends") {
-			case "Debug":
 				logger.Debug("XRAY: " + msgBody)
-			case "Info":
+				lw.lastLine = ""
-				logger.Info("XRAY: " + msgBody)
+				continue
-			case "Warning":
+			}
-				logger.Warning("XRAY: " + msgBody)
+
-			case "Error":
+			if strings.Contains(msgBodyLower, "failed") {
 				logger.Error("XRAY: " + msgBody)
-			default:
+			} else {
-				logger.Debug("XRAY: " + msg)
+				switch level {
+				case "Debug":
+					logger.Debug("XRAY: " + msgBody)
+				case "Info":
+					logger.Info("XRAY: " + msgBody)
+				case "Warning":
+					logger.Warning("XRAY: " + msgBody)
+				case "Error":
+					logger.Error("XRAY: " + msgBody)
+				default:
+					logger.Debug("XRAY: " + msg)
+				}
 			}
 			lw.lastLine = ""
 		} else if msg != "" {
-			logger.Debug("XRAY: " + msg)
+			msgLower := strings.ToLower(msg)
+
+			if strings.Contains(msgLower, "tls handshake error") ||
+				strings.Contains(msgLower, "connection ends") {
+				logger.Debug("XRAY: " + msg)
+				lw.lastLine = msg
+				continue
+			}
+
+			if strings.Contains(msgLower, "failed") {
+				logger.Error("XRAY: " + msg)
+			} else {
+				logger.Debug("XRAY: " + msg)
+			}
 			lw.lastLine = msg
 		}
 	}

xray/process.go

@@ -64,7 +64,7 @@ func GetAccessLogPath() (string, error) {
 		return "", err
 	}
 
-	jsonConfig := map[string]interface{}{}
+	jsonConfig := map[string]any{}
 	err = json.Unmarshal([]byte(config), &jsonConfig)
 	if err != nil {
 		logger.Warningf("Failed to parse JSON configuration: %s", err)
@@ -72,7 +72,7 @@ func GetAccessLogPath() (string, error) {
 	}
 
 	if jsonConfig["log"] != nil {
-		jsonLog := jsonConfig["log"].(map[string]interface{})
+		jsonLog := jsonConfig["log"].(map[string]any)
 		if jsonLog["access"] != nil {
 			accessLogPath := jsonLog["access"].(string)
 			return accessLogPath, nil