bug fix

bug fixed - mux #2015
v2.2.5
2024-03-12 14:48:09 +03:30 · 2024-03-12 02:17:42 +03:30 · 2024-03-12 00:48:00 +03:30 · 2024-03-12 00:46:20 +03:30 · 2024-03-12 00:36:25 +03:30 · 2024-03-11 23:56:23 +03:30
105 changed files with 3123 additions and 1807 deletions
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -11,15 +11,15 @@ jobs:

    steps:
      - name: Check out the code
-        uses: actions/checkout@v4.1.1
+        uses: actions/checkout@v4
      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v3.0.0
+        uses: docker/setup-qemu-action@v3

      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3.0.0
+        uses: docker/setup-buildx-action@v3

      - name: Login to GHCR
-        uses: docker/login-action@v3.0.0
+        uses: docker/login-action@v3
        with:
          registry: ghcr.io
          username: ${{ github.actor }}
@@ -27,12 +27,12 @@ jobs:

      - name: Docker meta
        id: meta
-        uses: docker/metadata-action@v5.5.1
+        uses: docker/metadata-action@v5
        with:
          images: ghcr.io/${{ github.repository }}

      - name: Build and push Docker image
-        uses: docker/build-push-action@v5.1.0
+        uses: docker/build-push-action@v5
        with:
          context: .
          push: ${{ github.event_name != 'pull_request' }}
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -20,10 +20,10 @@ jobs:
    runs-on: ubuntu-20.04
    steps:
      - name: Checkout repository
-        uses: actions/checkout@v4.1.1
+        uses: actions/checkout@v4

      - name: Setup Go
-        uses: actions/setup-go@v5.0.0
+        uses: actions/setup-go@v5
        with:
          go-version: '1.22'

@@ -77,7 +77,7 @@ jobs:
          cd x-ui/bin
          
          # Download dependencies
-          Xray_URL="https://github.com/XTLS/Xray-core/releases/download/v1.8.7/"
+          Xray_URL="https://github.com/XTLS/Xray-core/releases/download/v1.8.9/"
          if [ "${{ matrix.platform }}" == "amd64" ]; then
            wget ${Xray_URL}Xray-linux-64.zip
            unzip Xray-linux-64.zip
@@ -117,7 +117,7 @@ jobs:
        run: tar -zcvf x-ui-linux-${{ matrix.platform }}.tar.gz x-ui
        
      - name: Upload files to GH release
-        uses: svenstaro/upload-release-action@2.9.0
+        uses: svenstaro/upload-release-action@v2
        with:
          repo_token: ${{ secrets.GITHUB_TOKEN }}
          tag: ${{ github.ref }}
--- a/.gitignore
+++ b/.gitignore
@@ -3,6 +3,7 @@
 .cache
 .sync*
 *.tar.gz
+*.log
 access.log
 error.log
 tmp
--- a/DockerInit.sh
+++ b/DockerInit.sh
@@ -27,7 +27,7 @@ case $1 in
 esac
 mkdir -p build/bin
 cd build/bin
-wget "https://github.com/XTLS/Xray-core/releases/download/v1.8.7/Xray-linux-${ARCH}.zip"
+wget "https://github.com/XTLS/Xray-core/releases/download/v1.8.9/Xray-linux-${ARCH}.zip"
 unzip "Xray-linux-${ARCH}.zip"
 rm -f "Xray-linux-${ARCH}.zip" geoip.dat geosite.dat
 mv xray "xray-linux-${FNAME}"
--- a/README.md
+++ b/README.md
@@ -1,5 +1,7 @@
 # 3X-UI

+<p align="center"><a href="#"><img src="./media/3X-UI.png" alt="Image"></a></p>
+
 **An Advanced Web Panel • Built on Xray Core**

 [![](https://img.shields.io/github/v/release/mhsanaei/3x-ui.svg)](https://github.com/MHSanaei/3x-ui/releases)
@@ -12,8 +14,7 @@

 **If this project is helpful to you, you may wish to give it a**:star2:

-<a href="#">
-  <img width="125" alt="image" src="https://github.com/MHSanaei/3x-ui/assets/115543613/7aa895dd-048a-42e7-989b-afd41a74e2e1.jpg"></a>
+<p align="left"><a href="#"><img width="125" src="https://github.com/MHSanaei/3x-ui/assets/115543613/7aa895dd-048a-42e7-989b-afd41a74e2e1" alt="Image"></a></p>

 - USDT (TRC20): `TXncxkvhkDWGts487Pjqq1qT9JmwRUz8CC`

@@ -25,10 +26,10 @@ bash <(curl -Ls https://raw.githubusercontent.com/mhsanaei/3x-ui/master/install.

 ## Install Custom Version

-To install your desired version, add the version to the end of the installation command. e.g., ver `v2.2.0`:
+To install your desired version, add the version to the end of the installation command. e.g., ver `v2.2.5`:

 ```
-bash <(curl -Ls https://raw.githubusercontent.com/mhsanaei/3x-ui/master/install.sh) v2.2.0
+bash <(curl -Ls https://raw.githubusercontent.com/mhsanaei/3x-ui/master/install.sh) v2.2.5
 ```

 ## SSL Certificate
@@ -212,6 +213,7 @@ Our platform offers compatibility with a diverse range of architectures and devi
 - Vietnamese
 - Spanish
 - Indonesian 
+- Ukrainian


 ## Features
@@ -309,9 +311,9 @@ If you want to use routing to WARP before v2.1.0 follow steps as below:
  
  ```sh
    "log": {
-    "access": "./access.log",
-    "dnsLog": false,
-    "loglevel": "warning"
+      "access": "./access.log",
+      "dnsLog": false,
+      "loglevel": "warning"
    },
  ```

--- a/config/version
+++ b/config/version
@@ -1 +1 @@
-2.2.0
+2.2.5
--- a/database/model/model.go
+++ b/database/model/model.go
@@ -2,6 +2,7 @@ package model

 import (
 	"fmt"
+
 	"x-ui/util/json_util"
 	"x-ui/xray"
 )
--- a/go.mod
+++ b/go.mod
@@ -12,35 +12,35 @@ require (
 	github.com/op/go-logging v0.0.0-20160315200505-970db520ece7
 	github.com/pelletier/go-toml/v2 v2.1.1
 	github.com/robfig/cron/v3 v3.0.1
-	github.com/shirou/gopsutil/v3 v3.24.1
+	github.com/shirou/gopsutil/v3 v3.24.2
 	github.com/valyala/fasthttp v1.52.0
-	github.com/xtls/xray-core v1.8.7
+	github.com/xtls/xray-core v1.8.9
 	go.uber.org/atomic v1.11.0
 	golang.org/x/text v0.14.0
-	google.golang.org/grpc v1.62.0
+	google.golang.org/grpc v1.62.1
 	gorm.io/driver/sqlite v1.5.5
 	gorm.io/gorm v1.25.7
 )

 require (
 	github.com/andybalholm/brotli v1.1.0 // indirect
-	github.com/bytedance/sonic v1.10.2 // indirect
+	github.com/bytedance/sonic v1.11.2 // indirect
 	github.com/chenzhuoyu/base64x v0.0.0-20230717121745-296ad89f973d // indirect
 	github.com/chenzhuoyu/iasm v0.9.1 // indirect
 	github.com/cloudflare/circl v1.3.7 // indirect
 	github.com/dgryski/go-metro v0.0.0-20211217172704-adc40b04c140 // indirect
-	github.com/fasthttp/router v1.4.22 // indirect
+	github.com/fasthttp/router v1.5.0 // indirect
 	github.com/francoispqt/gojay v1.2.13 // indirect
 	github.com/gabriel-vasile/mimetype v1.4.3 // indirect
 	github.com/gin-contrib/sse v0.1.0 // indirect
 	github.com/go-ole/go-ole v1.3.0 // indirect
 	github.com/go-playground/locales v0.14.1 // indirect
 	github.com/go-playground/universal-translator v0.18.1 // indirect
-	github.com/go-playground/validator/v10 v10.17.0 // indirect
+	github.com/go-playground/validator/v10 v10.19.0 // indirect
 	github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 // indirect
-	github.com/golang/protobuf v1.5.3 // indirect
+	github.com/golang/protobuf v1.5.4 // indirect
 	github.com/google/btree v1.1.2 // indirect
-	github.com/google/pprof v0.0.0-20231229205709-960ae82b1e42 // indirect
+	github.com/google/pprof v0.0.0-20240227163752-401108e1b7e7 // indirect
 	github.com/gorilla/context v1.1.2 // indirect
 	github.com/gorilla/securecookie v1.1.2 // indirect
 	github.com/gorilla/sessions v1.2.2 // indirect
@@ -49,25 +49,24 @@ require (
 	github.com/jinzhu/inflection v1.0.0 // indirect
 	github.com/jinzhu/now v1.1.5 // indirect
 	github.com/json-iterator/go v1.1.12 // indirect
-	github.com/klauspost/compress v1.17.6 // indirect
-	github.com/klauspost/cpuid/v2 v2.2.6 // indirect
-	github.com/leodido/go-urn v1.2.4 // indirect
+	github.com/klauspost/compress v1.17.7 // indirect
+	github.com/klauspost/cpuid/v2 v2.2.7 // indirect
+	github.com/leodido/go-urn v1.4.0 // indirect
 	github.com/lufia/plan9stats v0.0.0-20231016141302-07b5767bb0ed // indirect
 	github.com/mattn/go-isatty v0.0.19 // indirect
-	github.com/mattn/go-sqlite3 v1.14.19 // indirect
+	github.com/mattn/go-sqlite3 v1.14.22 // 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.13.2 // indirect
+	github.com/onsi/ginkgo/v2 v2.16.0 // indirect
 	github.com/pires/go-proxyproto v0.7.0 // indirect
 	github.com/power-devops/perfstat v0.0.0-20221212215047-62379fc7944b // indirect
-	github.com/quic-go/qtls-go1-20 v0.4.1 // indirect
-	github.com/quic-go/quic-go v0.40.1 // indirect
-	github.com/refraction-networking/utls v1.6.0 // indirect
+	github.com/quic-go/quic-go v0.41.0 // indirect
+	github.com/refraction-networking/utls v1.6.3 // indirect
 	github.com/riobard/go-bloom v0.0.0-20200614022211-cdc8013cb5b3 // indirect
 	github.com/rogpeppe/go-internal v1.11.0 // indirect
-	github.com/sagernet/sing v0.3.0 // indirect
+	github.com/sagernet/sing v0.3.6 // indirect
 	github.com/sagernet/sing-shadowsocks v0.2.6 // indirect
-	github.com/savsgio/gotils v0.0.0-20230208104028-c358bd845dee // indirect
+	github.com/savsgio/gotils v0.0.0-20240303185622-093b76447511 // indirect
 	github.com/seiflotfy/cuckoofilter v0.0.0-20220411075957-e3b120b3f5fb // indirect
 	github.com/shoenig/go-m1cpu v0.1.6 // indirect
 	github.com/tklauser/go-sysconf v0.3.12 // indirect
@@ -80,21 +79,21 @@ require (
 	github.com/vishvananda/netlink v1.2.1-beta.2.0.20230316163032-ced5aaba43e3 // indirect
 	github.com/vishvananda/netns v0.0.4 // indirect
 	github.com/xtls/reality v0.0.0-20231112171332-de1173cf2b19 // indirect
-	github.com/yusufpapurcu/wmi v1.2.3 // indirect
+	github.com/yusufpapurcu/wmi v1.2.4 // indirect
 	go.uber.org/mock v0.4.0 // indirect
 	go4.org/netipx v0.0.0-20231129151722-fdeea329fbba // indirect
 	golang.org/x/arch v0.6.0 // indirect
-	golang.org/x/crypto v0.19.0 // indirect
-	golang.org/x/exp v0.0.0-20240103183307-be819d1f06fc // indirect
-	golang.org/x/mod v0.14.0 // indirect
-	golang.org/x/net v0.21.0 // indirect
-	golang.org/x/sys v0.17.0 // indirect
+	golang.org/x/crypto v0.21.0 // indirect
+	golang.org/x/exp v0.0.0-20240222234643-814bf88cf225 // indirect
+	golang.org/x/mod v0.16.0 // indirect
+	golang.org/x/net v0.22.0 // indirect
+	golang.org/x/sys v0.18.0 // indirect
 	golang.org/x/time v0.5.0 // indirect
-	golang.org/x/tools v0.16.1 // indirect
+	golang.org/x/tools v0.19.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-20240123012728-ef4313101c80 // indirect
-	google.golang.org/protobuf v1.32.0 // indirect
+	google.golang.org/genproto/googleapis/rpc v0.0.0-20240308144416-29370a3891b7 // indirect
+	google.golang.org/protobuf v1.33.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 	gvisor.dev/gvisor v0.0.0-20231104011432-48a6d7d5bd0b // indirect
 	lukechampine.com/blake3 v1.2.1 // indirect
--- a/go.sum
+++ b/go.sum
@@ -20,8 +20,8 @@ github.com/bradfitz/go-smtpd v0.0.0-20170404230938-deb6d6237625/go.mod h1:HYsPBT
 github.com/buger/jsonparser v0.0.0-20181115193947-bf1c66bbce23/go.mod h1:bbYlZJ7hK1yFx9hf58LP0zeX7UjIGs20ufpu3evjr+s=
 github.com/bytedance/sonic v1.5.0/go.mod h1:ED5hyg4y6t3/9Ku1R6dU/4KyJ48DZ4jPhfY1O2AihPM=
 github.com/bytedance/sonic v1.10.0-rc/go.mod h1:ElCzW+ufi8qKqNW0FY314xriJhyJhuoJ3gFZdAHF7NM=
-github.com/bytedance/sonic v1.10.2 h1:GQebETVBxYB7JGWJtLBi07OVzWwt+8dWA00gEVW2ZFE=
-github.com/bytedance/sonic v1.10.2/go.mod h1:iZcSUejdk5aukTND/Eu/ivjQuEL0Cu9/rf50Hi0u/g4=
+github.com/bytedance/sonic v1.11.2 h1:ywfwo0a/3j9HR8wsYGWsIWl2mvRsI950HyoxiBERw5A=
+github.com/bytedance/sonic v1.11.2/go.mod h1:iZcSUejdk5aukTND/Eu/ivjQuEL0Cu9/rf50Hi0u/g4=
 github.com/chenzhuoyu/base64x v0.0.0-20211019084208-fb5309c8db06/go.mod h1:DH46F32mSOjUmXrMHnKwZdA8wcEefY7UVqBKYGjpdQY=
 github.com/chenzhuoyu/base64x v0.0.0-20221115062448-fe3a3abad311/go.mod h1:b583jCggY9gE99b6G5LEC39OIiVsWj+R97kbl5odCEk=
 github.com/chenzhuoyu/base64x v0.0.0-20230717121745-296ad89f973d h1:77cEq6EriyTZ0g/qfRdp61a3Uu/AWrgIq2s0ClJV1g0=
@@ -41,8 +41,8 @@ github.com/dgryski/go-metro v0.0.0-20200812162917-85c65e2d0165/go.mod h1:c9O8+fp
 github.com/dgryski/go-metro v0.0.0-20211217172704-adc40b04c140 h1:y7y0Oa6UawqTFPCDw9JG6pdKt4F9pAhHv0B7FMGaGD0=
 github.com/dgryski/go-metro v0.0.0-20211217172704-adc40b04c140/go.mod h1:c9O8+fpSOX1DM8cPNSkX/qsBWdkD4yd2dpciOWQjpBw=
 github.com/dustin/go-humanize v1.0.0/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk=
-github.com/fasthttp/router v1.4.22 h1:qwWcYBbndVDwts4dKaz+A2ehsnbKilmiP6pUhXBfYKo=
-github.com/fasthttp/router v1.4.22/go.mod h1:KeMvHLqhlB9vyDWD5TSvTccl9qeWrjSSiTJrJALHKV0=
+github.com/fasthttp/router v1.5.0 h1:3Qbbo27HAPzwbpRzgiV5V9+2faPkPt3eNuRaDV6LYDA=
+github.com/fasthttp/router v1.5.0/go.mod h1:FddcKNXFZg1imHcy+uKB0oo/o6yE9zD3wNguqlhWDak=
 github.com/flynn/go-shlex v0.0.0-20150515145356-3f9db97f8568/go.mod h1:xEzjJPgXI435gkrCt3MPfRiAkVrwSbHsst4LCFVfpJc=
 github.com/francoispqt/gojay v1.2.13 h1:d2m3sFjloqoIUQU3TsHBgj6qg/BVGlTBeHDUmyJnXKk=
 github.com/francoispqt/gojay v1.2.13/go.mod h1:ehT5mTG4ua4581f1++1WLG0vPdaA9HaiDsoyrBGkyDY=
@@ -61,8 +61,8 @@ github.com/gin-gonic/gin v1.9.1 h1:4idEAncQnU5cB7BeOkPtxjfCSye0AAm1R0RVIqJ+Jmg=
 github.com/gin-gonic/gin v1.9.1/go.mod h1:hPrL7YrpYKXt5YId3A/Tnip5kqbEAP+KLuI3SUcPTeU=
 github.com/gliderlabs/ssh v0.1.1/go.mod h1:U7qILu1NlMHj9FlMhZLlkCdDnU1DBEAqr0aevW3Awn0=
 github.com/go-errors/errors v1.0.1/go.mod h1:f4zRHt4oKfwPJE5k8C9vpYG+aDHdBFUsgrm6/TyX73Q=
-github.com/go-logr/logr v1.3.0 h1:2y3SDp0ZXuc6/cjLSZ+Q3ir+QB9T/iG5yYRXqsagWSY=
-github.com/go-logr/logr v1.3.0/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY=
+github.com/go-logr/logr v1.4.1 h1:pKouT5E8xu9zeFC39JXRDukb6JFQPXM5p5I91188VAQ=
+github.com/go-logr/logr v1.4.1/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY=
 github.com/go-ole/go-ole v1.2.6/go.mod h1:pprOEPIfldk/42T2oK7lQ4v4JSDwmV0As9GaiUsvbm0=
 github.com/go-ole/go-ole v1.3.0 h1:Dt6ye7+vXGIKZ7Xtk4s6/xVdGDQynvom7xCFEdWr6uE=
 github.com/go-ole/go-ole v1.3.0/go.mod h1:5LS6F96DhAwUc7C+1HLexzMXY1xGRSryjyPPKW6zv78=
@@ -76,8 +76,8 @@ github.com/go-playground/universal-translator v0.18.0/go.mod h1:UvRDBj+xPUEGrFYl
 github.com/go-playground/universal-translator v0.18.1 h1:Bcnm0ZwsGyWbCzImXv+pAJnYK9S473LQFuzCbDbfSFY=
 github.com/go-playground/universal-translator v0.18.1/go.mod h1:xekY+UJKNuX9WP91TpwSH2VMlDf28Uj24BCp08ZFTUY=
 github.com/go-playground/validator/v10 v10.10.0/go.mod h1:74x4gJWsvQexRdW8Pn3dXSGrTK4nAUsbPlLADvpJkos=
-github.com/go-playground/validator/v10 v10.17.0 h1:SmVVlfAOtlZncTxRuinDPomC2DkXJ4E5T9gDA0AIH74=
-github.com/go-playground/validator/v10 v10.17.0/go.mod h1:9iXMNT7sEkjXb0I+enO7QXmzG6QCsPWY4zveKFVRSyU=
+github.com/go-playground/validator/v10 v10.19.0 h1:ol+5Fu+cSq9JD7SoSqe04GMI92cbn0+wvQ3bZ8b/AU4=
+github.com/go-playground/validator/v10 v10.19.0/go.mod h1:dbuPbCMFw/DrkbEynArYaCwl3amGuJotoKCe95atGMM=
 github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 h1:tfuBGBXKqDEevZMzYi5KSi8KkcZtzBcTgAUUtapy0OI=
 github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572/go.mod h1:9Pwr4B2jHnOSGXyyzV8ROjYa2ojvAY6HCGYYfMoC3Ls=
 github.com/goccy/go-json v0.9.7/go.mod h1:6MelG93GURQebXPDq3khkgXZkazVtN9CRI+MGFi0w8I=
@@ -88,13 +88,13 @@ github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfU
 github.com/golang/lint v0.0.0-20180702182130-06c8688daad7/go.mod h1:tluoj9z5200jBnyusfRPU2LqT6J+DAorxEvtC7LHB+E=
 github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A=
 github.com/golang/mock v1.2.0/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A=
-github.com/golang/mock v1.6.0 h1:ErTB+efbowRARo13NNdxyJji2egdxLGQhRaY+DUumQc=
-github.com/golang/mock v1.6.0/go.mod h1:p6yTPP+5HYm5mzsMV8JkE6ZKdX+/wYM6Hr+LicevLPs=
+github.com/golang/mock v1.7.0-rc.1 h1:YojYx61/OLFsiv6Rw1Z96LpldJIy31o+UHmwAUMJ6/U=
+github.com/golang/mock v1.7.0-rc.1/go.mod h1:s42URUywIqd+OcERslBJvOjepvNymP31m3q8d/GkuRs=
 github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
 github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
 github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk=
-github.com/golang/protobuf v1.5.3 h1:KhyjKVUg7Usr/dYsdSqoFveMYd5ko72D+zANwlG1mmg=
-github.com/golang/protobuf v1.5.3/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY=
+github.com/golang/protobuf v1.5.4 h1:i7eJL8qZTpSEXOPTxNKhASYpMn+8e5Q6AdndVa1dWek=
+github.com/golang/protobuf v1.5.4/go.mod h1:lnTiLA8Wa4RWRcIUkrtSVa5nRhsEGBg48fD6rSs7xps=
 github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ=
 github.com/google/btree v1.1.2 h1:xf4v41cLI2Z6FxbKm+8Bu+m8ifhj15JuZ9sa0jZCMUU=
 github.com/google/btree v1.1.2/go.mod h1:qOPhT0dTNdNzV6Z/lhRX0YXUafgPLFUh+gZMl761Gm4=
@@ -111,8 +111,8 @@ 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/martian v2.1.0+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXiIaQGbYVAs8BPL6v8lEs=
 github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc=
-github.com/google/pprof v0.0.0-20231229205709-960ae82b1e42 h1:dHLYa5D8/Ta0aLR2XcPsrkpAgGeFs6thhMcQK0oQ0n8=
-github.com/google/pprof v0.0.0-20231229205709-960ae82b1e42/go.mod h1:czg5+yv1E0ZGTi6S6vVK1mke0fV+FaUhNGcd6VRS9Ik=
+github.com/google/pprof v0.0.0-20240227163752-401108e1b7e7 h1:y3N7Bm7Y9/CtpiVkw/ZWj6lSlDF3F74SfKwfTCer72Q=
+github.com/google/pprof v0.0.0-20240227163752-401108e1b7e7/go.mod h1:czg5+yv1E0ZGTi6S6vVK1mke0fV+FaUhNGcd6VRS9Ik=
 github.com/googleapis/gax-go v2.0.0+incompatible/go.mod h1:SFVmujtThgffbyetf+mdk2eWhX2bMyUtNHzFKcPA9HY=
 github.com/googleapis/gax-go/v2 v2.0.3/go.mod h1:LLvjysVCY1JZeum8Z6l8qUty8fiNwE08qbEPm1M08qg=
 github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY=
@@ -138,11 +138,11 @@ github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnr
 github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo=
 github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1:6v2b51hI/fHJwM22ozAgKL4VKDeJcHhJFhtBdhmNjmU=
 github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck=
-github.com/klauspost/compress v1.17.6 h1:60eq2E/jlfwQXtvZEeBUYADs+BwKBWURIY+Gj2eRGjI=
-github.com/klauspost/compress v1.17.6/go.mod h1:/dCuZOvVtNoHsyb+cuJD3itjs3NbnF6KH9zAO4BDxPM=
+github.com/klauspost/compress v1.17.7 h1:ehO88t2UGzQK66LMdE8tibEd1ErmzZjNEqWkjLAKQQg=
+github.com/klauspost/compress v1.17.7/go.mod h1:Di0epgTjJY877eYKx5yC51cX2A2Vl2ibi7bDH9ttBbw=
 github.com/klauspost/cpuid/v2 v2.0.9/go.mod h1:FInQzS24/EEf25PyTYn52gqo7WaD8xa0213Md/qVLRg=
-github.com/klauspost/cpuid/v2 v2.2.6 h1:ndNyv040zDGIDh8thGkXYjnFtiN02M1PVVF+JE/48xc=
-github.com/klauspost/cpuid/v2 v2.2.6/go.mod h1:Lcz8mBdAVJIBVzewtcLocK12l3Y+JytZYpaMropDUws=
+github.com/klauspost/cpuid/v2 v2.2.7 h1:ZWSB3igEs+d0qvnxR/ZBzXVmxkgt8DdzP6m9pfuVLDM=
+github.com/klauspost/cpuid/v2 v2.2.7/go.mod h1:Lcz8mBdAVJIBVzewtcLocK12l3Y+JytZYpaMropDUws=
 github.com/knz/go-libedit v1.10.1/go.mod h1:MZTVkCWyz0oBc7JOWP3wNAzd002ZbM/5hgShxwh4x8M=
 github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
 github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI=
@@ -155,8 +155,8 @@ github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
 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.2.1/go.mod h1:zt4jvISO2HfUBqxjfIshjdMTYS56ZS/qv49ictyFfxY=
-github.com/leodido/go-urn v1.2.4 h1:XlAE/cm/ms7TE/VMVoduSpNBoyc2dOxHs5MZSwAN63Q=
-github.com/leodido/go-urn v1.2.4/go.mod h1:7ZrI8mTSeBSHl/UaRyKQW1qZeMgak41ANeCNaVckg+4=
+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-20211012122336-39d0f177ccd0/go.mod h1:zJYVVT2jmtg6P3p1VtQj7WsuWi/y4VnjVBn7F8KPB3I=
 github.com/lufia/plan9stats v0.0.0-20231016141302-07b5767bb0ed h1:036IscGBfJsFIgJQzlui7nK1Ncm0tp2ktmPj8xO4N/0=
 github.com/lufia/plan9stats v0.0.0-20231016141302-07b5767bb0ed/go.mod h1:ilwx/Dta8jXAgpFYFvSWEMwxmbWXyiUHkd5FwyKhb5k=
@@ -165,12 +165,12 @@ github.com/mailru/easyjson v0.0.0-20190312143242-1de009706dbe/go.mod h1:C1wdFJiN
 github.com/mattn/go-isatty v0.0.14/go.mod h1:7GGIvUiUoEMVVmxf/4nioHXj79iQHKdU27kJ6hsGG94=
 github.com/mattn/go-isatty v0.0.19 h1:JITubQf0MOLdlGRuRq+jtsDlekdYPia9ZFsB8h/APPA=
 github.com/mattn/go-isatty v0.0.19/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y=
-github.com/mattn/go-sqlite3 v1.14.19 h1:fhGleo2h1p8tVChob4I9HpmVFIAkKGpiukdrgQbWfGI=
-github.com/mattn/go-sqlite3 v1.14.19/go.mod h1:2eHXhiwb8IkHr+BDWZGa96P6+rkvnG63S2DGjv9HUNg=
+github.com/mattn/go-sqlite3 v1.14.22 h1:2gZY6PC6kBnID23Tichd1K+Z0oS6nE/XwU+Vz/5o4kU=
+github.com/mattn/go-sqlite3 v1.14.22/go.mod h1:Uh1q+B4BYcTPb+yiD3kU8Ct7aC0hY9fxUwlHK0RXw+Y=
 github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0=
 github.com/microcosm-cc/bluemonday v1.0.1/go.mod h1:hsXNsILzKxV+sX77C5b8FSuKF00vh2OMYv+xgHpAMF4=
-github.com/miekg/dns v1.1.57 h1:Jzi7ApEIzwEPLHWRcafCN9LZSBbqQpxjt/wpgvg7wcM=
-github.com/miekg/dns v1.1.57/go.mod h1:uqRjCRUuEAA6qsOiJvDd+CFo/vW+y5WR6SNmHE55hZk=
+github.com/miekg/dns v1.1.58 h1:ca2Hdkz+cDg/7eNF6V56jjzuZ4aCAE+DbVkILdQWG/4=
+github.com/miekg/dns v1.1.58/go.mod h1:Ypv+3b/KadlvW9vJfXOTf300O4UqaHFzFCuHz+rPkBY=
 github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
 github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w8PVh93nsPXa1VrQ6jlwL5oN8l14QlcNfg=
 github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
@@ -183,10 +183,10 @@ github.com/neelance/astrewrite v0.0.0-20160511093645-99348263ae86/go.mod h1:kHJE
 github.com/neelance/sourcemap v0.0.0-20151028013722-8c68805598ab/go.mod h1:Qr6/a/Q4r9LP1IltGz7tA7iOK1WonHEYhu1HRBA7ZiM=
 github.com/nicksnyder/go-i18n/v2 v2.4.0 h1:3IcvPOAvnCKwNm0TB0dLDTuawWEj+ax/RERNC+diLMM=
 github.com/nicksnyder/go-i18n/v2 v2.4.0/go.mod h1:nxYSZE9M0bf3Y70gPQjN9ha7XNHX7gMc814+6wVyEI4=
-github.com/onsi/ginkgo/v2 v2.13.2 h1:Bi2gGVkfn6gQcjNjZJVO8Gf0FHzMPf2phUei9tejVMs=
-github.com/onsi/ginkgo/v2 v2.13.2/go.mod h1:XStQ8QcGwLyF4HdfcZB8SFOS/MWCgDuXMSBe6zrvLgM=
-github.com/onsi/gomega v1.29.0 h1:KIA/t2t5UBzoirT4H9tsML45GEbo3ouUnBHsCfD2tVg=
-github.com/onsi/gomega v1.29.0/go.mod h1:9sxs+SwGrKI0+PWe4Fxa9tFQQBG5xSsSbMXOI8PPpoQ=
+github.com/onsi/ginkgo/v2 v2.16.0 h1:7q1w9frJDzninhXxjZd+Y/x54XNjG/UlRLIYPZafsPM=
+github.com/onsi/ginkgo/v2 v2.16.0/go.mod h1:llBI3WDLL9Z6taip6f33H76YcWtJv+7R3HigUjbIBOs=
+github.com/onsi/gomega v1.30.0 h1:hvMK7xYz4D3HapigLTeGdId/NcfQx1VHMJc60ew99+8=
+github.com/onsi/gomega v1.30.0/go.mod h1:9sxs+SwGrKI0+PWe4Fxa9tFQQBG5xSsSbMXOI8PPpoQ=
 github.com/op/go-logging v0.0.0-20160315200505-970db520ece7 h1:lDH9UUVJtmYCjyT0CI4q8xvlXPxeZ0gYCVvWbmPlp88=
 github.com/op/go-logging v0.0.0-20160315200505-970db520ece7/go.mod h1:HzydrMdWErDVzsI23lYNej1Htcns9BCg93Dk0bBINWk=
 github.com/openzipkin/zipkin-go v0.1.1/go.mod h1:NtoC/o8u3JlF1lSlyPNswIbeQH9bJTmOf0Erfk+hxe8=
@@ -208,12 +208,10 @@ github.com/prometheus/client_golang v0.8.0/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXP
 github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo=
 github.com/prometheus/common v0.0.0-20180801064454-c7de2306084e/go.mod h1:daVV7qP5qjZbuso7PdcryaAu0sAZbrN9i7WWcTMWvro=
 github.com/prometheus/procfs v0.0.0-20180725123919-05ee40e3a273/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk=
-github.com/quic-go/qtls-go1-20 v0.4.1 h1:D33340mCNDAIKBqXuAvexTNMUByrYmFYVfKfDN5nfFs=
-github.com/quic-go/qtls-go1-20 v0.4.1/go.mod h1:X9Nh97ZL80Z+bX/gUXMbipO6OxdiDi58b/fMC9mAL+k=
-github.com/quic-go/quic-go v0.40.1 h1:X3AGzUNFs0jVuO3esAGnTfvdgvL4fq655WaOi1snv1Q=
-github.com/quic-go/quic-go v0.40.1/go.mod h1:PeN7kuVJ4xZbxSv/4OX6S1USOX8MJvydwpTx31vx60c=
-github.com/refraction-networking/utls v1.6.0 h1:X5vQMqVx7dY7ehxxqkFER/W6DSjy8TMqSItXm8hRDYQ=
-github.com/refraction-networking/utls v1.6.0/go.mod h1:kHJ6R9DFFA0WsRgBM35iiDku4O7AqPR6y79iuzW7b10=
+github.com/quic-go/quic-go v0.41.0 h1:aD8MmHfgqTURWNJy48IYFg2OnxwHT3JL7ahGs73lb4k=
+github.com/quic-go/quic-go v0.41.0/go.mod h1:qCkNjqczPEvgsOnxZ0eCD14lv+B2LHlFAB++CNOh9hA=
+github.com/refraction-networking/utls v1.6.3 h1:MFOfRN35sSx6K5AZNIoESsBuBxS2LCgRilRIdHb6fDc=
+github.com/refraction-networking/utls v1.6.3/go.mod h1:yil9+7qSl+gBwJqztoQseO6Pr3h62pQoY1lXiNR/FPs=
 github.com/riobard/go-bloom v0.0.0-20200614022211-cdc8013cb5b3 h1:f/FNXud6gA3MNr8meMVVGxhp+QBTqY91tM8HjEuMjGg=
 github.com/riobard/go-bloom v0.0.0-20200614022211-cdc8013cb5b3/go.mod h1:HgjTstvQsPGkxUsCd2KWxErBblirPizecHcpD3ffK+s=
 github.com/robfig/cron/v3 v3.0.1 h1:WdRxkvbJztn8LMz/QEvLN5sBU+xKpSqwwUO1Pjr4qDs=
@@ -223,17 +221,17 @@ github.com/rogpeppe/go-internal v1.8.0/go.mod h1:WmiCO8CzOY8rg0OYDC4/i/2WRWAB6po
 github.com/rogpeppe/go-internal v1.11.0 h1:cWPaGQEPrBb5/AsnsZesgZZ9yb1OQ+GOISoDNXVBh4M=
 github.com/rogpeppe/go-internal v1.11.0/go.mod h1:ddIwULY96R17DhadqLgMfk9H9tvdUzkipdSkR5nkCZA=
 github.com/russross/blackfriday v1.5.2/go.mod h1:JO/DiYxRf+HjHt06OyowR9PTA263kcR/rfWxYHBV53g=
-github.com/sagernet/sing v0.3.0 h1:PIDVFZHnQAAYRL1UYqNM+0k5s8f/tb1lUW6UDcQiOc8=
-github.com/sagernet/sing v0.3.0/go.mod h1:9pfuAH6mZfgnz/YjP6xu5sxx882rfyjpcrTdUpd6w3g=
+github.com/sagernet/sing v0.3.6 h1:dsEdYLKBQlrxUfw1a92x0VdPvR1/BOxQ+HIMyaoEJsQ=
+github.com/sagernet/sing v0.3.6/go.mod h1:+60H3Cm91RnL9dpVGWDPHt0zTQImO9Vfqt9a4rSambI=
 github.com/sagernet/sing-shadowsocks v0.2.6 h1:xr7ylAS/q1cQYS8oxKKajhuQcchd5VJJ4K4UZrrpp0s=
 github.com/sagernet/sing-shadowsocks v0.2.6/go.mod h1:j2YZBIpWIuElPFL/5sJAj470bcn/3QQ5lxZUNKLDNAM=
-github.com/savsgio/gotils v0.0.0-20230208104028-c358bd845dee h1:8Iv5m6xEo1NR1AvpV+7XmhI4r39LGNzwUL4YpMuL5vk=
-github.com/savsgio/gotils v0.0.0-20230208104028-c358bd845dee/go.mod h1:qwtSXrKuJh/zsFQ12yEE89xfCrGKK63Rr7ctU/uCo4g=
+github.com/savsgio/gotils v0.0.0-20240303185622-093b76447511 h1:KanIMPX0QdEdB4R3CiimCAbxFrhB3j7h0/OvpYGVQa8=
+github.com/savsgio/gotils v0.0.0-20240303185622-093b76447511/go.mod h1:sM7Mt7uEoCeFSCBM+qBrqvEo+/9vdmj19wzp3yzUhmg=
 github.com/seiflotfy/cuckoofilter v0.0.0-20220411075957-e3b120b3f5fb h1:XfLJSPIOUX+osiMraVgIrMR27uMXnRJWGm1+GL8/63U=
 github.com/seiflotfy/cuckoofilter v0.0.0-20220411075957-e3b120b3f5fb/go.mod h1:bR6DqgcAl1zTcOX8/pE2Qkj9XO00eCNqmKb7lXP8EAg=
 github.com/sergi/go-diff v1.0.0/go.mod h1:0CfEIISq7TuYL3j771MWULgwwjU+GofnZX9QAmXWZgo=
-github.com/shirou/gopsutil/v3 v3.24.1 h1:R3t6ondCEvmARp3wxODhXMTLC/klMa87h2PHUw5m7QI=
-github.com/shirou/gopsutil/v3 v3.24.1/go.mod h1:UU7a2MSBQa+kW1uuDq8DeEBS8kmrnQwsv2b5O513rwU=
+github.com/shirou/gopsutil/v3 v3.24.2 h1:kcR0erMbLg5/3LcInpw0X/rrPSqq4CDPyI6A6ZRC18Y=
+github.com/shirou/gopsutil/v3 v3.24.2/go.mod h1:tSg/594BcA+8UdQU2XcW803GWYgdtauFFPgJCJKZlVk=
 github.com/shoenig/go-m1cpu v0.1.6 h1:nxdKQNcEB6vzgA2E2bvzKIYRuNj7XNJ4S/aRSwKzFtM=
 github.com/shoenig/go-m1cpu v0.1.6/go.mod h1:1JJMcUBvfNwpq05QDQVAnx3gUHr9IYF7GNg9SUEw2VQ=
 github.com/shoenig/test v0.6.4 h1:kVTaSd7WLz5WZ2IaoM0RSzRsUD+m8wRR+5qvntpn4LU=
@@ -272,9 +270,9 @@ github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/
 github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
 github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
-github.com/stretchr/testify v1.8.2/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
-github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk=
 github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=
+github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg=
+github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
 github.com/tarm/serial v0.0.0-20180830185346-98f6abe2eb07/go.mod h1:kDXzergiv9cbyO7IOYJZWg1U88JhDg3PB6klq9Hg2pA=
 github.com/tklauser/go-sysconf v0.3.12 h1:0QaGUFOdQaIVdPgfITYzaTegZvdCjmYO52cSFAEVmqU=
 github.com/tklauser/go-sysconf v0.3.12/go.mod h1:Ho14jnntGE1fpdOqQEEaiKRpvIavV0hSfmBq8nJbHYI=
@@ -303,10 +301,10 @@ github.com/vishvananda/netns v0.0.4 h1:Oeaw1EM2JMxD51g9uhtC0D7erkIjgmj8+JZc26m1Y
 github.com/vishvananda/netns v0.0.4/go.mod h1:SpkAiCQRtJ6TvvxPnOSyH3BMl6unz3xZlaprSwhNNJM=
 github.com/xtls/reality v0.0.0-20231112171332-de1173cf2b19 h1:capMfFYRgH9BCLd6A3Er/cH3A9Nz3CU2KwxwOQZIePI=
 github.com/xtls/reality v0.0.0-20231112171332-de1173cf2b19/go.mod h1:dm4y/1QwzjGaK17ofi0Vs6NpKAHegZky8qk6J2JJZAE=
-github.com/xtls/xray-core v1.8.7 h1:lb8O1l3/eAg3YAXA6tLm5M6N7BsX8wxW9sJLjU3dHkA=
-github.com/xtls/xray-core v1.8.7/go.mod h1:9rFpflfQbgFeH1VKJw7yUmEy7myOyDCgNXXl0bmmyOo=
-github.com/yusufpapurcu/wmi v1.2.3 h1:E1ctvB7uKFMOJw3fdOW32DwGE9I7t++CRUEMKvFoFiw=
-github.com/yusufpapurcu/wmi v1.2.3/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQmPyzfmi0=
+github.com/xtls/xray-core v1.8.9 h1:wefcON0behu4DoQvCKJYZKsJlSvNhyq2I7vC2fxLFcY=
+github.com/xtls/xray-core v1.8.9/go.mod h1:XDE4f422qJKAU3hNDSNZyWrOHvn9kF8UHVdyOzU38rc=
+github.com/yusufpapurcu/wmi v1.2.4 h1:zFUKzehAFReQwLys1b/iSMl+JQGSCSjtVqQn9bBrPo0=
+github.com/yusufpapurcu/wmi v1.2.4/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQmPyzfmi0=
 go.opencensus.io v0.18.0/go.mod h1:vKdFvxhtzZ9onBp9VKHK8z/sRpBMnKAsufL7wlDrCOA=
 go.uber.org/atomic v1.11.0 h1:ZvwS0R+56ePWxUNi+Atn9dWONBPp/AUETXlHW0DxSjE=
 go.uber.org/atomic v1.11.0/go.mod h1:LUxbIzbOniOlMKjJjyPfpl4v+PKK2cNJn91OQbhoJI0=
@@ -323,16 +321,16 @@ golang.org/x/crypto v0.0.0-20181030102418-4d3f4d9ffa16/go.mod h1:6SG95UA2DQfeDnf
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
 golang.org/x/crypto v0.0.0-20190313024323-a1f597ede03a/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
 golang.org/x/crypto v0.0.0-20210711020723-a769d52b0f97/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
-golang.org/x/crypto v0.19.0 h1:ENy+Az/9Y1vSrlrvBSyna3PITt4tiZLf7sgCjZBX7Wo=
-golang.org/x/crypto v0.19.0/go.mod h1:Iy9bg/ha4yyC70EfRS8jz+B6ybOBKMaSxLj6P6oBDfU=
+golang.org/x/crypto v0.21.0 h1:X31++rzVUdKhX5sWmSOFZxx8UW/ldWx55cbf08iNAMA=
+golang.org/x/crypto v0.21.0/go.mod h1:0BP7YvVV9gBbVKyeTG0Gyn+gZm94bibOW5BjDEYAOMs=
 golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
-golang.org/x/exp v0.0.0-20240103183307-be819d1f06fc h1:ao2WRsKSzW6KuUY9IWPwWahcHCgR0s52IfwutMfEbdM=
-golang.org/x/exp v0.0.0-20240103183307-be819d1f06fc/go.mod h1:iRJReGqOEeBhDZGkGbynYwcHlctCvnjTYIamk7uXpHI=
+golang.org/x/exp v0.0.0-20240222234643-814bf88cf225 h1:LfspQV/FYTatPTr/3HzIcmiUFH7PGP+OQ6mgDYo3yuQ=
+golang.org/x/exp v0.0.0-20240222234643-814bf88cf225/go.mod h1:CxmFvTBINI24O/j8iY7H1xHzx2i4OsyguNBmN/uPtqc=
 golang.org/x/lint v0.0.0-20180702182130-06c8688daad7/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
 golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
 golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU=
-golang.org/x/mod v0.14.0 h1:dGoOF9QVLYng8IHTm7BAyWqCqSheQ5pYWGhzW00YJr0=
-golang.org/x/mod v0.14.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c=
+golang.org/x/mod v0.16.0 h1:QX4fJ0Rr5cPQCF7O9lh9Se4pmwfwskqZfq5moyldzic=
+golang.org/x/mod v0.16.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c=
 golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
@@ -342,8 +340,8 @@ golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod h1:mL1N/T3taQHkDXs73r
 golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20190313220215-9f648a60d977/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
-golang.org/x/net v0.21.0 h1:AQyQV4dYCvJ7vGmJyKki9+PBdyvhkSd8EIx/qb0AYv4=
-golang.org/x/net v0.21.0/go.mod h1:bIjVDfnllIU7BJ2DNgfnXvpSvtn8VRwhlsaeUTyUS44=
+golang.org/x/net v0.22.0 h1:9sGLhx7iRIHEiX0oAJ3MRZMUCElJgy7Br1nO+AMN3Tc=
+golang.org/x/net v0.22.0/go.mod h1:JKghWKKOSdJwpW2GEx0Ja7fmaKnMsbu+MWVZTokSYmg=
 golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
 golang.org/x/oauth2 v0.0.0-20181017192945-9dcd33a902f4/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
 golang.org/x/oauth2 v0.0.0-20181203162652-d668ce993890/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
@@ -373,9 +371,9 @@ golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.11.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.16.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
-golang.org/x/sys v0.17.0 h1:25cE3gD+tdBA7lp7QfhuV+rJiE9YXTcS3VG1SqssI/Y=
 golang.org/x/sys v0.17.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
+golang.org/x/sys v0.18.0 h1:DBdB3niSjOA/O0blCZBqDefyWNYveAYMNF1Wum0DYQ4=
+golang.org/x/sys v0.18.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
@@ -392,8 +390,8 @@ golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGm
 golang.org/x/tools v0.0.0-20181030000716-a0a13e073c7b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY=
-golang.org/x/tools v0.16.1 h1:TLyB3WofjdOEepBHAU20JdNC1Zbg87elYofWYAY5oZA=
-golang.org/x/tools v0.16.1/go.mod h1:kYVVN6I1mBNoB1OX+noeBjbRk4IUEPa7JJ+TJMEooJ0=
+golang.org/x/tools v0.19.0 h1:tfGCXNR1OsFG+sVdLAitlpjAvD/I6dHDKnYrpEZUHkw=
+golang.org/x/tools v0.19.0/go.mod h1:qoJWxmGSIBmAeriMx19ogtrEPrGtDbPK634QFIcLAhc=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.zx2c4.com/wintun v0.0.0-20230126152724-0fa3db229ce2 h1:B82qJJgjvYKsXS9jeunTOisW56dUokqW/FOteYJJ/yg=
 golang.zx2c4.com/wintun v0.0.0-20230126152724-0fa3db229ce2/go.mod h1:deeaetjYA+DHMHg+sMSMI58GrEteJUUzzw7en6TJQcI=
@@ -411,19 +409,18 @@ google.golang.org/genproto v0.0.0-20180831171423-11092d34479b/go.mod h1:JiN7NxoA
 google.golang.org/genproto v0.0.0-20181029155118-b69ba1387ce2/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=
 google.golang.org/genproto v0.0.0-20181202183823-bd91e49a0898/go.mod h1:7Ep/1NZk928CDR8SjdVbjWNpdIf6nzjE3BTgJDr2Atg=
 google.golang.org/genproto v0.0.0-20190306203927-b5d61aea6440/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE=
-google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 h1:AjyfHzEPEFp/NpvfN5g+KDla3EMojjhRVZc1i7cj+oM=
-google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80/go.mod h1:PAREbraiVEVGVdTZsVWjSbbTtSyGbAgIIvni8a8CD5s=
+google.golang.org/genproto/googleapis/rpc v0.0.0-20240308144416-29370a3891b7 h1:em/y72n4XlYRtayY/cVj6pnVzHa//BDA1BdoO+z9mdE=
+google.golang.org/genproto/googleapis/rpc v0.0.0-20240308144416-29370a3891b7/go.mod h1:UCOku4NytXMJuLQE5VuqA5lX3PcHCBo8pxNyvkf4xBs=
 google.golang.org/grpc v1.14.0/go.mod h1:yo6s7OP7yaDglbqo1J04qKzAhqBH6lvTonzMVmEdcZw=
 google.golang.org/grpc v1.16.0/go.mod h1:0JHn/cJsOMiMfNA9+DeHDlAU7KAAB5GDlYFpa9MZMio=
 google.golang.org/grpc v1.17.0/go.mod h1:6QZJwpn2B+Zp71q/5VxRsJ6NXXVCE5NRUHRo+f3cWCs=
 google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
-google.golang.org/grpc v1.62.0 h1:HQKZ/fa1bXkX1oFOvSjmZEUL8wLSaZTjCcLAlmZRtdk=
-google.golang.org/grpc v1.62.0/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE=
+google.golang.org/grpc v1.62.1 h1:B4n+nfKzOICUXMgyrNd19h/I9oH0L1pizfk1d4zSgTk=
+google.golang.org/grpc v1.62.1/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE=
 google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw=
-google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
 google.golang.org/protobuf v1.28.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=
-google.golang.org/protobuf v1.32.0 h1:pPC6BG5ex8PDFnkbrGU3EixyhKcQ2aDuBS36lqK/C7I=
-google.golang.org/protobuf v1.32.0/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos=
+google.golang.org/protobuf v1.33.0 h1:uNO2rsAINq/JlFpSdYEKIZ0uKD/R9cpdv0T+yoGwGmI=
+google.golang.org/protobuf v1.33.0/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=
--- a/logger/logger.go
+++ b/logger/logger.go
@@ -8,12 +8,14 @@ import (
 	"github.com/op/go-logging"
 )

-var logger *logging.Logger
-var logBuffer []struct {
-	time  string
-	level logging.Level
-	log   string
-}
+var (
+	logger    *logging.Logger
+	logBuffer []struct {
+		time  string
+		level logging.Level
+		log   string
+	}
+)

 func init() {
 	InitLogger(logging.INFO)
--- a/main.go
+++ b/main.go
@@ -8,6 +8,7 @@ import (
 	"os/signal"
 	"syscall"
 	_ "unsafe"
+
 	"x-ui/config"
 	"x-ui/database"
 	"x-ui/logger"
@@ -342,7 +343,7 @@ func main() {
 			updateTgbotEnableSts(enabletgbot)
 		}
 	default:
-		fmt.Println("except 'run' or 'setting' subcommands")
+		fmt.Println("Invalid subcommands")
 		fmt.Println()
 		runCmd.Usage()
 		fmt.Println()
--- a/media/3X-UI.png
+++ b/media/3X-UI.png
--- a/sub/default.json
+++ b/sub/default.json
@@ -1,4 +1,5 @@
 {
+  "remarks": "",
  "dns": {
    "tag": "dns_out",
    "queryStrategy": "UseIP",
@@ -78,28 +79,9 @@
      {
        "type": "field",
        "network": "tcp,udp",
-        "balancerTag": "all"
-      }
-    ],
-    "balancers": [
-      {
-        "tag": "all",
-        "selector": [
-          "proxy"
-        ],
-        "strategy": {
-          "type": "leastPing"
-        }
+        "outboundTag": "proxy"
      }
    ]
  },
-  "observatory": {
-    "probeInterval": "5m",
-    "probeURL": "https://api.github.com/_private/browser/stats",
-    "subjectSelector": [
-      "proxy"
-    ],
-    "EnableConcurrency": true
-  },
  "stats": {}
 }
--- a/sub/sub.go
+++ b/sub/sub.go
@@ -7,6 +7,7 @@ import (
 	"net"
 	"net/http"
 	"strconv"
+
 	"x-ui/config"
 	"x-ui/logger"
 	"x-ui/util/common"
@@ -99,7 +100,7 @@ func (s *Server) initRouter() (*gin.Engine, error) {
 }

 func (s *Server) Start() (err error) {
-	//This is an anonymous function, no function name
+	// This is an anonymous function, no function name
 	defer func() {
 		if err != nil {
 			s.Stop()
@@ -144,21 +145,19 @@ func (s *Server) Start() (err error) {

 	if certFile != "" || keyFile != "" {
 		cert, err := tls.LoadX509KeyPair(certFile, keyFile)
-		if err != nil {
-			listener.Close()
-			return err
+		if err == nil {
+			c := &tls.Config{
+				Certificates: []tls.Certificate{cert},
+			}
+			listener = network.NewAutoHttpsListener(listener)
+			listener = tls.NewListener(listener, c)
+			logger.Info("sub server run https on", listener.Addr())
+		} else {
+			logger.Error("error in loading certificates: ", err)
+			logger.Info("sub server run http on", listener.Addr())
 		}
-		c := &tls.Config{
-			Certificates: []tls.Certificate{cert},
-		}
-		listener = network.NewAutoHttpsListener(listener)
-		listener = tls.NewListener(listener, c)
-	}
-
-	if certFile != "" || keyFile != "" {
-		logger.Info("Sub server run https on", listener.Addr())
 	} else {
-		logger.Info("Sub server run http on", listener.Addr())
+		logger.Info("sub server run http on", listener.Addr())
 	}
 	s.listener = listener

--- a/sub/subController.go
+++ b/sub/subController.go
@@ -25,16 +25,17 @@ func NewSUBController(
 	showInfo bool,
 	rModel string,
 	update string,
-	jsonFragment string) *SUBController {
-
+	jsonFragment string,
+) *SUBController {
+	sub := NewSubService(showInfo, rModel)
 	a := &SUBController{
 		subPath:        subPath,
 		subJsonPath:    jsonPath,
 		subEncrypt:     encrypt,
 		updateInterval: update,

-		subService:     NewSubService(showInfo, rModel),
-		subJsonService: NewSubJsonService(jsonFragment),
+		subService:     sub,
+		subJsonService: NewSubJsonService(jsonFragment, sub),
 	}
 	a.initRouter(g)
 	return a
@@ -50,7 +51,6 @@ func (a *SUBController) initRouter(g *gin.RouterGroup) {
 }

 func (a *SUBController) subs(c *gin.Context) {
-	println(c.Request.Header["User-Agent"][0])
 	subId := c.Param("subid")
 	host := strings.Split(c.Request.Host, ":")[0]
 	subs, header, err := a.subService.GetSubs(subId, host)
@@ -76,7 +76,6 @@ func (a *SUBController) subs(c *gin.Context) {
 }

 func (a *SUBController) subJsons(c *gin.Context) {
-	println(c.Request.Header["User-Agent"][0])
 	subId := c.Param("subid")
 	host := strings.Split(c.Request.Host, ":")[0]
 	jsonSub, header, err := a.subJsonService.GetJson(subId, host)
--- a/sub/subJsonService.go
+++ b/sub/subJsonService.go
@@ -5,6 +5,7 @@ import (
 	"encoding/json"
 	"fmt"
 	"strings"
+
 	"x-ui/database/model"
 	"x-ui/logger"
 	"x-ui/util/json_util"
@@ -17,15 +18,34 @@ import (
 var defaultJson string

 type SubJsonService struct {
-	fragmanet string
+	configJson       map[string]interface{}
+	defaultOutbounds []json_util.RawMessage
+	fragment         string

 	inboundService service.InboundService
-	SubService
+	SubService     *SubService
 }

-func NewSubJsonService(fragment string) *SubJsonService {
+func NewSubJsonService(fragment string, subService *SubService) *SubJsonService {
+	var configJson map[string]interface{}
+	var defaultOutbounds []json_util.RawMessage
+	json.Unmarshal([]byte(defaultJson), &configJson)
+	if outboundSlices, ok := configJson["outbounds"].([]interface{}); ok {
+		for _, defaultOutbound := range outboundSlices {
+			jsonBytes, _ := json.Marshal(defaultOutbound)
+			defaultOutbounds = append(defaultOutbounds, jsonBytes)
+		}
+	}
+
+	if fragment != "" {
+		defaultOutbounds = append(defaultOutbounds, json_util.RawMessage(fragment))
+	}
+
 	return &SubJsonService{
-		fragmanet: fragment,
+		configJson:       configJson,
+		defaultOutbounds: defaultOutbounds,
+		fragment:         fragment,
+		SubService:       subService,
 	}
 }

@@ -38,19 +58,8 @@ func (s *SubJsonService) GetJson(subId string, host string) (string, string, err
 	var header string
 	var traffic xray.ClientTraffic
 	var clientTraffics []xray.ClientTraffic
-	var configJson map[string]interface{}
-	var defaultOutbounds []json_util.RawMessage
+	var configArray []json_util.RawMessage

-	json.Unmarshal([]byte(defaultJson), &configJson)
-	if outboundSlices, ok := configJson["outbounds"].([]interface{}); ok {
-		for _, defaultOutbound := range outboundSlices {
-			jsonBytes, _ := json.Marshal(defaultOutbound)
-			defaultOutbounds = append(defaultOutbounds, jsonBytes)
-		}
-	}
-
-	outbounds := []json_util.RawMessage{}
-	startIndex := 0
 	// Prepare Inbounds
 	for _, inbound := range inbounds {
 		clients, err := s.inboundService.GetClients(inbound)
@@ -61,7 +70,7 @@ func (s *SubJsonService) GetJson(subId string, host string) (string, string, err
 			continue
 		}
 		if len(inbound.Listen) > 0 && inbound.Listen[0] == '@' {
-			listen, port, streamSettings, err := s.getFallbackMaster(inbound.Listen, inbound.StreamSettings)
+			listen, port, streamSettings, err := s.SubService.getFallbackMaster(inbound.Listen, inbound.StreamSettings)
 			if err == nil {
 				inbound.Listen = listen
 				inbound.Port = port
@@ -69,22 +78,16 @@ func (s *SubJsonService) GetJson(subId string, host string) (string, string, err
 			}
 		}

-		var subClients []model.Client
 		for _, client := range clients {
 			if client.Enable && client.SubID == subId {
-				subClients = append(subClients, client)
 				clientTraffics = append(clientTraffics, s.SubService.getClientTraffics(inbound.ClientStats, client.Email))
+				newConfigs := s.getConfig(inbound, client, host)
+				configArray = append(configArray, newConfigs...)
 			}
 		}
-
-		outbound := s.getOutbound(inbound, subClients, host, startIndex)
-		if outbound != nil {
-			outbounds = append(outbounds, outbound...)
-			startIndex += len(outbound)
-		}
 	}

-	if len(outbounds) == 0 {
+	if len(configArray) == 0 {
 		return "", "", nil
 	}

@@ -111,21 +114,15 @@ func (s *SubJsonService) GetJson(subId string, host string) (string, string, err
 		}
 	}

-	if s.fragmanet != "" {
-		outbounds = append(outbounds, json_util.RawMessage(s.fragmanet))
-	}
-
 	// Combile outbounds
-	outbounds = append(outbounds, defaultOutbounds...)
-	configJson["outbounds"] = outbounds
-	finalJson, _ := json.MarshalIndent(configJson, "", "  ")
+	finalJson, _ := json.MarshalIndent(configArray, "", "  ")

 	header = fmt.Sprintf("upload=%d; download=%d; total=%d; expire=%d", traffic.Up, traffic.Down, traffic.Total, traffic.ExpiryTime/1000)
 	return string(finalJson), header, nil
 }

-func (s *SubJsonService) getOutbound(inbound *model.Inbound, clients []model.Client, host string, startIndex int) []json_util.RawMessage {
-	var newOutbounds []json_util.RawMessage
+func (s *SubJsonService) getConfig(inbound *model.Inbound, client model.Client, host string) []json_util.RawMessage {
+	var newJsonArray []json_util.RawMessage
 	stream := s.streamData(inbound.StreamSettings)

 	externalProxies, ok := stream["externalProxy"].([]interface{})
@@ -135,13 +132,13 @@ func (s *SubJsonService) getOutbound(inbound *model.Inbound, clients []model.Cli
 				"forceTls": "same",
 				"dest":     host,
 				"port":     float64(inbound.Port),
+				"remark":   "",
 			},
 		}
 	}

 	delete(stream, "externalProxy")

-	config_index := startIndex
 	for _, ep := range externalProxies {
 		extPrxy := ep.(map[string]interface{})
 		inbound.Listen = extPrxy["dest"].(string)
@@ -160,21 +157,28 @@ func (s *SubJsonService) getOutbound(inbound *model.Inbound, clients []model.Cli
 			}
 		}
 		streamSettings, _ := json.MarshalIndent(newStream, "", "  ")
-		inbound.StreamSettings = string(streamSettings)

-		for _, client := range clients {
-			inbound.Tag = fmt.Sprintf("proxy_%d", config_index)
-			switch inbound.Protocol {
-			case "vmess", "vless":
-				newOutbounds = append(newOutbounds, s.genVnext(inbound, client))
-			case "trojan", "shadowsocks":
-				newOutbounds = append(newOutbounds, s.genServer(inbound, client))
-			}
-			config_index += 1
+		var newOutbounds []json_util.RawMessage
+
+		switch inbound.Protocol {
+		case "vmess", "vless":
+			newOutbounds = append(newOutbounds, s.genVnext(inbound, streamSettings, client))
+		case "trojan", "shadowsocks":
+			newOutbounds = append(newOutbounds, s.genServer(inbound, streamSettings, client))
 		}
+
+		newOutbounds = append(newOutbounds, s.defaultOutbounds...)
+		newConfigJson := make(map[string]interface{})
+		for key, value := range s.configJson {
+			newConfigJson[key] = value
+		}
+		newConfigJson["outbounds"] = newOutbounds
+		newConfigJson["remarks"] = s.SubService.genRemark(inbound, client.Email, extPrxy["remark"].(string))
+		newConfig, _ := json.MarshalIndent(newConfigJson, "", "  ")
+		newJsonArray = append(newJsonArray, newConfig)
 	}

-	return newOutbounds
+	return newJsonArray
 }

 func (s *SubJsonService) streamData(stream string) map[string]interface{} {
@@ -188,8 +192,8 @@ func (s *SubJsonService) streamData(stream string) map[string]interface{} {
 	}
 	delete(streamSettings, "sockopt")

-	if s.fragmanet != "" {
-		streamSettings["sockopt"] = json_util.RawMessage(`{"dialerProxy": "fragment", "tcpKeepAliveIdle": 100, "TcpNoDelay": true}`)
+	if s.fragment != "" {
+		streamSettings["sockopt"] = json_util.RawMessage(`{"dialerProxy": "fragment", "tcpKeepAliveIdle": 100, "tcpNoDelay": true}`)
 	}

 	// remove proxy protocol
@@ -214,11 +218,11 @@ func (s *SubJsonService) removeAcceptProxy(setting interface{}) map[string]inter

 func (s *SubJsonService) tlsData(tData map[string]interface{}) map[string]interface{} {
 	tlsData := make(map[string]interface{}, 1)
-	tlsClientSettings := tData["settings"].(map[string]interface{})
+	tlsClientSettings, _ := tData["settings"].(map[string]interface{})

 	tlsData["serverName"] = tData["serverName"]
 	tlsData["alpn"] = tData["alpn"]
-	if allowInsecure, ok := tlsClientSettings["allowInsecure"].(string); ok {
+	if allowInsecure, ok := tlsClientSettings["allowInsecure"].(bool); ok {
 		tlsData["allowInsecure"] = allowInsecure
 	}
 	if fingerprint, ok := tlsClientSettings["fingerprint"].(string); ok {
@@ -229,7 +233,7 @@ func (s *SubJsonService) tlsData(tData map[string]interface{}) map[string]interf

 func (s *SubJsonService) realityData(rData map[string]interface{}) map[string]interface{} {
 	rltyData := make(map[string]interface{}, 1)
-	rltyClientSettings := rData["settings"].(map[string]interface{})
+	rltyClientSettings, _ := rData["settings"].(map[string]interface{})

 	rltyData["show"] = false
 	rltyData["publicKey"] = rltyClientSettings["publicKey"]
@@ -253,7 +257,7 @@ func (s *SubJsonService) realityData(rData map[string]interface{}) map[string]in
 	return rltyData
 }

-func (s *SubJsonService) genVnext(inbound *model.Inbound, client model.Client) json_util.RawMessage {
+func (s *SubJsonService) genVnext(inbound *model.Inbound, streamSettings json_util.RawMessage, client model.Client) json_util.RawMessage {
 	outbound := Outbound{}
 	usersData := make([]UserVnext, 1)

@@ -272,8 +276,8 @@ func (s *SubJsonService) genVnext(inbound *model.Inbound, client model.Client) j
 	}

 	outbound.Protocol = string(inbound.Protocol)
-	outbound.Tag = inbound.Tag
-	outbound.StreamSettings = json_util.RawMessage(inbound.StreamSettings)
+	outbound.Tag = "proxy"
+	outbound.StreamSettings = streamSettings
 	outbound.Settings = OutboundSettings{
 		Vnext: vnextData,
 	}
@@ -282,7 +286,7 @@ func (s *SubJsonService) genVnext(inbound *model.Inbound, client model.Client) j
 	return result
 }

-func (s *SubJsonService) genServer(inbound *model.Inbound, client model.Client) json_util.RawMessage {
+func (s *SubJsonService) genServer(inbound *model.Inbound, streamSettings json_util.RawMessage, client model.Client) json_util.RawMessage {
 	outbound := Outbound{}

 	serverData := make([]ServerSetting, 1)
@@ -308,8 +312,8 @@ func (s *SubJsonService) genServer(inbound *model.Inbound, client model.Client)
 	}

 	outbound.Protocol = string(inbound.Protocol)
-	outbound.Tag = inbound.Tag
-	outbound.StreamSettings = json_util.RawMessage(inbound.StreamSettings)
+	outbound.Tag = "proxy"
+	outbound.StreamSettings = streamSettings
 	outbound.Settings = OutboundSettings{
 		Servers: serverData,
 	}
--- a/sub/subService.go
+++ b/sub/subService.go
@@ -6,10 +6,12 @@ import (
 	"net/url"
 	"strings"
 	"time"
+
 	"x-ui/database"
 	"x-ui/database/model"
 	"x-ui/logger"
 	"x-ui/util/common"
+	"x-ui/util/random"
 	"x-ui/web/service"
 	"x-ui/xray"

@@ -212,9 +214,14 @@ func (s *SubService) genVmessLink(inbound *model.Inbound, email string) string {
 	case "grpc":
 		grpc, _ := stream["grpcSettings"].(map[string]interface{})
 		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{})
+		obj["path"] = httpupgrade["path"].(string)
+		obj["host"] = httpupgrade["host"].(string)
 	}

 	security, _ := stream["security"].(string)
@@ -346,9 +353,14 @@ func (s *SubService) genVlessLink(inbound *model.Inbound, email string) string {
 	case "grpc":
 		grpc, _ := stream["grpcSettings"].(map[string]interface{})
 		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{})
+		params["path"] = httpupgrade["path"].(string)
+		params["host"] = httpupgrade["host"].(string)
 	}

 	security, _ := stream["security"].(string)
@@ -391,25 +403,21 @@ func (s *SubService) genVlessLink(inbound *model.Inbound, email string) string {
 		if realitySetting != nil {
 			if sniValue, ok := searchKey(realitySetting, "serverNames"); ok {
 				sNames, _ := sniValue.([]interface{})
-				params["sni"], _ = sNames[0].(string)
+				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{})
-				params["sid"], _ = shortIds[0].(string)
+				params["sid"] = shortIds[random.Num(len(shortIds))].(string)
 			}
 			if fpValue, ok := searchKey(realitySettings, "fingerprint"); ok {
 				if fp, ok := fpValue.(string); ok && len(fp) > 0 {
 					params["fp"] = fp
 				}
 			}
-			if spxValue, ok := searchKey(realitySettings, "spiderX"); ok {
-				if spx, ok := spxValue.(string); ok && len(spx) > 0 {
-					params["spx"] = spx
-				}
-			}
+			params["spx"] = "/" + random.Seq(15)
 		}

 		if streamNetwork == "tcp" && len(clients[clientIndex].Flow) > 0 {
@@ -562,9 +570,14 @@ func (s *SubService) genTrojanLink(inbound *model.Inbound, email string) string
 	case "grpc":
 		grpc, _ := stream["grpcSettings"].(map[string]interface{})
 		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{})
+		params["path"] = httpupgrade["path"].(string)
+		params["host"] = httpupgrade["host"].(string)
 	}

 	security, _ := stream["security"].(string)
@@ -603,25 +616,21 @@ func (s *SubService) genTrojanLink(inbound *model.Inbound, email string) string
 		if realitySetting != nil {
 			if sniValue, ok := searchKey(realitySetting, "serverNames"); ok {
 				sNames, _ := sniValue.([]interface{})
-				params["sni"], _ = sNames[0].(string)
+				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{})
-				params["sid"], _ = shortIds[0].(string)
+				params["sid"] = shortIds[random.Num(len(shortIds))].(string)
 			}
 			if fpValue, ok := searchKey(realitySettings, "fingerprint"); ok {
 				if fp, ok := fpValue.(string); ok && len(fp) > 0 {
 					params["fp"] = fp
 				}
 			}
-			if spxValue, ok := searchKey(realitySettings, "spiderX"); ok {
-				if spx, ok := spxValue.(string); ok && len(spx) > 0 {
-					params["spx"] = spx
-				}
-			}
+			params["spx"] = "/" + random.Seq(15)
 		}

 		if streamNetwork == "tcp" && len(clients[clientIndex].Flow) > 0 {
@@ -779,9 +788,14 @@ func (s *SubService) genShadowsocksLink(inbound *model.Inbound, email string) st
 	case "grpc":
 		grpc, _ := stream["grpcSettings"].(map[string]interface{})
 		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{})
+		params["path"] = httpupgrade["path"].(string)
+		params["host"] = httpupgrade["host"].(string)
 	}

 	security, _ := stream["security"].(string)
--- a/util/common/err.go
+++ b/util/common/err.go
@@ -3,6 +3,7 @@ package common
 import (
 	"errors"
 	"fmt"
+
 	"x-ui/logger"
 )

--- a/util/random/random.go
+++ b/util/random/random.go
@@ -4,12 +4,14 @@ import (
 	"math/rand"
 )

-var numSeq [10]rune
-var lowerSeq [26]rune
-var upperSeq [26]rune
-var numLowerSeq [36]rune
-var numUpperSeq [36]rune
-var allSeq [62]rune
+var (
+	numSeq      [10]rune
+	lowerSeq    [26]rune
+	upperSeq    [26]rune
+	numLowerSeq [36]rune
+	numUpperSeq [36]rune
+	allSeq      [62]rune
+)

 func init() {
 	for i := 0; i < 10; i++ {
--- a/web/assets/codemirror/codemirror.js
+++ b/web/assets/codemirror/codemirror.js
@@ -538,7 +538,7 @@

  var on = function(emitter, type, f) {
    if (emitter.addEventListener) {
-      emitter.addEventListener(type, f, { passive: true });
+      emitter.addEventListener(type, f, { passive: false });
    } else if (emitter.attachEvent) {
      emitter.attachEvent("on" + type, f);
    } else {
--- a/web/assets/codemirror/xq.css
+++ b/web/assets/codemirror/xq.css
@@ -45,12 +45,12 @@ THE SOFTWARE.
 .cm-s-xq .CodeMirror-activeline-background { background: #e8f2ff; }
 .cm-s-xq .CodeMirror-matchingbracket { outline:1px solid grey;color:black !important;background:yellow; }

-.dark .cm-s-xq.CodeMirror { background-color: #000000; border-color: #25272a; color: rgb(255 255 255 / 85%); }
-.dark .cm-s-xq.CodeMirror:hover { background-color: rgb(0 50 42 / 20%); border-color: #008771; transition: all .3s; }
-.dark .cm-s-xq div.CodeMirror-selected { background: rgba(0, 0, 0, 0.5);  }
-.dark .cm-s-xq .CodeMirror-line::selection, .dark .cm-s-xq .CodeMirror-line > span::selection, .dark .cm-s-xq .CodeMirror-line > span > span::selection { background: rgba(39, 0, 122, 0.99); }
-.dark .cm-s-xq .CodeMirror-line::-moz-selection, .dark .cm-s-xq .CodeMirror-line > span::-moz-selection, .dark .cm-s-xq .CodeMirror-line > span > span::-moz-selection { background: rgba(39, 0, 122, 0.99); }
-.dark .cm-s-xq .CodeMirror-gutters { background: rgb(0 0 0 / 30%); border-right: 1px solid #2c3950; }
+.dark .cm-s-xq.CodeMirror { background-color: var(--dark-color-surface-200); border-color: var(--dark-color-surface-300); color: rgb(255 255 255 / 65%); }
+.dark .cm-s-xq.CodeMirror:hover { background-color: rgb(0 50 42 / 30%); border-color: #008771; transition: all .3s; }
+.dark .cm-s-xq div.CodeMirror-selected { background: var(--dark-color-codemirror-line-selection); }
+.dark .cm-s-xq .CodeMirror-line::selection, .dark .cm-s-xq .CodeMirror-line > span::selection, .dark .cm-s-xq .CodeMirror-line > span > span::selection { background: var(--dark-color-codemirror-line-selection); }
+.dark .cm-s-xq .CodeMirror-line::-moz-selection, .dark .cm-s-xq .CodeMirror-line > span::-moz-selection, .dark .cm-s-xq .CodeMirror-line > span > span::-moz-selection { background: var(--dark-color-codemirror-line-selection); }
+.dark .cm-s-xq .CodeMirror-gutters { background: rgb(0 0 0 / 30%); border-right: 1px solid var(--dark-color-surface-300); }
 .dark .cm-s-xq .CodeMirror-guttermarker { color: #FFBD40; }
 .dark .cm-s-xq .CodeMirror-guttermarker-subtle { color: rgb(255 255 255 / 70%); }
 .dark .cm-s-xq .CodeMirror-linenumber { color: rgb(255 255 255 / 50%); }
@@ -80,7 +80,7 @@ THE SOFTWARE.

 .Line-Hover{transition: all .2s;}
 .Line-Hover:hover{ background-color: rgba(0, 102, 85, 0.05) !important; }  
-.dark .Line-Hover:hover{ background-color: rgb(0 0 0 / 20%) !important; }
+.dark .Line-Hover:hover{ background-color: var(--dark-color-codemirror-line-hover) !important; }

 .CodeMirror-foldmarker { color: #fc8800; text-shadow: #ffd8aa 1px 1px 2px, #ffd8aa -1px -1px 2px, #ffd8aa 1px -1px 2px, #ffd8aa -1px 1px 2px; font-family: arial; line-height: .3; cursor: pointer; }
 .dark .CodeMirror-foldmarker { color: #ffffff; text-shadow: #bbb 1px 1px 2px, #bbb -1px -1px 2px, #bbb 1px -1px 2px, #bbb -1px 1px 2px; font-family: arial; line-height: .3; cursor: pointer; }
--- a/web/assets/css/custom.css
+++ b/web/assets/css/custom.css
@@ -1,4 +1,44 @@
 :root {
+    --color-primary-100: #008771;
+    --dark-color-background: #0a1222;
+    --dark-color-surface-100: #151f31;
+    --dark-color-surface-200: #222d42;
+    --dark-color-surface-300: #2c3950;
+    --dark-color-surface-400: rgba(65, 85, 119, 0.5); /* line */
+    --dark-color-surface-500: #2c3950; /* popover & switch btn */
+    --dark-color-surface-600: #313f5a; /* dropmenu hover */ 
+    --dark-color-surface-700: #111929; /* modals */
+    --dark-color-table-hover: rgba(44, 57, 80, 0.2);
+    --dark-color-text-primary: rgba(255, 255, 255, 0.75);
+    --dark-color-stroke: #2c3950;
+    --dark-color-btn-danger: #cd3838;
+    --dark-color-btn-danger-border: transparent;
+    --dark-color-btn-danger-hover: #e94b4b;
+    --dark-color-tag-bg: rgba(255, 255, 255, 0.05);
+    --dark-color-tag-border:rgba(255, 255, 255, 0.15);
+    --dark-color-tag-color:rgba(255, 255, 255, 0.75);
+    --dark-color-tag-green-bg: #112421;
+    --dark-color-tag-green-border: #195141;
+    --dark-color-tag-green-color: #3ad3ba;
+    --dark-color-tag-purple-bg: #201425;
+    --dark-color-tag-purple-border: #5a2969;
+    --dark-color-tag-purple-color: #d988cd;
+    --dark-color-tag-red-bg: #291515;
+    --dark-color-tag-red-border: #5c2626;
+    --dark-color-tag-red-color: #e04141;
+    --dark-color-tag-orange-bg: #312313;
+    --dark-color-tag-orange-border: #593914;
+    --dark-color-tag-orange-color: #ffa031;
+    --dark-color-tag-blue-bg: #111a2c;
+    --dark-color-tag-blue-border: #1348ab;
+    --dark-color-tag-blue-color: #529fff;
+    --dark-color-codemirror-line-hover: rgba(0, 135, 113, 0.2);
+    --dark-color-codemirror-line-selection: rgba(0, 135, 113, 0.3);
+    --dark-color-login-background: var(--dark-color-background);
+    --dark-color-login-wave: var(--dark-color-surface-200);
+}
+
+html[data-theme='ultra-dark'] {
    --dark-color-background: #21242a;
    --dark-color-surface-100: #0c0e12;
    --dark-color-surface-200: #222327;
@@ -6,11 +46,45 @@
    --dark-color-surface-400: rgba(255, 255, 255, 0.1);
    --dark-color-surface-500: #3b404b;
    --dark-color-surface-600: #505663;
+    --dark-color-surface-700: #101113;
+    --dark-color-table-hover: rgba(89, 89, 89, 0.15);
    --dark-color-text-primary: rgb(255 255 255 / 85%);
    --dark-color-stroke: #202025;
-    --dark-color-btn-danger: #cd3838;
-    --dark-color-btn-danger-border: transparent;
-    --dark-color-btn-danger-hover: #e94b4b;
+    --dark-color-tag-green-bg: #112421;
+    --dark-color-tag-green-border: #1d5f4d;
+    --dark-color-tag-green-color: #59cbac;
+    --dark-color-tag-purple-bg: #241121;
+    --dark-color-tag-purple-border: #5a2969;
+    --dark-color-tag-purple-color: #d686ca;
+    --dark-color-tag-red-bg: #2a1215;
+    --dark-color-tag-red-border: #58181c;
+    --dark-color-tag-red-color: #e84749;
+    --dark-color-tag-orange-bg: #2b1d11;
+    --dark-color-tag-orange-border: #593815;
+    --dark-color-tag-orange-color: #e89a3c;
+    --dark-color-tag-blue-bg: #111a2c;
+    --dark-color-tag-blue-border: #0f367e;
+    --dark-color-tag-blue-color: #3c89e8;
+    --dark-color-codemirror-line-hover: rgba(85, 85, 85, 0.3);
+    --dark-color-codemirror-line-selection: rgba(85, 85, 85, 0.4);
+    --dark-color-login-background: #0a2227;
+    --dark-color-login-wave: #0f2d32;
+    .ant-dropdown-menu-dark {
+        background-color: var(--dark-color-surface-500);
+    }
+    .dark .ant-dropdown-menu-submenu-title:hover,
+    .dark .ant-select-dropdown-menu-item-active:not(.ant-select-dropdown-menu-item-disabled),
+    .dark .ant-select-dropdown-menu-item:hover:not(.ant-select-dropdown-menu-item-disabled) {
+        background-color: var(--dark-color-surface-300);
+    }
+    .dark .waves-header {
+        background-color: #0a2227;
+    }
+    .dark .ant-calendar-year-panel-year:hover,
+    .dark .ant-calendar-month-panel-month:hover,
+    .dark .ant-calendar-decade-panel-decade:hover {
+        background-color: var(--dark-color-surface-600);
+    }
 }

 html,
@@ -31,7 +105,7 @@ body {
    font-feature-settings: "tnum";
 }
 html {
-    --antd-wave-shadow-color: #008771;
+    --antd-wave-shadow-color: var(--color-primary-100);
    line-height: 1.15;
    text-size-adjust: 100%;
    -webkit-text-size-adjust: 100%;
@@ -41,7 +115,7 @@ html {
 }

 ::selection {
-    color: #008771;
+    color: var(--color-primary-100);
    background-color: #cfe8e4;
 }

@@ -106,7 +180,7 @@ style attribute {
    position: relative;
    clear: both;
 }
-.ant-table-body {
+.ant-table-wrapper > div > div > div > div > div > div {
    overflow-x: auto !important;
 }
 .ant-card-hoverable {
@@ -149,7 +223,7 @@ style attribute {
        padding: 0.5rem;
    }
    .ant-modal-body {
-        padding: 10px;
+        padding: 20px;
    }
    .ant-form-item-label {
        line-height: 1.5;
@@ -233,7 +307,7 @@ style attribute {
 .ant-menu-submenu-active,
 .ant-menu-submenu-title:hover,
 .ant-menu:not(.ant-menu-inline) .ant-menu-submenu-open {
-    color: #008771;
+    color: var(--color-primary-100);
    background-color: rgb(232 244 242);
    border-radius: 0.5rem;
 }
@@ -495,14 +569,14 @@ style attribute {
 }

 .normal-icon:hover {
-    color: #008771;
+    color: var(--color-primary-100);
 }

 /* DARK THEME */

 .dark ::selection {
    color: #fff;
-    background-color: #008771;
+    background-color: var(--color-primary-100);
 }

 .dark .normal-icon:hover {
@@ -523,6 +597,7 @@ style attribute {

 .dark .ant-card-hoverable:hover,
 .dark .ant-space-item > .ant-tabs:hover {
+    /* box-shadow: 0 1px 10px -1px rgb(154 175 238 / 80%); */
    box-shadow: 0 2px 8px transparent;
 }

@@ -612,7 +687,7 @@ style attribute {
 .dark .ant-calendar-year-panel-year,
 .dark .ant-calendar-month-panel-month,
 .dark .ant-calendar-decade-panel-decade {
-    color: rgba(255, 255, 255, 0.85);
+    color: var(--dark-color-text-primary);
 }

 .dark .ant-list-item-meta-description {
@@ -643,7 +718,7 @@ style attribute {
 .dark .ant-calendar-time-picker-inner {
    background-color: var(--dark-color-surface-200);
    border-color: var(--dark-color-surface-300);
-    color: rgba(255, 255, 255, 0.85);
+    color: var(--dark-color-text-primary);
 }

 .dark .ant-select-selection:hover,
@@ -653,27 +728,27 @@ style attribute {
 .dark .ant-input:hover,
 .dark .ant-input:focus {
    background-color: rgba(0, 135, 113, 0.3);
-    border-color: #008771;
+    border-color: var(--color-primary-100);
 }

 .dark .ant-btn:not(.ant-btn-primary):not(.ant-btn-danger) {
-    color: rgba(255, 255, 255, 0.85);
+    color: var(--dark-color-text-primary);
    background-color: rgb(10 117 87 / 30%);
-    border: 1px solid #008771;
+    border: 1px solid var(--color-primary-100);
 }

 .dark .ant-radio-button-wrapper,
 .dark .ant-radio-button-wrapper:before {
-    color: rgb(255 255 255 / 65%);
+    color: var(--dark-color-text-primary);
    background-color: rgba(0, 135, 113, 0.3);
-    border-color: #008771;
+    border-color: var(--color-primary-100);
 }

 .dark .ant-btn:focus:not(.ant-btn-primary):not(.ant-btn-danger),
 .dark .ant-btn:hover:not(.ant-btn-primary):not(.ant-btn-danger) {
    color: #fff;
    background-color: rgb(10 117 87 / 50%);
-    border-color: #008771;
+    border-color: var(--color-primary-100);
 }

 .dark .ant-btn-primary[disabled],
@@ -689,7 +764,7 @@ style attribute {
    > tr:hover:not(.ant-table-expanded-row):not(.ant-table-row-selected)
    > td,
 .dark .client-table-odd-row {
-    background-color: rgb(89 89 89 / 15%);
+    background-color: var(--dark-color-table-hover);
 }

 .dark .ant-table-row-expand-icon {
@@ -699,9 +774,9 @@ style attribute {
 }

 .dark .ant-table-row-expand-icon:hover {
-    color: #008771;
+    color: var(--color-primary-100);
    background-color: #fff0;
-    border-color: #008771;
+    border-color: var(--color-primary-100);
 }

 .dark .ant-switch:not(.ant-switch-checked),
@@ -713,7 +788,6 @@ style attribute {
    stroke: var(--dark-color-stroke) !important;
 }

-.ant-dropdown-menu-dark,
 .dark .ant-popover-inner {
    background-color: var(--dark-color-surface-500);
 }
@@ -722,9 +796,17 @@ style attribute {
    border-color: var(--dark-color-surface-500);
 }

+@media (max-width: 768px) {
+    .dark .ant-popover-inner {
+        background-color: var(--dark-color-surface-200);
+    }
+    .dark > .ant-popover-content > .ant-popover-arrow {
+        border-color: var(--dark-color-surface-200);
+    }
+}
+
 .ant-dropdown-menu-dark .ant-dropdown-menu-item:hover,
 .dark .ant-select-dropdown-menu-item-selected,
-.dark .ant-select-dropdown-menu-item:hover,
 .dark .ant-calendar-time-picker-select-option-selected {
    background-color: var(--dark-color-surface-600);
 }
@@ -738,46 +820,46 @@ style attribute {
 }

 .dark .ant-tag {
-    color: rgba(255, 255, 255, 0.85);
-    background-color: rgba(255, 255, 255, 0.08);
-    border-color: rgba(255, 255, 255, 0.15);
+    color: var(--dark-color-tag-color);
+    background-color: var(--dark-color-tag-bg);
+    border-color: var(--dark-color-tag-border);
 }

 .dark .ant-tag-blue {
-    background-color: #111a2c;
-    border-color: #0f367e;
-    color: #3c89e8;
+    background-color: var(--dark-color-tag-blue-bg);
+    border-color: var(--dark-color-tag-blue-border);
+    color: var(--dark-color-tag-blue-color);
 }

 .dark .ant-tag-red,
 .dark .ant-alert-error {
-    background-color: #2a1215;
-    border-color: #58181c;
-    color: #e84749;
+    background-color: var(--dark-color-tag-red-bg);
+    border-color: var(--dark-color-tag-red-border);
+    color: var(--dark-color-tag-red-color);
 }

 .dark .ant-tag-orange,
 .dark .ant-alert-warning {
-    background-color: #2b1d11;
-    border-color: #593815;
-    color: #e89a3c;
+    background-color: var(--dark-color-tag-orange-bg);
+    border-color: var(--dark-color-tag-orange-border);
+    color: var(--dark-color-tag-orange-color);
 }

 .dark .ant-tag-green {
-    background-color: #112421;
-    border-color: #195544;
-    color: #59cbac;
+    background-color: var(--dark-color-tag-green-bg);
+    border-color: var(--dark-color-tag-green-border);
+    color: var(--dark-color-tag-green-color);
 }

 .dark .ant-tag-purple {
-    background-color: #241121;
-    border-color: #5a2969;
-    color: #d686ca;
+    background-color: var(--dark-color-tag-purple-bg);
+    border-color: var(--dark-color-tag-purple-border);
+    color: var(--dark-color-tag-purple-color);
 }

 .dark .ant-modal-content,
 .dark .ant-modal-header {
-    background-color: #101113;
+    background-color: var(--dark-color-surface-700);
 }

 .dark .ant-calendar-next-month-btn-day .ant-calendar-date,
@@ -786,13 +868,13 @@ style attribute {
 }

 .dark .ant-calendar-selected-day .ant-calendar-date {
-    background-color: #008771 !important;
+    background-color: var(--color-primary-100) !important;
    color: #fff;
 }

 .dark .ant-calendar-date:hover,
 .dark .ant-calendar-time-picker-select li:hover {
-    background-color: var(--dark-color-surface-300);
+    background-color: var(--dark-color-surface-600);
    color: #fff;
 }

@@ -806,13 +888,15 @@ style attribute {
    color: #fff;
    font-weight: 600;
    outline: none;
-    background-color: #008771;
+    background-color: var(--color-primary-100);
 }

 .dark .ant-calendar-time-picker-select {
    border-right-color: var(--dark-color-surface-300);
 }

+.has-warning .ant-select-selection,
+.has-warning .ant-select-selection:hover,
 .has-warning .ant-input,
 .has-warning .ant-input:hover {
    background-color: #ffeee1;
@@ -827,6 +911,8 @@ style attribute {
    border-color: #fec093;
 }

+.dark .has-warning .ant-select-selection,
+.dark .has-warning .ant-select-selection:hover,
 .dark .has-warning .ant-input,
 .dark .has-warning .ant-input:hover {
    border-color: #784e1d;
@@ -842,7 +928,7 @@ style attribute {
 }

 .dark .has-success .anticon {
-    color: #61bf39;
+    color: var(--color-primary-100);
    animation-name: diffZoomIn1 !important;
 }

@@ -888,19 +974,19 @@ style attribute {
 }

 .ant-calendar-today .ant-calendar-date {
-    color: #008771;
+    color: var(--color-primary-100);
    font-weight: 700;
-    border-color: #008771;
+    border-color: var(--color-primary-100);
 }

 .dark .ant-calendar-today .ant-calendar-date {
    color: #fff;
    font-weight: 700;
-    border-color: #008771;
+    border-color: var(--color-primary-100);
 }

 .ant-calendar-selected-day .ant-calendar-date {
-    background: #008771;
+    background: var(--color-primary-100);
    color: #ffffff;
 }

@@ -934,7 +1020,7 @@ li.ant-select-dropdown-menu-item:empty:after {
 .ant-select-dropdown.ant-select-dropdown--multiple
    .ant-select-dropdown-menu-item-selected:hover
    .ant-select-selected-icon {
-    color: #008771;
+    color: var(--color-primary-100);
 }
 .ant-select-selection:hover,
 .ant-input-number-focused,
@@ -943,7 +1029,7 @@ li.ant-select-dropdown-menu-item:empty:after {
 }

 .dark .ant-input-number-handler:active {
-    background-color: #008771;
+    background-color: var(--color-primary-100);
 }

 .dark .ant-input-number-handler:hover .ant-input-number-handler-down-inner,
@@ -979,10 +1065,11 @@ li.ant-select-dropdown-menu-item:empty:after {
    color: rgba(255, 255, 255, 0.35);
 }

+.ant-dropdown-menu-dark,
 .dark .ant-calendar-year-panel-year:hover,
 .dark .ant-calendar-month-panel-month:hover,
 .dark .ant-calendar-decade-panel-decade:hover {
-    background-color: var(--dark-color-surface-600);
+    background-color: var(--dark-color-surface-200);
 }

 .dark .ant-calendar-header a:hover {
@@ -1014,7 +1101,7 @@ li.ant-select-dropdown-menu-item:empty:after {
    .ant-calendar-decade-panel-selected-cell
    .ant-calendar-decade-panel-decade:hover {
    color: #fff;
-    background-color: #008771;
+    background-color: var(--color-primary-100);
 }

 .dark .ant-calendar-last-month-cell .ant-calendar-date,
@@ -1028,8 +1115,8 @@ li.ant-select-dropdown-menu-item:empty:after {

 .dark .ant-calendar-today .ant-calendar-date:hover {
    color: #fff;
-    border-color: #008771;
-    background-color: #008771;
+    border-color: var(--color-primary-100);
+    background-color: var(--color-primary-100);
 }

 .dark
@@ -1052,8 +1139,8 @@ li.ant-select-dropdown-menu-item:empty:after {
 }

 .dark .ant-checkbox-checked .ant-checkbox-inner {
-    background-color: #008771;
-    border-color: #008771;
+    background-color: var(--color-primary-100);
+    border-color: var(--color-primary-100);
 }

 .dark .ant-calendar-input {
@@ -1117,7 +1204,7 @@ li.ant-select-dropdown-menu-item:empty:after {
 .dark .ant-dropdown-menu-submenu-title:hover,
 .dark .ant-select-dropdown-menu-item-active:not(.ant-select-dropdown-menu-item-disabled),
 .dark .ant-select-dropdown-menu-item:hover:not(.ant-select-dropdown-menu-item-disabled) {
-    background-color: var(--dark-color-surface-300);
+    background-color: var(--dark-color-surface-600);
 }

 .ant-select-dropdown,
@@ -1140,7 +1227,7 @@ li.ant-select-dropdown-menu-item:empty:after {
    border-radius: 1rem;
 }

-.ant-input-group-addon:not(:first-child):not(:last-child), .ant-input-group-wrap:not(:first-child):not(:last-child), .ant-input-group>.ant-input:not(:first-child):not(:last-child) {
+.ant-input-group-addon:not(:first-child):not(:last-child) {
    border-radius: 0rem 1rem 1rem 0rem;
 }

@@ -1157,9 +1244,9 @@ b, strong {
 }

 .dark .ant-message-notice-content {
-    background-color: #000000;
-    border: 1px solid #303134;
-    color: rgba(255, 255, 255, 0.85);
+    background-color: var(--dark-color-surface-200);
+    border: 1px solid var(--dark-color-surface-300); 
+    color: var(--dark-color-text-primary);
 }

 .ant-btn-danger {
@@ -1174,4 +1261,18 @@ b, strong {

 .dark .ant-alert-close-icon .anticon-close:hover {
    color: rgb(255 255 255);
-}
+}
+
+.ant-empty-small {
+    margin: 4px 0;
+    background-color: transparent !important;
+}
+
+.ant-empty-small .ant-empty-image {
+    height: 20px;
+}
+
+.ant-menu-theme-switch:hover {
+    background-color: transparent !important;
+    cursor: default !important;
+}
--- a/web/assets/js/axios-init.js
+++ b/web/assets/js/axios-init.js
@@ -14,3 +14,17 @@ axios.interceptors.request.use(
    },
    (error) => Promise.reject(error),
 );
+
+axios.interceptors.response.use(
+    (response) => response,
+    (error) => {
+        if (error.response) {
+            const statusCode = error.response.status;
+            // Check the status code
+            if (statusCode === 401) { // Unauthorized
+                return window.location.reload();
+            }
+        }
+        return Promise.reject(error);
+    }
+);
--- a/web/assets/js/langs.js
+++ b/web/assets/js/langs.js
@@ -34,6 +34,11 @@ const supportLangs = [
        value: 'id-ID',
        icon: '🇮🇩',
    },
+    {
+        name: 'Український',
+        value: 'uk-UA',
+        icon: '🇺🇦',
+    },
 ];

 function getLang() {
--- a/web/assets/js/model/outbound.js
+++ b/web/assets/js/model/outbound.js
@@ -51,7 +51,14 @@ const OutboundDomainStrategies = [
    "AsIs",
    "UseIP",
    "UseIPv4",
-    "UseIPv6"
+    "UseIPv6",
+    "UseIPv6v4",
+    "UseIPv4v6",
+    "ForceIP",
+    "ForceIPv6v4",
+    "ForceIPv6",
+    "ForceIPv4v6",
+    "ForceIPv4"
 ];

 const WireguardDomainStrategy = [
@@ -268,6 +275,28 @@ class GrpcStreamSettings extends CommonClass {
    }
 }

+class HttpUpgradeStreamSettings extends CommonClass {
+    constructor(path='/', host='') {
+        super();
+        this.path = path;
+        this.host = host;
+    }
+
+    static fromJson(json={}) {
+        return new HttpUpgradeStreamSettings(
+            json.path,
+            json.Host,
+        );
+    }
+
+    toJson() {
+        return {
+            path: this.path,
+            host: this.host,
+        };
+    }
+}
+
 class TlsStreamSettings extends CommonClass {
    constructor(serverName='',
                alpn=[],
@@ -327,6 +356,34 @@ class RealityStreamSettings extends CommonClass {
        };
    }
 };
+class SockoptStreamSettings extends CommonClass {
+    constructor(dialerProxy = "", tcpFastOpen = false, tcpKeepAliveInterval = 0, tcpNoDelay = false) {
+        super();
+        this.dialerProxy = dialerProxy;
+        this.tcpFastOpen = tcpFastOpen;
+        this.tcpKeepAliveInterval = tcpKeepAliveInterval;
+        this.tcpNoDelay = tcpNoDelay;
+    }
+
+    static fromJson(json = {}) {
+        if (Object.keys(json).length === 0) return undefined;
+        return new SockoptStreamSettings(
+            json.dialerProxy,
+            json.tcpFastOpen,
+            json.tcpKeepAliveInterval,
+            json.tcpNoDelay,
+        );
+    }
+
+    toJson() {
+        return {
+            dialerProxy: this.dialerProxy,
+            tcpFastOpen: this.tcpFastOpen,
+            tcpKeepAliveInterval: this.tcpKeepAliveInterval,
+            tcpNoDelay: this.tcpNoDelay,
+        };
+    }
+}

 class StreamSettings extends CommonClass {
    constructor(network='tcp',
@@ -339,6 +396,8 @@ class StreamSettings extends CommonClass {
                httpSettings=new HttpStreamSettings(),
                quicSettings=new QuicStreamSettings(),
                grpcSettings=new GrpcStreamSettings(),
+                httpupgradeSettings=new HttpUpgradeStreamSettings(),
+                sockopt = undefined,
                ) {
        super();
        this.network = network;
@@ -351,6 +410,8 @@ class StreamSettings extends CommonClass {
        this.http = httpSettings;
        this.quic = quicSettings;
        this.grpc = grpcSettings;
+        this.httpupgrade = httpupgradeSettings;
+        this.sockopt = sockopt;
    }
    
    get isTls() {
@@ -361,6 +422,14 @@ class StreamSettings extends CommonClass {
        return this.security === "reality";
    }

+    get sockoptSwitch() {
+        return this.sockopt != undefined;
+    }
+
+    set sockoptSwitch(value) {
+        this.sockopt = value ? new SockoptStreamSettings() : undefined;
+    }
+
    static fromJson(json={}) {
        return new StreamSettings(
            json.network,
@@ -373,6 +442,8 @@ class StreamSettings extends CommonClass {
            HttpStreamSettings.fromJson(json.httpSettings),
            QuicStreamSettings.fromJson(json.quicSettings),
            GrpcStreamSettings.fromJson(json.grpcSettings),
+            HttpUpgradeStreamSettings.fromJson(json.httpupgradeSettings),
+            SockoptStreamSettings.fromJson(json.sockopt),
        );
    }

@@ -389,6 +460,37 @@ class StreamSettings extends CommonClass {
            httpSettings: network === 'http' ? this.http.toJson() : undefined,
            quicSettings: network === 'quic' ? this.quic.toJson() : undefined,
            grpcSettings: network === 'grpc' ? this.grpc.toJson() : undefined,
+            httpupgradeSettings: network === 'httpupgrade' ? this.httpupgrade.toJson() : undefined,
+            sockopt: this.sockopt != undefined ? this.sockopt.toJson() : undefined,
+        };
+    }
+}
+
+class Mux extends CommonClass {
+    constructor(enabled = false, concurrency = 8, xudpConcurrency = 16, xudpProxyUDP443 = "reject") {
+        super();
+        this.enabled = enabled;
+        this.concurrency = concurrency;
+        this.xudpConcurrency = xudpConcurrency;
+        this.xudpProxyUDP443 = xudpProxyUDP443;
+    }
+
+    static fromJson(json = {}) {
+        if (Object.keys(json).length === 0) return undefined;
+        return new Mux(
+            json.enabled,
+            json.concurrency,
+            json.xudpConcurrency,
+            json.xudpProxyUDP443,
+        );
+    }
+
+    toJson() {
+        return {
+            enabled: this.enabled,
+            concurrency: this.concurrency,
+            xudpConcurrency: this.xudpConcurrency,
+            xudpProxyUDP443: this.xudpProxyUDP443,
        };
    }
 }
@@ -399,12 +501,14 @@ class Outbound extends CommonClass {
        protocol=Protocols.VMess,
        settings=null,
        streamSettings = new StreamSettings(),
+        mux = new Mux(),
    ) {
        super();
        this.tag = tag;
        this._protocol = protocol;
        this.settings = settings == null ? Outbound.Settings.getSettings(protocol) : settings;
        this.stream = streamSettings;
+        this.mux = mux;
    }

    get protocol() {
@@ -419,7 +523,7 @@ class Outbound extends CommonClass {

    canEnableTls() {
        if (![Protocols.VMess, Protocols.VLESS, Protocols.Trojan, Protocols.Shadowsocks].includes(this.protocol)) return false;
-        return ["tcp", "ws", "http", "quic", "grpc"].includes(this.stream.network);
+        return ["tcp", "ws", "http", "quic", "grpc", "httpupgrade"].includes(this.stream.network);
    }

    //this is used for xtls-rprx-vision
@@ -469,6 +573,7 @@ class Outbound extends CommonClass {
            json.protocol,
            Outbound.Settings.fromJson(json.protocol, json.settings),
            StreamSettings.fromJson(json.streamSettings),
+            Mux.fromJson(json.mux),
        )
    }

@@ -478,6 +583,7 @@ class Outbound extends CommonClass {
            protocol: this.protocol,
            settings: this.settings instanceof CommonClass ? this.settings.toJson() : this.settings,
            streamSettings: this.canEnableStream() ? this.stream.toJson() : undefined,
+            mux: this.mux?.enabled ? this.mux : undefined,
        };
    }

@@ -523,6 +629,8 @@ class Outbound extends CommonClass {
                json.type ? json.type : 'none');
        } else if (network === 'grpc') {
            stream.grpc = new GrpcStreamSettings(json.path, json.type == 'multi');
+        } else if (network === 'httpupgrade') {
+            stream.httpupgrade = new HttpUpgradeStreamSettings(json.path,json.host);
        }

        if(json.tls && json.tls == 'tls'){
@@ -533,7 +641,6 @@ class Outbound extends CommonClass {
                json.allowInsecure);
        }

-
        return new Outbound(json.ps, Protocols.VMess, new Outbound.VmessSettings(json.add, json.port, json.id), stream);
    }

@@ -564,6 +671,8 @@ class Outbound extends CommonClass {
                headerType ?? 'none');
        } else if (type === 'grpc') {
            stream.grpc = new GrpcStreamSettings(url.searchParams.get('serviceName') ?? '', url.searchParams.get('mode') == 'multi');
+        } else if (type === 'httpupgrade') {
+            stream.httpupgrade = new HttpUpgradeStreamSettings(path,host);
        }

        if(security == 'tls'){
@@ -580,7 +689,7 @@ class Outbound extends CommonClass {
            let sni=url.searchParams.get('sni') ?? '';
            let sid=url.searchParams.get('sid') ?? '';
            let spx=url.searchParams.get('spx') ?? '';
-            stream.reality  = new RealityStreamSettings(pbk, fp, sni, sid, spx);
+            stream.reality = new RealityStreamSettings(pbk, fp, sni, sid, spx);
        }

        let data = link.split('?');
--- a/web/assets/js/model/xray.js
+++ b/web/assets/js/model/xray.js
@@ -446,16 +446,19 @@ class QuicStreamSettings extends XrayCommonClass {
 class GrpcStreamSettings extends XrayCommonClass {
    constructor(
        serviceName="",
+        authority="",
        multiMode=false,
        ) {
        super();
        this.serviceName = serviceName;
+        this.authority = authority;
        this.multiMode = multiMode;
    }

    static fromJson(json={}) {
        return new GrpcStreamSettings(
            json.serviceName,
+            json.authority,
            json.multiMode
            );
    }
@@ -463,11 +466,36 @@ class GrpcStreamSettings extends XrayCommonClass {
    toJson() {
        return {
            serviceName: this.serviceName,
+            authority: this.authority,
            multiMode: this.multiMode,
        }
    }
 }

+class HttpUpgradeStreamSettings extends XrayCommonClass {
+    constructor(acceptProxyProtocol=false, path='/', host='') {
+        super();
+        this.acceptProxyProtocol = acceptProxyProtocol;
+        this.path = path;
+        this.host = host;
+    }
+
+    static fromJson(json={}) {
+        return new HttpUpgradeStreamSettings(
+            json.acceptProxyProtocol,
+            json.path,
+            json.host,
+        );
+    }
+
+    toJson() {
+        return {
+            acceptProxyProtocol: this.acceptProxyProtocol,
+            path: this.path,
+            host: this.host,
+        };
+    }
+}

 class TlsStreamSettings extends XrayCommonClass {
    constructor(serverName='',
@@ -833,6 +861,7 @@ class StreamSettings extends XrayCommonClass {
        httpSettings=new HttpStreamSettings(),
        quicSettings=new QuicStreamSettings(),
        grpcSettings=new GrpcStreamSettings(),
+        httpupgradeSettings=new HttpUpgradeStreamSettings(),
        sockopt = undefined,
        ) {
        super();
@@ -848,6 +877,7 @@ class StreamSettings extends XrayCommonClass {
        this.http = httpSettings;
        this.quic = quicSettings;
        this.grpc = grpcSettings;
+        this.httpupgrade = httpupgradeSettings;
        this.sockopt = sockopt;
    }

@@ -910,6 +940,7 @@ class StreamSettings extends XrayCommonClass {
            HttpStreamSettings.fromJson(json.httpSettings),
            QuicStreamSettings.fromJson(json.quicSettings),
            GrpcStreamSettings.fromJson(json.grpcSettings),
+            HttpUpgradeStreamSettings.fromJson(json.httpupgradeSettings),
            SockoptStreamSettings.fromJson(json.sockopt),
        );
    }
@@ -929,6 +960,7 @@ class StreamSettings extends XrayCommonClass {
            httpSettings: network === 'http' ? this.http.toJson() : undefined,
            quicSettings: network === 'quic' ? this.quic.toJson() : undefined,
            grpcSettings: network === 'grpc' ? this.grpc.toJson() : undefined,
+            httpupgradeSettings: network === 'httpupgrade' ? this.httpupgrade.toJson() : undefined,
            sockopt: this.sockopt != undefined ? this.sockopt.toJson() : undefined,
        };
    }
@@ -1045,6 +1077,10 @@ class Inbound extends XrayCommonClass {
        return this.network === "http";
    }

+    get isHttpupgrade() {
+        return this.network === "httpupgrade";
+    }
+
    // Shadowsocks
    get method() {
        switch (this.protocol) {
@@ -1075,6 +1111,8 @@ class Inbound extends XrayCommonClass {
            return this.stream.ws.getHeader("Host");
        } else if (this.isH2) {
            return this.stream.http.host[0];
+        } else if (this.isHttpupgrade) {
+            return this.stream.httpupgrade.host;
        }
        return null;
    }
@@ -1086,6 +1124,8 @@ class Inbound extends XrayCommonClass {
            return this.stream.ws.path;
        } else if (this.isH2) {
            return this.stream.http.path;
+        } else if (this.isHttpupgrade) {
+            return this.stream.httpupgrade.path;
        }
        return null;
    }
@@ -1121,7 +1161,7 @@ class Inbound extends XrayCommonClass {

    canEnableTls() {
        if(![Protocols.VMESS, Protocols.VLESS, Protocols.TROJAN, Protocols.SHADOWSOCKS].includes(this.protocol)) return false;
-        return ["tcp", "ws", "http", "quic", "grpc"].includes(this.network);
+        return ["tcp", "ws", "http", "quic", "grpc", "httpupgrade"].includes(this.network);
    }

    //this is used for xtls-rprx-vision
@@ -1204,9 +1244,14 @@ class Inbound extends XrayCommonClass {
            obj.path = this.stream.quic.key;
        } else if (network === 'grpc') {
            obj.path = this.stream.grpc.serviceName;
+            obj.authority = this.stream.grpc.authority;
            if (this.stream.grpc.multiMode){
                obj.type = 'multi'
            }
+        } else if (network === 'httpupgrade') {
+            let httpupgrade = this.stream.httpupgrade;
+            obj.path = httpupgrade.path;
+            obj.host = httpupgrade.host;
        }

        if (security === 'tls') {
@@ -1275,10 +1320,16 @@ class Inbound extends XrayCommonClass {
            case "grpc":
                const grpc = this.stream.grpc;
                params.set("serviceName", grpc.serviceName);
+                params.set("authority", grpc.authority);
                if(grpc.multiMode){
                    params.set("mode", "multi");
                }
                break;
+            case "httpupgrade":
+                    const httpupgrade = this.stream.httpupgrade;
+                    params.set("path", httpupgrade.path);
+                    params.set("host", httpupgrade.host);
+                break;
        }

        if (security === 'tls') {
@@ -1389,10 +1440,16 @@ class Inbound extends XrayCommonClass {
            case "grpc":
                const grpc = this.stream.grpc;
                params.set("serviceName", grpc.serviceName);
+                params.set("authority", grpc.authority);
                if(grpc.multiMode){
                    params.set("mode", "multi");
                }
                break;
+            case "httpupgrade":
+                    const httpupgrade = this.stream.httpupgrade;
+                    params.set("path", httpupgrade.path);
+                    params.set("host", httpupgrade.host);
+                break;
        }

        if (security === 'tls') {
@@ -1470,10 +1527,16 @@ class Inbound extends XrayCommonClass {
            case "grpc":
                const grpc = this.stream.grpc;
                params.set("serviceName", grpc.serviceName);
+                params.set("authority", grpc.authority);
                if(grpc.multiMode){
                    params.set("mode", "multi");
                }
                break;
+            case "httpupgrade":
+                    const httpupgrade = this.stream.httpupgrade;
+                    params.set("path", httpupgrade.path);
+                    params.set("host", httpupgrade.host);
+                break;
        }

        if (security === 'tls') {
--- a/web/assets/js/util/utils.js
+++ b/web/assets/js/util/utils.js
@@ -131,11 +131,11 @@ class RandomUtil {
    static randomUUID() {
        const template = 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx';
        return template.replace(/[xy]/g, function (c) {
-          const randomValues = new Uint8Array(1);
-          crypto.getRandomValues(randomValues);
-          let randomValue = randomValues[0] % 16;
-          let calculatedValue = (c === 'x') ? randomValue : (randomValue & 0x3 | 0x8);
-          return calculatedValue.toString(16);
+            const randomValues = new Uint8Array(1);
+            crypto.getRandomValues(randomValues);
+            let randomValue = randomValues[0] % 16;
+            let calculatedValue = (c === 'x') ? randomValue : (randomValue & 0x3 | 0x8);
+            return calculatedValue.toString(16);
        });
    }

--- a/web/assets/persian-datepicker/persian-datepicker.min.css
+++ b/web/assets/persian-datepicker/persian-datepicker.min.css
@@ -206,15 +206,15 @@ jdp-container .jdp-day-name {
 }
 jdp-container .jdp-day-name.today,
 jdp-container .jdp-day.today {
-    border-color: #008771;
-    color: #008771;
+    border-color: var(--color-primary-100);
+    color: var(--color-primary-100);
    font-weight: 700;
 }
 .dark jdp-container .jdp-day-name.selected,
 .dark jdp-container .jdp-day.selected,
 jdp-container .jdp-day-name.selected,
 jdp-container .jdp-day.selected {
-    background-color: #008771 !important;
+    background-color: var(--color-primary-100) !important;
    color: #fff !important;
    opacity: 1 !important;
 }
@@ -267,7 +267,7 @@ jdp-container .jdp-btn-empty,
 jdp-container .jdp-btn-today {
    background: #00877000;
    border-radius: 5px;
-    color: #008771;
+    color: var(--color-primary-100);
    cursor: pointer;
    display: inline-block;
    font-size: 90%;
@@ -369,26 +369,26 @@ jdp-container .jdp-time-container.jdp-only-time .jdp-time:after {
 }

 .dark jdp-container .jdp-days {
-    border-color: #32353b;
+    border-color: var(--dark-color-surface-400);
 }

 .dark jdp-overlay {
    background-color: #181f2c;
 }
 .dark jdp-container {
-    background: #000000;
+    background: var(--dark-color-background);
    border-color: #2c3950;
    box-shadow: 0 2px 8px rgba(0,0,0,.15);
    color: #fff;
 }
 .dark jdp-container .jdp-icon-minus,
 .dark jdp-container .jdp-icon-plus {
-    outline-color: #32353b;
+    outline-color: var(--dark-color-surface-600);
 }

 .dark jdp-container .jdp-icon-minus:hover,
 .dark jdp-container .jdp-icon-plus:hover {
-    background-color: #32353b;
+    background-color: var(--dark-color-surface-600);
 }

 .dark jdp-container .jdp-months,
@@ -405,27 +405,27 @@ jdp-container .jdp-time-container.jdp-only-time .jdp-time:after {
 .dark jdp-container .jdp-year,
 .dark jdp-container .jdp-year input,
 .dark jdp-container .jdp-year select {
-    background: #000000;
-    color: rgba(255, 255, 255, 0.85);
+    background: var(--dark-color-background);
+    color: var(--dark-color-text-primary);
 }
 .dark jdp-container .jdp-day,
 .dark jdp-container .jdp-day-name {
    border: 1px solid transparent;
-    color: rgba(255, 255, 255, 0.85);
+    color: var(--dark-color-text-primary);
 }
 .dark jdp-container .jdp-day-name.today,
 .dark jdp-container .jdp-day.today {
-    border-color: #008771;
+    border-color: var(--color-primary-100);
 }
 .dark jdp-container .jdp-day.disabled-day {
    opacity: 0.15;
 }
 .dark jdp-container .jdp-day:not(.disabled-day):hover {
-    background-color: #32353b;
+    background-color: var(--dark-color-surface-600);
    color: #fff;
 }
 .dark jdp-container .jdp-footer {
-    border-color: #32353b;
+    border-color: var(--dark-color-surface-400);
 }
 .dark jdp-container .jdp-btn-close,
 .dark jdp-container .jdp-btn-empty,
@@ -446,10 +446,10 @@ jdp-container .jdp-time-container.jdp-only-time .jdp-time:after {
 }

 .dark jdp-container .jdp-time-container .jdp-time select:hover {
-    background-color: #32353b;
+    background-color: var(--dark-color-surface-600);
    color: #fff;
 }

 .dark jdp-container .jdp-time-container .jdp-time select {
-    border: 1px solid #32353b;
+    border: 1px solid var(--dark-color-surface-600);
 }
--- a/web/controller/api.go
+++ b/web/controller/api.go
@@ -22,91 +22,37 @@ func (a *APIController) initRouter(g *gin.RouterGroup) {
 	g = g.Group("/panel/api/inbounds")
 	g.Use(a.checkLogin)

-	g.GET("/list", a.getAllInbounds)
-	g.GET("/get/:id", a.getSingleInbound)
-	g.GET("/getClientTraffics/:email", a.getClientTraffics)
-	g.POST("/add", a.addInbound)
-	g.POST("/del/:id", a.delInbound)
-	g.POST("/update/:id", a.updateInbound)
-	g.POST("/clientIps/:email", a.getClientIps)
-	g.POST("/clearClientIps/:email", a.clearClientIps)
-	g.POST("/addClient", a.addInboundClient)
-	g.POST("/:id/delClient/:clientId", a.delInboundClient)
-	g.POST("/updateClient/:clientId", a.updateInboundClient)
-	g.POST("/:id/resetClientTraffic/:email", a.resetClientTraffic)
-	g.POST("/resetAllTraffics", a.resetAllTraffics)
-	g.POST("/resetAllClientTraffics/:id", a.resetAllClientTraffics)
-	g.POST("/delDepletedClients/:id", a.delDepletedClients)
-	g.GET("/createbackup", a.createBackup)
-	g.POST("/onlines", a.onlines)
-
 	a.inboundController = NewInboundController(g)
-}

-func (a *APIController) getAllInbounds(c *gin.Context) {
-	a.inboundController.getInbounds(c)
-}
+	inboundRoutes := []struct {
+		Method  string
+		Path    string
+		Handler gin.HandlerFunc
+	}{
+		{"GET", "/createbackup", a.createBackup},
+		{"GET", "/list", a.inboundController.getInbounds},
+		{"GET", "/get/:id", a.inboundController.getInbound},
+		{"GET", "/getClientTraffics/:email", a.inboundController.getClientTraffics},
+		{"POST", "/add", a.inboundController.addInbound},
+		{"POST", "/del/:id", a.inboundController.delInbound},
+		{"POST", "/update/:id", a.inboundController.updateInbound},
+		{"POST", "/clientIps/:email", a.inboundController.getClientIps},
+		{"POST", "/clearClientIps/:email", a.inboundController.clearClientIps},
+		{"POST", "/addClient", a.inboundController.addInboundClient},
+		{"POST", "/:id/delClient/:clientId", a.inboundController.delInboundClient},
+		{"POST", "/updateClient/:clientId", a.inboundController.updateInboundClient},
+		{"POST", "/:id/resetClientTraffic/:email", a.inboundController.resetClientTraffic},
+		{"POST", "/resetAllTraffics", a.inboundController.resetAllTraffics},
+		{"POST", "/resetAllClientTraffics/:id", a.inboundController.resetAllClientTraffics},
+		{"POST", "/delDepletedClients/:id", a.inboundController.delDepletedClients},
+		{"POST", "/onlines", a.inboundController.onlines},
+	}

-func (a *APIController) getSingleInbound(c *gin.Context) {
-	a.inboundController.getInbound(c)
-}
-
-func (a *APIController) getClientTraffics(c *gin.Context) {
-	a.inboundController.getClientTraffics(c)
-}
-
-func (a *APIController) addInbound(c *gin.Context) {
-	a.inboundController.addInbound(c)
-}
-
-func (a *APIController) delInbound(c *gin.Context) {
-	a.inboundController.delInbound(c)
-}
-
-func (a *APIController) updateInbound(c *gin.Context) {
-	a.inboundController.updateInbound(c)
-}
-
-func (a *APIController) getClientIps(c *gin.Context) {
-	a.inboundController.getClientIps(c)
-}
-
-func (a *APIController) clearClientIps(c *gin.Context) {
-	a.inboundController.clearClientIps(c)
-}
-
-func (a *APIController) addInboundClient(c *gin.Context) {
-	a.inboundController.addInboundClient(c)
-}
-
-func (a *APIController) delInboundClient(c *gin.Context) {
-	a.inboundController.delInboundClient(c)
-}
-
-func (a *APIController) updateInboundClient(c *gin.Context) {
-	a.inboundController.updateInboundClient(c)
-}
-
-func (a *APIController) resetClientTraffic(c *gin.Context) {
-	a.inboundController.resetClientTraffic(c)
-}
-
-func (a *APIController) resetAllTraffics(c *gin.Context) {
-	a.inboundController.resetAllTraffics(c)
-}
-
-func (a *APIController) resetAllClientTraffics(c *gin.Context) {
-	a.inboundController.resetAllClientTraffics(c)
-}
-
-func (a *APIController) delDepletedClients(c *gin.Context) {
-	a.inboundController.delDepletedClients(c)
+	for _, route := range inboundRoutes {
+		g.Handle(route.Method, route.Path, route.Handler)
+	}
 }

 func (a *APIController) createBackup(c *gin.Context) {
 	a.Tgbot.SendBackupToAdmins()
 }
-
-func (a *APIController) onlines(c *gin.Context) {
-	a.inboundController.onlines(c)
-}
--- a/web/controller/base.go
+++ b/web/controller/base.go
@@ -2,6 +2,7 @@ package controller

 import (
 	"net/http"
+
 	"x-ui/logger"
 	"x-ui/web/locale"
 	"x-ui/web/session"
@@ -9,13 +10,12 @@ import (
 	"github.com/gin-gonic/gin"
 )

-type BaseController struct {
-}
+type BaseController struct{}

 func (a *BaseController) checkLogin(c *gin.Context) {
 	if !session.IsLogin(c) {
 		if isAjax(c) {
-			pureJsonMsg(c, false, I18nWeb(c, "pages.login.loginAgain"))
+			pureJsonMsg(c, http.StatusUnauthorized, false, I18nWeb(c, "pages.login.loginAgain"))
 		} else {
 			c.Redirect(http.StatusTemporaryRedirect, c.GetString("base_path"))
 		}
--- a/web/controller/inbound.go
+++ b/web/controller/inbound.go
@@ -4,6 +4,7 @@ import (
 	"encoding/json"
 	"fmt"
 	"strconv"
+
 	"x-ui/database/model"
 	"x-ui/web/service"
 	"x-ui/web/session"
@@ -174,7 +175,7 @@ func (a *InboundController) addInboundClient(c *gin.Context) {
 		return
 	}
 	jsonMsg(c, "Client(s) added", nil)
-	if err == nil && needRestart {
+	if needRestart {
 		a.xrayService.SetToNeedRestart()
 	}
 }
@@ -195,7 +196,7 @@ func (a *InboundController) delInboundClient(c *gin.Context) {
 		return
 	}
 	jsonMsg(c, "Client deleted", nil)
-	if err == nil && needRestart {
+	if needRestart {
 		a.xrayService.SetToNeedRestart()
 	}
 }
@@ -218,7 +219,7 @@ func (a *InboundController) updateInboundClient(c *gin.Context) {
 		return
 	}
 	jsonMsg(c, "Client updated", nil)
-	if err == nil && needRestart {
+	if needRestart {
 		a.xrayService.SetToNeedRestart()
 	}
 }
@@ -239,7 +240,7 @@ func (a *InboundController) resetClientTraffic(c *gin.Context) {
 		return
 	}
 	jsonMsg(c, "traffic reseted", nil)
-	if err == nil && needRestart {
+	if needRestart {
 		a.xrayService.SetToNeedRestart()
 	}
 }
--- a/web/controller/index.go
+++ b/web/controller/index.go
@@ -3,6 +3,7 @@ package controller
 import (
 	"net/http"
 	"time"
+
 	"x-ui/logger"
 	"x-ui/web/service"
 	"x-ui/web/session"
@@ -49,15 +50,15 @@ func (a *IndexController) login(c *gin.Context) {
 	var form LoginForm
 	err := c.ShouldBind(&form)
 	if err != nil {
-		pureJsonMsg(c, false, I18nWeb(c, "pages.login.toasts.invalidFormData"))
+		pureJsonMsg(c, http.StatusOK, false, I18nWeb(c, "pages.login.toasts.invalidFormData"))
 		return
 	}
 	if form.Username == "" {
-		pureJsonMsg(c, false, I18nWeb(c, "pages.login.toasts.emptyUsername"))
+		pureJsonMsg(c, http.StatusOK, false, I18nWeb(c, "pages.login.toasts.emptyUsername"))
 		return
 	}
 	if form.Password == "" {
-		pureJsonMsg(c, false, I18nWeb(c, "pages.login.toasts.emptyPassword"))
+		pureJsonMsg(c, http.StatusOK, false, I18nWeb(c, "pages.login.toasts.emptyPassword"))
 		return
 	}

@@ -66,7 +67,7 @@ func (a *IndexController) login(c *gin.Context) {
 	if user == nil {
 		logger.Warningf("wrong username or password: \"%s\" \"%s\"", form.Username, form.Password)
 		a.tgbot.UserLoginNotify(form.Username, getRemoteIp(c), timeStr, 0)
-		pureJsonMsg(c, false, I18nWeb(c, "pages.login.toasts.wrongUsernameOrPassword"))
+		pureJsonMsg(c, http.StatusOK, false, I18nWeb(c, "pages.login.toasts.wrongUsernameOrPassword"))
 		return
 	} else {
 		logger.Infof("%s login success, Ip Address: %s\n", form.Username, getRemoteIp(c))
--- a/web/controller/server.go
+++ b/web/controller/server.go
@@ -5,6 +5,7 @@ import (
 	"net/http"
 	"regexp"
 	"time"
+
 	"x-ui/web/global"
 	"x-ui/web/service"

--- a/web/controller/setting.go
+++ b/web/controller/setting.go
@@ -3,6 +3,7 @@ package controller
 import (
 	"errors"
 	"time"
+
 	"x-ui/web/entity"
 	"x-ui/web/service"
 	"x-ui/web/session"
--- a/web/controller/util.go
+++ b/web/controller/util.go
@@ -4,6 +4,7 @@ import (
 	"net"
 	"net/http"
 	"strings"
+
 	"x-ui/config"
 	"x-ui/logger"
 	"x-ui/web/entity"
@@ -48,18 +49,11 @@ func jsonMsgObj(c *gin.Context, msg string, obj interface{}, err error) {
 	c.JSON(http.StatusOK, m)
 }

-func pureJsonMsg(c *gin.Context, success bool, msg string) {
-	if success {
-		c.JSON(http.StatusOK, entity.Msg{
-			Success: true,
-			Msg:     msg,
-		})
-	} else {
-		c.JSON(http.StatusOK, entity.Msg{
-			Success: false,
-			Msg:     msg,
-		})
-	}
+func pureJsonMsg(c *gin.Context, statusCode int, success bool, msg string) {
+	c.JSON(statusCode, entity.Msg{
+		Success: success,
+		Msg:     msg,
+	})
 }

 func html(c *gin.Context, name string, title string, data gin.H) {
--- a/web/entity/entity.go
+++ b/web/entity/entity.go
@@ -5,6 +5,7 @@ import (
 	"net"
 	"strings"
 	"time"
+
 	"x-ui/util/common"
 )

--- a/web/global/global.go
+++ b/web/global/global.go
@@ -7,8 +7,10 @@ import (
 	"github.com/robfig/cron/v3"
 )

-var webServer WebServer
-var subServer SubServer
+var (
+	webServer WebServer
+	subServer SubServer
+)

 type WebServer interface {
 	GetCron() *cron.Cron
--- a/web/html/common/prompt_modal.html
+++ b/web/html/common/prompt_modal.html
@@ -1,6 +1,7 @@
 {{define "promptModal"}}
 <a-modal id="prompt-modal" v-model="promptModal.visible" :title="promptModal.title"
         :closable="true" @ok="promptModal.ok" :mask-closable="false"
+         :confirm-loading="promptModal.confirmLoading"
         :ok-text="promptModal.okText" cancel-text='{{ i18n "cancel" }}' :class="themeSwitcher.currentTheme">
    <a-input id="prompt-modal-input" :type="promptModal.type"
             v-model="promptModal.value"
@@ -17,6 +18,7 @@
        value: '',
        okText: '{{ i18n "sure"}}',
        visible: false,
+        confirmLoading: false,
        keyEnter(e) {
            if (this.type !== 'textarea') {
                e.preventDefault();
@@ -30,7 +32,6 @@
            }
        },
        ok() {
-            promptModal.close();
            promptModal.confirm(promptModal.value);
        },
        confirm() {},
@@ -53,7 +54,10 @@
        },
        close() {
            this.visible = false;
-        }
+        },
+        loading(loading=true) {
+            this.confirmLoading = loading;
+        },
    };

    const promptModalApp = new Vue({
--- a/web/html/common/qrcode_modal.html
+++ b/web/html/common/qrcode_modal.html
@@ -1,9 +1,10 @@
 {{define "qrcodeModal"}}
 <a-modal id="qrcode-modal" v-model="qrModal.visible" :title="qrModal.title"
-         :closable="true"
-         :class="themeSwitcher.currentTheme"
-         :footer="null"
-         width="300px">
+        :dialog-style="{ top: '20px' }"
+        :closable="true"
+        :class="themeSwitcher.currentTheme"
+        :footer="null"
+        width="300px">
    <a-tag color="green" style="margin-bottom: 10px;display: block;text-align: center;">
        {{ i18n "pages.inbounds.clickOnQRcode" }}
    </a-tag>
--- a/web/html/login.html
+++ b/web/html/login.html
@@ -49,6 +49,9 @@
    border-radius: 2rem;
    padding: 3rem;
    transition: all 0.3s;
+    user-select:none;
+    -webkit-user-select:none;
+    -moz-user-select: none;
  }
  #login:hover {
    box-shadow: 0 2px 8px rgba(0, 0, 0, 0.09);
@@ -68,10 +71,10 @@
    z-index: 0;
  }
  .dark .under {
-    background-color: #0f2d32;
+    background-color: var(--dark-color-login-wave);
  }
  .dark #login {
-    background-color: #101113;
+    background-color: var(--dark-color-surface-100);
  }
  .dark h1 {
    color: rgba(255, 255, 255);
@@ -199,7 +202,7 @@
    z-index: -1;
  }
  .dark .waves-header {
-    background-color: #0a2227;
+    background-color: var(--dark-color-login-background);
  }
  .waves-inner-header {
    height: 50vh;
@@ -219,7 +222,7 @@
    animation: move-forever 25s cubic-bezier(0.55, 0.5, 0.45, 0.5) infinite;
  }
  .dark .parallax > use {
-    fill: #0f2d32;
+    fill: var(--dark-color-login-wave);
  }
  .parallax > use:nth-child(1) {
    animation-delay: -2s;
@@ -371,96 +374,104 @@
      transform: translateZ(-100px);
    }
  }
+  .ant-menu-item .anticon {
+    margin-right: 4px;
+  }
+  .ant-menu-inline .ant-menu-item {
+    padding: 0 16px !important;
+  }
 </style>
 <body>
-<a-layout id="app" v-cloak :class="themeSwitcher.currentTheme">
+  <a-layout id="app" v-cloak :class="themeSwitcher.currentTheme">
    <transition name="list" appear>
-        <a-layout-content class="under" style="min-height: 0;">
-            <div class="waves-header">
-                <div class="waves-inner-header"></div>
-                <svg class="waves" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 24 150 28" preserveAspectRatio="none" shape-rendering="auto">
-                    <defs>
-                        <path id="gentle-wave" d="M-160 44c30 0 58-18 88-18s 58 18 88 18 58-18 88-18 58 18 88 18 v44h-352z" />
-                    </defs>
-                    <g class="parallax">
-                        <use xlink:href="#gentle-wave" x="48" y="0" fill="rgba(0, 135, 113, 0.08)" />
-                        <use xlink:href="#gentle-wave" x="48" y="3" fill="rgba(0, 135, 113, 0.08)" />
-                        <use xlink:href="#gentle-wave" x="48" y="5" fill="rgba(0, 135, 113, 0.08)" />
-                        <use xlink:href="#gentle-wave" x="48" y="7" fill="#c7ebe2" />
-                    </g>
-                </svg>
-            </div>
-            <a-row type="flex" justify="center" align="middle" style="height: 100%; overflow: auto;">
-            <a-col :xs="22" :sm="20" :md="14" :lg="10" :xl="8" :xxl="6" id="login" style="margin: 3rem 0;">
+      <a-layout-content class="under" style="min-height: 0;">
+        <div class="waves-header">
+          <div class="waves-inner-header"></div>
+          <svg class="waves" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"
+               viewBox="0 24 150 28" preserveAspectRatio="none" shape-rendering="auto">
+            <defs>
+              <path id="gentle-wave" d="M-160 44c30 0 58-18 88-18s 58 18 88 18 58-18 88-18 58 18 88 18 v44h-352z" />
+            </defs>
+            <g class="parallax">
+              <use xlink:href="#gentle-wave" x="48" y="0" fill="rgba(0, 135, 113, 0.08)" />
+              <use xlink:href="#gentle-wave" x="48" y="3" fill="rgba(0, 135, 113, 0.08)" />
+              <use xlink:href="#gentle-wave" x="48" y="5" fill="rgba(0, 135, 113, 0.08)" />
+              <use xlink:href="#gentle-wave" x="48" y="7" fill="#c7ebe2" />
+            </g>
+          </svg>
+        </div>
+        <a-row type="flex" justify="center" align="middle" style="height: 100%; overflow: auto;">
+          <a-col :xs="22" :sm="20" :md="14" :lg="10" :xl="8" :xxl="6" id="login" style="margin: 3rem 0;">
            <a-row type="flex" justify="center">
-                <a-col style="width: 100%;">
-                    <h1 class="title headline zoom">
-                      <span class="words-wrapper">
-                        <b class="is-visible">{{ i18n "pages.login.title" }}</b>
-                        <b>3X-UI</b>
-                      </span>
-                    </h1>
-                </a-col>
+              <a-col style="width: 100%;">
+                <h1 class="title headline zoom">
+                  <span class="words-wrapper">
+                    <b class="is-visible">{{ i18n "pages.login.hello" }}</b>
+                    <b>{{ i18n "pages.login.title" }}</b>
+                  </span>
+                </h1>
+              </a-col>
            </a-row>
            <a-row type="flex" justify="center">
-                <a-col span="24">
-                    <a-form>
-                        <a-form-item>
-                            <a-input v-model.trim="user.username" placeholder='{{ i18n "username" }}'
-                                     @keydown.enter.native="login" autofocus>
-                                <a-icon slot="prefix" type="user" style="font-size: 16px;"/>
-                            </a-input>
-                        </a-form-item>
-                        <a-form-item>
-                            <password-input icon="lock" v-model.trim="user.password"
-                                            placeholder='{{ i18n "password" }}' @keydown.enter.native="login">
-                            </password-input>
-                        </a-form-item>
-                        <a-form-item v-if="secretEnable">
-                            <password-input icon="key" v-model.trim="user.loginSecret"
-                                            placeholder='{{ i18n "secretToken" }}' @keydown.enter.native="login">
-                            </password-input>
-                        </a-input>
-                        </a-form-item>
-                        <a-form-item>
-                            <a-row justify="center" class="centered">
-                                <div class="wave-btn-bg wave-btn-bg-cl" :style="loading ? { width: '52px' } : { display: 'inline-block' }">
-                                    <a-button class="ant-btn-primary-login" type="primary" :loading="loading" @click="login" :icon="loading ? 'poweroff' : undefined">
-                                        [[ loading ? '' : '{{ i18n "login" }}' ]]
-                                    </a-button>
-                                </div>
-                            </a-row>
-                        </a-form-item>
-                        <a-form-item>
-                            <a-row justify="center" class="centered">
-                                <a-col :span="24">
-                                    <a-select ref="selectLang" v-model="lang" @change="setLang(lang)" style="width: 150px;" :dropdown-class-name="themeSwitcher.currentTheme">
-                                        <a-select-option :value="l.value" label="English" v-for="l in supportLangs">
-                                            <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>
-                                </a-col>
-                            </a-row>
-                        </a-form-item>
-                        <a-form-item>
-                            <a-row justify="center" class="centered">
-                                <a-col>
-                                    <a-icon type="bulb" :theme="themeSwitcher.isDarkTheme ? 'filled' : 'outlined'"></a-icon>&nbsp;
-                                </a-col>
-                                <a-col>
-                                    <theme-switch />
-                                </a-col>
-                            </a-row>
-                        </a-form-item>
-                    </a-form>
-                </a-col>
+              <a-col span="24">
+                <a-form>
+                  <a-form-item>
+                    <a-input autocomplete="username" v-model.trim="user.username" placeholder='{{ i18n "username" }}'
+                             @keydown.enter.native="login" autofocus>
+                      <a-icon slot="prefix" type="user" style="font-size: 16px;"></a-icon>
+                    </a-input>
+                  </a-form-item>
+                  <a-form-item>
+                    <password-input autocomplete="current-password" icon="lock" v-model.trim="user.password"
+                                    placeholder='{{ i18n "password" }}'
+                                    @keydown.enter.native="login">
+                    </password-input>
+                  </a-form-item>
+                  <a-form-item v-if="secretEnable">
+                    <password-input autocomplete="secret" icon="key" v-model.trim="user.loginSecret"
+                                    placeholder='{{ i18n "secretToken" }}'
+                                    @keydown.enter.native="login">
+                    </password-input>
+                  </a-form-item>
+                  <a-form-item>
+                    <a-row justify="center" class="centered">
+                      <div style="height: 50px;" class="wave-btn-bg wave-btn-bg-cl"
+                           :style="loading ? { width: '52px' } : { display: 'inline-block' }">
+                        <a-button class="ant-btn-primary-login" type="primary"
+                                  :loading="loading" @click="login"
+                                  :icon="loading ? 'poweroff' : undefined">
+                                  [[ loading ? '' : '{{ i18n "login" }}' ]]
+                        </a-button>
+                      </div>
+                    </a-row>
+                  </a-form-item>
+                  <a-form-item>
+                    <a-row justify="center" class="centered">
+                      <a-col :span="24">
+                        <a-select ref="selectLang" v-model="lang"
+                                  @change="setLang(lang)" style="width: 150px;"
+                                  :dropdown-class-name="themeSwitcher.currentTheme">
+                          <a-select-option :value="l.value" label="English" v-for="l in supportLangs">
+                            <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>
+                      </a-col>
+                    </a-row>
+                  </a-form-item>
+                  <a-form-item>
+                    <a-row justify="center" class="centered">
+                      <theme-switch></theme-switch>
+                    </a-row>
+                  </a-form-item>
+                </a-form>
+              </a-col>
            </a-row>
-            </a-col>
-            </a-row>
-        </a-layout-content>
+          </a-col>
+        </a-row>
+      </a-layout-content>
    </transition>
-</a-layout>
+  </a-layout>
 {{template "js" .}}
 {{template "component/themeSwitcher" .}}
 {{template "component/password" .}}
--- a/web/html/xui/common_sider.html
+++ b/web/html/xui/common_sider.html
@@ -15,10 +15,6 @@
    <a-icon type="tool"></a-icon>
    <span><b>{{ i18n "menu.xray"}}</b></span>
 </a-menu-item>
-<!--<a-menu-item key="{{ .base_path }}panel/clients">-->
-<!--    <a-icon type="laptop"></a-icon>-->
-<!--    <span>Client</span>-->
-<!--</a-menu-item>-->
 <a-menu-item key="{{ .base_path }}logout">
    <a-icon type="logout"></a-icon>
    <span><b>{{ i18n "menu.logout"}}</b></span>
@@ -28,12 +24,7 @@

 {{define "commonSider"}}
 <a-layout-sider :theme="themeSwitcher.currentTheme" id="sider" collapsible breakpoint="md" collapsed-width="0">
-    <a-menu :theme="themeSwitcher.currentTheme" mode="inline" selected-keys="">
-        <a-menu-item mode="inline">
-            <a-icon type="bulb" :theme="themeSwitcher.isDarkTheme ? 'filled' : 'outlined'"></a-icon>
-            <theme-switch />
-        </a-menu-item>
-    </a-menu>
+    <theme-switch></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" .}}
@@ -47,12 +38,7 @@
    <div class="drawer-handle" @click="siderDrawer.change()" slot="handle">
        <a-icon :type="siderDrawer.visible ? 'close' : 'menu-fold'"></a-icon>
    </div>
-    <a-menu :theme="themeSwitcher.currentTheme" mode="inline" selected-keys="">
-        <a-menu-item mode="inline">
-            <a-icon type="bulb" :theme="themeSwitcher.isDarkTheme ? 'filled' : 'outlined'"></a-icon>
-            <theme-switch />
-        </a-menu-item>
-    </a-menu>
+    <theme-switch></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/web/html/xui/component/setting.html
+++ b/web/html/xui/component/setting.html
@@ -16,7 +16,7 @@
                <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" style="width: 100%;"></a-input-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>
@@ -29,7 +29,7 @@
 {{define "component/setting"}}
 <script>
    Vue.component('setting-list-item', {
-        props: ["type", "title", "desc", "value", "min", "step", "placeholder"],
+        props: ["type", "title", "desc", "value", "min", "max" , "step", "placeholder"],
        template: `{{template "component/settingListItem"}}`,
    });
 </script>
--- a/web/html/xui/component/sortableTable.html
+++ b/web/html/xui/component/sortableTable.html
@@ -0,0 +1,236 @@
+{{define "component/sortableTableTrigger"}}
+    <a-icon type="drag"
+        class="sortable-icon"
+        style="cursor: move;"
+        @mouseup="mouseUpHandler"
+        @mousedown="mouseDownHandler"
+        @click="clickHandler" />
+{{end}}
+
+{{define "component/sortableTable"}}
+<script>
+    const DRAGGABLE_ROW_CLASS = 'draggable-row';
+
+    const findParentRowElement = (el) => {
+        if (!el || !el.tagName) {
+            return null;
+        } else if (el.classList.contains(DRAGGABLE_ROW_CLASS)) {
+            return el;
+        } else if (el.parentNode) {
+            return findParentRowElement(el.parentNode);
+        } else {
+            return null;
+        }
+    }
+
+    Vue.component('a-table-sortable', {
+        data() {
+            return {
+                sortingElementIndex: null,
+                newElementIndex: null,
+            };
+        },
+        props: ['data-source', 'customRow'],
+        inheritAttrs: false,
+        provide() {
+            const sortable = {}
+
+            Object.defineProperty(sortable, "setSortableIndex", {
+                enumerable: true,
+                get: () => this.setCurrentSortableIndex,
+            });
+
+            Object.defineProperty(sortable, "resetSortableIndex", {
+                enumerable: true,
+                get: () => this.resetSortableIndex,
+            });
+
+            return {
+                sortable,
+            }
+        },
+        render: function (createElement) {
+            return createElement('a-table', {
+                class: {
+                    'ant-table-is-sorting': this.isDragging(),
+                },
+                props: {
+                    ...this.$attrs,
+                    'data-source': this.records,
+                    customRow: (record, index) => this.customRowRender(record, index),
+                },
+                on: this.$listeners,
+                nativeOn: {
+                    drop: (e) => this.dropHandler(e),
+                },
+                scopedSlots: this.$scopedSlots,
+            }, this.$slots.default, )
+        },
+        created() {
+            this.$memoSort = {};
+        },
+        methods: {
+            isDragging() {
+                const currentIndex = this.sortingElementIndex;
+                return currentIndex !== null && currentIndex !== undefined;
+            },
+            resetSortableIndex(e, index) {
+                this.sortingElementIndex = null;
+                this.newElementIndex = null;
+                this.$memoSort = {};
+            },
+            setCurrentSortableIndex(e, index) {
+                this.sortingElementIndex = index;
+            },
+            dragStartHandler(e, index) {
+                if (!this.isDragging()) {
+                    e.preventDefault();
+                    return;
+                }
+                const hideDragImage = this.$el.cloneNode(true);
+                hideDragImage.id = "hideDragImage-hide";
+                hideDragImage.style.opacity = 0;
+                e.dataTransfer.setDragImage(hideDragImage, 0, 0);
+            },
+            dragStopHandler(e, index) {
+                const hideDragImage = document.getElementById('hideDragImage-hide');
+                if (hideDragImage) hideDragImage.remove();
+                this.resetSortableIndex(e, index);
+            },
+            dragOverHandler(e, index) {
+                if (!this.isDragging()) {
+                    return;
+                }
+
+                e.preventDefault();
+
+                const currentIndex = this.sortingElementIndex;
+                if (index === currentIndex) {
+                    this.newElementIndex = null;
+                    return;
+                }
+
+                const row = findParentRowElement(e.target);
+                if (!row) {
+                    return;
+                }
+
+                const rect = row.getBoundingClientRect();
+                const offsetTop = e.pageY - rect.top;
+
+                if (offsetTop < rect.height / 2) {
+                    this.newElementIndex = Math.max(index - 1, 0);
+                } else {
+                    this.newElementIndex = index;
+                }
+            },
+            dropHandler(e) {
+                if (this.isDragging()) {
+                    this.$emit('onsort', this.sortingElementIndex, this.newElementIndex);
+                }
+            },
+            customRowRender(record, index) {
+                const parentMethodResult = this.customRow?.(record, index) || {};
+                const newIndex = this.newElementIndex;
+                const currentIndex = this.sortingElementIndex;
+
+                return {
+                    ...parentMethodResult,
+                    attrs: {
+                        ...(parentMethodResult?.attrs || {}),
+                        draggable: true,
+                    },
+                    on: {
+                        ...(parentMethodResult?.on || {}),
+                        dragstart: (e) => this.dragStartHandler(e, index),
+                        dragend: (e) => this.dragStopHandler(e, index),
+                        dragover: (e) => this.dragOverHandler(e, index),
+                    },
+                    class: {
+                        ...(parentMethodResult?.class || {}),
+                        [DRAGGABLE_ROW_CLASS]: true,
+                        ['dragging']: this.isDragging()
+                            ? (newIndex === null ? index === currentIndex : index === newIndex)
+                            : false,
+                    },
+                };
+            }
+        },
+        computed: {
+            records() {
+                const newIndex = this.newElementIndex;
+                const currentIndex = this.sortingElementIndex;
+
+                if (!this.isDragging() || newIndex === null || currentIndex === newIndex) {
+                    return this.dataSource;
+                }
+
+                if (this.$memoSort.newIndex === newIndex) {
+                    return this.$memoSort.list;
+                }
+
+                let list = [...this.dataSource];
+                list.splice(newIndex, 0, list.splice(currentIndex, 1)[0]);
+
+                this.$memoSort = {
+                    newIndex,
+                    list,
+                };
+
+                return list;
+            }
+        }
+    });
+
+    Vue.component('table-sort-trigger', {
+        template: `{{template "component/sortableTableTrigger"}}`,
+        props: ['item-index'],
+        inject: ['sortable'],
+        methods: {
+            mouseDownHandler(e) {
+                if (this.sortable) {
+                    this.sortable.setSortableIndex(e, this.itemIndex);
+                }
+            },
+            mouseUpHandler(e) {
+                if (this.sortable) {
+                    this.sortable.resetSortableIndex(e, this.itemIndex);
+                }
+            },
+            clickHandler(e) {
+                e.preventDefault();
+            },
+        }
+    })
+</script>
+
+<style>
+    @media only screen and (max-width: 767px) {
+        .sortable-icon {
+            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}}
--- a/web/html/xui/component/themeSwitch.html
+++ b/web/html/xui/component/themeSwitch.html
@@ -1,8 +1,14 @@
 {{define "component/themeSwitchTemplate"}}
 <template>
-  <a-switch size="small" :default-checked="themeSwitcher.isDarkTheme"
-            @change="themeSwitcher.toggleTheme()">
-  </a-switch>
+  <a-menu :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>
+      <template v-if="themeSwitcher.isDarkTheme">
+        <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}}

@@ -10,32 +16,48 @@
 <script>
  function createThemeSwitcher() {
    const isDarkTheme = localStorage.getItem('dark-mode') === 'true';
+    const isUltra = localStorage.getItem('isUltraDarkThemeEnabled') === 'true';
+    if (isUltra) {
+      document.documentElement.setAttribute('data-theme', 'ultra-dark');
+    }
    const theme = isDarkTheme ? 'dark' : 'light';
-    document.querySelector('body').setAttribute('class', theme)
+    document.querySelector('body').setAttribute('class', theme);
    return {
      isDarkTheme,
+      isUltra,
      get currentTheme() {
        return this.isDarkTheme ? 'dark' : 'light';
      },
      toggleTheme() {
        this.isDarkTheme = !this.isDarkTheme;
        localStorage.setItem('dark-mode', this.isDarkTheme);
-        document.querySelector('body').setAttribute('class', this.isDarkTheme ? 'dark' : 'light')
+        document.querySelector('body').setAttribute('class', this.isDarkTheme ? 'dark' : 'light');
        document.getElementById('message').className = themeSwitcher.currentTheme;
      },
+      toggleUltra() {
+        this.isUltra = !this.isUltra;
+        if (this.isUltra) {
+          document.documentElement.setAttribute('data-theme', 'ultra-dark');
+        } else {
+          document.documentElement.removeAttribute('data-theme');
+        }
+        localStorage.setItem('isUltraDarkThemeEnabled', this.isUltra.toString());
+      }
    };
  }
-
  const themeSwitcher = createThemeSwitcher();
-
  Vue.component('theme-switch', {
    props: [],
    template: `{{template "component/themeSwitchTemplate"}}`,
-    data: () => ({ themeSwitcher }),
+    data: () => ({
+      themeSwitcher
+    }),
    mounted() {
-      this.$message.config({getContainer: () => document.getElementById('message')});
+      this.$message.config({
+        getContainer: () => document.getElementById('message')
+      });
      document.getElementById('message').className = themeSwitcher.currentTheme;
    }
  });
 </script>
-{{end}}
+{{end}}
--- a/web/html/xui/dns_modal.html
+++ b/web/html/xui/dns_modal.html
@@ -2,7 +2,7 @@
 <a-modal id="dns-modal" v-model="dnsModal.visible" :title="dnsModal.title" @ok="dnsModal.ok"
         :closable="true" :mask-closable="false"
         :ok-text="dnsModal.okText" cancel-text='{{ i18n "close" }}' :class="themeSwitcher.currentTheme">
-    <a-form :colon="false" :label-col="{ md: {span:6} }" :wrapper-col="{ md: {span:14} }">
+    <a-form :colon="false" :label-col="{ md: {span:8} }" :wrapper-col="{ md: {span:14} }">
        <a-form-item label='{{ i18n "pages.xray.outbound.address" }}'>
            <a-input v-model.trim="dnsModal.dnsServer.address"></a-input>
        </a-form-item>
--- a/web/html/xui/fakedns_modal.html
+++ b/web/html/xui/fakedns_modal.html
@@ -2,7 +2,7 @@
 <a-modal id="fakedns-modal" v-model="fakednsModal.visible" :title="fakednsModal.title" @ok="fakednsModal.ok"
         :closable="true" :mask-closable="false"
         :ok-text="fakednsModal.okText" cancel-text='{{ i18n "close" }}' :class="themeSwitcher.currentTheme">
-    <a-form :colon="false" :label-col="{ md: {span:6} }" :wrapper-col="{ md: {span:14} }">
+    <a-form :colon="false" :label-col="{ md: {span:8} }" :wrapper-col="{ md: {span:14} }">
        <a-form-item label='{{ i18n "pages.xray.fakedns.ipPool" }}'>
            <a-input v-model.trim="fakednsModal.fakeDns.ipPool"></a-input>
        </a-form-item>
--- a/web/html/xui/form/inbound.html
+++ b/web/html/xui/form/inbound.html
@@ -1,6 +1,6 @@
 {{define "form/inbound"}}
 <!-- base -->
-<a-form :colon="false" :label-col="{ md: {span:6} }" :wrapper-col="{ md: {span:14} }">
+<a-form :colon="false" :label-col="{ md: {span:8} }" :wrapper-col="{ md: {span:14} }">
    <a-form-item label='{{ i18n "enable" }}'>
        <a-switch v-model="dbInbound.enable"></a-switch>
    </a-form-item>
@@ -28,7 +28,7 @@
    </a-form-item>

    <a-form-item label='{{ i18n "pages.inbounds.port" }}'>
-        <a-input-number v-model.number="inbound.port"></a-input-number>
+        <a-input-number v-model.number="inbound.port" :min="1" :max="65531"></a-input-number>
    </a-form-item>

    <a-form-item>
--- a/web/html/xui/form/outbound.html
+++ b/web/html/xui/form/outbound.html
@@ -214,34 +214,34 @@

 <!-- stream settings -->
 <template v-if="outbound.canEnableStream()">
-        <a-form-item label='{{ i18n "transmission" }}'>
-            <a-select v-model="outbound.stream.network" @change="streamNetworkChange"
-                    :dropdown-class-name="themeSwitcher.currentTheme">
-                <a-select-option value="tcp">TCP</a-select-option>
-                <a-select-option value="kcp">mKCP</a-select-option>
-                <a-select-option value="ws">WS</a-select-option>
-                <a-select-option value="http">H2</a-select-option>
-                <a-select-option value="quic">QUIC</a-select-option>
-                <a-select-option value="grpc">gRPC</a-select-option>
-            </a-select>
-        </a-form-item>
+    <a-form-item label='{{ i18n "transmission" }}'>
+        <a-select v-model="outbound.stream.network" @change="streamNetworkChange"
+            :dropdown-class-name="themeSwitcher.currentTheme">
+            <a-select-option value="tcp">TCP</a-select-option>
+            <a-select-option value="kcp">mKCP</a-select-option>
+            <a-select-option value="ws">WebSocket</a-select-option>
+            <a-select-option value="http">H2</a-select-option>
+            <a-select-option value="quic">QUIC</a-select-option>
+            <a-select-option value="grpc">gRPC</a-select-option>
+            <a-select-option value="httpupgrade">HTTPUpgrade</a-select-option>
+        </a-select>
+    </a-form-item>
    <template v-if="outbound.stream.network === 'tcp'">
        <a-form-item label='HTTP {{ i18n "camouflage" }}'>
-            <a-switch
-                :checked="outbound.stream.tcp.type === 'http'"
+            <a-switch :checked="outbound.stream.tcp.type === 'http'"
                @change="checked => outbound.stream.tcp.type = checked ? 'http' : 'none'">
            </a-switch>
        </a-form-item>
        <template v-if="outbound.stream.tcp.type == 'http'">
-        <a-form-item label='{{ i18n "host" }}'>
-            <a-input v-model.trim="outbound.stream.tcp.host"></a-input>
-        </a-form-item> 
-        <a-form-item label='{{ i18n "path" }}'>
-            <a-input v-model.trim="outbound.stream.tcp.path"></a-input>
-        </a-form-item> 
+            <a-form-item label='{{ i18n "host" }}'>
+                <a-input v-model.trim="outbound.stream.tcp.host"></a-input>
+            </a-form-item>
+            <a-form-item label='{{ i18n "path" }}'>
+                <a-input v-model.trim="outbound.stream.tcp.path"></a-input>
+            </a-form-item>
        </template>
    </template>
-    
+
    <!-- kcp -->
    <template v-if="outbound.stream.network === 'kcp'">
        <a-form-item label='{{ i18n "camouflage" }}'>
@@ -265,7 +265,7 @@
        </a-form-item>
        <a-form-item label='Uplink (MB/s)'>
            <a-input-number v-model.number="outbound.stream.kcp.upCap"></a-input-number>
-        </a-form-item> 
+        </a-form-item>
        <a-form-item label='Downlink (MB/s)'>
            <a-input-number v-model.number="outbound.stream.kcp.downCap"></a-input-number>
        </a-form-item>
@@ -279,7 +279,7 @@
            <a-input-number v-model.number="outbound.stream.kcp.writeBuffer"></a-input-number>
        </a-form-item>
    </template>
-    
+
    <!-- ws -->
    <template v-if="outbound.stream.network === 'ws'">
        <a-form-item label='{{ i18n "host" }}'>
@@ -287,9 +287,9 @@
        </a-form-item>
        <a-form-item label='{{ i18n "path" }}'>
            <a-form-item><a-input v-model.trim="outbound.stream.ws.path"></a-input>
-        </a-form-item>
+            </a-form-item>
    </template>
-    
+
    <!-- http -->
    <template v-if="outbound.stream.network === 'http'">
        <a-form-item label='{{ i18n "host" }}'>
@@ -299,7 +299,7 @@
            <a-input v-model.trim="outbound.stream.http.path"></a-input>
        </a-form-item>
    </template>
-    
+
    <!-- quic -->
    <template v-if="outbound.stream.network === 'quic'">
        <a-form-item label='{{ i18n "pages.inbounds.stream.quic.encryption" }}'>
@@ -311,7 +311,7 @@
        </a-form-item>
        <a-form-item label='{{ i18n "password" }}'>
            <a-input v-model.trim="outbound.stream.quic.key"></a-input>
-        </a-form-item> 
+        </a-form-item>
        <a-form-item label='{{ i18n "camouflage" }}'>
            <a-select v-model="outbound.stream.quic.type" :dropdown-class-name="themeSwitcher.currentTheme">
                <a-select-option value="none">None</a-select-option>
@@ -323,7 +323,7 @@
            </a-select>
        </a-form-item>
    </template>
-    
+
    <!-- grpc -->
    <template v-if="outbound.stream.network === 'grpc'">
        <a-form-item label='Service Name'>
@@ -333,6 +333,16 @@
            <a-switch v-model="outbound.stream.grpc.multiMode"></a-switch>
        </a-form-item>
    </template>
+
+    <!-- httpupgrade -->
+    <template v-if="outbound.stream.network === 'httpupgrade'">
+        <a-form-item label='{{ i18n "host" }}'>
+            <a-input v-model="outbound.stream.httpupgrade.host"></a-input>
+        </a-form-item>
+        <a-form-item label='{{ i18n "path" }}'>
+            <a-form-item><a-input v-model.trim="outbound.stream.httpupgrade.path"></a-input>
+            </a-form-item>
+    </template>
 </template>

 <!-- tls settings -->
@@ -341,7 +351,7 @@
        <a-radio-group v-model="outbound.stream.security" button-style="solid">
            <a-radio-button value="none">{{ i18n "none" }}</a-radio-button>
            <a-radio-button value="tls">TLS</a-radio-button>
-            <a-radio-button v-if="outbound.canEnableReality()" value="reality">REALITY</a-radio-button>
+            <a-radio-button v-if="outbound.canEnableReality()" value="reality">Reality</a-radio-button>
        </a-radio-group>
    </a-form-item>
    <template v-if="outbound.stream.isTls">
@@ -389,6 +399,46 @@
        </a-form-item>
    </template>
 </template>
+
+<!-- sockopt settings -->
+    <a-form-item label="Sockopts">
+        <a-switch v-model="outbound.stream.sockoptSwitch"></a-switch>
+    </a-form-item>
+    <template v-if="outbound.stream.sockoptSwitch">
+        <a-form-item label="Dialer Proxy">
+            <a-select v-model="outbound.stream.sockopt.dialerProxy" :dropdown-class-name="themeSwitcher.currentTheme">
+                <a-select-option v-for="tag in ['', ...outModal.tags]" :value="tag">[[ tag ]]</a-select-option>
+            </a-select>
+        </a-form-item>
+        <a-form-item label="TCP Fast Open">
+            <a-switch v-model="outbound.stream.sockopt.tcpFastOpen"></a-switch>
+        </a-form-item>
+        <a-form-item label="Keep Alive Interval">
+            <a-input-number v-model="outbound.stream.sockopt.tcpKeepAliveInterval" :min="0"></a-input-number>
+        </a-form-item>
+        <a-form-item label="TCP No-Delay">
+            <a-switch v-model="outbound.stream.sockopt.tcpNoDelay"></a-switch>
+        </a-form-item>
+</template>
+
+<!-- mux settings -->
+<a-form-item label="Mux">
+    <a-switch v-model="outbound.mux.enabled"></a-switch>
+</a-form-item>
+<template v-if="outbound.mux.enabled">
+    <a-form-item label="Concurrency">
+        <a-input-number v-model="outbound.mux.concurrency" :min="-1" :max="1024"></a-input-number>
+    </a-form-item>
+    <a-form-item label="xudp Concurrency">
+        <a-input-number v-model="outbound.mux.xudpConcurrency" :min="-1" :max="1024"></a-input-number>
+    </a-form-item>
+    <a-form-item label="xudp UDP 443">
+        <a-select v-model="outbound.mux.xudpProxyUDP443" :dropdown-class-name="themeSwitcher.currentTheme">
+            <a-select-option v-for="c in ['reject', 'allow', 'skip']" :value="c">[[ c ]]</a-select-option>
+        </a-select>
+    </a-form-item>
+</template>
+
 </a-form>
 </a-tab-pane>
 <a-tab-pane key="2" tab="JSON" force-render="true">
--- a/web/html/xui/form/protocol/dokodemo.html
+++ b/web/html/xui/form/protocol/dokodemo.html
@@ -1,5 +1,5 @@
 {{define "form/dokodemo"}}
-<a-form :colon="false" :label-col="{ md: {span:6} }" :wrapper-col="{ md: {span:14} }">
+<a-form :colon="false" :label-col="{ md: {span:8} }" :wrapper-col="{ md: {span:14} }">
    <a-form-item label='{{ i18n "pages.inbounds.targetAddress"}}'>
        <a-input v-model.trim="inbound.settings.address"></a-input>
    </a-form-item>
--- a/web/html/xui/form/protocol/http.html
+++ b/web/html/xui/form/protocol/http.html
@@ -1,6 +1,6 @@
 {{define "form/http"}}
-<a-form>
-        <table style="width: 100%; text-align: center; margin-bottom: 10px;">
+<a-form :colon="false" :label-col="{ md: {span:8} }" :wrapper-col="{ md: {span:14} }">
+        <table style="width: 100%; text-align: center; margin: 1rem 0;">
            <tr>
                <td width="45%">{{ i18n "username" }}</td>
                <td width="45%">{{ i18n "password" }}</td>
@@ -18,4 +18,4 @@
            </a-input>
        </a-input-group>
 </a-form>
-{{end}}
+{{end}}
--- a/web/html/xui/form/protocol/shadowsocks.html
+++ b/web/html/xui/form/protocol/shadowsocks.html
@@ -20,7 +20,7 @@
        </a-collapse-panel>
    </a-collapse>
 </template>
-<a-form :colon="false" :label-col="{ md: {span:6} }" :wrapper-col="{ md: {span:14} }">
+<a-form :colon="false" :label-col="{ md: {span:8} }" :wrapper-col="{ md: {span:14} }">
    <a-form-item label='{{ i18n "encryption" }}'>
        <a-select v-model="inbound.settings.method" @change="SSMethodChange" :dropdown-class-name="themeSwitcher.currentTheme">
            <a-select-option v-for="(method,method_name) in SSMethods" :value="method">[[ method_name ]]</a-select-option>
--- a/web/html/xui/form/protocol/socks.html
+++ b/web/html/xui/form/protocol/socks.html
@@ -1,5 +1,5 @@
 {{define "form/socks"}}
-<a-form :colon="false" :label-col="{ md: {span:6} }" :wrapper-col="{ md: {span:14} }">
+<a-form :colon="false" :label-col="{ md: {span:8} }" :wrapper-col="{ md: {span:14} }">
    <a-form-item label='{{ i18n "pages.inbounds.enable" }} UDP'>
        <a-switch v-model="inbound.settings.udp"></a-switch>
    </a-form-item>
@@ -11,7 +11,7 @@
        @change="checked => inbound.settings.auth = checked ? 'password' : 'noauth'"></a-switch>
    </a-form-item>
    <template v-if="inbound.settings.auth === 'password'">
-        <table style="width: 100%; text-align: center; margin-bottom: 10px;">
+        <table style="width: 100%; text-align: center; margin: 1rem 0;">
            <tr>
                <td width="45%">{{ i18n "username" }}</td>
                <td width="45%">{{ i18n "password" }}</td>
--- a/web/html/xui/form/protocol/trojan.html
+++ b/web/html/xui/form/protocol/trojan.html
@@ -19,27 +19,23 @@
    </a-collapse-panel>
 </a-collapse>
 <template v-if="inbound.isTcp && !inbound.stream.isReality">
-    <a-form layout="inline">
+    <a-form :colon="false" :label-col="{ md: {span:8} }" :wrapper-col="{ md: {span:14} }">
        <a-form-item label="Fallbacks">
-            <a-row>
-                <a-button type="primary" size="small"
-                        @click="inbound.settings.addFallback()">
-                    +
-                </a-button>
-            </a-row>
+            <a-button type="primary" size="small" @click="inbound.settings.addFallback()">+</a-button>
        </a-form-item>
    </a-form>

    <!-- trojan fallbacks -->
-    <a-form v-for="(fallback, index) in inbound.settings.fallbacks" :colon="false" :label-col="{ md: {span:6} }" :wrapper-col="{ md: {span:14} }">
+    <a-form v-for="(fallback, index) in inbound.settings.fallbacks" :colon="false" :label-col="{ md: {span:8} }"
+        :wrapper-col="{ md: {span:14} }">
        <a-divider style="margin:0;">
            Fallback [[ index + 1 ]]
            <a-icon type="delete" @click="() => inbound.settings.delFallback(index)"
-                    style="color: rgb(255, 77, 79);cursor: pointer;"/>
+                style="color: rgb(255, 77, 79);cursor: pointer;" />
        </a-divider>
        <a-form-item label='SNI'>
            <a-input v-model="fallback.name"></a-input>
-        </a-form-item>            
+        </a-form-item>
        <a-form-item label='ALPN'>
            <a-input v-model="fallback.alpn"></a-input>
        </a-form-item>
@@ -53,6 +49,6 @@
            <a-input-number v-model="fallback.xver" :min="0" :max="2"></a-input-number>
        </a-form-item>
    </a-form>
-    <a-divider style="margin:0;"></a-divider>
+    <a-divider style="margin:5px 0;"></a-divider>
 </template>
 {{end}}
--- a/web/html/xui/form/protocol/vless.html
+++ b/web/html/xui/form/protocol/vless.html
@@ -21,27 +21,23 @@
    </a-collapse-panel>
 </a-collapse>
 <template v-if="inbound.isTcp && !inbound.stream.isReality">
-    <a-form layout="inline">
+    <a-form :colon="false" :label-col="{ md: {span:8} }" :wrapper-col="{ md: {span:14} }">
        <a-form-item label="Fallbacks">
-            <a-row>
-                <a-button type="primary" size="small"
-                        @click="inbound.settings.addFallback()">
-                    +
-                </a-button>
-            </a-row>
+            <a-button type="primary" size="small" @click="inbound.settings.addFallback()">+</a-button>
        </a-form-item>
    </a-form>

    <!-- vless fallbacks -->
-    <a-form v-for="(fallback, index) in inbound.settings.fallbacks" :colon="false" :label-col="{ md: {span:6} }" :wrapper-col="{ md: {span:14} }">
+    <a-form v-for="(fallback, index) in inbound.settings.fallbacks" :colon="false" :label-col="{ md: {span:8} }"
+        :wrapper-col="{ md: {span:14} }">
        <a-divider style="margin:0;">
            Fallback [[ index + 1 ]]
            <a-icon type="delete" @click="() => inbound.settings.delFallback(index)"
-                    style="color: rgb(255, 77, 79);cursor: pointer;"/>
+                style="color: rgb(255, 77, 79);cursor: pointer;" />
        </a-divider>
        <a-form-item label='SNI'>
            <a-input v-model="fallback.name"></a-input>
-        </a-form-item>            
+        </a-form-item>
        <a-form-item label='ALPN'>
            <a-input v-model="fallback.alpn"></a-input>
        </a-form-item>
--- a/web/html/xui/form/protocol/wireguard.html
+++ b/web/html/xui/form/protocol/wireguard.html
@@ -1,5 +1,5 @@
 {{define "form/wireguard"}}
-<a-form :colon="false" :label-col="{ md: {span:6} }" :wrapper-col="{ md: {span:14} }">
+<a-form :colon="false" :label-col="{ md: {span:8} }" :wrapper-col="{ md: {span:14} }">
    <a-form-item>
        <template slot="label">
            <a-tooltip>
@@ -26,7 +26,7 @@
    <a-form-item label="Peers">
        <a-button type="primary" size="small" @click="inbound.settings.addPeer()">+</a-button>
    </a-form-item>
-    <a-form v-for="(peer, index) in inbound.settings.peers" :colon="false" :label-col="{ md: {span:6} }" :wrapper-col="{ md: {span:14} }">
+    <a-form v-for="(peer, index) in inbound.settings.peers" :colon="false" :label-col="{ md: {span:8} }" :wrapper-col="{ md: {span:14} }">
        <a-divider style="margin:0;">
            Peer [[ index + 1 ]]
            <a-icon v-if="inbound.settings.peers.length>1" type="delete" @click="() => inbound.settings.delPeer(index)"
--- a/web/html/xui/form/sniffing.html
+++ b/web/html/xui/form/sniffing.html
@@ -1,6 +1,6 @@
 {{define "form/sniffing"}}
 <a-divider style="margin:5px 0 0;"></a-divider>
-<a-form :colon="false" :label-col="{ md: {span:6} }" :wrapper-col="{ md: {span:14} }">
+<a-form :colon="false" :label-col="{ md: {span:8} }" :wrapper-col="{ md: {span:14} }">
  <a-form-item>
    <span slot="label">
        Sniffing
--- a/web/html/xui/form/stream/stream_grpc.html
+++ b/web/html/xui/form/stream/stream_grpc.html
@@ -1,8 +1,11 @@
 {{define "form/streamGRPC"}}
-<a-form :colon="false" :label-col="{ md: {span:6} }" :wrapper-col="{ md: {span:14} }">
+<a-form :colon="false" :label-col="{ md: {span:8} }" :wrapper-col="{ md: {span:14} }">
    <a-form-item label="Service Name">
        <a-input v-model.trim="inbound.stream.grpc.serviceName"></a-input>
    </a-form-item>
+    <a-form-item label="Authority">
+        <a-input v-model.trim="inbound.stream.grpc.authority"></a-input>
+    </a-form-item>
    <a-form-item label="Multi Mode">
        <a-switch v-model="inbound.stream.grpc.multiMode"></a-switch>
    </a-form-item>
--- a/web/html/xui/form/stream/stream_http.html
+++ b/web/html/xui/form/stream/stream_http.html
@@ -1,5 +1,5 @@
 {{define "form/streamHTTP"}}
-<a-form :colon="false" :label-col="{ md: {span:6} }" :wrapper-col="{ md: {span:14} }">
+<a-form :colon="false" :label-col="{ md: {span:8} }" :wrapper-col="{ md: {span:14} }">
    <a-form-item label='{{ i18n "path" }}'>
        <a-input v-model.trim="inbound.stream.http.path"></a-input>
    </a-form-item>
--- a/web/html/xui/form/stream/stream_httpupgrade.html
+++ b/web/html/xui/form/stream/stream_httpupgrade.html
@@ -0,0 +1,13 @@
+{{define "form/streamHTTPUpgrade"}}
+<a-form :colon="false" :label-col="{ md: {span:8} }" :wrapper-col="{ md: {span:14} }">
+    <a-form-item label="PROXY Protocol">
+        <a-switch v-model="inbound.stream.httpupgrade.acceptProxyProtocol"></a-switch>
+    </a-form-item>
+    <a-form-item label='{{ i18n "path" }}'>
+        <a-input v-model.trim="inbound.stream.httpupgrade.path"></a-input>
+    </a-form-item>
+    <a-form-item label='{{ i18n "host" }}'>
+        <a-input v-model.trim="inbound.stream.httpupgrade.host"></a-input>
+    </a-form-item>
+</a-form>
+{{end}}
--- a/web/html/xui/form/stream/stream_kcp.html
+++ b/web/html/xui/form/stream/stream_kcp.html
@@ -1,7 +1,7 @@
 {{define "form/streamKCP"}}
-<a-form :colon="false" :label-col="{ md: {span:6} }" :wrapper-col="{ md: {span:14} }">
+<a-form :colon="false" :label-col="{ md: {span:8} }" :wrapper-col="{ md: {span:14} }">
    <a-form-item label='{{ i18n "camouflage" }}'>
-        <a-select v-model="inbound.stream.kcp.type" :dropdown-class-name="themeSwitcher.currentTheme">
+        <a-select v-model="inbound.stream.kcp.type" style="width: 50%" :dropdown-class-name="themeSwitcher.currentTheme">
            <a-select-option value="none">None</a-select-option>
            <a-select-option value="srtp">SRTP</a-select-option>
            <a-select-option value="utp">uTP</a-select-option>
@@ -23,25 +23,25 @@
        <a-input v-model.trim="inbound.stream.kcp.seed"></a-input>
    </a-form-item>
    <a-form-item label='MTU'>
-        <a-input-number v-model.number="inbound.stream.kcp.mtu"></a-input-number>
+        <a-input-number v-model.number="inbound.stream.kcp.mtu" :min="576" :max="1460"></a-input-number>
    </a-form-item>
    <a-form-item label='TTI (ms)'>
-        <a-input-number v-model.number="inbound.stream.kcp.tti"></a-input-number>
+        <a-input-number v-model.number="inbound.stream.kcp.tti" :min="10" :max="100"></a-input-number>
    </a-form-item>
    <a-form-item label='Uplink (MB/s)'>
-        <a-input-number v-model.number="inbound.stream.kcp.upCap"></a-input-number>
+        <a-input-number v-model.number="inbound.stream.kcp.upCap" :min="0"></a-input-number>
    </a-form-item> 
    <a-form-item label='Downlink (MB/s)'>
-        <a-input-number v-model.number="inbound.stream.kcp.downCap"></a-input-number>
+        <a-input-number v-model.number="inbound.stream.kcp.downCap" :min="0"></a-input-number>
    </a-form-item>
    <a-form-item label='Congestion'>
        <a-switch v-model="inbound.stream.kcp.congestion"></a-switch>
    </a-form-item>
    <a-form-item label='Read Buffer (MB)'>
-        <a-input-number v-model.number="inbound.stream.kcp.readBuffer"></a-input-number>
+        <a-input-number v-model.number="inbound.stream.kcp.readBuffer" :min="0"></a-input-number>
    </a-form-item>
    <a-form-item label='Write Buffer (MB)'>
-        <a-input-number v-model.number="inbound.stream.kcp.writeBuffer"></a-input-number>
+        <a-input-number v-model.number="inbound.stream.kcp.writeBuffer" :min="0"></a-input-number>
    </a-form-item>
 </a-form>
 {{end}}
--- a/web/html/xui/form/stream/stream_quic.html
+++ b/web/html/xui/form/stream/stream_quic.html
@@ -1,5 +1,5 @@
 {{define "form/streamQUIC"}}
-<a-form :colon="false" :label-col="{ md: {span:6} }" :wrapper-col="{ md: {span:14} }">
+<a-form :colon="false" :label-col="{ md: {span:8} }" :wrapper-col="{ md: {span:14} }">
    <a-form-item label='{{ i18n "pages.inbounds.stream.quic.encryption" }}'>
        <a-select v-model="inbound.stream.quic.security" :dropdown-class-name="themeSwitcher.currentTheme">
            <a-select-option value="none">None</a-select-option>
@@ -20,7 +20,7 @@
        <a-input v-model.trim="inbound.stream.quic.key"></a-input>
    </a-form-item>
    <a-form-item label='{{ i18n "camouflage" }}'>
-        <a-select v-model="inbound.stream.quic.type" :dropdown-class-name="themeSwitcher.currentTheme">
+        <a-select v-model="inbound.stream.quic.type" style="width: 50%" :dropdown-class-name="themeSwitcher.currentTheme">
            <a-select-option value="none">None</a-select-option>
            <a-select-option value="srtp">SRTP</a-select-option>
            <a-select-option value="utp">uTP</a-select-option>
--- a/web/html/xui/form/stream/stream_settings.html
+++ b/web/html/xui/form/stream/stream_settings.html
@@ -1,15 +1,16 @@
 {{define "form/streamSettings"}}
 <!-- select stream network -->
-<a-form :colon="false" :label-col="{ md: {span:6} }" :wrapper-col="{ md: {span:14} }">
+<a-form :colon="false" :label-col="{ md: {span:8} }" :wrapper-col="{ md: {span:14} }">
    <a-form-item label='{{ i18n "transmission" }}'>
-        <a-select v-model="inbound.stream.network" @change="streamNetworkChange"
+        <a-select v-model="inbound.stream.network" style="width: 75%" @change="streamNetworkChange"
            :dropdown-class-name="themeSwitcher.currentTheme">
            <a-select-option value="tcp">TCP</a-select-option>
            <a-select-option value="kcp">mKCP</a-select-option>
-            <a-select-option value="ws">WS</a-select-option>
+            <a-select-option value="ws">WebSocket</a-select-option>
            <a-select-option value="http">H2</a-select-option>
            <a-select-option value="quic">QUIC</a-select-option>
            <a-select-option value="grpc">gRPC</a-select-option>
+            <a-select-option value="httpupgrade">HTTPUpgrade</a-select-option>
        </a-select>
    </a-form-item>
 </a-form>
@@ -43,6 +44,12 @@
 <template v-if="inbound.stream.network === 'grpc'">
    {{template "form/streamGRPC"}}
 </template>
+
+<!-- httpupgrade -->
+<template v-if="inbound.stream.network === 'httpupgrade'">
+    {{template "form/streamHTTPUpgrade"}}
+</template>
+
 <!-- sockopt -->
 <template>
    {{template "form/streamSockopt"}}
--- a/web/html/xui/form/tls_settings.html
+++ b/web/html/xui/form/tls_settings.html
@@ -34,16 +34,16 @@
        </a-form-item>
        <a-form-item label="Min/Max Version">
            <a-input-group compact>
-                <a-select v-model="inbound.stream.tls.minVersion" :dropdown-class-name="themeSwitcher.currentTheme">
+                <a-select v-model="inbound.stream.tls.minVersion" style="width: 50%" :dropdown-class-name="themeSwitcher.currentTheme">
                    <a-select-option v-for="key in TLS_VERSION_OPTION" :value="key">[[ key ]]</a-select-option>
                </a-select>
-                <a-select v-model="inbound.stream.tls.maxVersion" :dropdown-class-name="themeSwitcher.currentTheme">
+                <a-select v-model="inbound.stream.tls.maxVersion" style="width: 50%" :dropdown-class-name="themeSwitcher.currentTheme">
                    <a-select-option v-for="key in TLS_VERSION_OPTION" :value="key">[[ key ]]</a-select-option>
                </a-select>
            </a-input-group>
        </a-form-item>
        <a-form-item label="uTLS">
-            <a-select v-model="inbound.stream.tls.settings.fingerprint"
+            <a-select v-model="inbound.stream.tls.settings.fingerprint" style="width: 50%"
                :dropdown-class-name="themeSwitcher.currentTheme">
                <a-select-option value=''>None</a-select-option>
                <a-select-option v-for="key in UTLS_FINGERPRINT" :value="key">[[ key ]]</a-select-option>
@@ -73,10 +73,10 @@
                    @click="inbound.stream.tls.removeCert(index)" style="margin-left: 10px">-</a-button>
            </a-form-item>
            <template v-if="cert.useFile">
-                <a-form-item label='{{ i18n "pages.inbounds.publicKeyPath" }}'>
+                <a-form-item label='{{ i18n "pages.inbounds.publicKey" }}'>
                    <a-input v-model.trim="cert.certFile"></a-input>
                </a-form-item>
-                <a-form-item label='{{ i18n "pages.inbounds.keyPath" }}'>
+                <a-form-item label='{{ i18n "pages.inbounds.privatekey" }}'>
                    <a-input v-model.trim="cert.keyFile"></a-input>
                </a-form-item>
                <a-form-item label=" ">
@@ -85,10 +85,10 @@
                </a-form-item>
            </template>
            <template v-else>
-                <a-form-item label='{{ i18n "pages.inbounds.publicKeyContent" }}'>
+                <a-form-item label='{{ i18n "pages.inbounds.publicKey" }}'>
                    <a-input type="textarea" :rows="3" v-model="cert.cert"></a-input>
                </a-form-item>
-                <a-form-item label='{{ i18n "pages.inbounds.keyContent" }}'>
+                <a-form-item label='{{ i18n "pages.inbounds.privatekey" }}'>
                    <a-input type="textarea" :rows="3" v-model="cert.key"></a-input>
                </a-form-item>
            </template>
@@ -124,10 +124,10 @@
                    @click="inbound.stream.xtls.removeCert(index)" style="margin-left: 10px">-</a-button>
            </a-form-item>
            <template v-if="cert.useFile">
-                <a-form-item label='{{ i18n "pages.inbounds.publicKeyPath" }}'>
+                <a-form-item label='{{ i18n "pages.inbounds.publicKey" }}'>
                    <a-input v-model.trim="cert.certFile"></a-input>
                </a-form-item>
-                <a-form-item label='{{ i18n "pages.inbounds.keyPath" }}'>
+                <a-form-item label='{{ i18n "pages.inbounds.privatekey" }}'>
                    <a-input v-model.trim="cert.keyFile"></a-input>
                </a-form-item>
                <a-form-item label=" ">
@@ -136,10 +136,10 @@
                </a-form-item>
            </template>
            <template v-else>
-                <a-form-item label='{{ i18n "pages.inbounds.publicKeyContent" }}'>
+                <a-form-item label='{{ i18n "pages.inbounds.publicKey" }}'>
                    <a-input type="textarea" :rows="3" v-model="cert.cert"></a-input>
                </a-form-item>
-                <a-form-item label='{{ i18n "pages.inbounds.keyContent" }}'>
+                <a-form-item label='{{ i18n "pages.inbounds.privatekey" }}'> 
                    <a-input type="textarea" :rows="3" v-model="cert.key"></a-input>
                </a-form-item>
            </template>
@@ -154,7 +154,7 @@
            <a-input-number v-model.number="inbound.stream.reality.xver" :min="0"></a-input-number>
        </a-form-item>
        <a-form-item label='uTLS'>
-            <a-select v-model="inbound.stream.reality.settings.fingerprint"
+            <a-select v-model="inbound.stream.reality.settings.fingerprint" style="width: 50%"
                :dropdown-class-name="themeSwitcher.currentTheme">
                <a-select-option v-for="key in UTLS_FINGERPRINT" :value="key">[[ key ]]</a-select-option>
            </a-select>
@@ -180,10 +180,10 @@
        <a-form-item label='SpiderX'>
            <a-input v-model.trim="inbound.stream.reality.settings.spiderX"></a-input>
        </a-form-item>
-        <a-form-item label='Private Key'>
+        <a-form-item label='{{ i18n "pages.inbounds.privatekey" }}'>
            <a-input v-model.trim="inbound.stream.reality.privateKey"></a-input>
        </a-form-item>
-        <a-form-item label='Public Key'>
+        <a-form-item label='{{ i18n "pages.inbounds.publicKey" }}'>
            <a-input v-model.trim="inbound.stream.reality.settings.publicKey"></a-input>
        </a-form-item>
        <a-form-item label=" ">
--- a/web/html/xui/inbound_info_modal.html
+++ b/web/html/xui/inbound_info_modal.html
@@ -25,7 +25,7 @@
                <tr>
                    <td>{{ i18n "transmission" }}</td><td><a-tag color="green">[[ inbound.network ]]</a-tag></td>
                </tr>
-            <template v-if="inbound.isTcp || inbound.isWs || inbound.isH2">
+            <template v-if="inbound.isTcp || inbound.isWs || inbound.isH2 || inbound.isHttpupgrade ">
                <tr>
                    <td>{{ i18n "host" }}</td>
                    <td v-if="inbound.host">
--- a/web/html/xui/inbound_modal.html
+++ b/web/html/xui/inbound_modal.html
@@ -1,8 +1,9 @@
 {{define "inboundModal"}}
-<a-modal id="inbound-modal" v-model="inModal.visible" :title="inModal.title" @ok="inModal.ok"
-         :confirm-loading="inModal.confirmLoading" :closable="true" :mask-closable="false"
-         :class="themeSwitcher.currentTheme"
-         :ok-text="inModal.okText" cancel-text='{{ i18n "close" }}'>
+<a-modal id="inbound-modal" v-model="inModal.visible" :title="inModal.title"
+        :dialog-style="{ top: '20px' }" @ok="inModal.ok"
+        :confirm-loading="inModal.confirmLoading" :closable="true" :mask-closable="false"
+        :class="themeSwitcher.currentTheme"
+        :ok-text="inModal.okText" cancel-text='{{ i18n "close" }}'>
    {{template "form/inbound"}}
 </a-modal>
 <script>
--- a/web/html/xui/inbounds.html
+++ b/web/html/xui/inbounds.html
@@ -537,7 +537,7 @@
        { title: '{{ i18n "online" }}', width: 30, scopedSlots: { customRender: 'online' } },
        { title: '{{ i18n "pages.inbounds.client" }}', width: 80, scopedSlots: { customRender: 'client' } },
        { title: '{{ i18n "pages.inbounds.traffic" }}', width: 80, align: 'center', scopedSlots: { customRender: 'traffic' } },
-        { title: '{{ i18n "pages.inbounds.expireDate" }}', width: 80, align: 'center', scopedSlots: { customRender: 'expiryTime' } },
+        { title: '{{ i18n "pages.inbounds.expireDate" }}', width: 100, align: 'center', scopedSlots: { customRender: 'expiryTime' } },
    ];

    const innerMobileColumns = [
@@ -848,9 +848,7 @@
                    okText: '{{ i18n "pages.inbounds.create"}}',
                    cancelText: '{{ i18n "close" }}',
                    confirm: async (inbound, dbInbound) => {
-                        inModal.loading();
-                        await this.addInbound(inbound, dbInbound);
-                        inModal.close();
+                        await this.addInbound(inbound, dbInbound, inModal);
                    },
                    isEdit: false
                });
@@ -865,9 +863,7 @@
                    inbound: inbound,
                    dbInbound: dbInbound,
                    confirm: async (inbound, dbInbound) => {
-                        inModal.loading();
                        await this.updateInbound(inbound, dbInbound);
-                        inModal.close();
                    },
                    isEdit: true
                });
@@ -917,9 +913,7 @@
                    okText: '{{ i18n "pages.client.submitAdd"}}',
                    dbInbound: dbInbound,
                    confirm: async (clients, dbInboundId) => {
-                        clientModal.loading();
-                        await this.addClient(clients, dbInboundId);
-                        clientModal.close();
+                        await this.addClient(clients, dbInboundId, clientModal);
                    },
                    isEdit: false
                });
@@ -931,9 +925,7 @@
                    okText: '{{ i18n "pages.client.bulk"}}',
                    dbInbound: dbInbound,
                    confirm: async (clients, dbInboundId) => {
-                        clientsBulkModal.loading();
-                        await this.addClient(clients, dbInboundId);
-                        clientsBulkModal.close();
+                        await this.addClient(clients, dbInboundId, clientsBulkModal);
                    },
                });
            },
@@ -962,19 +954,19 @@
                    default: return clients.findIndex(item => item.id === client.id && item.email === client.email);
                }
            },
-            async addClient(clients, dbInboundId) {
+            async addClient(clients, dbInboundId, modal) {
                const data = {
                    id: dbInboundId,
                    settings: '{"clients": [' + clients.toString() + ']}',
                };
-                await this.submit(`/panel/inbound/addClient`, data);
+                await this.submit(`/panel/inbound/addClient`, data, modal);
            },
            async updateClient(client, dbInboundId, clientId) {
                const data = {
                    id: dbInboundId,
                    settings: '{"clients": [' + client.toString() + ']}',
                };
-                await this.submit(`/panel/inbound/updateClient/${clientId}`, data);
+                await this.submit(`/panel/inbound/updateClient/${clientId}`, data, clientModal);
            },
            resetTraffic(dbInboundId) {
                dbInbound = this.dbInbounds.find(row => row.id === dbInboundId);
@@ -1077,8 +1069,8 @@
                await this.updateClient(clients[index], dbInboundId, clientId);
                this.loading(false);
            },
-            async submit(url, data) {
-                const msg = await HttpUtil.postWithModal(url, data);
+            async submit(url, data, modal) {
+                const msg = await HttpUtil.postWithModal(url, data, modal);
                if (msg.success) {
                    await this.getDBInbounds();
                }
@@ -1237,7 +1229,6 @@
                    okText: '{{ i18n "pages.inbounds.import" }}',
                    confirm: async (dbInboundText) => {
                        await this.submit('/panel/inbound/import', {data: dbInboundText}, promptModal);
-                        promptModal.close();
                    },
                });
            },
--- a/web/html/xui/index.html
+++ b/web/html/xui/index.html
@@ -10,23 +10,11 @@
            margin-inline: 0.3rem;
        }
    }
-
    .ant-col-sm-24 {
        margin-top: 10px;
    }
-
    .ant-card-dark h2 {
-        color: hsla(0, 0%, 100%, .65);
-    }
-
-    .dark .ant-card-hoverable:hover,
-    .dark .ant-space-item > .ant-tabs:hover {
-        transform: scale(0.987);
-        outline-color: #40434d;
-    }
-
-    .dark .ant-card-bordered {
-        outline: 2px solid var(--dark-color-background);
+        color: var(--dark-color-text-primary);
    }
 </style>

@@ -104,8 +92,8 @@
                    <a-col :sm="24" :lg="12">
                        <a-card hoverable>
                            <b>{{ i18n "pages.index.operationHours" }}:</b>
-                            <a-tag color="green">Xray [[ formatSecond(status.appStats.uptime) ]]</a-tag>
-                            <a-tag color="green">OS [[ formatSecond(status.uptime) ]]</a-tag>
+                            <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">
@@ -153,10 +141,10 @@
                        <a-card hoverable>
                            <b>{{ i18n "usage"}}:</b>
                            <a-tag color="green">
-                            RAM [[ sizeFormat(status.appStats.mem) ]]
+                                RAM: [[ sizeFormat(status.appStats.mem) ]]
                            </a-tag>
                            <a-tag color="green">
-                                Threads [[ status.appStats.threads ]]
+                                Threads: [[ status.appStats.threads ]]
                            </a-tag>
                        </a-card>
                    </a-col>
@@ -271,17 +259,13 @@
        </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-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"
-        message='{{ i18n "pages.index.xraySwitchClickDesk" }}'
-        show-icon
-        ></a-alert>
+            message='{{ i18n "pages.index.xraySwitchClickDesk" }}' show-icon></a-alert>
        <template v-for="version, index in versionModal.versions">
-            <a-tag :color="index % 2 == 0 ? 'purple' : 'green'"
-                   style="margin-right: 10px" @click="switchV2rayVersion(version)">
+            <a-tag :color="index % 2 == 0 ? 'purple' : 'green'" style="margin-right: 12px; margin-bottom: 12px"
+                @click="switchV2rayVersion(version)">
                [[ version ]]
            </a-tag>
        </template>
--- a/web/html/xui/settings.html
+++ b/web/html/xui/settings.html
@@ -76,23 +76,17 @@
        <a-layout-content>
            <a-spin :spinning="spinning" :delay="500" tip='{{ i18n "loading"}}'>
                <transition name="list" appear>
-                    <a-alert type="error" v-if="showAlert" style="margin-bottom: 10px"
+                    <a-alert type="error" v-if="confAlerts.length>0" style="margin: 10px 5px;"
                    message='{{ i18n "secAlertTitle" }}'
                    color="red"
-                    description='{{ i18n "secAlertSsl" }}'
-                    show-icon closable
+                    show-icon
+                    closable
                    >
-                    </a-alert>
-                    <a-alert type="error" v-if="confAlerts.length>0" style="margin-bottom: 10px"
-                        message='{{ i18n "secAlertTitle" }}'
-                        color="red"
-                        show-icon closable
-                        >
-                        <template slot="description">
-                            {{ i18n "secAlertConf" }}
-                            <li v-for="a in confAlerts">- [[ a ]]</li>
-                        </template>
-                        </a-alert>
+                    <template slot="description">
+                    <b>{{ i18n "secAlertConf" }}</b>
+                    <ul><li v-for="a in confAlerts">[[ a ]]</li></ul>
+                    </template>
+                  </a-alert>
                    </transition>
                <a-space direction="vertical">
                    <a-card hoverable style="margin-bottom: .5rem; overflow-x: hidden;">
@@ -144,7 +138,7 @@
                                </a-list-item>
                                <setting-list-item type="text" title='{{ i18n "pages.settings.panelListeningIP"}}' desc='{{ i18n "pages.settings.panelListeningIPDesc"}}' v-model="allSetting.webListen"></setting-list-item>
                                <setting-list-item type="text" title='{{ i18n "pages.settings.panelListeningDomain"}}' desc='{{ i18n "pages.settings.panelListeningDomainDesc"}}' v-model="allSetting.webDomain"></setting-list-item>
-                                <setting-list-item type="number" title='{{ i18n "pages.settings.panelPort"}}' desc='{{ i18n "pages.settings.panelPortDesc"}}' v-model="allSetting.webPort" :min="0"></setting-list-item>
+                                <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>
                                <setting-list-item type="text" title='{{ i18n "pages.settings.publicKeyPath"}}' desc='{{ i18n "pages.settings.publicKeyPathDesc"}}' v-model="allSetting.webCertFile"></setting-list-item>
                                <setting-list-item type="text" title='{{ i18n "pages.settings.privateKeyPath"}}' desc='{{ i18n "pages.settings.privateKeyPathDesc"}}' v-model="allSetting.webKeyFile"></setting-list-item>
                                <setting-list-item type="text" title='{{ i18n "pages.settings.panelUrlPath"}}' desc='{{ i18n "pages.settings.panelUrlPathDesc"}}' v-model="allSetting.webBasePath"></setting-list-item>
@@ -203,16 +197,16 @@
                            <a-divider>{{ i18n "pages.settings.security.admin"}}</a-divider>
                            <a-form  layout="horizontal" :colon="false" style="float: left; margin: 10px 0;" :label-col="{ md: {span:10} }" :wrapper-col="{ md: {span:14} }">
                                <a-form-item label='{{ i18n "pages.settings.oldUsername"}}'>
-                                    <a-input v-model="user.oldUsername"></a-input>
+                                    <a-input autocomplete="username" v-model="user.oldUsername"></a-input>
                                </a-form-item>
                                <a-form-item label='{{ i18n "pages.settings.currentPassword"}}'>
-                                    <password-input v-model="user.oldPassword"></password-input>
+                                    <password-input autocomplete="current-password" v-model="user.oldPassword"></password-input>
                                </a-form-item>
                                <a-form-item label='{{ i18n "pages.settings.newUsername"}}'>
                                    <a-input v-model="user.newUsername"></a-input>
                                </a-form-item>
                                <a-form-item label='{{ i18n "pages.settings.newPassword"}}'>
-                                    <password-input v-model="user.newPassword"></password-input>
+                                    <password-input autocomplete="new-password" v-model="user.newPassword"></password-input>
                                </a-form-item>
                                <a-form-item label=" ">
                                    <a-button type="primary" @click="updateUser">{{ i18n "confirm" }}</a-button>
@@ -263,7 +257,6 @@
                                        <a-col :lg="24" :xl="12">
                                            <a-list-item-meta title="Telegram Bot Language" />
                                        </a-col>
-
                                        <a-col :lg="24" :xl="12">
                                            <template>
                                                <a-select
@@ -289,12 +282,12 @@
                                <setting-list-item type="switch" title='{{ i18n "pages.settings.subShowInfo"}}' desc='{{ i18n "pages.settings.subShowInfoDesc"}}' v-model="allSetting.subShowInfo"></setting-list-item>
                                <setting-list-item type="text" title='{{ i18n "pages.settings.subListen"}}' desc='{{ i18n "pages.settings.subListenDesc"}}' v-model="allSetting.subListen"></setting-list-item>
                                <setting-list-item type="text" title='{{ i18n "pages.settings.subDomain"}}' desc='{{ i18n "pages.settings.subDomainDesc"}}' v-model="allSetting.subDomain"></setting-list-item>
-                                <setting-list-item type="number" title='{{ i18n "pages.settings.subPort"}}' desc='{{ i18n "pages.settings.subPortDesc"}}' v-model.number="allSetting.subPort"></setting-list-item>
+                                <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>
                                <setting-list-item type="text" title='{{ i18n "pages.settings.subPath"}}' desc='{{ i18n "pages.settings.subPathDesc"}}' v-model="allSetting.subPath"></setting-list-item>
                                <setting-list-item type="text" title='{{ i18n "pages.settings.subCertPath"}}' desc='{{ i18n "pages.settings.subCertPathDesc"}}' v-model="allSetting.subCertFile"></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>
                                <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>
-                                <setting-list-item type="number" title='{{ i18n "pages.settings.subUpdates"}}' desc='{{ i18n "pages.settings.subUpdatesDesc"}}' v-model="allSetting.subUpdates"></setting-list-item>
+                                <setting-list-item type="number" title='{{ i18n "pages.settings.subUpdates"}}' desc='{{ i18n "pages.settings.subUpdatesDesc"}}' v-model="allSetting.subUpdates" :min="1"></setting-list-item>
                            </a-list>
                        </a-tab-pane>
                        <a-tab-pane key="5" tab='{{ i18n "pages.settings.subSettings" }} Json' v-if="allSetting.subEnable">
@@ -302,11 +295,30 @@
                                <setting-list-item type="text" title='{{ i18n "pages.settings.subPath"}}' desc='{{ i18n "pages.settings.subPathDesc"}}' v-model="allSetting.subJsonPath"></setting-list-item>
                                <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>
                                <setting-list-item type="switch" title='{{ i18n "pages.settings.fragment"}}' desc='{{ i18n "pages.settings.fragmentDesc"}}' v-model="fragment"></setting-list-item>
-                                <template v-if="fragment">
-                                    <setting-list-item type="text" title='length' v-model="fragmentLength" placeholder="100-200"></setting-list-item>
-                                    <setting-list-item type="text" title='Interval' v-model="fragmentInterval" placeholder="10-20"></setting-list-item>
-                                </template>
                            </a-list>
+                            <a-collapse v-if="fragment">
+                                <a-collapse-panel header='{{ i18n "pages.settings.fragment"}}'>
+                                    <a-list-item style="padding: 20px">
+                                        <a-row>
+                                            <a-col :lg="24" :xl="12">
+                                                <a-list-item-meta title='Packets'/>
+                                            </a-col>
+                                            <a-col :lg="24" :xl="12">
+                                                <a-select
+                                                    v-model="fragmentPackets"
+                                                    style="width: 100%"
+                                                    :dropdown-class-name="themeSwitcher.currentTheme">
+                                                    <a-select-option :value="p" :label="p" v-for="p in ['1-1', '1-3', 'tlshello']">
+                                                        [[ p ]]
+                                                    </a-select-option>
+                                                </a-select>
+                                            </a-col>
+                                        </a-row>
+                                    </a-list-item>
+                                    <setting-list-item type="text" title='Length' v-model="fragmentLength" placeholder="100-200"></setting-list-item>
+                                    <setting-list-item type="text" title='Interval' v-model="fragmentInterval" placeholder="10-20"></setting-list-item>
+                                </a-collapse-panel>
+                            </a-collapse>
                        </a-tab-pane>
                    </a-tabs>
                </a-space>
@@ -333,7 +345,6 @@
            saveBtnDisable: true,
            user: {},
            lang: getLang(),
-            showAlert: false,
            remarkModels: {i:'Inbound',e:'Email',o:'Other'},
            remarkSeparators: [' ','-','_','@',':','~','|',',','.','/'],
            datepickerList: [{name:'Gregorian (Standard)', value: 'gregorian'}, {name:'Jalalian (شمسی)', value: 'jalalian'}],
@@ -352,7 +363,7 @@
                streamSettings: {
                    sockopt: {
                        tcpKeepAliveIdle: 100,
-                        TcpNoDelay: true
+                        tcpNoDelay: true
                    }
                }
            },
@@ -491,6 +502,16 @@
                    this.allSetting.subJsonFragment = v ? JSON.stringify(this.defaultFragment) : "";
                }
            },
+            fragmentPackets: {
+                get: function() { return this.fragment ? JSON.parse(this.allSetting.subJsonFragment).settings.fragment.packets : ""; },
+                set: function(v) {
+                    if (v != ""){
+                        newFragment = JSON.parse(this.allSetting.subJsonFragment);
+                        newFragment.settings.fragment.packets = v;
+                        this.allSetting.subJsonFragment = JSON.stringify(newFragment);
+                    }
+                }
+            },
            fragmentLength: {
                get: function() { return this.fragment ? JSON.parse(this.allSetting.subJsonFragment).settings.fragment.length : ""; },
                set: function(v) {
@@ -515,23 +536,21 @@
                get: function() {
                    if (!this.allSetting) return [];
                    var alerts = []
-                    if (this.allSetting.port == 54321) alerts.push('{{ i18n "pages.settings.panelPort"}}');
+                    if (window.location.protocol !== "https:") alerts.push('{{ i18n "secAlertSSL" }}');
+                    if (this.allSetting.webPort == 54321) alerts.push('{{ i18n "secAlertPanelPort" }}');
                    panelPath = window.location.pathname.split('/').length<4
-                    if (panelPath && this.allSetting.webBasePath == '/') alerts.push('{{ i18n "pages.settings.panelSettings"}} {{ i18n "pages.settings.panelUrlPath"}}');
+                    if (panelPath && this.allSetting.webBasePath == '/') alerts.push('{{ i18n "secAlertPanelURI" }}');
                    if (this.allSetting.subEnable) {
                        subPath = this.allSetting.subURI.length >0 ? new URL(this.allSetting.subURI).pathname : this.allSetting.subPath;
-                        if (subPath == '/sub/') alerts.push('{{ i18n "pages.settings.subSettings"}} {{ i18n "pages.settings.subPath"}}');
+                        if (subPath == '/sub/') alerts.push('{{ i18n "secAlertSubURI" }}');
                        subJsonPath = this.allSetting.subJsonURI.length >0 ? new URL(this.allSetting.subJsonURI).pathname : this.allSetting.subJsonPath;
-                        if (subJsonPath == '/json/') alerts.push('JSON {{ i18n "pages.settings.subPath"}}');
+                        if (subJsonPath == '/json/') alerts.push('{{ i18n "secAlertSubJsonURI" }}');
                    }
                    return alerts
                }
            }
        }, 
        async mounted() {
-            if (window.location.protocol !== "https:") {
-                this.showAlert = true;
-            }
            await this.getAllSetting();
            while (true) {
                await PromiseUtil.sleep(1000);
--- a/web/html/xui/warp_modal.html
+++ b/web/html/xui/warp_modal.html
@@ -27,7 +27,7 @@
        <a-divider style="margin: 0;">{{ i18n "pages.settings.toasts.modifySettings" }}</a-divider>
        <a-collapse style="margin: 10px 0;">
            <a-collapse-panel header='WARP/WARP+ License Key'>
-                <a-form :colon="false" :label-col="{ md: {span:6} }" :wrapper-col="{ md: {span:14} }">
+                <a-form :colon="false" :label-col="{ md: {span:8} }" :wrapper-col="{ md: {span:14} }">
                    <a-form-item label="License Key">
                        <a-input v-model="warpPlus"></a-input>
                        <a-button @click="updateLicense(warpPlus)" :disabled="warpPlus.length<26" :loading="warpModal.confirmLoading">{{ i18n "pages.inbounds.update" }}</a-button>
--- a/web/html/xui/xray.html
+++ b/web/html/xui/xray.html
@@ -1,14 +1,14 @@
 <!DOCTYPE html>
 <html lang="en">
 {{template "head" .}}
-<link rel="stylesheet" href="{{ .base_path }}assets/codemirror/codemirror.css">
+<link rel="stylesheet" href="{{ .base_path }}assets/codemirror/codemirror.css?{{ .cur_ver }}">
 <link rel="stylesheet" href="{{ .base_path }}assets/codemirror/fold/foldgutter.css">
 <link rel="stylesheet" href="{{ .base_path }}assets/codemirror/xq.css?{{ .cur_ver }}">
 <link rel="stylesheet" href="{{ .base_path }}assets/codemirror/lint/lint.css">

 <script src="{{ .base_path }}assets/base64/base64.min.js"></script>
 <script src="{{ .base_path }}assets/js/model/outbound.js?{{ .cur_ver }}"></script>
-<script src="{{ .base_path }}assets/codemirror/codemirror.js"></script>
+<script src="{{ .base_path }}assets/codemirror/codemirror.js?{{ .cur_ver }}"></script>
 <script src="{{ .base_path }}assets/codemirror/javascript.js"></script>
 <script src="{{ .base_path }}assets/codemirror/jshint.js"></script>
 <script src="{{ .base_path }}assets/codemirror/jsonlint.js"></script>
@@ -74,8 +74,8 @@
                </transition>
                <a-space direction="vertical">
                    <a-card hoverable style="margin-bottom: .5rem;">
-                        <a-row>
-                            <a-col :xs="24" :sm="8" style="padding: 4px;">
+                        <a-row style="display: flex; flex-wrap: wrap; align-items: center;">
+                            <a-col :xs="24" :sm="10" style="padding: 4px;">
                                <a-space direction="horizontal">
                                    <a-button type="primary" :disabled="saveBtnDisable" @click="updateXraySetting">{{ i18n "pages.xray.save" }}</a-button>
                                    <a-button type="danger" :disabled="!saveBtnDisable" @click="restartXray">{{ i18n "pages.xray.restart" }}</a-button>
@@ -89,7 +89,7 @@
                                    </a-popover>
                                </a-space>
                            </a-col>
-                            <a-col :xs="24" :sm="16">
+                            <a-col :xs="24" :sm="14">
                                <template>
                                    <div>
                                        <a-back-top :target="() => document.getElementById('content-layout')" visibility-height="200">
@@ -180,7 +180,7 @@
                                        <a-col :lg="24" :xl="12">
                                            <template>
                                                <a-select v-model="accessLog" :dropdown-class-name="themeSwitcher.currentTheme" style="width: 100%">
-                                                    <a-select-option v-for="s in access" :value="s">[[ s ]]</a-select-option>
+                                                    <a-select-option v-for="s in access" :key="s" :value="s">[[ s ]]</a-select-option>
                                                </a-select>
                                            </template>
                                        </a-col>
@@ -193,7 +193,7 @@
                                        <a-col :lg="24" :xl="12">
                                            <template>
                                                <a-select v-model="errorLog" :dropdown-class-name="themeSwitcher.currentTheme" style="width: 100%">
-                                                    <a-select-option v-for="s in error" :value="s">[[ s ]]</a-select-option>
+                                                    <a-select-option v-for="s in error" :key="s" :value="s">[[ s ]]</a-select-option>
                                                </a-select>
                                            </template>
                                        </a-col>
@@ -290,15 +290,19 @@
                            <a-alert type="warning" style="margin-bottom: 10px; width: fit-content"
                            message='{{ i18n "pages.xray.RoutingsDesc"}}' show-icon></a-alert>
                            <a-button type="primary" icon="plus" @click="addRule">{{ i18n "pages.xray.rules.add" }}</a-button>
-                            <a-table :columns="isMobile ? rulesMobileColumns : rulesColumns" bordered
+                            <a-table-sortable :columns="isMobile ? rulesMobileColumns : rulesColumns" bordered
                                :row-key="r => r.key"
                                :data-source="routingRuleData"
                                :scroll="isMobile ? {} : { x: 1000 }"
                                :pagination="false"
                                :indent-size="0"
-                                :style="isMobile ? 'padding: 5px 0' : 'margin-top: 10px;'">
+                                :style="isMobile ? 'padding: 5px 0' : 'margin-top: 10px;'"
+                                v-on:onSort="replaceRule">
                                <template slot="action" slot-scope="text, rule, index">
-                                    [[ index+1 ]]
+                                    <table-sort-trigger :item-index="index"></table-sort-trigger>
+                                    <span class="ant-table-row-index">
+                                        [[ index+1 ]]
+                                    </span>
                                    <a-dropdown :trigger="['click']">
                                        <a-icon @click="e => e.preventDefault()" type="more" style="font-size: 16px; text-decoration: bold;"></a-icon>
                                        <a-menu slot="overlay" :theme="themeSwitcher.currentTheme">
@@ -404,7 +408,7 @@
                                        </a-button>
                                    </a-popover>
                                </template>
-                            </a-table>
+                            </a-table-sortable>
                        </a-tab-pane>
                        <a-tab-pane key="tpl-3" tab='{{ i18n "pages.xray.Outbounds"}}' style="padding-top: 20px;" force-render="true">
                            <a-row>
@@ -415,7 +419,14 @@
                                </a-col>
                                <a-col :xs="12" :sm="12" :lg="12" style="text-align: right;">
                                    <a-icon type="sync" :spin="refreshing" @click="refreshOutboundTraffic()" style="margin: 0 5px;"></a-icon>
-                                    <a-icon type="retweet" @click="resetOutboundTraffic(-1)"></a-icon>
+                                    <a-popconfirm placement="topRight" @confirm="resetOutboundTraffic(-1)"
+                                        title='{{ i18n "pages.inbounds.resetTrafficContent"}}'
+                                        :overlay-class-name="themeSwitcher.currentTheme"
+                                        ok-text='{{ i18n "reset"}}'
+                                        cancel-text='{{ i18n "cancel"}}'>
+                                        <a-icon slot="icon" type="question-circle-o" :style="themeSwitcher.isDarkTheme ? 'color: #008771' : 'color: #008771'"></a-icon>
+                                        <a-icon type="retweet" style="cursor: pointer;"></a-icon>
+                                    </a-popconfirm>
                                </a-col>
                            </a-row>
                            <a-table :columns="outboundColumns" bordered
@@ -526,15 +537,18 @@
                                <template slot="strategy" slot-scope="text, balancer, index">
                                    <a-tag style="margin:0;" v-if="balancer.strategy=='random'" color="purple">Random</a-tag>
                                    <a-tag style="margin:0;" v-if="balancer.strategy=='roundRobin'" color="green">Round Robin</a-tag>
+                                    <a-tag style="margin:0;" v-if="balancer.strategy=='leastload'" color="green">Least Load</a-tag>
+                                    <a-tag style="margin:0;" v-if="balancer.strategy=='leastping'" color="green">Least Ping</a-tag>
                                </template>
                                <template slot="selector" slot-scope="text, balancer, index">
                                    <a-tag class="info-large-tag" style="margin:1;" v-for="sel in balancer.selector">[[ sel ]]</a-tag>
                                </template>
-                            </a-table>                            
+                            </a-table>
                        </a-tab-pane>
                        <a-tab-pane key="tpl-6" tab='DNS' style="padding-top: 20px;" force-render="true">
                            <setting-list-item type="switch" title='{{ i18n "pages.xray.dns.enable" }}' desc='{{ i18n "pages.xray.dns.enableDesc" }}' v-model="enableDNS"></setting-list-item>
                            <template v-if="enableDNS">
+                                <setting-list-item type="text" title='{{ i18n "pages.xray.dns.tag" }}' desc='{{ i18n "pages.xray.dns.tagDesc" }}' v-model="dnsTag"></setting-list-item>
                                <a-list-item>
                                    <a-row style="padding: 20px">
                                        <a-col :lg="24" :xl="12">
@@ -630,6 +644,7 @@
 </a-layout>
 {{template "js" .}}
 {{template "component/themeSwitcher" .}}
+{{template "component/sortableTable" .}}
 {{template "component/setting"}}
 {{template "ruleModal"}}
 {{template "outModal"}}
@@ -753,8 +768,8 @@
            },
            routingDomainStrategies: ["AsIs", "IPIfNonMatch", "IPOnDemand"],
            logLevel: ["none" , "debug" , "info" , "warning", "error"],
-            access: ["none" , "./access.log" ],
-            error: ["none" , "./error.log" ],
+            access: [],
+            error: [],
            settingsData: {
                protocols: {
                    bittorrent: ["bittorrent"],
@@ -857,10 +872,10 @@
            },
            async getXrayResult() {
                const msg = await HttpUtil.get("/panel/xray/getXrayResult");
-                    if(msg.success){
-                        this.restartResult=msg.obj;
-                        if(msg.obj.length > 1) Vue.prototype.$message.error(msg.obj);
-                    }
+                if (msg.success) {
+                    this.restartResult=msg.obj;
+                    if(msg.obj.length > 1) Vue.prototype.$message.error(msg.obj);
+                }
            },
            async fetchUserSecret() {
                this.loading(true);
@@ -898,9 +913,9 @@
            },
            async toggleToken(value) {
                if (value) {
-                await this.getNewSecret();
+                    await this.getNewSecret();
                } else {
-                this.user.loginSecret = "";
+                    this.user.loginSecret = "";
                }
            },
            async resetXrayConfigToDefault() {
@@ -989,7 +1004,7 @@
                this.cm = CodeMirror.fromTextArea(textAreaObj, this.cmOptions);
                this.cm.on('change',editor => {
                    value = editor.getValue();
-                    if(this.isJsonString(value)){
+                    if (this.isJsonString(value)) {
                        this[this.advSettings] = value;
                    }
                });
@@ -1118,7 +1133,7 @@
                            'tag': balancer.tag,
                            'selector': balancer.selector
                        };
-                        if (balancer.strategy == 'roundRobin') {
+                        if (balancer.strategy === 'roundRobin' || balancer.strategy === 'leastload' || balancer.strategy === 'leastping') {
                            tmpBalancer.strategy = {
                                'type': balancer.strategy
                            };
@@ -1145,7 +1160,7 @@
                            'tag': balancer.tag,
                            'selector': balancer.selector
                        };
-                        if (balancer.strategy == 'roundRobin') {
+                        if (balancer.strategy === 'roundRobin' || balancer.strategy === 'leastload' || balancer.strategy === 'leastping') {
                            tmpBalancer.strategy = {
                                'type': balancer.strategy
                            };
@@ -1169,22 +1184,21 @@
            deleteBalancer(index) {
                newTemplateSettings = this.templateSettings;

-                //remove from balancers
-                const oldTag = this.balancersData[index].tag;
-                this.balancersData.splice(index, 1);
+                // Remove from balancers
+                const removedBalancer = this.balancersData.splice(index, 1)[0];

-                // remove from settings
-                let realIndex = newTemplateSettings.routing.balancers.findIndex((b) => b.tag == oldTag);
+                // Remove from settings
+                let realIndex = newTemplateSettings.routing.balancers.findIndex((b) => b.tag === removedBalancer.tag);
                newTemplateSettings.routing.balancers.splice(realIndex, 1);

-                // remove related routing rules
-                let rules = [];
-                newTemplateSettings.routing.rules.forEach((r) => {
-                    if (!r.balancerTag || r.balancerTag != oldTag) {
-                        rules.push(r);
-                    }
-                });
+                // Remove related routing rules
+                let rules = newTemplateSettings.routing.rules.filter((r) => !r.balancerTag || r.balancerTag !== removedBalancer.tag);
                newTemplateSettings.routing.rules = rules;
+
+                // Update balancers property to an empty array if there are no more balancers
+                if (newTemplateSettings.routing.balancers.length === 0) {
+                    delete newTemplateSettings.routing.balancers;
+                }
                this.templateSettings = newTemplateSettings;
            },
            addReverse(){
@@ -1269,7 +1283,7 @@
                    newRules = newTemplateSettings.routing.rules.filter(r => r.outboundTag != oldData.tag);
                }
                newTemplateSettings.routing.rules = newRules;
-                
+
                this.templateSettings = newTemplateSettings;
            },
            addDNSServer(){
@@ -1391,8 +1405,31 @@
        },
        computed: {
            templateSettings: {
-                get: function () { return this.xraySetting ? JSON.parse(this.xraySetting) : null; },
-                set: function (newValue) { this.xraySetting = JSON.stringify(newValue, null, 2); },
+                get: function () {
+                    const parsedSettings = this.xraySetting ? JSON.parse(this.xraySetting) : null;
+                    let accessLogPath = "./access.log";
+                    let errorLogPath = "./error.log";
+
+                    if (parsedSettings && parsedSettings.log) {
+                        if (parsedSettings.log.access && parsedSettings.log.access !== "none") {
+                            accessLogPath = parsedSettings.log.access;
+                        }
+                        if (parsedSettings.log.error && parsedSettings.log.error !== "none") {
+                            errorLogPath = parsedSettings.log.error;
+                        }
+                    }
+
+                    this.access = ["none", accessLogPath];
+                    this.error = ["none", errorLogPath];
+                    return parsedSettings;
+                },
+                set: function (newValue) {
+                    if (newValue && newValue.log) {
+                        this.xraySetting = JSON.stringify(newValue, null, 2);
+                        this.access = ["none", newValue.log.access || "./access.log"];
+                        this.error = ["none", newValue.log.error || "./error.log"];
+                    }
+                },
            },
            inboundSettings: {
                get: function () { return this.templateSettings ? JSON.stringify(this.templateSettings.inbounds, null, 2) : null; },
@@ -1445,11 +1482,11 @@
                    if (this.templateSettings != null && this.templateSettings.routing != null && this.templateSettings.routing.balancers != null) {
                        this.templateSettings.routing.balancers.forEach((o, index) => {
                            let strategy = "random"
-                            if (o.strategy && o.strategy.type == "roundRobin") {
-                                strategy = o.strategy.type
+                            if (o.strategy && (o.strategy.type == "roundRobin" || o.strategy.type == "leastload" || o.strategy.type == "leastping")) {
+                                strategy = o.strategy.type;
                            }

-                            data.push({ 
+                            data.push({
                                'key': index,
                                'tag': o.tag ? o.tag : "",
                                'strategy': strategy,
@@ -1999,7 +2036,23 @@
                },
                set: function (newValue) {
                    newTemplateSettings = this.templateSettings;
-                    newTemplateSettings.dns =  newValue ? { servers: [], queryStrategy: "UseIP" } : null;
+                    if (newValue) {
+                        newTemplateSettings.dns = { servers: [], queryStrategy: "UseIP", tag: "dns_inbound" };
+                        newTemplateSettings.fakedns = null; 
+                    } else {
+                        delete newTemplateSettings.dns;
+                        delete newTemplateSettings.fakedns;
+                    }
+                    this.templateSettings = newTemplateSettings;
+                }
+            },
+            dnsTag: {
+                get: function () {
+                    return this.enableDNS ? this.templateSettings.dns.tag : "";
+                },
+                set: function (newValue) {
+                    newTemplateSettings = this.templateSettings;
+                    newTemplateSettings.dns.tag =  newValue;
                    this.templateSettings = newTemplateSettings;
                }
            },
@@ -2025,7 +2078,11 @@
                get: function () { return this.templateSettings && this.templateSettings.fakedns ? this.templateSettings.fakedns : []; },
                set: function (newValue) {
                    newTemplateSettings = this.templateSettings;
-                    newTemplateSettings.fakedns = newValue.length >0 ? newValue : null;
+                    if (this.enableDNS) {
+                        newTemplateSettings.fakedns = newValue.length > 0 ? newValue : null;
+                    } else {
+                        delete newTemplateSettings.fakedns;
+                    }
                    this.templateSettings = newTemplateSettings;
                }
            }
--- a/web/html/xui/xray_balancer_modal.html
+++ b/web/html/xui/xray_balancer_modal.html
@@ -11,7 +11,7 @@
    :ok-text="balancerModal.okText"
    cancel-text='{{ i18n "close" }}'
    :class="themeSwitcher.currentTheme">
-    <a-form :colon="false" :label-col="{ md: {span:6} }" :wrapper-col="{ md: {span:14} }">
+    <a-form :colon="false" :label-col="{ md: {span:8} }" :wrapper-col="{ md: {span:14} }">
        <a-form-item label='{{ i18n "pages.xray.balancer.tag" }}' has-feedback
            :validate-status="balancerModal.duplicateTag? 'warning' : 'success'">
            <a-input v-model.trim="balancerModal.balancer.tag" @change="balancerModal.check()"
@@ -21,6 +21,8 @@
            <a-select v-model="balancerModal.balancer.strategy" :dropdown-class-name="themeSwitcher.currentTheme">
                <a-select-option value="random">Random</a-select-option>
                <a-select-option value="roundRobin">Round Robin</a-select-option>
+                <a-select-option value="leastload">Least Load</a-select-option>
+                <a-select-option value="leastping">Least Ping</a-select-option>
            </a-select>
        </a-form-item>
        <a-form-item label='{{ i18n "pages.xray.balancer.balancerSelectors" }}' has-feedback 
--- a/web/html/xui/xray_reverse_modal.html
+++ b/web/html/xui/xray_reverse_modal.html
@@ -2,7 +2,7 @@
 <a-modal id="reverse-modal" v-model="reverseModal.visible" :title="reverseModal.title" @ok="reverseModal.ok"
         :confirm-loading="reverseModal.confirmLoading" :closable="true" :mask-closable="false"
         :ok-text="reverseModal.okText" cancel-text='{{ i18n "close" }}' :class="themeSwitcher.currentTheme">
-    <a-form :colon="false" :label-col="{ md: {span:6} }" :wrapper-col="{ md: {span:14} }">
+    <a-form :colon="false" :label-col="{ md: {span:8} }" :wrapper-col="{ md: {span:14} }">
        <a-form-item label='{{ i18n "pages.xray.outbound.type" }}'>
            <a-select v-model="reverseModal.reverse.type" :dropdown-class-name="themeSwitcher.currentTheme">
                <a-select-option v-for="x,y in reverseTypes" :value="y">[[ x ]]</a-select-option>
@@ -38,7 +38,6 @@
                    :options="reverseModal.inboundTags"></a-checkbox-group>
            </a-form-item>
        </template>
-    </table>
    </a-form>
 </a-modal>
 <script>
@@ -114,6 +113,7 @@
            this.isEdit = isEdit;
            this.inboundTags = app.templateSettings.inbounds.filter((i) => !ObjectUtil.isEmpty(i.tag)).map(obj => obj.tag);
            this.inboundTags.push(...app.inboundTags);
+            if (app.enableDNS && !ObjectUtil.isEmpty(app.dnsTag)) this.inboundTags.push(app.dnsTag)
            this.outboundTags = app.templateSettings.outbounds.filter((o) => !ObjectUtil.isEmpty(o.tag)).map(obj => obj.tag);
        },
        close() {
--- a/web/html/xui/xray_rule_modal.html
+++ b/web/html/xui/xray_rule_modal.html
@@ -2,7 +2,7 @@
 <a-modal id="rule-modal" v-model="ruleModal.visible" :title="ruleModal.title" @ok="ruleModal.ok"
         :confirm-loading="ruleModal.confirmLoading" :closable="true" :mask-closable="false"
         :ok-text="ruleModal.okText" cancel-text='{{ i18n "close" }}' :class="themeSwitcher.currentTheme">
-    <a-form :colon="false" :label-col="{ md: {span:6} }" :wrapper-col="{ md: {span:14} }">
+    <a-form :colon="false" :label-col="{ md: {span:8} }" :wrapper-col="{ md: {span:14} }">
        <a-form-item label='Domain Matcher'>
                    <a-select v-model="ruleModal.rule.domainMatcher" :dropdown-class-name="themeSwitcher.currentTheme">
                        <a-select-option v-for="dm in ['','hybrid','linear']" :value="dm">[[ dm ]]</a-select-option>
@@ -195,6 +195,7 @@
            this.isEdit = isEdit;
            this.inboundTags = app.templateSettings.inbounds.filter((i) => !ObjectUtil.isEmpty(i.tag)).map(obj => obj.tag);
            this.inboundTags.push(...app.inboundTags);
+            if (app.enableDNS && !ObjectUtil.isEmpty(app.dnsTag)) this.inboundTags.push(app.dnsTag)
            this.outboundTags = ["", ...app.templateSettings.outbounds.filter((o) => !ObjectUtil.isEmpty(o.tag)).map(obj => obj.tag)];
            if(app.templateSettings.reverse){
                if(app.templateSettings.reverse.bridges) {
--- a/web/job/check_client_ip_job.go
+++ b/web/job/check_client_ip_job.go
@@ -14,23 +14,16 @@ import (

 	"x-ui/database"
 	"x-ui/database/model"
-	"x-ui/config"
 	"x-ui/logger"
 	"x-ui/xray"
 )

 type CheckClientIpJob struct {
+	lastClear     int64
 	disAllowedIps []string
 }

 var job *CheckClientIpJob
-var ipFiles = []string{
-	xray.GetIPLimitLogPath(),
-	xray.GetIPLimitBannedLogPath(),
-	xray.GetIPLimitBannedPrevLogPath(),
-	xray.GetAccessPersistentLogPath(),
-	xray.GetAccessPersistentPrevLogPath(),
-}

 func NewCheckClientIpJob() *CheckClientIpJob {
 	job = new(CheckClientIpJob)
@@ -38,52 +31,50 @@ func NewCheckClientIpJob() *CheckClientIpJob {
 }

 func (j *CheckClientIpJob) Run() {
-
-	// create files and dirs required for iplimit if not exists
-	for i := 0; i < len(ipFiles); i++ {
-		err := os.MkdirAll(config.GetLogFolder(), 0770)
-		j.checkError(err)
-		file, err := os.OpenFile(ipFiles[i], os.O_CREATE|os.O_APPEND|os.O_RDWR, 0644)
-		j.checkError(err)
-		defer file.Close()
+	if j.lastClear == 0 {
+		j.lastClear = time.Now().Unix()
 	}

-	// check for limit ip
+	shouldClearAccessLog := false
+	f2bInstalled := j.checkFail2BanInstalled()
+	isAccessLogAvailable := j.checkAccessLogAvailable(f2bInstalled)
+
 	if j.hasLimitIp() {
-		j.checkFail2BanInstalled()
-		j.processLogFile()
+		if f2bInstalled && isAccessLogAvailable {
+			shouldClearAccessLog = j.processLogFile()
+		} else {
+			if !f2bInstalled {
+				logger.Warning("fail2ban is not installed. IP limiting may not work properly.")
+			}
+		}
 	}

-	if !j.hasLimitIp() && xray.GetAccessLogPath() == "./access.log" {
-		go j.clearLogTime()
-	}
-}
-
-func (j *CheckClientIpJob) clearLogTime() {
-	for {
-		time.Sleep(time.Hour)
+	if shouldClearAccessLog || isAccessLogAvailable && time.Now().Unix()-j.lastClear > 3600 {
 		j.clearAccessLog()
 	}
 }

 func (j *CheckClientIpJob) clearAccessLog() {
-	accessLogPath := xray.GetAccessLogPath()
-	logAccessP, err := os.OpenFile(xray.GetAccessPersistentLogPath(), os.O_CREATE|os.O_APPEND|os.O_RDWR, 0644)
+	logAccessP, err := os.OpenFile(xray.GetAccessPersistentLogPath(), os.O_CREATE|os.O_APPEND|os.O_WRONLY, 0o644)
 	j.checkError(err)
-	defer logAccessP.Close()

 	// reopen the access log file for reading
+	accessLogPath := xray.GetAccessLogPath()
 	file, err := os.Open(accessLogPath)
 	j.checkError(err)
-	defer file.Close()

 	// copy access log content to persistent file
 	_, err = io.Copy(logAccessP, file)
 	j.checkError(err)

+	// close the file after copying content
+	logAccessP.Close()
+	file.Close()
+
 	// clean access log
 	err = os.Truncate(accessLogPath, 0)
 	j.checkError(err)
+	j.lastClear = time.Now().Unix()
 }

 func (j *CheckClientIpJob) hasLimitIp() bool {
@@ -115,32 +106,18 @@ func (j *CheckClientIpJob) hasLimitIp() bool {
 	return false
 }

-func (j *CheckClientIpJob) checkFail2BanInstalled() {
+func (j *CheckClientIpJob) checkFail2BanInstalled() bool {
 	cmd := "fail2ban-client"
 	args := []string{"-h"}
-
 	err := exec.Command(cmd, args...).Run()
-	if err != nil {
-		logger.Warning("fail2ban is not installed. IP limiting may not work properly.")
-	}
+	return err == nil
 }

-func (j *CheckClientIpJob) processLogFile() {
+func (j *CheckClientIpJob) processLogFile() bool {
 	accessLogPath := xray.GetAccessLogPath()

-	if accessLogPath == "none" {
-		logger.Warning("Access log is set to 'none' check your Xray Configs")
-		return
-	}
-
-	if accessLogPath == "" {
-		logger.Warning("Access log doesn't exist in your Xray Configs")
-		return
-	}
-
 	file, err := os.Open(accessLogPath)
 	j.checkError(err)
-	defer file.Close()

 	InboundClientIps := make(map[string][]string)

@@ -176,6 +153,7 @@ func (j *CheckClientIpJob) processLogFile() {
 	}

 	j.checkError(scanner.Err())
+	file.Close()

 	shouldCleanLog := false

@@ -189,12 +167,26 @@ func (j *CheckClientIpJob) processLogFile() {
 		}
 	}

-	// added delay before cleaning logs to reduce chance of logging IP that already has been banned
-	time.Sleep(time.Second * 2)
+	return shouldCleanLog
+}

-	if shouldCleanLog {
-		j.clearAccessLog()
+func (j *CheckClientIpJob) checkAccessLogAvailable(doWarning bool) bool {
+	accessLogPath := xray.GetAccessLogPath()
+	isAvailable := true
+	warningMsg := ""
+	// access log is not available if it is set to 'none' or an empty string
+	switch accessLogPath {
+	case "none":
+		warningMsg = "Access log is set to 'none', check your Xray Configs"
+		isAvailable = false
+	case "":
+		warningMsg = "Access log doesn't exist in your Xray Configs"
+		isAvailable = false
 	}
+	if doWarning && warningMsg != "" {
+		logger.Warning(warningMsg)
+	}
+	return isAvailable
 }

 func (j *CheckClientIpJob) checkError(e error) {
@@ -272,7 +264,7 @@ func (j *CheckClientIpJob) updateInboundClientIps(inboundClientIps *model.Inboun
 	j.disAllowedIps = []string{}

 	// create iplimit log file channel
-	logIpFile, err := os.OpenFile(xray.GetIPLimitLogPath(), os.O_CREATE|os.O_APPEND|os.O_RDWR, 0644)
+	logIpFile, err := os.OpenFile(xray.GetIPLimitLogPath(), os.O_CREATE|os.O_APPEND|os.O_WRONLY, 0o644)
 	if err != nil {
 		logger.Errorf("failed to create or open ip limit log file: %s", err)
 	}
@@ -305,9 +297,8 @@ func (j *CheckClientIpJob) updateInboundClientIps(inboundClientIps *model.Inboun

 	db := database.GetDB()
 	err = db.Save(inboundClientIps).Error
-	if err != nil {
-		return shouldCleanLog
-	}
+	j.checkError(err)
+
 	return shouldCleanLog
 }

--- a/web/job/check_cpu_usage.go
+++ b/web/job/check_cpu_usage.go
@@ -3,6 +3,7 @@ package job
 import (
 	"strconv"
 	"time"
+
 	"x-ui/web/service"

 	"github.com/shirou/gopsutil/v3/cpu"
--- a/web/job/check_xray_running_job.go
+++ b/web/job/check_xray_running_job.go
@@ -20,7 +20,7 @@ func (j *CheckXrayRunningJob) Run() {
 		j.checkTime = 0
 	} else {
 		j.checkTime++
-		//only restart if it's down 2 times in a row
+		// only restart if it's down 2 times in a row
 		if j.checkTime > 1 {
 			err := j.xrayService.RestartXray(false)
 			j.checkTime = 0
--- a/web/job/clear_logs_job.go
+++ b/web/job/clear_logs_job.go
@@ -1,7 +1,9 @@
 package job

 import (
+	"io"
 	"os"
+
 	"x-ui/logger"
 	"x-ui/xray"
 )
@@ -16,7 +18,7 @@ func NewClearLogsJob() *ClearLogsJob {
 func (j *ClearLogsJob) Run() {
 	logFiles := []string{xray.GetIPLimitLogPath(), xray.GetIPLimitBannedLogPath(), xray.GetAccessPersistentLogPath()}
 	logFilesPrev := []string{xray.GetIPLimitBannedPrevLogPath(), xray.GetAccessPersistentPrevLogPath()}
-	
+
 	// clear old previous logs
 	for i := 0; i < len(logFilesPrev); i++ {
 		if err := os.Truncate(logFilesPrev[i], 0); err != nil {
@@ -28,21 +30,23 @@ func (j *ClearLogsJob) Run() {
 	for i := 0; i < len(logFiles); i++ {
 		if i > 0 {
 			// copy to previous logs
-			logFilePrev, err := os.OpenFile(logFilesPrev[i-1], os.O_CREATE|os.O_APPEND|os.O_RDWR, 0644)
+			logFilePrev, err := os.OpenFile(logFilesPrev[i-1], os.O_CREATE|os.O_APPEND|os.O_WRONLY, 0644)
 			if err != nil {
 				logger.Warning("clear logs job err:", err)
 			}

-			logFile, err := os.ReadFile(logFiles[i])
+			logFile, err := os.Open(logFiles[i])
 			if err != nil {
 				logger.Warning("clear logs job err:", err)
 			}

-			_, err = logFilePrev.Write(logFile)
+			_, err = io.Copy(logFilePrev, logFile)
 			if err != nil {
 				logger.Warning("clear logs job err:", err)
 			}
-			defer logFilePrev.Close()
+
+			logFile.Close()
+			logFilePrev.Close()
 		}

 		err := os.Truncate(logFiles[i], 0)
--- a/web/job/xray_traffic_job.go
+++ b/web/job/xray_traffic_job.go
@@ -36,5 +36,4 @@ func (j *XrayTrafficJob) Run() {
 	if needRestart0 || needRestart1 {
 		j.xrayService.SetToNeedRestart()
 	}
-
 }
--- a/web/locale/locale.go
+++ b/web/locale/locale.go
@@ -4,6 +4,7 @@ import (
 	"embed"
 	"io/fs"
 	"strings"
+
 	"x-ui/logger"

 	"github.com/gin-gonic/gin"
@@ -12,9 +13,11 @@ import (
 	"golang.org/x/text/language"
 )

-var i18nBundle *i18n.Bundle
-var LocalizerWeb *i18n.Localizer
-var LocalizerBot *i18n.Localizer
+var (
+	i18nBundle   *i18n.Bundle
+	LocalizerWeb *i18n.Localizer
+	LocalizerBot *i18n.Localizer
+)

 type I18nType string

@@ -79,7 +82,6 @@ func I18n(i18nType I18nType, key string, params ...string) string {
 		MessageID:    key,
 		TemplateData: templateData,
 	})
-
 	if err != nil {
 		logger.Errorf("Failed to localize message: %v", err)
 		return ""
@@ -135,7 +137,6 @@ func parseTranslationFiles(i18nFS embed.FS, i18nBundle *i18n.Bundle) error {
 			_, err = i18nBundle.ParseMessageFileBytes(data, path)
 			return err
 		})
-
 	if err != nil {
 		return err
 	}
--- a/web/service/config.json
+++ b/web/service/config.json
@@ -28,7 +28,9 @@
    {
      "tag": "direct",
      "protocol": "freedom",
-      "settings": {}
+      "settings": {
+        "domainStrategy": "UseIP"
+      }
    },
    {
      "tag": "blocked",
@@ -51,7 +53,7 @@
    }
  },
  "routing": {
-    "domainStrategy": "IPIfNonMatch",
+    "domainStrategy": "AsIs",
    "rules": [
      {
        "type": "field",
--- a/web/service/inbound.go
+++ b/web/service/inbound.go
@@ -5,6 +5,7 @@ import (
 	"fmt"
 	"strings"
 	"time"
+
 	"x-ui/database"
 	"x-ui/database/model"
 	"x-ui/logger"
@@ -90,7 +91,6 @@ func (s *InboundService) getAllEmails() ([]string, error) {
 		FROM inbounds,
 			JSON_EACH(JSON_EXTRACT(inbounds.settings, '$.clients')) AS client
 		`).Scan(&emails).Error
-
 	if err != nil {
 		return nil, err
 	}
@@ -573,15 +573,19 @@ func (s *InboundService) UpdateInboundClient(data *model.Inbound, clientId strin
 	}

 	oldEmail := ""
+	newClientId := ""
 	clientIndex := 0
 	for index, oldClient := range oldClients {
 		oldClientId := ""
 		if oldInbound.Protocol == "trojan" {
 			oldClientId = oldClient.Password
+			newClientId = clients[0].Password
 		} else if oldInbound.Protocol == "shadowsocks" {
 			oldClientId = oldClient.Email
+			newClientId = clients[0].Email
 		} else {
 			oldClientId = oldClient.ID
+			newClientId = clients[0].ID
 		}
 		if clientId == oldClientId {
 			oldEmail = oldClient.Email
@@ -590,6 +594,11 @@ func (s *InboundService) UpdateInboundClient(data *model.Inbound, clientId strin
 		}
 	}

+	// Validate new client ID
+	if newClientId == "" {
+		return false, common.NewError("empty client ID")
+	}
+
 	if len(clients[0].Email) > 0 && clients[0].Email != oldEmail {
 		existEmail, err := s.checkEmailsExistForClients(clients)
 		if err != nil {
@@ -682,7 +691,7 @@ func (s *InboundService) UpdateInboundClient(data *model.Inbound, clientId strin
 	return needRestart, tx.Save(oldInbound).Error
 }

-func (s *InboundService) AddTraffic(traffics []*xray.Traffic, clientTraffics []*xray.ClientTraffic) (error, bool) {
+func (s *InboundService) AddTraffic(inboundTraffics []*xray.Traffic, clientTraffics []*xray.ClientTraffic) (error, bool) {
 	var err error
 	db := database.GetDB()
 	tx := db.Begin()
@@ -694,7 +703,7 @@ func (s *InboundService) AddTraffic(traffics []*xray.Traffic, clientTraffics []*
 			tx.Commit()
 		}
 	}()
-	err = s.addInboundTraffic(tx, traffics)
+	err = s.addInboundTraffic(tx, inboundTraffics)
 	if err != nil {
 		return err, false
 	}
@@ -969,7 +978,7 @@ func (s *InboundService) disableInvalidInbounds(tx *gorm.DB) (bool, int64, error
 		s.xrayApi.Init(p.GetAPIPort())
 		for _, tag := range tags {
 			err1 := s.xrayApi.DelInbound(tag)
-			if err == nil {
+			if err1 == nil {
 				logger.Debug("Inbound disabled by api:", tag)
 			} else {
 				logger.Debug("Error in disabling inbound by api:", err1)
@@ -1074,7 +1083,9 @@ func (s *InboundService) UpdateClientStat(tx *gorm.DB, email string, client *mod
 			"email":       client.Email,
 			"total":       client.TotalGB,
 			"expiry_time": client.ExpiryTime,
-			"reset":       client.Reset})
+			"reset":       client.Reset,
+		})
+
 	err := result.Error
 	if err != nil {
 		return err
@@ -1573,7 +1584,6 @@ func (s *InboundService) ResetAllClientTraffics(id int) error {
 		Updates(map[string]interface{}{"enable": true, "up": 0, "down": 0})

 	err := result.Error
-
 	if err != nil {
 		return err
 	}
@@ -1588,7 +1598,6 @@ func (s *InboundService) ResetAllTraffics() error {
 		Updates(map[string]interface{}{"up": 0, "down": 0})

 	err := result.Error
-
 	if err != nil {
 		return err
 	}
@@ -1814,7 +1823,7 @@ func (s *InboundService) MigrationRequirements() {
 		json.Unmarshal([]byte(inbounds[inbound_index].Settings), &settings)
 		clients, ok := settings["clients"].([]interface{})
 		if ok {
-			// Fix Clinet configuration problems
+			// Fix Client configuration problems
 			var newClients []interface{}
 			for client_index := range clients {
 				c := clients[client_index].(map[string]interface{})
--- a/web/service/outbound.go
+++ b/web/service/outbound.go
@@ -9,8 +9,7 @@ import (
 	"gorm.io/gorm"
 )

-type OutboundService struct {
-}
+type OutboundService struct{}

 func (s *OutboundService) AddTraffic(traffics []*xray.Traffic, clientTraffics []*xray.ClientTraffic) (error, bool) {
 	var err error
--- a/web/service/panel.go
+++ b/web/service/panel.go
@@ -4,11 +4,11 @@ import (
 	"os"
 	"syscall"
 	"time"
+
 	"x-ui/logger"
 )

-type PanelService struct {
-}
+type PanelService struct{}

 func (s *PanelService) RestartPanel(delay time.Duration) error {
 	p, err := os.FindProcess(syscall.Getpid())
--- a/web/service/server.go
+++ b/web/service/server.go
@@ -382,7 +382,6 @@ func (s *ServerService) UpdateXray(version string) error {
 	}

 	return nil
-
 }

 func (s *ServerService) GetLogs(count string, level string, syslog string) []string {
--- a/web/service/setting.go
+++ b/web/service/setting.go
@@ -9,6 +9,7 @@ import (
 	"strconv"
 	"strings"
 	"time"
+
 	"x-ui/database"
 	"x-ui/database/model"
 	"x-ui/logger"
@@ -64,8 +65,7 @@ var defaultValueMap = map[string]string{
 	"warp":               "",
 }

-type SettingService struct {
-}
+type SettingService struct{}

 func (s *SettingService) GetDefaultJsonConfig() (interface{}, error) {
 	var jsonData interface{}
@@ -444,6 +444,7 @@ func (s *SettingService) GetDatepicker() (string, error) {
 func (s *SettingService) GetWarp() (string, error) {
 	return s.getString("warp")
 }
+
 func (s *SettingService) SetWarp(data string) error {
 	return s.setString("warp", data)
 }
--- a/web/service/tgbot.go
+++ b/web/service/tgbot.go
@@ -10,6 +10,7 @@ import (
 	"strconv"
 	"strings"
 	"time"
+
 	"x-ui/config"
 	"x-ui/database"
 	"x-ui/database/model"
@@ -26,12 +27,14 @@ import (
 	"github.com/valyala/fasthttp/fasthttpproxy"
 )

-var bot *telego.Bot
-var botHandler *th.BotHandler
-var adminIds []int64
-var isRunning bool
-var hostname string
-var hashStorage *global.HashStorage
+var (
+	bot         *telego.Bot
+	botHandler  *th.BotHandler
+	adminIds    []int64
+	isRunning   bool
+	hostname    string
+	hashStorage *global.HashStorage
+)

 type LoginStatus byte

@@ -280,7 +283,6 @@ func (t *Tgbot) answerCommand(message *telego.Message, chatId int64, isAdmin boo
 }

 func (t *Tgbot) asnwerCallback(callbackQuery *telego.CallbackQuery, isAdmin bool) {
-
 	chatId := callbackQuery.Message.GetChat().ID

 	if isAdmin {
@@ -866,7 +868,7 @@ func (t *Tgbot) SendMsgToTgbot(chatId int64, msg string, replyMarkup ...telego.R
 			Text:      message,
 			ParseMode: "HTML",
 		}
-		//only add replyMarkup to last message
+		// only add replyMarkup to last message
 		if len(replyMarkup) > 0 && n == (len(allMessages)-1) {
 			params.ReplyMarkup = replyMarkup[0]
 		}
@@ -1030,9 +1032,15 @@ func (t *Tgbot) getInboundUsages() string {
 	return info
 }

-func (t *Tgbot) clientInfoMsg(traffic *xray.ClientTraffic, printEnabled bool, printOnline bool, printActive bool,
-	printDate bool, printTraffic bool, printRefreshed bool) string {
-
+func (t *Tgbot) clientInfoMsg(
+	traffic *xray.ClientTraffic,
+	printEnabled bool,
+	printOnline bool,
+	printActive bool,
+	printDate bool,
+	printTraffic bool,
+	printRefreshed bool,
+) string {
 	now := time.Now().Unix()
 	expiryTime := ""
 	flag := false
@@ -1544,7 +1552,6 @@ func (t *Tgbot) sendBackup(chatId int64) {
 		}
 	} else {
 		logger.Error("Error in opening db file for backup: ", err)
-
 	}

 	file, err = os.Open(xray.GetConfigPath())
@@ -1560,8 +1567,6 @@ func (t *Tgbot) sendBackup(chatId int64) {
 	} else {
 		logger.Error("Error in opening config.json file for backup: ", err)
 	}
-
-	t.sendBanLogs(chatId, false)
 }

 func (t *Tgbot) sendBanLogs(chatId int64, dt bool) {
--- a/web/service/user.go
+++ b/web/service/user.go
@@ -2,6 +2,7 @@ package service

 import (
 	"errors"
+
 	"x-ui/database"
 	"x-ui/database/model"
 	"x-ui/logger"
@@ -9,8 +10,7 @@ import (
 	"gorm.io/gorm"
 )

-type UserService struct {
-}
+type UserService struct{}

 func (s *UserService) GetFirstUser() (*model.User, error) {
 	db := database.GetDB()
--- a/web/service/xray.go
+++ b/web/service/xray.go
@@ -4,16 +4,19 @@ import (
 	"encoding/json"
 	"errors"
 	"sync"
+
 	"x-ui/logger"
 	"x-ui/xray"

 	"go.uber.org/atomic"
 )

-var p *xray.Process
-var lock sync.Mutex
-var isNeedXrayRestart atomic.Bool
-var result string
+var (
+	p                 *xray.Process
+	lock              sync.Mutex
+	isNeedXrayRestart atomic.Bool
+	result            string
+)

 type XrayService struct {
 	inboundService InboundService
@@ -87,7 +90,6 @@ func (s *XrayService) GetXrayConfig() (*xray.Config, error) {
 			// check users active or not
 			clientStats := inbound.ClientStats
 			for _, clientTraffic := range clientStats {
-
 				indexDecrease := 0
 				for index, client := range clients {
 					c := client.(map[string]interface{})
@@ -96,20 +98,15 @@ func (s *XrayService) GetXrayConfig() (*xray.Config, error) {
 							clients = RemoveIndex(clients, index-indexDecrease)
 							indexDecrease++
 							logger.Info("Remove Inbound User ", c["email"], " due the expire or traffic limit")
-
 						}
-
 					}
 				}
-
 			}

 			// clear client config for additional parameters
 			var final_clients []interface{}
 			for _, client := range clients {
-
 				c := client.(map[string]interface{})
-
 				if c["enable"] != nil {
 					if enable, ok := c["enable"].(bool); ok && !enable {
 						continue
--- a/web/service/xray_setting.go
+++ b/web/service/xray_setting.go
@@ -8,6 +8,7 @@ import (
 	"net/http"
 	"os"
 	"time"
+
 	"x-ui/util/common"
 	"x-ui/xray"
 )
--- a/web/session/session.go
+++ b/web/session/session.go
@@ -2,6 +2,7 @@ package session

 import (
 	"encoding/gob"
+
 	"x-ui/database/model"

 	sessions "github.com/Calidity/gin-sessions"
--- a/web/translation/translate.en_US.toml
+++ b/web/translation/translate.en_US.toml
@@ -42,7 +42,7 @@
 "online" = "Online"
 "domainName" = "Domain Name"
 "monitor" = "Listen IP"
-"certificate" = "Certificate"
+"certificate" = "Digital Certificate"
 "fail" = " Failed"
 "success" = " Successful"
 "getVersion" = "Get Version"
@@ -54,7 +54,12 @@
 "security" = "Security"
 "secAlertTitle" = "Security Alert"
 "secAlertSsl" = "This connection is not secure. Please avoid entering sensitive information until TLS is activated for data protection."
-"secAlertConf" = "Certain configurations have been identified as susceptible to attacks, prompting immediate action to reinforce security protocols and safeguard against potential security breaches."
+"secAlertConf" = "Certain settings are vulnerable to attacks. It is recommended to reinforce security protocols to prevent potential breaches."
+"secAlertSSL" = "Panel lacks secure connection. Please install TLS certificate for data protection."
+"secAlertPanelPort" = "Panel default port is vulnerable. Please configure a random or specific port."
+"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."

 [menu]
 "dashboard" = "Overview"
@@ -65,6 +70,7 @@
 "link" = "Manage"

 [pages.login]
+"hello" = "Hello"
 "title" = "Welcome"
 "loginAgain" = "Your session has expired, please log in again"

@@ -143,10 +149,8 @@
 "noRecommendKeepDefault" = "It is recommended to keep the default"
 "certificatePath" = "File Path"
 "certificateContent" = "File Content"
-"publicKeyPath" = "Public Key Path"
-"publicKeyContent" = "Public Key Content"
-"keyPath" = "Private Key Path"
-"keyContent" = "Private Key Content"
+"publicKey" = "Public Key"
+"privatekey" = "Private Key"
 "clickOnQRcode" = "Click on QR Code to Copy"
 "client" = "Client"
 "export" = "Export All URLs"
@@ -197,7 +201,7 @@
 "last" = "Last"
 "prefix" = "Prefix"
 "postfix" = "Postfix"
-"delayedStart" = "Start on Initial Use"
+"delayedStart" = "Start After First Use"
 "expireDays" = "Duration"
 "days" = "Day(s)"
 "renew" = "Auto Renew"
@@ -323,7 +327,7 @@
 "blockCountryConfigs" = "Block Country"
 "blockCountryConfigsDesc" = "These options will block traffic based on the specific requested country."
 "directCountryConfigs" = "Direct Country"
-"directCountryConfigsDesc" = "These options will directly forward traffic based on the specific requested country."
+"directCountryConfigsDesc" = "A direct connection ensures that specific traffic is not routed through another server."
 "ipv4Configs" = "IPv4 Routing"
 "ipv4ConfigsDesc" = "These options will route traffic based on a specific destination via IPv4."
 "warpConfigs" = "WARP Routing"
@@ -463,6 +467,8 @@
 [pages.xray.dns]
 "enable" = "Enable DNS"
 "enableDesc" = "Enable built-in DNS server"
+"tag" = "DNS Inbound Tag"
+"tagDesc" = "This tag will be available as an Inbound tag in routing rules."
 "strategy" = "Query Strategy"
 "strategyDesc" = "Overall strategy to resolve domain names"
 "add" = "Add Server"
--- a/web/translation/translate.es_ES.toml
+++ b/web/translation/translate.es_ES.toml
--- a/web/translation/translate.fa_IR.toml
+++ b/web/translation/translate.fa_IR.toml
@@ -42,7 +42,7 @@
 "online" = "آنلاین"
 "domainName" = "آدرس دامنه"
 "monitor" = "آی‌پی اتصال"
-"certificate" = "گواهی"
+"certificate" = "گواهی دیجیتال"
 "fail" = "ناموفق"
 "success" = " موفق"
 "getVersion" = "دریافت نسخه"
@@ -54,7 +54,12 @@
 "security" = "امنیت"
 "secAlertTitle" = "هشدار‌امنیتی"
 "secAlertSsl" = "این‌اتصال‌امن نیست. لطفا‌ تازمانی‌که تی‌ال‌اس برای محافظت از‌ داده‌ها فعال نشده‌است، از وارد کردن اطلاعات حساس خودداری کنید"
-"secAlertConf" = "پیکربندی‌های خاصی مستعد حملات سایبری شناسایی شده‌اند، اقدام فوری برای تقویت پروتکل‌های امنیتی و محافظت در برابر نقض‌های امنیتی لازم است"
+"secAlertConf" = "تنظیمات خاصی در برابر حملات آسیب پذیر هستند. توصیه می‌شود پروتکل‌های امنیتی را برای جلوگیری از نفوذ احتمالی تقویت کنید"
+"secAlertSSL" = "پنل فاقد ارتباط امن است. لطفاً یک گواهینامه تی‌ال‌اس برای محافظت از داده‌ها نصب کنید"
+"secAlertPanelPort" = "استفاده از پورت پیش‌فرض پنل ناامن است. لطفاً یک پورت تصادفی یا خاص تنظیم کنید"
+"secAlertPanelURI" = "مسیر پیش‌فرض لینک پنل ناامن است. لطفاً یک مسیر پیچیده تنظیم کنید"
+"secAlertSubURI" = "مسیر پیش‌فرض لینک سابسکریپشن ناامن است. لطفاً یک مسیر پیچیده تنظیم کنید"
+"secAlertSubJsonURI" = "مسیر پیش‌فرض لینک سابسکریپشن جیسون ناامن است. لطفاً یک مسیر پیچیده تنظیم کنید"

 [menu]
 "dashboard" = "نمای کلی"
@@ -65,6 +70,7 @@
 "link" = "مدیریت"

 [pages.login]
+"hello" = "سلام"
 "title" = "خوش‌آمدید"
 "loginAgain" = "مدت زمان استفاده به‌اتمام‌رسیده، لطفا دوباره وارد شوید"

@@ -137,16 +143,14 @@
 "destinationPort" = "پورت مقصد"
 "targetAddress" = "آدرس مقصد"
 "monitorDesc" = "به‌طور پیش‌فرض خالی‌بگذارید"
-"meansNoLimit" = " =‎ واحد: گیگابایت) نامحدود)"
+"meansNoLimit" = "0 = واحد: گیگابایت) نامحدود)"
 "totalFlow" = "ترافیک کل"
 "leaveBlankToNeverExpire" = "برای منقضی‌نشدن خالی‌بگذارید"
 "noRecommendKeepDefault" = "توصیه‌می‌شود به‌طور پیش‌فرض حفظ‌شود"
 "certificatePath" = "مسیر فایل"
 "certificateContent" = "محتوای فایل"
-"publicKeyPath" = "مسیر کلید عمومی"
-"publicKeyContent" = "محتوای کلید عمومی"
-"keyPath" = "مسیر کلید خصوصی"
-"keyContent" = "محتوای کلید خصوصی"
+"publicKey" = "کلید عمومی"
+"privatekey" = "کلید خصوصی"
 "clickOnQRcode" = "برای کپی بر روی کدتصویری کلیک کنید"
 "client" = "کاربر"
 "export" = "استخراج لینک‌ها"
@@ -323,7 +327,7 @@
 "blockCountryConfigs" = "مسدودسازی کشور"
 "blockCountryConfigsDesc" = "این گزینه‌ها ترافیک را بر اساس کشور درخواستی خاص مسدود می‌کند"
 "directCountryConfigs" = "اتصال مستقیم کشور"
-"directCountryConfigsDesc" = "این گزینه‌ها ترافیک را بر اساس کشور درخواستی خاص بصورت مستقیم ارسال می‌کند"
+"directCountryConfigsDesc" = "اتصال مستقیم اطمینان حاصل می‌کند که ترافیک خاص از طریق یک سرور دیگر هدایت نمی‌شود."
 "ipv4Configs" = "IPv4 مسیریابی"
 "ipv4ConfigsDesc" = "این گزینه‌ها ترافیک‌ را از طریق آی‌پی‌نسخه4 به مقصد هدایت می‌کند"
 "warpConfigs" = "WARP مسیریابی"
@@ -463,6 +467,8 @@
 [pages.xray.dns]
 "enable" = "فعال کردن حل دامنه"
 "enableDesc" = "سرور حل دامنه داخلی را فعال کنید"
+"tag" = "برچسب"
+"tagDesc" = "این برچسب در قوانین مسیریابی به عنوان یک برچسب ورودی قابل استفاده خواهد بود"
 "strategy" = "استراتژی پرس‌وجو"
 "strategyDesc" = "استراتژی کلی برای حل نام دامنه"
 "add" = "افزودن سرور"
--- a/web/translation/translate.id_ID.toml
+++ b/web/translation/translate.id_ID.toml
@@ -42,7 +42,7 @@
 "online" = "Online"
 "domainName" = "Nama Domain"
 "monitor" = "IP Pemantauan"
-"certificate" = "Sertifikat"
+"certificate" = "Sertifikat Digital"
 "fail" = "Gagal"
 "success" = "Berhasil"
 "getVersion" = "Dapatkan Versi"
@@ -54,7 +54,12 @@
 "security" = "Keamanan"
 "secAlertTitle" = "Peringatan keamanan"
 "secAlertSsl" = "Koneksi ini tidak aman. Harap hindari memasukkan informasi sensitif sampai TLS diaktifkan untuk perlindungan data."
-"secAlertConf" = "Konfigurasi tertentu telah diidentifikasi rentan terhadap serangan, sehingga mendorong tindakan segera untuk memperkuat protokol keamanan dan melindungi dari potensi pelanggaran keamanan."
+"secAlertConf" = "Beberapa pengaturan rentan terhadap serangan. Disarankan untuk memperkuat protokol keamanan guna mencegah pelanggaran potensial."
+"secAlertSSL" = "Panel kekurangan koneksi yang aman. Harap instal sertifikat TLS untuk perlindungan data."
+"secAlertPanelPort" = "Port default panel rentan. Harap konfigurasi port acak atau tertentu."
+"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."

 [menu]
 "dashboard" = "Ikhtisar"
@@ -65,6 +70,7 @@
 "link" = "Kelola"

 [pages.login]
+"hello" = "Halo"
 "title" = "Selamat Datang"
 "loginAgain" = "Sesi Anda telah berakhir, harap masuk kembali"

@@ -143,10 +149,8 @@
 "noRecommendKeepDefault" = "Disarankan untuk tetap menggunakan pengaturan default"
 "certificatePath" = "Path Berkas"
 "certificateContent" = "Konten Berkas"
-"publicKeyPath" = "Path Kunci Publik"
-"publicKeyContent" = "Konten Kunci Publik"
-"keyPath" = "Path Kunci Privat"
-"keyContent" = "Konten Kunci Privat"
+"publicKey" = "Kunci Publik"
+"privatekey" = "Kunci Pribadi"
 "clickOnQRcode" = "Klik pada Kode QR untuk Menyalin"
 "client" = "Klien"
 "export" = "Ekspor Semua URL"
@@ -197,7 +201,7 @@
 "last" = "Terakhir"
 "prefix" = "Awalan"
 "postfix" = "Akhiran"
-"delayedStart" = "Mulai saat Penggunaan Awal"
+"delayedStart" = "Mulai Awal"
 "expireDays" = "Durasi"
 "days" = "Hari"
 "renew" = "Perpanjang Otomatis"
@@ -323,7 +327,7 @@
 "blockCountryConfigs" = "Blokir Negara"
 "blockCountryConfigsDesc" = "Opsi ini akan memblokir lalu lintas berdasarkan negara yang diminta."
 "directCountryConfigs" = "Langsung ke Negara"
-"directCountryConfigsDesc" = "Opsi ini akan langsung meneruskan lalu lintas berdasarkan negara yang diminta."
+"directCountryConfigsDesc" = "Koneksi langsung memastikan bahwa lalu lintas tertentu tidak diarahkan melalui server lain."
 "ipv4Configs" = "Pengalihan IPv4"
 "ipv4ConfigsDesc" = "Opsi ini akan mengalihkan lalu lintas berdasarkan tujuan tertentu melalui IPv4."
 "warpConfigs" = "Pengalihan WARP"
@@ -463,6 +467,8 @@
 [pages.xray.dns]
 "enable" = "Aktifkan DNS"
 "enableDesc" = "Aktifkan server DNS bawaan"
+"tag" = "Tanda DNS Masuk"
+"tagDesc" = "Tanda ini akan tersedia sebagai tanda masuk dalam aturan penataan."
 "strategy" = "Strategi Kueri"
 "strategyDesc" = "Strategi keseluruhan untuk menyelesaikan nama domain"
 "add" = "Tambahkan Server"
--- a/web/translation/translate.ru_RU.toml
+++ b/web/translation/translate.ru_RU.toml
@@ -42,7 +42,7 @@
 "online" = "Онлайн"
 "domainName" = "Домен"
 "monitor" = "Порт IP"
-"certificate" = "Сертификат"
+"certificate" = "Цифровой сертификат"
 "fail" = "Неудачно"
 "success" = "Успешно"
 "getVersion" = "Узнать версию"
@@ -54,7 +54,12 @@
 "security" = "Безопасность"
 "secAlertTitle" = "Предупреждение системы безопасности"
 "secAlertSsl" = "Это соединение не защищено. Пожалуйста, воздержитесь от ввода конфиденциальной информации до тех пор, пока не будет активирован TLS для защиты данных"
-"secAlertConf" = "Некоторые конфигурации были определены как уязвимые для атак, что требует немедленных действий по усилению протоколов безопасности и защите от потенциальных нарушений безопасности."
+"secAlertConf" = "Некоторые настройки уязвимы для атак. Рекомендуется усилить протоколы безопасности, чтобы предотвратить потенциальные нарушения."
+"secAlertSSL" = "В панели отсутствует безопасное соединение. Пожалуйста, установите сертификат TLS для защиты данных."
+"secAlertPanelPort" = "Порт по умолчанию панели небезопасен. Пожалуйста, настройте случайный или определенный порт."
+"secAlertPanelURI" = "URI-путь по умолчанию панели небезопасен. Пожалуйста, настройте сложный URI-путь."
+"secAlertSubURI" = "URI-путь по умолчанию подписки небезопасен. Пожалуйста, настройте сложный URI-путь."
+"secAlertSubJsonURI" = "URI-путь по умолчанию для JSON подписки небезопасен. Пожалуйста, настройте сложный URI-путь."

 [menu]
 "dashboard" = "Статус системы"
@@ -65,6 +70,7 @@
 "link" = "менеджмент"

 [pages.login]
+"hello" = "Привет"
 "title" = "Добро пожаловать"
 "loginAgain" = "Время пребывания в сети вышло. Пожалуйста, войдите в систему снова"

@@ -143,10 +149,8 @@
 "noRecommendKeepDefault" = "Нет требований для сохранения настроек по умолчанию"
 "certificatePath" = "Путь файла"
 "certificateContent" = "Содержимое файла"
-"publicKeyPath" = "Путь к публичному ключу"
-"publicKeyContent" = "Содержимое публичного ключа"
-"keyPath" = "Путь к приватному ключу"
-"keyContent" = "Содержимое приватного ключа"
+"publicKey" = "Публичный ключ"
+"privatekey" = "Приватный ключ"
 "clickOnQRcode" = "Нажмите на QR-код, чтобы скопировать"
 "client" = "Клиент"
 "export" = "Экспорт ключей"
@@ -197,7 +201,7 @@
 "last" = "Последний"
 "prefix" = "Префикс"
 "postfix" = "Постфикс"
-"delayedStart" = "Начать с момента первого подключения"
+"delayedStart" = "Начало использования"
 "expireDays" = "Длительность"
 "days" = "дней"
 "renew" = "Автопродление"
@@ -323,7 +327,7 @@
 "blockCountryConfigs" = "Конфигурации блокировки страны"
 "blockCountryConfigsDesc" = "Эти параметры не позволят пользователям подключаться к доменам определенной страны"
 "directCountryConfigs" = "Настройки прямого подключения для страны"
-"directCountryConfigsDesc" = "Эти параметры позволят пользователям подключаться напрямую к доменам определенной страны"
+"directCountryConfigsDesc" = "Прямое подключение обеспечивает, что конкретный трафик не направляется через другой сервер."
 "ipv4Configs" = "Настройки IPv4"
 "ipv4ConfigsDesc" = "Эти параметры позволят пользователям маршрутизироваться к целевым доменам только через IPv4"
 "warpConfigs" = "Настройки WARP"
@@ -454,7 +458,7 @@

 [pages.xray.wireguard]
 "secretKey" = "Секретный ключ"
-"publicKey" = "Открытый ключ"
+"publicKey" = "Публичный ключ"
 "allowedIPs" = "Разрешенные IP-адреса"
 "endpoint" = "Конечная точка"
 "psk" = "Общий ключ"
@@ -463,6 +467,8 @@
 [pages.xray.dns]
 "enable" = "Включить DNS"
 "enableDesc" = "Включить встроенный DNS-сервер"
+"tag" = "Входящий тег DNS"
+"tagDesc" = "Этот тег будет доступен как входящий тег в правилах маршрутизации."
 "strategy" = "Стратегия запроса"
 "strategyDesc" = "Общая стратегия разрешения доменных имен"
 "add" = "Добавить сервер"
--- a/web/translation/translate.uk_UA.toml
+++ b/web/translation/translate.uk_UA.toml
@@ -0,0 +1,627 @@
+"username" = "Ім'я користувача"
+"password" = "Пароль"
+"login" = "Увійти"
+"confirm" = "Підтвердити"
+"cancel" = "Скасувати"
+"close" = "Закрити"
+"copy" = "Копіювати"
+"copied" = "Скопійовано"
+"download" = "Завантажити"
+"remark" = "Примітка"
+"enable" = "Увімкнути"
+"protocol" = "Протокол"
+"search" = "Пошук"
+"filter" = "Фільтр"
+"loading" = "Завантаження..."
+"second" = "Секунда"
+"minute" = "Хвилина"
+"hour" = "Година"
+"day" = "День"
+"check" = "Перевірка"
+"indefinite" = "Безстроково"
+"unlimited" = "Безлімітний"
+"none" = "Немає"
+"qrCode" = "QR-Код"
+"info" = "Більше інформації"
+"edit" = "Редагувати"
+"delete" = "Видалити"
+"reset" = "Скидання"
+"copySuccess" = "Скопійовано успішно"
+"sure" = "Звичайно"
+"encryption" = "Шифрування"
+"transmission" = "Протокол передачи"
+"host" = "Хост"
+"path" = "Шлях"
+"camouflage" = "Маскування"
+"status" = "Статус"
+"enabled" = "Увімкнено"
+"disabled" = "Вимкнено"
+"depleted" = "Вичерпано"
+"depletingSoon" = "Вичерпується"
+"offline" = "Офлайн"
+"online" = "Онлайн"
+"domainName" = "Доменне ім`я"
+"monitor" = "Слухати IP"
+"certificate" = "Цифровий сертифікат"
+"fail" = " Помилка"
+"success" = " Успішно"
+"getVersion" = "Отримати версію"
+"install" = "Встановити"
+"clients" = "Клієнти"
+"usage" = "Використання"
+"secretToken" = "Секретний маркер"
+"remained" = "Залишилося"
+"security" = "Беспека"
+"secAlertTitle" = "Попередження системи безпеки"
+"secAlertSsl" = "Це з'єднання не є безпечним. Будь ласка, уникайте введення конфіденційної інформації, поки TLS не буде активовано для захисту даних."
+"secAlertConf" = "Деякі налаштування вразливі до атак. Рекомендується посилити протоколи безпеки, щоб запобігти можливим порушенням."
+"secAlertSSL" = "Панель не має безпечного з'єднання. Будь ласка, встановіть сертифікат TLS для захисту даних."
+"secAlertPanelPort" = "Стандартний порт панелі вразливий. Будь ласка, сконфігуруйте випадковий або конкретний порт."
+"secAlertPanelURI" = "Стандартний URI-шлях панелі небезпечний. Будь ласка, сконфігуруйте складний URI-шлях."
+"secAlertSubURI" = "Стандартний URI-шлях підписки небезпечний. Будь ласка, сконфігуруйте складний URI-шлях."
+"secAlertSubJsonURI" = "Стандартний URI-шлях JSON підписки небезпечний. Будь ласка, сконфігуруйте складний URI-шлях."
+
+[menu]
+"dashboard" = "Огляд"
+"inbounds" = "Вхідні"
+"settings" = "Параметри панелі"
+"xray" = "Конфігурації Xray"
+"logout" = "Вийти"
+"link" = "Керувати"
+
+[pages.login]
+"hello" = "Привіт"
+"title" = "Ласкаво просимо"
+"loginAgain" = "Ваш сеанс закінчився, увійдіть знову"
+
+[pages.login.toasts]
+"invalidFormData" = "Формат вхідних даних недійсний."
+"emptyUsername" = "Потрібне ім'я користувача"
+"emptyPassword" = "Потрібен пароль"
+"wrongUsernameOrPassword" = "Невірне ім'я користувача або пароль."
+"successLogin" = "Вхід"
+
+[pages.index]
+"title" = "Огляд"
+"memory" = "Пам'ять"
+"hard" = "Диск"
+"xrayStatus" = "Xray"
+"stopXray" = "Зупинити"
+"restartXray" = "Перезапустити"
+"xraySwitch" = "Версія"
+"xraySwitchClick" = "Виберіть версію, на яку ви хочете перейти."
+"xraySwitchClickDesk" = "Вибирайте уважно, оскільки старіші версії можуть бути несумісними з поточними конфігураціями."
+"operationHours" = "Час роботи"
+"systemLoad" = "Завантаження системи"
+"systemLoadDesc" = "Середнє завантаження системи за останні 1, 5 і 15 хвилин"
+"connectionTcpCountDesc" = "Загальна кількість TCP-з'єднань у системі"
+"connectionUdpCountDesc" = "Загальна кількість UDP-з'єднань у системі"
+"connectionCount" = "Статистика з'єднання"
+"upSpeed" = "Загальна швидкість завантаження в системі"
+"downSpeed" = "Загальна швидкість завантаження в системі"
+"totalSent" = "Загальна кількість даних, надісланих через систему з моменту запуску ОС"
+"totalReceive" = "Загальна кількість даних, отриманих системою з моменту запуску ОС"
+"xraySwitchVersionDialog" = "Змінити версію Xray"
+"xraySwitchVersionDialogDesc" = "Ви впевнені, що бажаєте змінити версію Xray на"
+"dontRefresh" = "Інсталяція триває, будь ласка, не оновлюйте цю сторінку"
+"logs" = "Журнали"
+"config" = "Конфігурація"
+"backup" = "Резервне копіювання та відновлення"
+"backupTitle" = "Резервне копіювання та відновлення бази даних"
+"backupDescription" = "Рекомендується зробити резервну копію перед відновленням бази даних."
+"exportDatabase" = "Резервне копіювання"
+"importDatabase" = "Відновити"
+
+[pages.inbounds]
+"title" = "Вхідні"
+"totalDownUp" = "Всього надісланих/отриманих"
+"totalUsage" = "Всього використанно"
+"inboundCount" = "Загальна кількість вхідних"
+"operate" = "Меню"
+"enable" = "Увімкнено"
+"remark" = "Примітка"
+"protocol" = "Протокол"
+"port" = "Порт"
+"traffic" = "Трафік"
+"details" = "Деталі"
+"transportConfig" = "Транспорт"
+"expireDate" = "Тривалість"
+"resetTraffic" = "Скинути трафік"
+"addInbound" = "Додати вхідний"
+"generalActions" = "Загальні дії"
+"create" = "Створити"
+"update" = "Оновити"
+"modifyInbound" = "Змінити вхідний"
+"deleteInbound" = "Видалити вхідні"
+"deleteInboundContent" = "Ви впевнені, що хочете видалити вхідні?"
+"deleteClient" = "Видалити клієнта"
+"deleteClientContent" = "Ви впевнені, що хочете видалити клієнт?"
+"resetTrafficContent" = "Ви впевнені, що хочете скинути трафік?"
+"copyLink" = "Копіювати URL"
+"address" = "Адреса"
+"network" = "Мережа"
+"destinationPort" = "Порт призначення"
+"targetAddress" = "Цільова адреса"
+"monitorDesc" = "Залиште порожнім, щоб слухати всі IP-адреси"
+"meansNoLimit" = " = Необмежено. (одиниця: ГБ)"
+"totalFlow" = "Загальна витрата"
+"leaveBlankToNeverExpire" = "Залиште порожнім, щоб ніколи не закінчувався"
+"noRecommendKeepDefault" = "Рекомендується зберегти значення за замовчуванням"
+"certificatePath" = "Шлях до файлу"
+"certificateContent" = "Вміст файлу"
+"publicKey" = "Публічний ключ"
+"privatekey" = "Закритий ключ"
+"clickOnQRcode" = "Натисніть QR-код, щоб скопіювати"
+"client" = "Клієнт"
+"export" = "Експортувати всі URL-адреси"
+"clone" = "Клон"
+"cloneInbound" = "Клонувати"
+"cloneInboundContent" = "Усі налаштування цього вхідного потоку, крім порту, IP-адреси прослуховування та клієнтів, будуть застосовані до клону."
+"cloneInboundOk" = "Клонувати"
+"resetAllTraffic" = "Скинути весь вхідний трафік"
+"resetAllTrafficTitle" = "Скинути весь вхідний трафік"
+"resetAllTrafficContent" = "Ви впевнені, що бажаєте скинути трафік усіх вхідних?"
+"resetInboundClientTraffics" = "Скинути трафік клієнтів"
+"resetInboundClientTrafficTitle" = "Скинути трафік клієнтів"
+"resetInboundClientTrafficContent" = "Ви впевнені, що бажаєте скинути трафік клієнтів цього вхідного потоку?"
+"resetAllClientTraffics" = "Скинути весь трафік клієнтів"
+"resetAllClientTrafficTitle" = "Скинути весь трафік клієнтів"
+"resetAllClientTrafficContent" = "Ви впевнені, що бажаєте скинути трафік усіх клієнтів?"
+"delDepletedClients" = "Видалити вичерпані клієнти"
+"delDepletedClientsTitle" = "Видалити вичерпані клієнти"
+"delDepletedClientsContent" = "Ви впевнені, що хочете видалити всі вичерпані клієнти?"
+"email" = "Електронна пошта"
+"emailDesc" = "Будь ласка, надайте унікальну адресу електронної пошти."
+"IPLimit" = "Обмеження IP"
+"IPLimitDesc" = "Вимикає вхідний, якщо кількість перевищує встановлене значення. (0 = вимкнено)"
+"IPLimitlog" = "Журнал IP"
+"IPLimitlogDesc" = "Журнал історії IP-адрес. (щоб увімкнути вхідну після вимкнення, очистіть журнал)"
+"IPLimitlogclear" = "Очистити журнал"
+"setDefaultCert" = "Установити сертифікат з панелі"
+"xtlsDesc" = "Xray має бути v1.7.5"
+"realityDesc" = "Xray має бути v1.8.0+"
+"telegramDesc" = "Будь ласка, надайте ідентифікатори Telegram або чату без використання '@'. (отримайте його тут @userinfobot) або (використайте команду  '/id' у боті)"
+"subscriptionDesc" = "Щоб знайти URL-адресу вашої підписки, перейдіть до «Деталі». Крім того, ви можете використовувати одне ім'я для кількох клієнтів."
+"info" = "Інформація"
+"same" = "Те саме"
+"inboundData" = "Вхідні дані"
+"exportInbound" = "Експортувати вхідні"
+"import" = "Імпорт"
+"importInbound" = "Імпортувати вхідний"
+
+[pages.client]
+"add" = "Додати клієнта"
+"edit" = "Редагувати клієнта"
+"submitAdd" = "Додати клієнта"
+"submitEdit" = "Зберегти зміни"
+"clientCount" = "Кількість клієнтів"
+"bulk" = "Додати групу"
+"method" = "Метод"
+"first" = "Перший"
+"last" = "Останній"
+"prefix" = "Префікс"
+"postfix" = "Постфікс"
+"delayedStart" = "Початок використання"
+"expireDays" = "Тривалість"
+"days" = "Дні(в)"
+"renew" = "Автоматичне оновлення"
+"renewDesc" = "Автоматичне поновлення після закінчення терміну дії. (0 = вимкнено)(одиниця: день)"
+
+[pages.inbounds.toasts]
+"obtain" = "Отримати"
+
+[pages.inbounds.stream.general]
+"request" = "Запит"
+"response" = "Відповідь"
+"name" = "Ім'я"
+"value" = "Значення"
+
+[pages.inbounds.stream.tcp]
+"version" = "Версія"
+"method" = "Метод"
+"path" = "Шлях"
+"status" = "Статус"
+"statusDescription" = "Опис стану"
+"requestHeader" = "Заголовок запиту"
+"responseHeader" = "Заголовок відповіді"
+
+[pages.inbounds.stream.quic]
+"encryption" = "Шифрування"
+
+[pages.settings]
+"title" = "Параметри панелі"
+"save" = "Зберегти"
+"infoDesc" = "Кожна внесена тут зміна повинна бути збережена. Перезапустіть панель, щоб застосувати зміни."
+"restartPanel" = "Перезапустити панель"
+"restartPanelDesc" = "Ви впевнені, що бажаєте перезапустити панель? Якщо ви не можете отримати доступ до панелі після перезапуску, будь ласка, перегляньте інформацію журналу панелі на сервері."
+"actions" = "Дії"
+"resetDefaultConfig" = "Відновити значення за замовчуванням"
+"panelSettings" = "Загальні"
+"securitySettings" = "Автентифікація"
+"TGBotSettings" = "Telegram Бот"
+"panelListeningIP" = "Слухати IP"
+"panelListeningIPDesc" = "IP-адреса для веб-панелі. (залиште порожнім, щоб слухати всі IP-адреси)"
+"panelListeningDomain" = "Домен прослуховування"
+"panelListeningDomainDesc" = "Доменне ім'я для веб-панелі. (залиште порожнім, щоб слухати всі домени та IP-адреси)"
+"panelPort" = "Порт прослуховування"
+"panelPortDesc" = "Номер порту для веб-панелі. (має бути невикористаний порт)"
+"publicKeyPath" = "Шлях відкритого ключа"
+"publicKeyPathDesc" = "Шлях до файлу відкритого ключа для веб-панелі. (починається з ‘/‘)"
+"privateKeyPath" = "Шлях приватного ключа"
+"privateKeyPathDesc" = "Шлях до файлу приватного ключа для веб-панелі. (починається з ‘/‘)"
+"panelUrlPath" = "Шлях URL"
+"panelUrlPathDesc" = "Шлях URL для веб-панелі. (починається з ‘/‘ і закінчується ‘/‘)"
+"pageSize" = "Розмір сторінки"
+"pageSizeDesc" = "Визначити розмір сторінки для вхідної таблиці. (0 = вимкнено)"
+"remarkModel" = "Модель зауваження та роздільний символ"
+"datepicker" = "Тип календаря"
+"datepickerPlaceholder" = "Виберіть дату"
+"datepickerDescription" = "Заплановані завдання виконуватимуться на основі цього календаря."
+"sampleRemark" = "Зразок зауваження"
+"oldUsername" = "Поточне ім'я користувача"
+"currentPassword" = "Поточний пароль"
+"newUsername" = "Нове ім'я користувача"
+"newPassword" = "Новий пароль"
+"telegramBotEnable" = "Увімкнути Telegram Bot"
+"telegramBotEnableDesc" = "Вмикає бота Telegram."
+"telegramToken" = "Telegram Токен"
+"telegramTokenDesc" = "Токен бота Telegram, отриманий від '@BotFather'."
+"telegramProxy" = "SOCKS Проксі"
+"telegramProxyDesc" = "Вмикає проксі-сервер SOCKS5 для підключення до Telegram. (відкоригуйте параметри відповідно до посібника)"
+"telegramChatId" = "Ідентифікатор чату адміністратора"
+"telegramChatIdDesc" = "Ідентифікатори чату адміністратора Telegram. (розділені комами) (отримайте тут @userinfobot) або (використовуйте команду '/id' у боті)"
+"telegramNotifyTime" = "Час сповіщення"
+"telegramNotifyTimeDesc" = "Час повідомлення бота Telegram, встановлений для періодичних звітів. (використовуйте формат часу crontab)"
+"tgNotifyBackup" = "Резервне копіювання бази даних"
+"tgNotifyBackupDesc" = "Надіслати файл резервної копії бази даних зі звітом."
+"tgNotifyLogin" = "Сповіщення про вхід"
+"tgNotifyLoginDesc" = "Отримувати сповіщення про ім'я користувача, IP-адресу та час щоразу, коли хтось намагається увійти у вашу веб-панель."
+"sessionMaxAge" = "Тривалість сеансу"
+"sessionMaxAgeDesc" = "Тривалість, протягом якої ви можете залишатися в системі. (одиниця: хвилина)"
+"expireTimeDiff" = "Повідомлення про дату закінчення"
+"expireTimeDiffDesc" = "Отримувати сповіщення про термін дії при досягненні цього порогу. (одиниця: день)"
+"trafficDiff" = "Повідомлення про обмеження трафіку"
+"trafficDiffDesc" = "Отримувати сповіщення про обмеження трафіку при досягненні цього порогу. (одиниця: ГБ)"
+"tgNotifyCpu" = "Сповіщення про завантаження ЦП"
+"tgNotifyCpuDesc" = "Отримувати сповіщення, якщо навантаження ЦП перевищує це порогове значення. (одиниця: %)"
+"timeZone" = "Часовий пояс"
+"timeZoneDesc" = "Заплановані завдання виконуватимуться на основі цього часового поясу."
+"subSettings" = "Підписка"
+"subEnable" = "Увімкнути службу підписки"
+"subEnableDesc" = "Вмикає службу підписки."
+"subListen" = "Слухати IP"
+"subListenDesc" = "IP-адреса для служби підписки. (залиште порожнім, щоб слухати всі IP-адреси)"
+"subPort" = "Слухати порт"
+"subPortDesc" = "Номер порту для служби підписки. (має бути невикористаний порт)"
+"subCertPath" = "Шлях відкритого ключа"
+"subCertPathDesc" = "Шлях до файлу відкритого ключа для служби підписки. (починається з ‘/‘)"
+"subKeyPath" = "Шлях приватного ключа"
+"subKeyPathDesc" = "Шлях до файлу приватного ключа для служби підписки. (починається з ‘/‘)"
+"subPath" = "Шлях URI"
+"subPathDesc" = "Шлях URI для служби підписки. (починається з ‘/‘ і закінчується ‘/‘)"
+"subDomain" = "Домен прослуховування"
+"subDomainDesc" = "Ім'я домену для служби підписки. (залиште порожнім, щоб слухати всі домени та IP-адреси)"
+"subUpdates" = "Інтервали оновлення"
+"subUpdatesDesc" = "Інтервали оновлення URL-адреси підписки в клієнтських програмах. (одиниця: година)"
+"subEncrypt" = "Закодувати"
+"subEncryptDesc" = "Повернений вміст послуги підписки матиме кодування Base64."
+"subShowInfo" = "Показати інформацію про використання"
+"subShowInfoDesc" = "Залишок трафіку та дата відображатимуться в клієнтських програмах."
+"subURI" = "URI зворотного проксі"
+"subURIDesc" = "URI до URL-адреси підписки для використання за проксі."
+"fragment" = "Фрагментація"
+"fragmentDesc" = "Увімкнути фрагментацію для пакету привітання TLS"
+
+[pages.xray]
+"title" = "Xray конфігурації"
+"save" = "Зберегти"
+"restart" = "Перезапустити Xray"
+"basicTemplate" = "Базовий шаблон"
+"advancedTemplate" = "Додатково"
+"generalConfigs" = "Загальні конфігурації"
+"generalConfigsDesc" = "Ці параметри визначатимуть загальні налаштування."
+"logConfigs" = "Журнал"
+"logConfigsDesc" = "Журнали можуть вплинути на ефективність вашого сервера. Рекомендується вмикати його з розумом лише у випадку ваших потреб"
+"blockConfigs" = "Захисний екран"
+"blockConfigsDesc" = "Ці параметри блокуватимуть трафік на основі конкретних запитуваних протоколів і веб-сайтів."
+"blockCountryConfigs" = "Заблокувати країну"
+"blockCountryConfigsDesc" = "Ці параметри блокуватимуть трафік на основі конкретної запитуваної країни."
+"directCountryConfigs" = "Пряма країна"
+"directCountryConfigsDesc" = "Пряме підключення забезпечує, що конкретний трафік не маршрутизується через інший сервер."
+"ipv4Configs" = "Маршрутизація IPv4"
+"ipv4ConfigsDesc" = "Ці параметри спрямовуватимуть трафік на основі певного призначення через IPv4."
+"warpConfigs" = "WARP маршрутизація"
+"warpConfigsDesc" = "Ці параметри маршрутизуватимуть трафік на основі певного пункту призначення через WARP."
+"Template" = "Шаблон розширеної конфігурації Xray"
+"TemplateDesc" = "Остаточний конфігураційний файл Xray буде створено на основі цього шаблону."
+"FreedomStrategy" = "Стратегія протоколу свободи"
+"FreedomStrategyDesc" = "Установити стратегію виведення для мережі в протоколі свободи."
+"RoutingStrategy" = "Загальна стратегія маршрутизації"
+"RoutingStrategyDesc" = "Установити загальну стратегію маршрутизації трафіку для вирішення всіх запитів."
+"Torrent" = "Блокувати протокол BitTorrent"
+"TorrentDesc" = "Блокує протокол BitTorrent."
+"PrivateIp" = "Блокувати підключення до приватних IP-адрес"
+"PrivateIpDesc" = "Блокує встановлення підключень до приватних діапазонів IP."
+"Ads" = "Блокувати рекламу"
+"AdsDesc" = "Блокує рекламні веб-сайти."
+"Family" = "Захист сім'ї"
+"FamilyDesc" = "Блокує вміст для дорослих і веб-сайти з шкідливими програмами."
+"Security" = "Щит безпеки"
+"SecurityDesc" = "Блокує веб-сайти шкідливого програмного забезпечення, фішингу та майнерів."
+"Speedtest" = "Заблокувати Speedtest"
+"SpeedtestDesc" = "Блокує підключення до веб-сайтів для тестування швидкості."
+"IRIp" = "Блокувати підключення до IP-адрес Ірану"
+"IRIpDesc" = "Блокує встановлення з'єднань з діапазонами IP Ірану."
+"IRDomain" = "Блокувати підключення до доменів Ірану"
+"IRDomainDesc" = "Блокує встановлення з'єднань з доменами Ірану."
+"ChinaIp" = "Блокувати підключення до IP-адрес Китаю"
+"ChinaIpDesc" = "Блокує встановлення з'єднань із діапазонами IP-адрес Китаю."
+"ChinaDomain" = "Блокувати підключення до китайських доменів"
+"ChinaDomainDesc" = "Блокує встановлення підключень до доменів Китаю."
+"RussiaIp" = "Блокувати підключення до російських IP-адрес"
+"RussiaIpDesc" = "Блокує встановлення з'єднань з діапазонами IP-адрес Росії."
+"RussiaDomain" = "Блокувати підключення до російських доменів"
+"RussiaDomainDesc" = "Блокує встановлення з'єднань з російськими доменами."
+"VNIp" = "Блокувати підключення до IP-адрес В'єтнаму"
+"VNIpDesc" = "Блокує встановлення з'єднань із діапазонами IP-адрес В'єтнаму."
+"VNDomain" = "Блокувати підключення до доменів В'єтнаму"
+"VNDomainDesc" = "Блокує встановлення з'єднань із доменами В'єтнаму."
+"DirectIRIp" = "Пряме підключення до IP-адрес Ірану"
+"DirectIRIpDesc" = "Безпосередньо встановлює з'єднання з діапазонами IP Ірану."
+"DirectIRDomain" = "Пряме підключення до доменів Ірану"
+"DirectIRDomainDesc" = "Безпосередньо встановлює підключення до доменів Ірану."
+"DirectChinaIp" = "Пряме підключення до китайських IP-адрес"
+"DirectChinaIpDesc" = "Безпосередньо встановлює підключення до IP-діапазонів Китаю."
+"DirectChinaDomain" = "Пряме підключення до китайських доменів"
+"DirectChinaDomainDesc" = "Безпосередньо встановлює підключення до доменів Китаю."
+"DirectRussiaIp" = "Пряме підключення до IP-адрес Росії"
+"DirectRussiaIpDesc" = "Безпосередньо встановлює з'єднання з діапазонами IP-адрес Росії."
+"DirectRussiaDomain" = "Пряме підключення до російських доменів"
+"DirectRussiaDomainDesc" = "Безпосередньо встановлює підключення до російських доменів."
+"DirectVNIp" = "Пряме підключення до IP-адрес В'єтнаму"
+"DirectVNIpDesc" = "Безпосередньо встановлює з'єднання з діапазонами IP-адрес В'єтнаму."
+"DirectVNDomain" = "Пряме підключення до доменів В'єтнаму"
+"DirectVNDomainDesc" = "Безпосередньо встановлює з'єднання з доменами В'єтнаму."
+"GoogleIPv4" = "Google"
+"GoogleIPv4Desc" = "Направляє трафік до Google через IPv4."
+"NetflixIPv4" = "Netflix"
+"NetflixIPv4Desc" = "Направляє трафік до Netflix через IPv4."
+"GoogleWARP" = "Google"
+"GoogleWARPDesc" = "Додати маршрутизацію для Google через WARP."
+"OpenAIWARP" = "ChatGPT"
+"OpenAIWARPDesc" = "Направляє трафік до ChatGPT через WARP."
+"NetflixWARP" = "Netflix"
+"NetflixWARPDesc" = "Направляє трафік до Netflix через WARP."
+"MetaWARP" = "Meta"
+"MetaWARPDesc" = "Направляє трафік до Meta (Instagram, Facebook, WhatsApp, Threads,...) через WARP."
+"AppleWARP" = "Apple"
+"AppleWARPDesc" = "Направляє трафік до Apple через WARP."
+"RedditWARP" = "Reddit"
+"RedditWARPDesc" = "Направляє трафік до Reddit через WARP."
+"SpotifyWARP" = "Spotify"
+"SpotifyWARPDesc" = "Направляє трафік до Spotify через WARP."
+"IRWARP" = "Іранські домени"
+"IRWARPDesc" = "Направляє трафік до доменів Ірану через WARP"
+"Inbounds" = "Вхідні"
+"InboundsDesc" = "Прийняття певних клієнтів."
+"Outbounds" = "Вихід"
+"Balancers" = "Балансери"
+"OutboundsDesc" = "Встановити шлях вихідного трафіку."
+"Routings" = "Правила маршрутизації"
+"RoutingsDesc" = "Пріоритет кожного правила важливий!"
+"completeTemplate" = "Усі"
+"logLevel" = "Рівень журналу"
+"logLevelDesc" = "Рівень журналу для журналів помилок із зазначенням інформації, яку потрібно записати."
+"accessLog" = "Журнал доступу"
+"accessLogDesc" = "Шлях до файлу журналу доступу. Спеціальне значення 'none' вимикає журнали доступу"
+"errorLog" = "Журнал помилок"
+"errorLogDesc" = "Шлях до файлу журналу помилок. Спеціальне значення 'none' вимикає журнали помилок"
+
+[pages.xray.rules]
+"first" = "Перший"
+"last" = "Останній"
+"up" = "Вгору"
+"down" = "Вниз"
+"source" = "Джерело"
+"dest" = "Пункт призначення"
+"inbound" = "Вхідний"
+"outbound" = "Вихідний"
+"balancer" = "Балансувальник"
+"info" = "Інформація"
+"add" = "Додати правило"
+"edit" = "Редагувати правило"
+"useComma" = "Елементи, розділені комами"
+
+[pages.xray.outbound]
+"addOutbound" = "Додати вихідний"
+"addReverse" = "Додати реверс"
+"editOutbound" = "Редагувати вихідні"
+"editReverse" = "Редагувати реверс"
+"tag" = "Тег"
+"tagDesc" = "Унікальний тег"
+"address" = "Адреса"
+"reverse" = "Зворотний"
+"domain" = "Домен"
+"type" = "Тип"
+"bridge" = "Міст"
+"portal" = "Портал"
+"intercon" = "Взаємозв'язок"
+
+[pages.xray.balancer]
+"addBalancer" = "Додати балансир"
+"editBalancer" = "Редагувати балансир"
+"balancerStrategy" = "Стратегія"
+"balancerSelectors" = "Селектори"
+"tag" = "Тег"
+"tagDesc" = "Унікальний тег"
+"balancerDesc" = "Неможливо використовувати balancerTag і outboundTag одночасно. Якщо використовувати одночасно, працюватиме лише outboundTag."
+
+[pages.xray.wireguard]
+"secretKey" = "Приватний ключ"
+"publicKey" = "Публічний ключ"
+"allowedIPs" = "Дозволені IP-адреси"
+"endpoint" = "Кінцева точка"
+"psk" = "Спільний ключ"
+"domainStrategy" = "Стратегія домену"
+
+[pages.xray.dns]
+"enable" = "Увімкнути DNS"
+"enableDesc" = "Увімкнути вбудований DNS-сервер"
+"tag" = "Мітка вхідного DNS"
+"tagDesc" = "Ця мітка буде доступна як вхідна мітка в правилах маршрутизації."
+"strategy" = "Стратегія запиту"
+"strategyDesc" = "Загальна стратегія вирішення доменних імен"
+"add" = "Додати сервер"
+"edit" = "Редагувати сервер"
+"domains" = "Домени"
+
+[pages.xray.fakedns]
+"add" = "Додати підроблений DNS"
+"edit" = "Редагувати підроблений DNS"
+"ipPool" = "Підмережа IP-пулу"
+"poolSize" = "Розмір пулу"
+
+[pages.settings.security]
+"admin" = "Адміністратор"
+"secret" = "Секретний маркер"
+"loginSecurity" = "Безпечний вхід"
+"loginSecurityDesc" = "Додає додатковий рівень автентифікації для забезпечення більшої безпеки."
+"secretToken" = "Секретний маркер"
+"secretTokenDesc" = "Будь ласка, надійно зберігайте цей маркер у безпечному місці. Цей маркер потрібен для входу, і його неможливо відновити."
+
+[pages.settings.toasts]
+"modifySettings" = "Змінити налаштування"
+"getSettings" = "Отримати налаштування"
+"modifyUser" = "Змінити адміністратора"
+"originalUserPassIncorrect" = "Поточне ім'я користувача або пароль недійсні"
+"userPassMustBeNotEmpty" = "Нове ім'я користувача та пароль порожні"
+
+[tgbot]
+"keyboardClosed" = "❌ Спеціальна клавіатура закрита!"
+"noResult" = "❗ Немає результату!"
+"noQuery" = "❌ Запит не знайдено! Скористайтеся командою ще раз!"
+"wentWrong" = "❌ Щось пішло не так!"
+"noIpRecord" = "❗ Немає IP-запису!"
+"noInbounds" = "❗ Вхідних не знайдено!"
+"unlimited" = "♾ Необмежений (скинути)"
+"add" = "Додати"
+"month" = "Місяць"
+"months" = "Місяці"
+"day" = "День"
+"days" = "Дні"
+"hours" = "Годинник"
+"unknown" = "Невідомо"
+"inbounds" = "Вхідні"
+"clients" = "Клієнти"
+"offline" = "🔴 Офлайн"
+"online" = "🟢 Онлайн"
+
+[tgbot.commands]
+"unknown" = "❗ Невідома команда."
+"pleaseChoose" = "👇 Будь ласка, виберіть:\r\n"
+"help" = "🤖 Ласкаво просимо до цього бота! Він розроблений, щоб надавати певні дані з веб-панелі та дозволяє вносити зміни за потреби.\r\n\r\n"
+"start" = "👋 Привіт <i>{{ .Firstname }}</i>.\r\n"
+"welcome" = "🤖 Ласкаво просимо до <b>{{ .Hostname }}</b> бота керування.\r\n"
+"status" = "✅ Бот в порядку!"
+"usage" = "❗ Введіть текст для пошуку!"
+"getID" = "🆔 Ваш ідентифікатор: <code>{{ .ID }}</code>"
+"helpAdminCommands" = "Для пошуку електронної пошти клієнта:\r\n<code>/usage [Email]</code>\r\n\r\nДля пошуку вхідних листів (зі статистикою клієнта):\r\n<code>/inbound [Примітка]</code>"
+"helpClientCommands" = "Для пошуку статистики скористайтеся такою командою:\r\n\r\n<code>/usage [Email]</code>"
+
+[tgbot.messages]
+"cpuThreshold" = "🔴 Навантаження ЦП  {{ .Percent }}% перевищує порогове значення {{ .Threshold }}%"
+"selectUserFailed" = "❌ Помилка під час вибору користувача!"
+"userSaved" = "✅ Користувача Telegram збережено."
+"loginSuccess" = "✅ Успішно ввійшли в панель\r\n"
+"loginFailed" = "❗️ Помилка входу в панель.\r\n"
+"report" = "🕰 Заплановані звіти: {{ .RunTime }}\r\n"
+"datetime" = "⏰ Дата й час: {{ .DateTime }}\r\n"
+"hostname" = "💻 Хост: {{ .Hostname }}\r\n"
+"version" = "🚀 3X-UI Версія: {{ .Version }}\r\n"
+"ipv6" = "🌐 IPv6: {{ .IPv6 }}\r\n"
+"ipv4" = "🌐 IPv4: {{ .IPv4 }}\r\n"
+"ip" = "🌐 IP: {{ .IP }}\r\n"
+"ips" = "🔢 IP-адреси:\r\n{{ .IPs }}\r\n"
+"serverUpTime" = "⏳ Час роботи: {{ .UpTime }} {{ .Unit }}\r\n"
+"serverLoad" = "📈 Завантаження системи: {{ .Load1 }}, {{ .Load2 }}, {{ .Load3 }}\r\n"
+"serverMemory" = "📋 RAM: {{ .Current }}/{{ .Total }}\r\n"
+"tcpCount" = "🔹 TCP: {{ .Count }}\r\n"
+"udpCount" = "🔸 UDP: {{ .Count }}\r\n"
+"traffic" = "🚦 Трафік: {{ .Total }} (↑{{ .Upload }},↓{{ .Download }})\r\n"
+"xrayStatus" = "ℹ️ Статус: {{ .State }}\r\n"
+"username" = "👤 Ім'я користувача: {{ .Username }}\r\n"
+"time" = "⏰ Час: {{ .Time }}\r\n"
+"inbound" = "📍 Inbound: {{ .Remark }}\r\n"
+"port" = "🔌 Порт: {{ .Port }}\r\n"
+"expire" = "📅 Дата закінчення: {{ .Time }}\r\n"
+"expireIn" = "📅 Термін дії: {{ .Time }}\r\n"
+"active" = "💡 Активний: {{ .Enable }}\r\n"
+"enabled" = "🚨 Увімкнено: {{ .Enable }}\r\n"
+"online" = "🌐 Стан підключення: {{ .Status }}\r\n"
+"email" = "📧 Електронна пошта: {{ .Email }}\r\n"
+"upload" = "🔼 Upload: ↑{{ .Upload }}\r\n"
+"download" = "🔽 Download: ↓{{ .Download }}\r\n"
+"total" = "📊 Всього: ↑↓{{ .UpDown }} / {{ .Total }}\r\n"
+"TGUser" = "👤 Користувач Telegram: {{ .TelegramID }}\r\n"
+"exhaustedMsg" = "🚨 Вичерпано {{ .Type }}:\r\n"
+"exhaustedCount" = "🚨 Вичерпано кількість {{ .Type }} count:\r\n"
+"onlinesCount" = "🌐 Онлайн-клієнти: {{ .Count }}\r\n"
+"disabled" = "🛑 Вимкнено: {{ .Disabled }}\r\n"
+"depleteSoon" = "🔜 Скоро вичерпається: {{ .Deplete }}\r\n\r\n"
+"backupTime" = "🗄 Час резервного копіювання: {{ .Time }}\r\n"
+"refreshedOn" = "\r\n📋🔄 Оновлено: {{ .Time }}\r\n\r\n"
+"yes" = "✅ Так"
+"no" = "❌ Ні"
+
+[tgbot.buttons]
+"closeKeyboard" = "❌ Закрити клавіатуру"
+"cancel" = "❌ Скасувати"
+"cancelReset" = "❌ Скасувати скидання"
+"cancelIpLimit" = "❌ Скасувати обмеження IP"
+"confirmResetTraffic" = "✅ Підтвердити скидання трафіку?"
+"confirmClearIps" = "✅ Підтвердити очищення IP-адрес?"
+"confirmRemoveTGUser" = "✅ Підтвердити видалення користувача Telegram?"
+"confirmToggle" = "✅ Підтвердити ввімкнути/вимкнути користувача?"
+"dbBackup" = "Отримати резервну копію БД"
+"serverUsage" = "Використання сервера"
+"getInbounds" = "Отримати вхідні"
+"depleteSoon" = "Скоро вичерпати"
+"clientUsage" = "Отримати використання"
+"onlines" = "Онлайн-клієнти"
+"commands" = "Команди"
+"refresh" = "🔄 Оновити"
+"clearIPs" = "❌ Очистити IP-адреси"
+"removeTGUser" = "❌ Видалити користувача Telegram"
+"selectTGUser" = "👤 Виберіть користувача Telegram"
+"selectOneTGUser" = "👤 Виберіть користувача Telegram:"
+"resetTraffic" = "📈 Скинути трафік"
+"resetExpire" = "📅 Змінити термін дії"
+"ipLog" = "🔢 IP журнал"
+"ipLimit" = "🔢 IP Ліміт"
+"setTGUser" = "👤 Встановити користувача Telegram"
+"toggle" = "🔘 Увімкнути / Вимкнути"
+"custom" = "🔢 Custom"
+"confirmNumber" = "✅ Підтвердити: {{ .Num }}"
+"confirmNumberAdd" = "✅ Підтвердити додавання: {{ .Num }}"
+"limitTraffic" = "🚧 Ліміт трафіку"
+"getBanLogs" = "Отримати журнали заборон"
+
+[tgbot.answers]
+"successfulOperation" = "✅ Операція успішна!"
+"errorOperation" = "❗ Помилка в роботі."
+"getInboundsFailed" = "❌ Не вдалося отримати вхідні повідомлення."
+"canceled" = "❌ {{ .Email }}: Операцію скасовано."
+"clientRefreshSuccess" = "✅ {{ .Email }}: Клієнт успішно оновлено."
+"IpRefreshSuccess" = "✅ {{ .Email }}: IP-адреси успішно оновлено."
+"TGIdRefreshSuccess" = "✅ {{ .Email }}: Користувач Telegram клієнта успішно оновлено."
+"resetTrafficSuccess" = "✅ {{ .Email }}: Трафік скинуто успішно."
+"setTrafficLimitSuccess" = "✅ {{ .Email }}: Ліміт трафіку успішно збережено."
+"expireResetSuccess" = "✅ {{ .Email }}: Успішно скинуто дні закінчення терміну дії."
+"resetIpSuccess" = "✅ {{ .Email }}: IP обмеження {{ .Count }} успішно збережено."
+"clearIpSuccess" = "✅ {{ .Email }}: IP успішно очищено."
+"getIpLog" = "✅ {{ .Email }}: Отримати IP-журнал."
+"getUserInfo" = "✅ {{ .Email }}: Отримати інформацію про користувача Telegram."
+"removedTGUserSuccess" = "✅ {{ .Email }}: Користувача Telegram видалено успішно."
+"enableSuccess" = "✅ {{ .Email }}: Увімкнути успішно."
+"disableSuccess" = "✅ {{ .Email }}: Успішно вимкнено."
+"askToAddUserId" = "Вашу конфігурацію не знайдено!\r\nБудь ласка, попросіть свого адміністратора використовувати ваш ідентифікатор Telegram у вашій конфігурації.\r\n\r\nВаш ідентифікатор користувача: <code>{{ .TgUserID }}</code>"
--- a/web/translation/translate.vi_VN.toml
+++ b/web/translation/translate.vi_VN.toml
@@ -42,7 +42,7 @@
 "online" = "Trực tuyến"
 "domainName" = "Tên miền"
 "monitor" = "Listening IP"
-"certificate" = "Chứng chỉ"
+"certificate" = "Chứng chỉ số"
 "fail" = "Thất bại"
 "success" = "Thành công"
 "getVersion" = "Lấy phiên bản"
@@ -54,7 +54,12 @@
 "security" = "Bảo vệ"
 "secAlertTitle" = "Cảnh báo an ninh-Tiếng Việt by Ohoang7"
 "secAlertSsl" = "Kết nối này không an toàn; Vui lòng không nhập thông tin nhạy cảm cho đến khi TLS được kích hoạt để bảo vệ dữ liệu của Bạn"
-"secAlertConf" = "Một số cấu hình nhất định đã được xác định là dễ bị tấn công, thúc đẩy hành động ngay lập tức để củng cố các giao thức bảo mật và bảo vệ chống lại các vi phạm bảo mật tiềm ẩn."
+"secAlertConf" = "Một số cài đặt có thể dễ bị tấn công. Đề xuất tăng cường các giao thức bảo mật để ngăn chặn các vi phạm tiềm ẩn."
+"secAlertSSL" = "Bảng điều khiển thiếu kết nối an toàn. Vui lòng cài đặt chứng chỉ TLS để bảo vệ dữ liệu."
+"secAlertPanelPort" = "Cổng mặc định của bảng điều khiển có thể dễ bị tấn công. Vui lòng cấu hình một cổng ngẫu nhiên hoặc cụ thể."
+"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."

 [menu]
 "dashboard" = "Trạng thái hệ thống"
@@ -65,6 +70,7 @@
 "link" = "Quản lý"

 [pages.login]
+"hello" = "Xin chào"
 "title" = "Chào mừng"
 "loginAgain" = "Thời hạn đăng nhập đã hết. Vui lòng đăng nhập lại."

@@ -143,10 +149,8 @@
 "noRecommendKeepDefault" = "Không yêu cầu đặc biệt để giữ nguyên cài đặt mặc định"
 "certificatePath" = "Đường dẫn tập"
 "certificateContent" = "Nội dung tập"
-"publicKeyPath" = "Đường dẫn khóa công khai"
-"publicKeyContent" = "Nội dung khóa công khai"
-"keyPath" = "Đường dẫn khóa riêng tư"
-"keyContent" = "Nội dung khóa riêng tư"
+"publicKey" = "Khóa công khai"
+"privatekey" = "Khóa cá nhân"
 "clickOnQRcode" = "Nhấn vào Mã QR để sao chép"
 "client" = "Người dùng"
 "export" = "Xuất liên kết"
@@ -197,7 +201,7 @@
 "last" = "Cuối cùng"
 "prefix" = "Tiền tố"
 "postfix" = "Hậu tố"
-"delayedStart" = "Bắt đầu sau khi sử dụng lần đầu"
+"delayedStart" = "Bắt đầu ở Lần Đầu"
 "expireDays" = "Khoảng thời gian"
 "days" = "ngày"
 "renew" = "Tự động gia hạn"
@@ -323,7 +327,7 @@
 "blockCountryConfigs" = "Cấu hình Chặn Quốc gia"
 "blockCountryConfigsDesc" = "Những tùy chọn này sẽ ngăn người dùng kết nối đến các tên miền quốc gia cụ thể."
 "directCountryConfigs" = "Cấu hình Kết nối Trực tiếp Quốc gia"
-"directCountryConfigsDesc" = "Những tùy chọn này sẽ kết nối người dùng trực tiếp đến các tên miền quốc gia cụ thể."
+"directCountryConfigsDesc" = "Một kết nối trực tiếp đảm bảo rằng lưu lượng cụ thể không được định tuyến qua một máy chủ khác."
 "ipv4Configs" = "Cấu hình IPv4"
 "ipv4ConfigsDesc" = "Những tùy chọn này sẽ chỉ định kết nối đến các tên miền mục tiêu qua IPv4."
 "warpConfigs" = "Cấu hình WARP"
@@ -463,6 +467,8 @@
 [pages.xray.dns]
 "enable" = "Kích hoạt DNS"
 "enableDesc" = "Kích hoạt máy chủ DNS tích hợp"
+"tag" = "Thẻ gửi đến DNS"
+"tagDesc" = "Thẻ này sẽ có sẵn dưới dạng thẻ Gửi đến trong quy tắc định tuyến."
 "strategy" = "Chiến lược truy vấn"
 "strategyDesc" = "Chiến lược tổng thể để phân giải tên miền"
 "add" = "Thêm máy chủ"
--- a/web/translation/translate.zh_Hans.toml
+++ b/web/translation/translate.zh_Hans.toml
@@ -42,19 +42,24 @@
 "online" = "在线"
 "domainName" = "域名"
 "monitor" = "监听"
-"certificate" = "证书"
+"certificate" = "数字证书"
 "fail" = "失败"
 "success" = "成功"
 "getVersion" = "获取版本"
 "install" = "安装"
 "clients" = "客户端"
-"usage" = "用法"
+"usage" = "使用情况"
 "secretToken" = "安全密钥"
 "remained" = "剩余"
 "security" = "安全"
 "secAlertTitle" = "安全警报"
-"secAlertSsl" = "此连接不安全；在激活 TLS 进行数据保护之前，请勿输入敏感信息"
-"secAlertConf" = "某些配置已被确定为容易受到攻击，促使立即采取行动以加强安全协议并防范潜在的安全漏洞。"
+"secAlertSsl" = "此连接不安全。在激活 TLS 进行数据保护之前，请勿输入敏感信息。"
+"secAlertConf" = "某些设置易受攻击。建议加强安全协议以防止潜在漏洞。"
+"secAlertSSL" = "面板缺少安全连接。请安装 TLS 证书以保护数据安全。"
+"secAlertPanelPort" = "面板默认端口存在安全风险。请配置随机端口或特定端口。"
+"secAlertPanelURI" = "面板默认 URI 路径不安全。请配置复杂的 URI 路径。"
+"secAlertSubURI" = "订阅默认 URI 路径不安全。请配置复杂的 URI 路径。"
+"secAlertSubJsonURI" = "订阅 JSON 默认 URI 路径不安全。请配置复杂的 URI 路径。"

 [menu]
 "dashboard" = "系统状态"
@@ -65,6 +70,7 @@
 "link" = "管理"

 [pages.login]
+"hello" = "你好"
 "title" = "欢迎"
 "loginAgain" = "登录时效已过，请重新登录"

@@ -78,33 +84,33 @@
 [pages.index]
 "title" = "系统状态"
 "memory" = "内存"
-"hard" = "硬盘"
+"hard" = "磁盘"
 "xrayStatus" = "Xray"
 "stopXray" = "停止"
 "restartXray" = "重启"
 "xraySwitch" = "版本"
-"xraySwitchClick" = "点击你想切换的版本"
-"xraySwitchClickDesk" = "请谨慎选择，旧版本可能配置不兼容"
+"xraySwitchClick" = "选择你要切换到的版本"
+"xraySwitchClickDesk" = "请谨慎选择，因为较旧版本可能与当前配置不兼容"
 "operationHours" = "系统正常运行时间"
 "systemLoad" = "系统负载"
 "systemLoadDesc" = "过去 1、5 和 15 分钟的系统平均负载"
-"connectionTcpCountDesc" = "所有网卡的总 TCP 连接数。"
-"connectionUdpCountDesc" = "所有网卡的总 UDP 连接数。"
+"connectionTcpCountDesc" = "系统中所有 TCP 连接数"
+"connectionUdpCountDesc" = "系统中所有 UDP 连接数"
 "connectionCount" = "连接数"
-"upSpeed" = "所有网卡的总上传速度"
-"downSpeed" = "所有网卡的总下载速度"
-"totalSent" = "系统启动以来所有网卡的总上传流量"
-"totalReceive" = "系统启动以来所有网卡的总下载流量"
-"xraySwitchVersionDialog" = "切换 xray 版本"
-"xraySwitchVersionDialogDesc" = "是否切换 xray 版本至"
-"dontRefresh" = "安装中，请不要刷新此页面"
+"upSpeed" = "总上传速度"
+"downSpeed" = "总下载速度"
+"totalSent" = "系统启动以来发送的总数据量"
+"totalReceive" = "系统启动以来接收的总数据量"
+"xraySwitchVersionDialog" = "切换 Xray 版本"
+"xraySwitchVersionDialogDesc" = "是否切换 Xray 版本至"
+"dontRefresh" = "安装中，请勿刷新此页面"
 "logs" = "日志"
 "config" = "配置"
-"backup" = "备份还原"
+"backup" = "备份和恢复"
 "backupTitle" = "备份和恢复数据库"
-"backupDescription" = "请记住在导入新数据库之前进行备份。"
-"exportDatabase" = "下载数据库"
-"importDatabase" = "上传数据库"
+"backupDescription" = "恢复数据库之前建议进行备份"
+"exportDatabase" = "备份"
+"importDatabase" = "恢复"

 [pages.inbounds]
 "title" = "入站列表"
@@ -127,96 +133,94 @@
 "update" = "修改"
 "modifyInbound" = "修改入站"
 "deleteInbound" = "删除入站"
-"deleteInboundContent" = "确定要删除入站吗?"
+"deleteInboundContent" = "确定要删除入站吗？"
 "deleteClient" = "删除客户端"
-"deleteClientContent" = "您确定要删除客户端吗?"
-"resetTrafficContent" = "确定要重置流量吗?"
+"deleteClientContent" = "确定要删除客户端吗？"
+"resetTrafficContent" = "确定要重置流量吗？"
 "copyLink" = "复制链接"
 "address" = "地址"
 "network" = "网络"
 "destinationPort" = "目标端口"
 "targetAddress" = "目标地址"
-"monitorDesc" = "默认留空即可"
+"monitorDesc" = "留空表示监听所有 IP"
 "meansNoLimit" = " = 无限制（单位：GB)"
 "totalFlow" = "总流量"
-"leaveBlankToNeverExpire" = "留空则永不到期"
-"noRecommendKeepDefault" = "没有特殊需求保持默认即可"
+"leaveBlankToNeverExpire" = "留空表示永不过期"
+"noRecommendKeepDefault" = "建议保留默认值"
 "certificatePath" = "文件路径"
 "certificateContent" = "文件内容"
-"publicKeyPath" = "公钥文件路径"
-"publicKeyContent" = "公钥内容"
-"keyPath" = "密钥文件路径"
-"keyContent" = "密钥内容"
+"publicKey" = "公钥"
+"privatekey" = "私钥"
 "clickOnQRcode" = "点击二维码复制"
 "client" = "客户"
 "export" = "导出链接"
 "clone" = "克隆"
 "cloneInbound" = "克隆"
-"cloneInboundContent" = "此入站的所有项目除 Port、Listening IP、Clients 将应用于克隆"
-"cloneInboundOk" = "从创建克隆"
+"cloneInboundContent" = "此入站规则除端口（Port）、监听 IP（Listening IP）和客户端（Clients）以外的所有配置都将应用于克隆"
+"cloneInboundOk" = "创建克隆"
 "resetAllTraffic" = "重置所有入站流量"
 "resetAllTrafficTitle" = "重置所有入站流量"
-"resetAllTrafficContent" = "您确定要重置所有入站流量吗？"
+"resetAllTrafficContent" = "确定要重置所有入站流量吗？"
 "resetInboundClientTraffics" = "重置客户端流量"
 "resetInboundClientTrafficTitle" = "重置所有客户端流量"
-"resetInboundClientTrafficContent" = "您确定要重置此入站客户端的所有流量吗？"
+"resetInboundClientTrafficContent" = "确定要重置此入站客户端的所有流量吗？"
 "resetAllClientTraffics" = "重置所有客户端流量"
 "resetAllClientTrafficTitle" = "重置所有客户端流量"
-"resetAllClientTrafficContent" = "你确定要重置所有客户端的所有流量吗？"
-"delDepletedClients" = "删除耗尽的客户端"
-"delDepletedClientsTitle" = "删除耗尽的客户端"
-"delDepletedClientsContent" = "你确定要删除所有耗尽的客户端吗？"
+"resetAllClientTrafficContent" = "确定要重置所有客户端的所有流量吗？"
+"delDepletedClients" = "删除流量耗尽的客户端"
+"delDepletedClientsTitle" = "删除流量耗尽的客户端"
+"delDepletedClientsContent" = "确定要删除所有流量耗尽的客户端吗？"
 "email" = "电子邮件"
 "emailDesc" = "电子邮件必须完全唯一"
-"IPLimit" = "IP限制"
-"IPLimitDesc" = "如果超过输入的计数则禁用入站（0 表示禁用限制 ip）"
-"IPLimitlog" = "IP日志"
-"IPLimitlogDesc" = "IP 历史日志 （通过IP限制禁用inbound之前，需要清空日志）"
+"IPLimit" = "IP 限制"
+"IPLimitDesc" = "如果数量超过设置值，则禁用入站流量。（0 = 禁用）"
+"IPLimitlog" = "IP 日志"
+"IPLimitlogDesc" = "IP 历史日志（要启用被禁用的入站流量，请清除日志）"
 "IPLimitlogclear" = "清除日志"
 "setDefaultCert" = "从面板设置证书"
-"xtlsDesc" = "Xray核心需要1.7.5"
-"realityDesc" = "Xray核心需要1.8.0及以上版本"
-"telegramDesc" = "仅使用聊天 ID（可以在 @userinfobot 处获取，或在机器人中使用'/id'命令）"
-"subscriptionDesc" = "您可以在详细信息上找到您的子链接，也可以对多个配置使用相同的名称"
+"xtlsDesc" = "Xray 核心需要 1.7.5"
+"realityDesc" = "Xray 核心需要 1.8.0 及以上版本"
+"telegramDesc" = "请输入电报 (Telegram) 或聊天 ID，无需添加 '@' 符号。（可通过 @userinfobot 获取，或在机器人中使用 '/id' 命令）"
+"subscriptionDesc" = "要找到你的订阅 URL，请导航到“详细信息”。此外，你可以为多个客户端使用相同的名称。"
 "info" = "信息"
 "same" = "相同"
 "inboundData" = "入站数据"
-"exportInbound" = "出口 入境"
+"exportInbound" = "导出入站规则"
 "import"="导入"
-"importInbound" = "导入入站"
+"importInbound" = "导入入站规则"

 [pages.client]
 "add" = "添加客户端"
 "edit" = "编辑客户端"
 "submitAdd" = "添加客户端"
 "submitEdit" = "保存修改"
-"clientCount" = "客户数量"
+"clientCount" = "客户端数量"
 "bulk" = "批量创建"
 "method" = "方法"
-"first" = "第一"
-"last" = "最后"
+"first" = "置顶"
+"last" = "置底"
 "prefix" = "前缀"
 "postfix" = "后缀"
 "delayedStart" = "首次使用后开始"
 "expireDays" = "期间"
 "days" = "天"
 "renew" = "自动续订"
-"renewDesc" = "到期后自动续订。(0 = 禁用)(单元: 天)"
+"renewDesc" = "到期后自动续订。(0 = 禁用)(单位: 天)"

 [pages.inbounds.toasts]
 "obtain" = "获取"

 [pages.inbounds.stream.general]
-"request" = "要求"
-"response" = "回复"
-"name" = "姓名"
-"value" = "价值"
+"request" = "请求"
+"response" = "响应"
+"name" = "名称"
+"value" = "值"

 [pages.inbounds.stream.tcp]
 "version" = "版本"
 "method" = "方法"
-"path" = "小路"
-"status" = "地位"
+"path" = "路径"
+"status" = "状态"
 "statusDescription" = "状态说明"
 "requestHeader" = "请求头"
 "responseHeader" = "响应头"
@@ -225,16 +229,16 @@
 "encryption" = "加密"

 [pages.settings]
-"title" = "设置"
-"save" = "保存配置"
+"title" = "面板设置"
+"save" = "保存"
 "infoDesc" = "此处的所有更改都需要保存并重启面板才能生效"
 "restartPanel" = "重启面板"
-"restartPanelDesc" = "确定要重启面板吗？点击确定将于 3 秒后重启，若重启后无法访问面板，请前往服务器查看面板日志信息"
-"actions" = "动作"
+"restartPanelDesc" = "确定要重启面板吗？若重启后无法访问面板，请前往服务器查看面板日志信息"
+"actions" = "操作"
 "resetDefaultConfig" = "重置为默认配置"
-"panelSettings" = "面板配置"
+"panelSettings" = "常规"
 "securitySettings" = "安全设定"
-"TGBotSettings" = "TG提醒相关设置"
+"TGBotSettings" = "Telegram 机器人配置"
 "panelListeningIP" = "面板监听 IP"
 "panelListeningIPDesc" = "默认留空监听所有 IP"
 "panelListeningDomain" = "面板监听域名"
@@ -258,171 +262,171 @@
 "currentPassword" = "原密码"
 "newUsername" = "新用户名"
 "newPassword" = "新密码"
-"telegramBotEnable" = "启用电报机器人"
-"telegramBotEnableDesc" = "重启面板生效"
-"telegramToken" = "电报机器人TOKEN"
-"telegramTokenDesc" = "重启面板生效"
-"telegramProxy" = "Socks5 代理"
-"telegramProxyDesc" = "如果您需要 Socks5 代理来连接 Telegram。 根据指南调整其设置。"
-"telegramChatId" = "以逗号分隔的多个 chatID 重启面板生效"
-"telegramChatIdDesc" = "多个聊天 ID 用逗号分隔。使用 @userinfobot 或在机器人中使用'/id'命令获取您的聊天 ID。"
-"telegramNotifyTime" = "电报机器人通知时间"
-"telegramNotifyTimeDesc" = "采用Crontab定时格式,重启面板生效"
+"telegramBotEnable" = "启用 Telegram 机器人"
+"telegramBotEnableDesc" = "启用 Telegram 机器人功能"
+"telegramToken" = "Telegram 机器人令牌（token）"
+"telegramTokenDesc" = "从 '@BotFather' 获取的 Telegram 机器人令牌"
+"telegramProxy" = "SOCKS5 Proxy"
+"telegramProxyDesc" = "启用 SOCKS5 代理连接到 Telegram（根据指南调整设置）"
+"telegramChatId" = "管理员聊天 ID"
+"telegramChatIdDesc" = "Telegram 管理员聊天 ID (多个以逗号分隔)（可通过 @userinfobot 获取，或在机器人中使用 '/id' 命令获取）"
+"telegramNotifyTime" = "通知时间"
+"telegramNotifyTimeDesc" = "设置周期性的 Telegram 机器人通知时间（使用 crontab 时间格式）"
 "tgNotifyBackup" = "数据库备份"
-"tgNotifyBackupDesc" = "正在发送数据库备份文件和报告通知"
+"tgNotifyBackupDesc" = "发送带有报告的数据库备份文件"
 "tgNotifyLogin" = "登录通知"
-"tgNotifyLoginDesc" = "当有人试图登录您的面板时显示用户名、IP 地址和时间"
-"sessionMaxAge" = "会话最大年龄"
-"sessionMaxAgeDesc" = "您可以保持登录状态的时间（单位：分钟）"
-"expireTimeDiff" = "耗尽时间阈值"
-"expireTimeDiffDesc" = "到期前检测耗尽（单位：天）"
-"trafficDiff" = "耗尽流量阈值"
-"trafficDiffDesc" = "完成流量前检测耗尽（单位：GB）"
-"tgNotifyCpu" = "CPU 百分比警报阈值"
-"tgNotifyCpuDesc" = "如果 CPU 使用率超过此百分比（单位：%），此 talegram bot 将向您发送通知"
+"tgNotifyLoginDesc" = "当有人试图登录你的面板时显示用户名、IP 地址和时间"
+"sessionMaxAge" = "会话时长"
+"sessionMaxAgeDesc" = "保持登录状态的时长（单位：分钟）"
+"expireTimeDiff" = "到期通知阈值"
+"expireTimeDiffDesc" = "达到此阈值时，将收到有关到期时间的通知（单位：天）"
+"trafficDiff" = "流量耗尽阈值"
+"trafficDiffDesc" = "达到此阈值时，将收到有关流量耗尽的通知（单位：GB）"
+"tgNotifyCpu" = "CPU 负载通知阈值"
+"tgNotifyCpuDesc" = "CPU 负载超过此阈值时，将收到通知（单位：%）"
 "timeZone" = "时区"
-"timeZoneDesc" = "定时任务按照该时区的时间运行"
-"subSettings" = "订阅"
-"subEnable" = "启用服务"
-"subEnableDesc" = "具有单独配置的订阅功能"
-"subListen" = "监听IP"
-"subListenDesc" = "留空默认监听所有IP"
-"subPort" = "订阅端口"
-"subPortDesc" = "服务订阅服务的端口号必须在服务器中未使用"
-"subCertPath" = "订阅证书公钥文件路径"
-"subCertPathDesc" = "填写以'/'开头的绝对路径"
-"subKeyPath" = "订阅证书私钥文件路径"
-"subKeyPathDesc" = "填写以'/'开头的绝对路径"
-"subPath" = "订阅 URL 根路径"
-"subPathDesc" = "必须以'/'开始并以'/'结束"
+"timeZoneDesc" = "定时任务将按照该时区的时间运行"
+"subSettings" = "订阅设置"
+"subEnable" = "启用订阅服务"
+"subEnableDesc" = "启用订阅服务功能"
+"subListen" = "监听 IP"
+"subListenDesc" = "订阅服务监听的 IP 地址（留空表示监听所有 IP）"
+"subPort" = "监听端口"
+"subPortDesc" = "订阅服务监听的端口号（必须是未使用的端口）"
+"subCertPath" = "公钥路径"
+"subCertPathDesc" = "订阅服务使用的公钥文件路径（以 '/' 开头）"
+"subKeyPath" = "私钥路径"
+"subKeyPathDesc" = "订阅服务使用的私钥文件路径（以 '/' 开头）"
+"subPath" = "URI 路径"
+"subPathDesc" = "订阅服务使用的 URI 路径（以 '/' 开头，以 '/' 结尾）"
 "subDomain" = "监听域名"
-"subDomainDesc" = "留空默认监控所有域名和IP"
-"subUpdates" = "订阅更新间隔"
-"subUpdatesDesc" = "客户端应用程序更新订阅的间隔时间"
-"subEncrypt" = "加密配置"
-"subEncryptDesc" = "在订阅中加密返回的配置"
+"subDomainDesc" = "订阅服务监听的域名（留空表示监听所有域名和 IP）"
+"subUpdates" = "更新间隔"
+"subUpdatesDesc" = "客户端应用中订阅 URL 的更新间隔（单位：小时）"
+"subEncrypt" = "编码"
+"subEncryptDesc" = "订阅服务返回的内容将采用 Base64 编码"
 "subShowInfo" = "显示使用信息"
-"subShowInfoDesc" = "在配置名称后显示剩余流量和日期"
+"subShowInfoDesc" = "客户端应用中将显示剩余流量和日期信息"
 "subURI" = "反向代理 URI"
-"subURIDesc" = "更改订阅 URL 的基本 URI 以在代理后面使用"
-"fragment" = "碎片"
-"fragmentDesc" = "启用 TLS hello 数据包分段"
+"subURIDesc" = "用于代理后面的订阅 URL 的 URI 路径"
+"fragment" = "分片"
+"fragmentDesc" = "启用 TLS hello 数据包分片"

 [pages.xray]
-"title" = "Xray 设置"
-"save" = "保存设置"
+"title" = "Xray 配置"
+"save" = "保存"
 "restart" = "重新启动 Xray"
-"basicTemplate" = "基本模板"
-"advancedTemplate" = "高级模板部件"
-"generalConfigs" = "通用配置"
-"generalConfigsDesc" = "这些选项将提供一般调整"
-"logConfigs"="日志"
-"logConfigsDesc" = "日志可能会影响您服务器的效率。建议仅在您需要时明智地启用它"
-"blockConfigs" = "阻塞配置"
+"basicTemplate" = "基础配置"
+"advancedTemplate" = "高级配置"
+"generalConfigs" = "常规配置"
+"generalConfigsDesc" = "这些选项将决定常规配置"
+"logConfigs" = "日志"
+"logConfigsDesc" = "日志可能会影响服务器的效率，建议仅在需要时启用"
+"blockConfigs" = "防护屏蔽"
 "blockConfigsDesc" = "这些选项将阻止用户连接到特定协议和网站"
-"blockCountryConfigs" = "阻止国家配置"
-"blockCountryConfigsDesc" = "这些选项将阻止用户连接到特定国家/地区的域。"
-"directCountryConfigs" = "直接国家配置"
-"directCountryConfigsDesc" = "这些选项会将用户直接连接到特定国家/地区的域。"
-"ipv4Configs" = "IPv4 配置"
+"blockCountryConfigs" = "屏蔽国家/地区"
+"blockCountryConfigsDesc" = "这些选项将阻止用户连接到特定国家/地区"
+"directCountryConfigs" = "直连国家/地区"
+"directCountryConfigsDesc" = "直接连接可确保特定流量不会通过其他服务器路由"
+"ipv4Configs" = "IPv4 路由"
 "ipv4ConfigsDesc" = "此选项将仅通过 IPv4 路由到目标域"
-"warpConfigs" = "WARP 配置"
-"warpConfigsDesc" = "注意：在使用这些选项之前，请按照面板 GitHub 上的步骤在您的服务器上以 socks5 代理模式安装 WARP。 WARP 将通过 Cloudflare 服务器将流量路由到网站。"
-"Template" = "Xray 配置模板"
-"TemplateDesc" = "以该模型为基础生成最终的Xray配置文件，重新启动面板生成效率"
-"FreedomStrategy" = "配置自由协议的策略"
-"FreedomStrategyDesc" = "在自由协议中设置网络输出策略"
+"warpConfigs" = "WARP 路由"
+"warpConfigsDesc" = "注意：在使用这些选项之前，请按照面板 GitHub 上的步骤在你的服务器上以 socks5 代理模式安装 WARP。WARP 将通过 Cloudflare 服务器将流量路由到网站。"
+"Template" = "高级 Xray 配置模板"
+"TemplateDesc" = "最终的 Xray 配置文件将基于此模板生成"
+"FreedomStrategy" = "Freedom 协议策略"
+"FreedomStrategyDesc" = "设置 Freedom 协议中网络的输出策略"
 "RoutingStrategy" = "配置路由域策略"
-"RoutingStrategyDesc" = "设置DNS解析的整体路由策略"
-"Torrent" = "禁止使用 bittorrent"
-"TorrentDesc" = "更改配置模板避免用户使用bittorrent"
-"PrivateIp" = "禁止私人 IP 范围连接"
-"PrivateIpDesc" = "更改配置模板以避免连接私有 IP 范围"
+"RoutingStrategyDesc" = "设置 DNS 解析的整体路由策略"
+"Torrent" = "屏蔽 BitTorrent 协议"
+"TorrentDesc" = "禁止使用 BitTorrent"
+"PrivateIp" = "屏蔽私有 IP"
+"PrivateIpDesc" = "阻止连接到私有 IP"
 "Ads" = "屏蔽广告"
-"AdsDesc" = "修改配置模板屏蔽广告"
-"Family" = "阻止恶意软件和成人内容"
-"FamilyDesc" = "Cloudflare DNS 解析器可阻止恶意软件和成人内容以保护家庭."
-"Security" = "阻止恶意软件、网络钓鱼和加密货币挖矿网站"
-"SecurityDesc" = "更改安全防护配置模板."
-"Speedtest" = "阻止测速网站"
-"SpeedtestDesc" = "更改配置模板以避免连接到速度测试网站。 重新启动面板以应用更改。"
-"IRIp" = "禁止伊朗 IP 范围连接"
-"IRIpDesc" = "修改配置模板避免连接伊朗IP段"
-"IRDomain" = "禁止伊朗域连接"
-"IRDomainDesc" = "更改配置模板避免连接伊朗域名"
-"ChinaIp" = "禁止中国 IP 范围连接"
-"ChinaIpDesc" = "修改配置模板避免连接中国IP段"
-"ChinaDomain" = "禁止中国域名连接"
-"ChinaDomainDesc" = "更改配置模板避免连接中国域"
-"RussiaIp" = "禁止俄罗斯 IP 范围连接"
-"RussiaIpDesc" = "修改配置模板避免连接俄罗斯IP范围"
-"RussiaDomain" = "禁止俄罗斯域连接"
-"RussiaDomainDesc" = "更改配置模板避免连接俄罗斯域"
-"VNIp" = "禁用与越南 IP 的连接"
-"VNIpDesc" = "更改配置模板以避免连接到越南 IP 范围"
-"VNDomain" = "禁用与越南域的连接"
-"VNDomainDesc" = "更改配置模板以避免连接到越南域"
-"DirectIRIp" = "直接连接到伊朗 IP 范围"
-"DirectIRIpDesc" = "更改直接连接到伊朗 IP 范围的配置模板"
-"DirectIRDomain" = "直接连接到伊朗域"
-"DirectIRDomainDesc" = "更改直接连接到伊朗域的配置模板"
-"DirectChinaIp" = "直连中国IP范围"
-"DirectChinaIpDesc" = "更改直连中国 IP 范围的配置模板"
+"AdsDesc" = "屏蔽广告网站"
+"Family" = "家庭保护"
+"FamilyDesc" = "屏蔽成人内容和恶意网站"
+"Security" = "安全防护"
+"SecurityDesc" = "屏蔽恶意软件、网络钓鱼和挖矿网站"
+"Speedtest" = "屏蔽测速网站"
+"SpeedtestDesc" = "阻止连接到测速网站"
+"IRIp" = "屏蔽连接到伊朗 IP"
+"IRIpDesc" = "阻止建立到伊朗 IP 范围的连接"
+"IRDomain" = "屏蔽连接到伊朗域名"
+"IRDomainDesc" = "阻止建立到伊朗域名的连接"
+"ChinaIp" = "屏蔽连接到中国 IP"
+"ChinaIpDesc" = "阻止建立到中国 IP 范围的连接"
+"ChinaDomain" = "屏蔽连接到中国域名"
+"ChinaDomainDesc" = "阻止建立到中国域名的连接"
+"RussiaIp" = "屏蔽连接到俄罗斯 IP"
+"RussiaIpDesc" = "阻止建立到俄罗斯 IP 范围的连接"
+"RussiaDomain" = "屏蔽连接到俄罗斯域名"
+"RussiaDomainDesc" = "阻止建立到俄罗斯域名的连接"
+"VNIp" = "屏蔽连接到越南 IP"
+"VNIpDesc" = "阻止建立到越南 IP 范围的连接"
+"VNDomain" = "屏蔽连接到越南域名"
+"VNDomainDesc" = "阻止建立到越南域名的连接"
+"DirectIRIp" = "直连伊朗 IP"
+"DirectIRIpDesc" = "直接建立到伊朗 IP 范围的连接"
+"DirectIRDomain" = "直连伊朗域名"
+"DirectIRDomainDesc" = "直接建立到伊朗域名的连接"
+"DirectChinaIp" = "直连中国 IP"
+"DirectChinaIpDesc" = "直接建立到中国 IP 范围的连接"
 "DirectChinaDomain" = "直连中国域名"
-"DirectChinaDomainDesc" = "修改中国域名直连配置模板"
-"DirectRussiaIp" = "直接连接到俄罗斯 IP 范围"
-"DirectRussiaIpDesc" = "更改直接连接到俄罗斯 IP 范围的配置模板"
-"DirectRussiaDomain" = "直接连接到俄罗斯域"
-"DirectRussiaDomainDesc" = "更改直接连接到俄罗斯域的配置模板"
-"DirectVNIp" = "直接连接越南IP"
-"DirectVNIpDesc" = "更改直接连接到越南 IP 范围的配置模板"
-"DirectVNDomain" = "直接连接至越南域名"
-"DirectVNDomainDesc" = "更改直连越南域的配置模板。"
-"GoogleIPv4" = "为谷歌使用 IPv4"
-"GoogleIPv4Desc" = "添加谷歌连接IPv4的路由"
-"NetflixIPv4" = "为 Netflix 使用 IPv4"
-"NetflixIPv4Desc" = "添加Netflix连接IPv4的路由"
+"DirectChinaDomainDesc" = "直接建立到中国域名的连接"
+"DirectRussiaIp" = "直连俄罗斯 IP"
+"DirectRussiaIpDesc" = "直接建立到俄罗斯 IP 范围的连接"
+"DirectRussiaDomain" = "直连俄罗斯域名"
+"DirectRussiaDomainDesc" = "直接建立到俄罗斯域名的连接"
+"DirectVNIp" = "直连越南 IP"
+"DirectVNIpDesc" = "直接建立到越南 IP 范围的连接"
+"DirectVNDomain" = "直连越南域名"
+"DirectVNDomainDesc" = "直接建立到越南域名的连接"
+"GoogleIPv4" = "Google"
+"GoogleIPv4Desc" = "通过 IPv4 将流量路由到谷歌"
+"NetflixIPv4" = "Netflix"
+"NetflixIPv4Desc" = "通过 IPv4 将流量路由到 Netflix"
 "GoogleWARP" = "Google"
-"GoogleWARPDesc" = "通过 WARP 将流量路由到 Google。"
+"GoogleWARPDesc" = "通过 WARP 将流量路由到 Google"
 "OpenAIWARP" = "OpenAI (ChatGPT)"
-"OpenAIWARPDesc" = "通过 WARP 将流量路由到 OpenAI (ChatGPT)。"
+"OpenAIWARPDesc" = "通过 WARP 将流量路由到 OpenAI (ChatGPT)"
 "NetflixWARP" = "Netflix"
-"NetflixWARPDesc" = "通过 WARP 将流量路由到 Netflix。"
+"NetflixWARPDesc" = "通过 WARP 将流量路由到 Netflix"
 "MetaWARP"="Meta"
 "MetaWARPDesc" = "通过 WARP 将流量路由到 Meta（Instagram、Facebook、WhatsApp、Threads...）"
 "AppleWARP" = "Apple"
-"AppleWARPDesc" = "通过 WARP 将流量路由到 Apple。"
+"AppleWARPDesc" = "通过 WARP 将流量路由到 Apple"
 "RedditWARP" = "Reddit"
-"RedditWARPDesc" = "通过 WARP 将流量路由到 Reddit。"
+"RedditWARPDesc" = "通过 WARP 将流量路由到 Reddit"
 "SpotifyWARP" = "Spotify"
-"SpotifyWARPDesc" = "通过 WARP 将流量路由到 Spotify。"
-"IRWARP" = "将伊朗域名路由到 WARP"
-"IRWARPDesc" = "将伊朗域的路由添加到 WARP。 重启面板生效"
-"Inbounds" = "入站"
-"InboundsDesc" = "更改配置模板接受特殊客户端"
-"Outbounds" = "出站"
-"Balancers" = "平衡器"
-"OutboundsDesc" = "更改配置模板定义此服务器的传出方式"
+"SpotifyWARPDesc" = "通过 WARP 将流量路由到 Spotify"
+"IRWARP" = "伊朗域名"
+"IRWARPDesc" = "通过 WARP 将流量路由到伊朗域名"
+"Inbounds" = "入站规则"
+"InboundsDesc" = "接受来自特定客户端的流量"
+"Outbounds" = "出站规则"
+"Balancers" = "负载均衡"
+"OutboundsDesc" = "设置出站流量传出方式"
 "Routings" = "路由规则"
 "RoutingsDesc" = "每条规则的优先级都很重要"
 "completeTemplate" = "全部"
 "logLevel" = "日志级别"
-"logLevelDesc" = "错误日志的日志级别，表示需要记录的信息。"
+"logLevelDesc" = "错误日志的日志级别，用于指示需要记录的信息"
 "accessLog" = "访问日志"
-"accessLogDesc" = "访问日志的文件路径。 特殊值“none”禁用访问日志"
+"accessLogDesc" = "访问日志的文件路径。特殊值 'none' 禁用访问日志"
 "errorLog" = "错误日志"
-"errorLogDesc" = "错误日志的文件路径。 特殊值“none”禁用错误日志"
+"errorLogDesc" = "错误日志的文件路径。特殊值 'none' 禁用错误日志"

 [pages.xray.rules]
-"first" = "第一个"
-"last" = "最后"
+"first" = "置顶"
+"last" = "置底"
 "up" = "向上"
 "down" = "向下"
 "source" = "来源"
 "dest" = "目的地"
 "inbound" = "入站"
 "outbound" = "出站"
-"balancer" = "平衡器"
+"balancer" = "负载均衡"
 "info" = "信息"
 "add" = "添加规则"
 "edit" = "编辑规则"
@@ -434,35 +438,37 @@
 "editOutbound" = "编辑出站"
 "editReverse" = "编辑反向"
 "tag" = "标签"
-"tagDesc" = "唯一标记"
+"tagDesc" = "唯一标签"
 "address" = "地址"
-"reverse" = "反转"
+"reverse" = "反向"
 "domain" = "域名"
 "type" = "类型"
-"bridge" = "桥"
-"portal" = "门户"
+"bridge" = "Bridge"
+"portal" = "Portal"
 "intercon" = "互连"

 [pages.xray.balancer]
-"addBalancer" = "添加平衡器"
-"editBalancer" = "编辑平衡器"
-"balancerStrategy" = "战略"
+"addBalancer" = "添加负载均衡"
+"editBalancer" = "编辑负载均衡"
+"balancerStrategy" = "策略"
 "balancerSelectors" = "选择器"
 "tag" = "标签"
-"tagDesc" = "唯一标记"
-"balancerDesc" = "不能同时使用balancerTag和outboundTag。 如果同时使用，则只有outboundTag起作用。"
+"tagDesc" = "唯一标签"
+"balancerDesc" = "无法同时使用 balancerTag 和 outboundTag。如果同时使用，则只有 outboundTag 会生效。"

 [pages.xray.wireguard]
 "secretKey" = "密钥"
 "publicKey" = "公钥"
 "allowedIPs" = "允许的 IP"
-"endpoint" = "终点"
+"endpoint" = "端点"
 "psk" = "共享密钥"
 "domainStrategy" = "域策略"

 [pages.xray.dns]
 "enable" = "启用 DNS"
 "enableDesc" = "启用内置 DNS 服务器"
+"tag" = "DNS 入站标签"
+"tagDesc" = "此标签将在路由规则中可用作入站标签"
 "strategy" = "查询策略"
 "strategyDesc" = "解析域名的总体策略"
 "add" = "添加服务器"
@@ -477,16 +483,16 @@

 [pages.settings.security]
 "admin" = "管理员"
-"secret" = "密钥"
+"secret" = "安全令牌"
 "loginSecurity" = "登录安全"
-"loginSecurityDesc" = "在用户登录页面中切换附加步骤"
-"secretToken" = "密钥"
-"secretTokenDesc" = "复制此密钥并将其保存在安全的地方；没有这个你将无法登录。这也无法从 x-ui 命令工具中恢复" 
+"loginSecurityDesc" = "添加额外的身份验证以提高安全性"
+"secretToken" = "安全令牌"
+"secretTokenDesc" = "请将此令牌存储在安全的地方。此令牌用于登录，丢失无法恢复。" 

 [pages.settings.toasts]
 "modifySettings" = "修改设置"
 "getSettings" = "获取设置"
-"modifyUser" = "修改用户"
+"modifyUser" = "修改管理员"
 "originalUserPassIncorrect" = "原用户名或原密码错误"
 "userPassMustBeNotEmpty" = "新用户名和新密码不能为空"

@@ -495,7 +501,7 @@
 "noResult" = "❗ 没有结果！"
 "noQuery" = "❌ 未找到查询！请重新使用命令！"
 "wentWrong" = "❌ 出了点问题！"
-"noIpRecord" = "❗ 没有IP记录！"
+"noIpRecord" = "❗ 没有 IP 记录！"
 "noInbounds" = "❗ 没有找到入站连接！"
 "unlimited" = "♾ 无限制"
 "add" = "添加"
@@ -508,17 +514,17 @@
 "inbounds" = "入站连接"
 "clients" = "客户端"
 "offline" = "🔴 离线"
-"online" = "🟢 在线的"
+"online" = "🟢 在线"

 [tgbot.commands]
 "unknown" = "❗ 未知命令"
 "pleaseChoose" = "👇 请选择：\r\n"
 "help" = "🤖 欢迎使用本机器人！它旨在为您提供来自服务器的特定数据，并允许您进行必要的修改。\r\n\r\n"
 "start" = "👋 你好，<i>{{ .Firstname }}</i>。\r\n"
-"welcome" = "🤖 欢迎来到<b>{{ .Hostname }}</b>管理机器人。\r\n"
+"welcome" = "🤖 欢迎来到 <b>{{ .Hostname }}</b> 管理机器人。\r\n"
 "status" = "✅ 机器人正常运行！"
 "usage" = "❗ 请输入要搜索的文本！"
-"getID" = "🆔 您的ID为：<code>{{ .ID }}</code>"
+"getID" = "🆔 您的 ID 为：<code>{{ .ID }}</code>"
 "helpAdminCommands" = "搜索客户端邮箱：\r\n<code>/usage [Email]</code>\r\n\r\n搜索入站连接（包含客户端统计信息）：\r\n<code>/inbound [Remark]</code>"
 "helpClientCommands" = "要搜索统计信息，请使用以下命令：\r\n\r\n<code>/usage [Email]</code>"

@@ -557,8 +563,8 @@
 "download" = "🔽 下载↓：{{ .Download }}\r\n"
 "total" = "📊 总计：{{ .UpDown }} / {{ .Total }}\r\n"
 "TGUser" = "👤 电报用户：{{ .TelegramID }}\r\n"
-"exhaustedMsg" = "🚨 耗尽的{{ .Type }}：\r\n"
-"exhaustedCount" = "🚨 耗尽的{{ .Type }}数量：\r\n"
+"exhaustedMsg" = "🚨 耗尽的 {{ .Type }}：\r\n"
+"exhaustedCount" = "🚨 耗尽的 {{ .Type }} 数量：\r\n"
 "onlinesCount" = "🌐 在线客户：{{ .Count }}\r\n"
 "disabled" = "🛑 禁用：{{ .Disabled }}\r\n"
 "depleteSoon" = "🔜 即将耗尽：{{ .Deplete }}\r\n\r\n"
@@ -581,7 +587,7 @@
 "getInbounds" = "获取入站信息"
 "depleteSoon" = "即将耗尽"
 "clientUsage" = "获取使用情况"
-"onlines" = "在线客户"
+"onlines" = "在线客户端"
 "commands" = "命令"
 "refresh" = "🔄 刷新"
 "clearIPs" = "❌ 清除 IP"
@@ -597,11 +603,11 @@
 "custom" = "🔢 风俗"
 "confirmNumber" = "✅ 确认: {{ .Num }}"
 "confirmNumberAdd" = "✅ 确认添加：{{ .Num }}"
-"limitTraffic" = "🚧 交通限制"
+"limitTraffic" = "🚧 流量限制"
 "getBanLogs" = "禁止日志"

 [tgbot.answers]
-"successfulOperation" = "✅ 成功的！"
+"successfulOperation" = "✅ 成功！"
 "errorOperation" = "❗ 操作错误。"
 "getInboundsFailed" = "❌ 获取入站信息失败。"
 "canceled" = "❌ {{ .Email }}：操作已取消。"
@@ -609,7 +615,7 @@
 "IpRefreshSuccess" = "✅ {{ .Email }}：IP 刷新成功。"
 "TGIdRefreshSuccess" = "✅ {{ .Email }}：客户端的 Telegram 用户刷新成功。"
 "resetTrafficSuccess" = "✅ {{ .Email }}：流量已重置成功。"
-"setTrafficLimitSuccess" = "✅ {{ .Email }} : 流量限制保存成功。"
+"setTrafficLimitSuccess" = "✅ {{ .Email }}: 流量限制保存成功。"
 "expireResetSuccess" = "✅ {{ .Email }}：过期天数已重置成功。"
 "resetIpSuccess" = "✅ {{ .Email }}：成功保存 IP 限制数量为 {{ .Count }}。"
 "clearIpSuccess" = "✅ {{ .Email }}：IP 已成功清除。"
@@ -618,4 +624,4 @@
 "removedTGUserSuccess" = "✅ {{ .Email }}：Telegram 用户已成功移除。"
 "enableSuccess" = "✅ {{ .Email }}：已成功启用。"
 "disableSuccess" = "✅ {{ .Email }}：已成功禁用。"
-"askToAddUserId" = "未找到您的配置！\r\n请向管理员询问，在您的配置中使用您的 Telegram 用户ID。\r\n\r\n您的用户ID：<code>{{ .TgUserID }}</code>"
+"askToAddUserId" = "未找到您的配置！\r\n请向管理员询问，在您的配置中使用您的 Telegram 用户 ID。\r\n\r\n您的用户 ID：<code>{{ .TgUserID }}</code>"
--- a/web/web.go
+++ b/web/web.go
@@ -13,6 +13,7 @@ import (
 	"strconv"
 	"strings"
 	"time"
+
 	"x-ui/config"
 	"x-ui/logger"
 	"x-ui/util/common"
@@ -295,7 +296,7 @@ func (s *Server) startTask() {
 }

 func (s *Server) Start() (err error) {
-	//This is an anonymous function, no function name
+	// This is an anonymous function, no function name
 	defer func() {
 		if err != nil {
 			s.Stop()
@@ -337,19 +338,17 @@ func (s *Server) Start() (err error) {
 	}
 	if certFile != "" || keyFile != "" {
 		cert, err := tls.LoadX509KeyPair(certFile, keyFile)
-		if err != nil {
-			listener.Close()
-			return err
+		if err == nil {
+			c := &tls.Config{
+				Certificates: []tls.Certificate{cert},
+			}
+			listener = network.NewAutoHttpsListener(listener)
+			listener = tls.NewListener(listener, c)
+			logger.Info("web server run https on", listener.Addr())
+		} else {
+			logger.Error("error in loading certificates: ", err)
+			logger.Info("web server run http on", listener.Addr())
 		}
-		c := &tls.Config{
-			Certificates: []tls.Certificate{cert},
-		}
-		listener = network.NewAutoHttpsListener(listener)
-		listener = tls.NewListener(listener, c)
-	}
-
-	if certFile != "" || keyFile != "" {
-		logger.Info("web server run https on", listener.Addr())
 	} else {
 		logger.Info("web server run http on", listener.Addr())
 	}
--- a/x-ui.sh
+++ b/x-ui.sh
@@ -947,20 +947,26 @@ run_speedtest() {
 }

 create_iplimit_jails() {
-    # Use default bantime if not passed => 30 minutes
-    local bantime="${1:-30}"
+    # Use default bantime if not passed => 15 minutes
+    local bantime="${1:-15}"

    # Uncomment 'allowipv6 = auto' in fail2ban.conf
    sed -i 's/#allowipv6 = auto/allowipv6 = auto/g' /etc/fail2ban/fail2ban.conf

+    #On Debian 12+ fail2ban's default backend should be changed to systemd
+    if [[  "${release}" == "debian" && ${os_version} -ge 12 ]]; then
+        sed -i '0,/action =/s/backend = auto/backend = systemd/' /etc/fail2ban/jail.conf
+    fi
+
    cat << EOF > /etc/fail2ban/jail.d/3x-ipl.conf
 [3x-ipl]
 enabled=true
+backend=auto
 filter=3x-ipl
 action=3x-ipl
 logpath=${iplimit_log_path}
-maxretry=4
-findtime=60
+maxretry=2
+findtime=32
 bantime=${bantime}m
 EOF

@@ -973,7 +979,7 @@ EOF

    cat << EOF > /etc/fail2ban/action.d/3x-ipl.conf
 [INCLUDES]
-before = iptables-common.conf
+before = iptables-allports.conf

 [Definition]
 actionstart = <iptables> -N f2b-<name>
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
MHSanaei	4593147b65	bug fix	2024-03-12 14:48:09 +03:30
MHSanaei	020d1adc55	bug fixed - mux #2015	2024-03-12 02:17:42 +03:30
MHSanaei	389b5408b1	v2.2.5	2024-03-12 00:48:00 +03:30
Moiudev	037dbb5670	Update translate.zh_Hans.toml (#2013 ) Optimize Chinese translation.	2024-03-12 00:46:20 +03:30
MHSanaei	6af0d55ca9	improve null handling	2024-03-12 00:36:25 +03:30
MHSanaei	0917eb2742	Fix empty log path handling	2024-03-11 23:56:23 +03:30
MHSanaei	f8be7a7649	[xray outbound] add mux Co-Authored-By: Alireza Ahmadi <alireza7@gmail.com>	2024-03-11 21:48:33 +03:30
MHSanaei	5b87b12535	[sub] JSON sub enhancement + minor changes Co-Authored-By: Alireza Ahmadi <alireza7@gmail.com>	2024-03-11 18:40:11 +03:30
MHSanaei	8908e8b16a	[xray] add sockopt to all outbounds Co-Authored-By: Alireza Ahmadi <alireza7@gmail.com>	2024-03-11 16:03:33 +03:30
Steven	4f7af1e57a	update translation-zh (#2004 ) * modify a translation mistake in translate.zh_Hans update "value" = "价值" to "value" = "值" in line 217 in translate.zh_Hans.toml * Update translate.zh_Hans.toml	2024-03-11 13:59:59 +03:30
MHSanaei	3af55cc5b4	[sub] random reality params Co-Authored-By: Alireza Ahmadi <alireza7@gmail.com>	2024-03-11 13:52:06 +03:30
MHSanaei	ac5d8af4f9	New - leastload, leastping balancer	2024-03-11 13:16:59 +03:30
MHSanaei	01cd7539f9	New - gRPC Authority	2024-03-11 13:00:00 +03:30
MHSanaei	102864525c	[xray outbound] add sockopt Co-Authored-By: Alireza Ahmadi <alireza7@gmail.com>	2024-03-11 12:07:52 +03:30
MHSanaei	e6254e23f2	[xray] add dns tag Co-Authored-By: Alireza Ahmadi <alireza7@gmail.com>	2024-03-11 12:01:08 +03:30
MHSanaei	5f3c2f781e	avoid empty client id Co-Authored-By: Alireza Ahmadi <alireza7@gmail.com>	2024-03-11 11:52:28 +03:30
MHSanaei	6c73791cab	[xray] add BurstObservatory + minor changes Co-Authored-By: Alireza Ahmadi <alireza7@gmail.com>	2024-03-11 11:46:54 +03:30
MHSanaei	f76e3ff94b	[xray] add new dns strategies Co-Authored-By: Alireza Ahmadi <alireza7@gmail.com>	2024-03-11 11:38:25 +03:30
MHSanaei	7f0fc1b8ef	run sub on http if https failed Co-Authored-By: Alireza Ahmadi <alireza7@gmail.com>	2024-03-11 11:37:16 +03:30
MHSanaei	d18eb7e4e4	New - HttpUpgrade Transport	2024-03-11 11:27:43 +03:30
MHSanaei	d3377cd45e	Upgrade Xray Core to v1.8.9	2024-03-11 09:59:52 +03:30
Hamidreza	64a5a9f1bc	Some fixes and improvements (#1997 ) * [refactor] api controller * [fix] access log path better to not hardcode the access log path, maybe some ppl dont want to use the default ./access.log * [fix] set select options from logs paths in xray settings * [update] .gitignore * [lint] all .go files * [update] use status code for jsonMsg and 401 to unauthorize * [update] handle response status code via axios * [fix] set correct value if log paths is set to 'none' we also use the default value for the paths if its set to none * [fix] iplimit - only warning access log if f2b is installed	2024-03-11 01:01:24 +03:30
MHSanaei	32afd7200a	default config domainStrategy	2024-03-11 00:08:57 +03:30
Tara Rostami	ffa531f9ca	Minor Fixes (#1992 ) autocomplete max - min for input-number	2024-03-09 16:36:16 +03:30
Steven	05deb89451	update translation-zh (#1999 )	2024-03-09 16:19:15 +03:30
dependabot[bot]	6f807823b9	Bump google.golang.org/grpc from 1.62.0 to 1.62.1 (#1987 ) Bumps [google.golang.org/grpc](https://github.com/grpc/grpc-go) from 1.62.0 to 1.62.1. - [Release notes](https://github.com/grpc/grpc-go/releases) - [Commits](https://github.com/grpc/grpc-go/compare/v1.62.0...v1.62.1) --- updated-dependencies: - dependency-name: google.golang.org/grpc dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2024-03-06 20:36:23 +03:30
somebodywashere	2f594ca7c9	[IPLimit] Optimize + Debian 12 compability [IPLimit] Optimize + Debian 12 compability	2024-03-05 17:38:47 +03:00
somebodywashere	ecae6e5ead	Merge branch 'main' of https://github.com/somebodywashere/3x-ui	2024-03-05 17:22:22 +03:00
somebodywashere	34ab6ed7ee	[IPLimit] Added check for accessLogPath	2024-03-05 17:20:00 +03:00
somebodywashere	5ba9d6e118	[IPLimit] Optimize + Debian 12 compability	2024-03-05 16:39:20 +03:00
emirjorge	c47a67975f	Improved Spanish translation (#1980 )	2024-03-05 15:00:52 +03:30
MHSanaei	6563d23f38	Enhance CheckClientIpJob #1964	2024-03-02 21:16:28 +03:30
Tara Rostami	3a46c3302b	UI improvements (#1963 ) * Update sortableTable.html * Update custom.css	2024-03-02 01:43:04 +03:30
LOVECHEN	1c97593360	Update translate.zh_Hans.toml (#1955 ) * Fix Dockerfile Fix wrong image * Update translate.zh_Hans.toml Fixed wrong translation, although I think system load / usage should be merged into the project	2024-03-02 01:42:52 +03:30
MHSanaei	95416cd553	translation - direct connection	2024-03-01 23:31:07 +03:30
Tara Rostami	d6cd0611d4	Minor fixes (#1943 )	2024-02-28 19:53:18 +03:30
MHSanaei	aad2cd8739	remove drag button on mobile	2024-02-28 19:15:44 +03:30
MHSanaei	4cc0149317	v2.2.1	2024-02-28 16:37:00 +03:30
Tara Rostami	836ee29b78	Optimize Dark Theme & Ultra Dark (#1889 ) --------- Co-authored-by: MHSanaei <ho3ein.sanaei@gmail.com> Co-authored-by: Alireza Ahmadi <alireza7@gmail.com>	2024-02-28 14:35:01 +03:30
MHSanaei	806b57f959	improve translate	2024-02-27 21:18:12 +03:30
MHSanaei	e827c1477c	better design - OCPD Problem	2024-02-27 19:02:23 +03:30
Ho3ein	b827a4680d	Merge pull request #1931 from shahin-io/3XMH [settings] security alert translations	2024-02-27 16:28:53 +03:30
Shahin	3fd124f76d	[settings] improve security alert	2024-02-27 12:50:45 +00:00
Shahin	3e8863f6ce	[i18n] add security alert translations	2024-02-27 12:47:22 +00:00
MHSanaei	9b026572cf	close modal only after success msg Co-Authored-By: Alireza Ahmadi <alireza7@gmail.com>	2024-02-27 16:01:20 +03:30
MHSanaei	6b34a3ae13	Update login.html	2024-02-27 15:44:32 +03:30
Serge Pavlyuk	8b64180136	Added drag'n'drop for routes (#1915 ) * Added drag'n'drop for routes * Drop handler works only for local dnd events * Cleanup console.log	2024-02-27 15:18:29 +03:30
Nikolas	688ae4da10	Added Ukrainian language (#1926 ) * Added Ukrainian language Ukrainian * Update langs.js Added Ukrainian language	2024-02-27 15:05:24 +03:30
Ikko Eltociear Ashimine	0785da7223	Update inbound.go (#1925 ) Clinet -> Client	2024-02-27 15:03:37 +03:30
somebodywashere	2f1aad3e63	Merge pull request #1929 from somebodywashere/main Changes to fail2ban jails to work with f2b 1.0+	2024-02-27 13:37:15 +03:00
somebodywashere	754b591e4f	Changes to fail2ban to work with f2b 1.0+ Change default bantime to 15 minutes Mofidied logic a bit	2024-02-27 13:02:25 +03:00
MHSanaei	2b9d2d044c	Xray v1.8.8	2024-02-25 22:31:01 +03:30
MHSanaei	511eef54bb	run panel on http if https failed Co-Authored-By: Alireza Ahmadi <alireza7@gmail.com>	2024-02-25 22:30:37 +03:30
MHSanaei	e705ae8e48	minor changes	2024-02-25 02:08:14 +03:30
@@ -1 +1 @@
 .2.0
 .2.5