fixed - sub show time when "Start After First Use"

Xray Core v1.8.19
v2.3.9
2026-03-21 10:05:49 +00:00 · 2024-07-17 16:39:53 +02:00 · 2024-07-17 16:21:03 +02:00 · 2024-07-17 13:51:11 +02:00 · 2024-07-16 01:33:24 +02:00 · 2024-07-15 11:09:24 +02:00
110 changed files with 4845 additions and 13768 deletions
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -0,0 +1,24 @@
 ---
 name: Bug report
 about: Create a report to help us improve
 title: ''
 labels: bug
 assignees: ''
 ---
 **Describe the bug**
 A clear and concise description of what the bug is.
 **Expected behavior**
 A clear and concise description of what you expected to happen.
 **Screenshots**
 If applicable, add screenshots to help explain your problem.
 **Version (please complete the following information):**
 - 3X-UI Version : [e.g. 2.3.5]
 - Xray Version : [e.g. 1.8.13]
 **Additional context**
 Add any other context about the problem here.
--- a/.github/ISSUE_TEMPLATE/bug_report.yml
+++ b/.github/ISSUE_TEMPLATE/bug_report.yml
@@ -1,56 +0,0 @@
 name: Issue Report
 description: "Create a report to help us improve."
 body:
  - type:  checkboxes
    id: terms
    attributes:
      label: Welcome
      options:
        - label: Yes, I'm using the latest major release. Only such installations are supported.
          required: true
        - label: Yes, I'm using the supported system. Only such systems are supported.
          required: true
        - label: Yes, I have read all WIKI document,nothing can help me in my problem.
          required: true
        - label: Yes, I've searched similar issues on GitHub and didn't find any.
          required: true
        - label: Yes, I've included all information below (version, config, log, etc).
          required: true
  - type: textarea
    id: problem
    attributes:
      label: Description of the problem,screencshot would be good 
      placeholder: Your problem description
    validations:
      required: true
  - type: textarea
    id: version
    attributes:
      label: Version of 3x-ui
      value: |-
        <details>
        ```console
        # Paste here
        ```
        </details>
    validations:
      required: true
  - type: textarea
    id: log
    attributes:
      label: x-ui log reports or xray log
      value: |-
        <details>
        ```console
        # paste log here
        ```
        </details>
    validations:
      required: true
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -32,7 +32,7 @@ jobs:
          images: ghcr.io/${{ github.repository }}
      - name: Build and push Docker image
-        uses: docker/build-push-action@v5
+        uses: docker/build-push-action@v6
        with:
          context: .
          push: ${{ github.event_name != 'pull_request' }}
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -26,7 +26,7 @@ jobs:
      - name: Setup Go
        uses: actions/setup-go@v5
        with:
-          go-version: '1.22'
+          go-version-file: go.mod
      - name: Install dependencies
        run: |
@@ -83,7 +83,7 @@ jobs:
          cd x-ui/bin
          # Download dependencies
-          Xray_URL="https://github.com/XTLS/Xray-core/releases/download/v1.8.10/"
+          Xray_URL="https://github.com/XTLS/Xray-core/releases/download/v1.8.19/"
          if [ "${{ matrix.platform }}" == "amd64" ]; then
            wget ${Xray_URL}Xray-linux-64.zip
            unzip Xray-linux-64.zip
@@ -126,6 +126,12 @@ jobs:
      - name: Package
        run: tar -zcvf x-ui-linux-${{ matrix.platform }}.tar.gz x-ui
      - name: Upload files to Artifacts
        uses: actions/upload-artifact@v4
        with:
          name: x-ui-linux-${{ matrix.platform }}
          path: ./x-ui-linux-${{ matrix.platform }}.tar.gz
      - name: Upload files to GH release
        uses: svenstaro/upload-release-action@v2
        with:
--- 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.10/Xray-linux-${ARCH}.zip"
+wget "https://github.com/XTLS/Xray-core/releases/download/v1.8.19/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.es_ES.md
+++ b/README.es_ES.md
@@ -1,5 +1,3 @@
 # 3X-UI
 [English](/README.md) | [Chinese](/README.zh.md) | [Español](/README.es_ES.md)
 <p align="center"><a href="#"><img src="./media/3X-UI.png" alt="Image"></a></p>
@@ -28,10 +26,10 @@ bash <(curl -Ls https://raw.githubusercontent.com/mhsanaei/3x-ui/master/install.
 ## Instalar una Versión Personalizada
-Para instalar la versión deseada, agrega la versión al final del comando de instalación. Por ejemplo, ver `v2.2.8`:
+Para instalar la versión deseada, agrega la versión al final del comando de instalación. Por ejemplo, ver `v2.3.6`:
 ```
-bash <(curl -Ls https://raw.githubusercontent.com/mhsanaei/3x-ui/master/install.sh) v2.2.8
+bash <(curl -Ls https://raw.githubusercontent.com/mhsanaei/3x-ui/master/install.sh) v2.3.6
 ```
 ## Certificado SSL
@@ -185,6 +183,7 @@ eliminar 3x-ui de docker
 - Armbian
 - AlmaLinux 9+
 - Rockylinux 9+
 - OpenSUSE Tubleweed
 ## Arquitecturas y Dispositivos Compatibles
@@ -257,7 +256,7 @@ Nuestra plataforma ofrece compatibilidad con una amplia gama de arquitecturas y
 </details>
-## [Configuración WARP](https://gitlab.com/fscarmen/warp)
+## Configuración WARP
 <details>
  <summary>Haz clic para detalles de la configuración WARP</summary>
@@ -397,7 +396,7 @@ Ingresa el ID de chat de usuario en el campo de entrada número 4. Las cuentas d
 - `/panel/api/inbounds` base para las siguientes acciones:
 | Método | Ruta                               | Acción                                                    |
-| :----: | ---------------------------------- | -------------------------------------------------------- |
+| :----: | ---------------------------------- | --------------------------------------------------------- |
 | `GET`  | `"/list"`                          | Obtener todas los Entradas                                |
 | `GET`  | `"/get/:id"`                       | Obtener Entrada con inbound.id                            |
 | `GET`  | `"/getClientTraffics/:email"`      | Obtener Tráficos del Cliente con email                    |
@@ -435,7 +434,7 @@ Ingresa el ID de chat de usuario en el campo de entrada número 4. Las cuentas d
 #### Uso
 | Variable       |                      Tipo                      | Predeterminado |
-| -------------- | :--------------------------------------------: | :------------ |
+| -------------- | :--------------------------------------------: | :------------- |
 | XUI_LOG_LEVEL  | `"debug"` \| `"info"` \| `"warn"` \| `"error"` | `"info"`       |
 | XUI_DEBUG      |                   `boolean`                    | `false`        |
 | XUI_BIN_FOLDER |                    `string`                    | `"bin"`        |
--- a/README.md
+++ b/README.md
@@ -1,5 +1,3 @@
 # 3X-UI
 [English](/README.md) | [Chinese](/README.zh.md) | [Español](/README.es_ES.md)
 <p align="center"><a href="#"><img src="./media/3X-UI.png" alt="Image"></a></p>
@@ -28,48 +26,59 @@ 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.3.0`:
+To install your desired version, add the version to the end of the installation command. e.g., ver `v2.3.9`:
 ```
-bash <(curl -Ls https://raw.githubusercontent.com/mhsanaei/3x-ui/master/install.sh) v2.3.0
+bash <(curl -Ls https://raw.githubusercontent.com/mhsanaei/3x-ui/master/install.sh) v2.3.9
 ```
 ## SSL Certificate
 <details>
-  <summary>Click for SSL Certificate</summary>
+  <summary>Click for SSL Certificate details</summary>
-### Cloudflare
+### ACME
-The Management script has a built-in SSL certificate application for Cloudflare. To use this script to apply for a certificate, you need the following:
+To manage SSL certificates using ACME:
- Cloudflare registered email
+1. Ensure your domain is correctly resolved to the server.
- Cloudflare Global API Key
+2. Run the `x-ui` command in the terminal, then choose `SSL Certificate Management`.
- The domain name has been resolved to the current server through cloudflare
+3. You will be presented with the following options:
-How to get the Cloudflare Global API Key:
+   - **Get SSL:** Obtain SSL certificates.
-
+   - **Revoke:** Revoke existing SSL certificates.
-1. Run the`x-ui`command on the terminal, then choose `Cloudflare SSL Certificate`.
+   - **Force Renew:** Force renewal of SSL certificates.
 2. Visit the link https://dash.cloudflare.com/profile/api-tokens
 3. Click on View Global API Key (See the screenshot below)
        ![](media/APIKey1.PNG)
 4. You may have to re-authenticate your account. After that, the API Key will be shown (See the screenshot below)\
        ![](media/APIKey2.png)
 When using, just enter `domain name`, `email`, `API KEY`, the diagram is as follows:
        ![](media/DetailEnter.png)
 ### Certbot
-```
+
 To install and use Certbot:
 ```sh
 apt-get install certbot -y
 certbot certonly --standalone --agree-tos --register-unsafely-without-email -d yourdomain.com
 certbot renew --dry-run
 ```
-***Tip:*** *Certbot is also built into the Management script. You can run the `x-ui` command, then choose `SSL Certificate Management`.*
+### Cloudflare
 The management script includes a built-in SSL certificate application for Cloudflare. To use this script to apply for a certificate, you need the following:
 - Cloudflare registered email
 - Cloudflare Global API Key
 - The domain name must be resolved to the current server through Cloudflare
 **How to get the Cloudflare Global API Key:**
 1. Run the `x-ui` command in the terminal, then choose `Cloudflare SSL Certificate`.
 2. Visit the link: [Cloudflare API Tokens](https://dash.cloudflare.com/profile/api-tokens).
 3. Click on "View Global API Key" (see the screenshot below):
   ![](media/APIKey1.PNG)
 4. You may need to re-authenticate your account. After that, the API Key will be shown (see the screenshot below):
   ![](media/APIKey2.png)
 When using, just enter your `domain name`, `email`, and `API KEY`. The diagram is as follows:
   ![](media/DetailEnter.png)
 </details>
@@ -135,26 +144,26 @@ systemctl restart x-ui
 #### Usage
-1. Install Docker:
+1. **Install Docker:**
   ```sh
   bash <(curl -sSL https://get.docker.com)
   ```
-2. Clone the Project Repository:
+2. **Clone the Project Repository:**
   ```sh
   git clone https://github.com/MHSanaei/3x-ui.git
   cd 3x-ui
   ```
-3. Start the Service
+3. **Start the Service:**
   ```sh
   docker compose up -d
   ```
-   OR
+   **OR**
   ```sh
   docker run -itd \
@@ -167,7 +176,7 @@ systemctl restart x-ui
      ghcr.io/mhsanaei/3x-ui:latest
   ```
-update to latest version
+4. **Update to the Latest Version:**
   ```sh
   cd 3x-ui
@@ -176,7 +185,7 @@ update to latest version
   docker compose up -d
   ```
-remove 3x-ui from docker 
+5. **Remove 3x-ui from Docker:**
   ```sh
   docker stop 3x-ui
@@ -201,6 +210,7 @@ remove 3x-ui from docker
 - AlmaLinux 9+
 - Rocky Linux 9+
 - Oracle Linux 8+
 - OpenSUSE Tubleweed
 ## Supported Architectures and Devices
@@ -254,55 +264,68 @@ Our platform offers compatibility with a diverse range of architectures and devi
 - Supports export/import database from the panel
-## Default Settings
+## Default Panel Settings
 <details>
  <summary>Click for default settings details</summary>
-  ### Information
+### Username & Password & webbasepath:
  These will be generated randomly if you skip modifying them.
  - **Port:** the default port for panel is `2053`
 ### Database Management:
  You can conveniently perform database Backups and Restores directly from the panel.
 - **Port:** 2053
 - **Username & Password:** It will be generated randomly if you skip modifying.
 - **Database Path:**
-  - /etc/x-ui/x-ui.db
+  - `/etc/x-ui/x-ui.db`
- **Xray Config Path:**
+
-  - /usr/local/x-ui/bin/config.json
+
- **Web Panel Path w/o Deploying SSL:**
+### Web Base Path
-  - http://ip:2053/panel
+
-  - http://domain:2053/panel
+1. **Reset Web Base Path:**
- **Web Panel Path w/ Deploying SSL:**
+   - Open your terminal.
-  - https://domain:2053/panel
+   - Run the `x-ui` command.
   - Select the option to `Reset Web Base Path`.
 2. **Generate or Customize Path:**
   - The path will be randomly generated, or you can enter a custom path.
 3. **View Current Settings:**
   - To view your current settings, use the `x-ui settings` command in the terminal or `View Current Settings` in `x-ui`
 ### Security Recommendation:
 - For enhanced security, use a long, random word in your URL structure.
 **Examples:**
 - `http://ip:port/*webbasepath*/panel`
 - `http://domain:port/*webbasepath*/panel`
 </details>
-## [WARP Configuration](https://gitlab.com/fscarmen/warp)
+## WARP Configuration
 <details>
  <summary>Click for WARP configuration details</summary>
 #### Usage
-If you want to use routing to WARP before v2.1.0 follow steps as below:
+**For versions `v2.1.0` and later:**
-**1.** Install WARP on **SOCKS Proxy Mode**:
+WARP is built-in, and no additional installation is required. Simply turn on the necessary configuration in the panel.
-   ```sh
+**For versions before `v2.1.0`:**
   bash <(curl -sSL https://raw.githubusercontent.com/hamid-gh98/x-ui-scripts/main/install_warp_proxy.sh)
   ```
-**2.** If you already installed warp, you can uninstall using below command:
+1. Run the `x-ui` command in the terminal, then choose `WARP Management`.
 2. You will see the following options:
-   ```sh
+   - **Account Type (free, plus, team):** Choose the appropriate account type.
-   warp u
+   - **Enable/Disable WireProxy:** Toggle WireProxy on or off.
-   ```
+   - **Uninstall WARP:** Remove the WARP application.
-**3.** Turn on the config you need in panel
+3. Configure the settings as needed in the panel.
   Config Features:
   - Block Ads
   - Route Google + Netflix + Spotify + OpenAI (ChatGPT) to WARP
   - Fix Google 403 error
 </details>
@@ -313,21 +336,29 @@ If you want to use routing to WARP before v2.1.0 follow steps as below:
 #### Usage
-**Note:** IP Limit won't work correctly when using IP Tunnel
+**Note:** IP Limit won't work correctly when using IP Tunnel.
- For versions up to `v1.6.1`:
+- **For versions up to `v1.6.1`:**
  - The IP limit is built-in to the panel
-  - IP limit is built-in into the panel.
+**For versions `v1.7.0` and newer:**
- For versions `v1.7.0` and newer:
+To enable the IP Limit functionality, you need to install `fail2ban` and its required files by following these steps:
-  - To make IP Limit work properly, you need to install fail2ban and its required files by following these steps:
+1. Run the `x-ui` command in the terminal, then choose `IP Limit Management`.
 2. You will see the following options:
-    1. Use the `x-ui` command inside the shell.
+   - **Change Ban Duration:** Adjust the duration of bans.
-    2. Select `IP Limit Management`.
+   - **Unban Everyone:** Lift all current bans.
-    3. Choose the appropriate options based on your needs.
+   - **Check Logs:** Review the logs.
   - **Fail2ban Status:** Check the status of `fail2ban`.
   - **Restart Fail2ban:** Restart the `fail2ban` service.
   - **Uninstall Fail2ban:** Uninstall Fail2ban with configuration.
-  - make sure you have ./access.log on your Xray Configuration after v2.1.3 we have an option for it
+3. Add a path for the access log on the panel by setting `Xray Configs/log/Access log` to `./access.log` then save and restart xray.
 - **For versions before `v2.1.3`:**
  - You need to set the access log path manually in your Xray configuration:
    ```sh
    "log": {
@@ -337,6 +368,9 @@ If you want to use routing to WARP before v2.1.0 follow steps as below:
    },
    ```
 - **For versions `v2.1.3` and newer:**
  - There is an option for configuring `access.log` directly from the panel.
 </details>
 ## Telegram Bot
--- a/README.zh.md
+++ b/README.zh.md
@@ -1,5 +1,3 @@
 # 3X-UI
 [English](/README.md) | [Chinese](/README.zh.md) | [Español](/README.es_ES.md)
 <p align="center"><a href="#"><img src="./media/3X-UI.png" alt="Image"></a></p>
@@ -28,10 +26,10 @@ bash <(curl -Ls https://raw.githubusercontent.com/mhsanaei/3x-ui/master/install.
 ## 安装指定版本
-要安装所需的版本，请将该版本添加到安装命令的末尾。 e.g., ver `v2.2.8`:
+要安装所需的版本，请将该版本添加到安装命令的末尾。 e.g., ver `v2.3.6`:
 ```
-bash <(curl -Ls https://raw.githubusercontent.com/mhsanaei/3x-ui/master/install.sh) v2.2.8
+bash <(curl -Ls https://raw.githubusercontent.com/mhsanaei/3x-ui/master/install.sh) v2.3.6
 ```
 ## SSL 认证
@@ -185,6 +183,7 @@ systemctl restart x-ui
 - Armbian
 - AlmaLinux 9+
 - Rockylinux 9+
 - OpenSUSE Tubleweed
 ## 支持的架构和设备
 <details>
@@ -256,7 +255,7 @@ systemctl restart x-ui
 </details>
-## [WARP 配置](https://gitlab.com/fscarmen/warp)
+## WARP 配置
 <details>
  <summary>点击查看 WARP 配置</summary>
@@ -396,7 +395,7 @@ Web 面板通过 Telegram Bot 支持每日流量、面板登录、数据库备
 - `/panel/api/inbounds` 以下操作的基础：
 |  方法  | 路径                               | 操作                              |
-| :----: | ---------------------------------- | ------------------------------------------- |
+| :----: | ---------------------------------- | --------------------------------- |
 | `GET`  | `"/list"`                          | 获取所有入站                      |
 | `GET`  | `"/get/:id"`                       | 获取所有入站以及inbound.id        |
 | `GET`  | `"/getClientTraffics/:email"`      | 通过电子邮件获取客户端流量        |
--- a/config/version
+++ b/config/version
@@ -1 +1 @@
-2.3.0
+2.3.9
--- a/database/db.go
+++ b/database/db.go
@@ -4,6 +4,7 @@ import (
 	"bytes"
 	"io"
 	"io/fs"
 	"log"
 	"os"
 	"path"
@@ -18,54 +19,51 @@ import (
 var db *gorm.DB
-var initializers = []func() error{
+const (
-	initUser,
+	defaultUsername = "admin"
-	initInbound,
+	defaultPassword = "admin"
-	initOutbound,
+	defaultSecret   = ""
-	initSetting,
+)
-	initInboundClientIps,
+
-	initClientTraffic,
+func initModels() error {
 	models := []interface{}{
 		&model.User{},
 		&model.Inbound{},
 		&model.OutboundTraffics{},
 		&model.Setting{},
 		&model.InboundClientIps{},
 		&xray.ClientTraffic{},
 	}
 	for _, model := range models {
 		if err := db.AutoMigrate(model); err != nil {
 			log.Printf("Error auto migrating model: %v", err)
 			return err
 		}
 	}
 	return nil
 }
 func initUser() error {
-	err := db.AutoMigrate(&model.User{})
+	empty, err := isTableEmpty("users")
 	if err != nil {
 		log.Printf("Error checking if users table is empty: %v", err)
 		return err
 	}
-	var count int64
+	if empty {
 	err = db.Model(&model.User{}).Count(&count).Error
 	if err != nil {
 		return err
 	}
 	if count == 0 {
 		user := &model.User{
-			Username:    "admin",
+			Username:    defaultUsername,
-			Password:    "admin",
+			Password:    defaultPassword,
-			LoginSecret: "",
+			LoginSecret: defaultSecret,
 		}
 		return db.Create(user).Error
 	}
 	return nil
 }
-func initInbound() error {
+func isTableEmpty(tableName string) (bool, error) {
-	return db.AutoMigrate(&model.Inbound{})
+	var count int64
-}
+	err := db.Table(tableName).Count(&count).Error
-
+	return count == 0, err
 func initOutbound() error {
 	return db.AutoMigrate(&model.OutboundTraffics{})
 }
 func initSetting() error {
 	return db.AutoMigrate(&model.Setting{})
 }
 func initInboundClientIps() error {
 	return db.AutoMigrate(&model.InboundClientIps{})
 }
 func initClientTraffic() error {
 	return db.AutoMigrate(&xray.ClientTraffic{})
 }
 func InitDB(dbPath string) error {
@@ -91,15 +89,27 @@ func InitDB(dbPath string) error {
 		return err
 	}
-	for _, initialize := range initializers {
+	if err := initModels(); err != nil {
 		if err := initialize(); err != nil {
 		return err
 	}
 	if err := initUser(); err != nil {
 		return err
 	}
 	return nil
 }
 func CloseDB() error {
 	if db != nil {
 		sqlDB, err := db.DB()
 		if err != nil {
 			return err
 		}
 		return sqlDB.Close()
 	}
 	return nil
 }
 func GetDB() *gorm.DB {
 	return db
 }
--- a/database/model/model.go
+++ b/database/model/model.go
@@ -12,10 +12,12 @@ type Protocol string
 const (
 	VMess       Protocol = "vmess"
 	VLESS       Protocol = "vless"
-	Dokodemo    Protocol = "Dokodemo-door"
+	DOKODEMO    Protocol = "dokodemo-door"
-	Http        Protocol = "http"
+	HTTP        Protocol = "http"
 	Trojan      Protocol = "trojan"
 	Shadowsocks Protocol = "shadowsocks"
 	Socks       Protocol = "socks"
 	WireGuard   Protocol = "wireguard"
 )
 type User struct {
--- a/go.mod
+++ b/go.mod
@@ -1,75 +1,77 @@
 module x-ui
-go 1.22.2
+go 1.22.5
 require (
-	github.com/Calidity/gin-sessions v1.3.1
+	github.com/gin-contrib/gzip v1.0.1
-	github.com/gin-contrib/gzip v1.0.0
+	github.com/gin-contrib/sessions v1.0.1
-	github.com/gin-gonic/gin v1.9.1
+	github.com/gin-gonic/gin v1.10.0
-	github.com/goccy/go-json v0.10.2
+	github.com/goccy/go-json v0.10.3
-	github.com/mymmrac/telego v0.29.2
+	github.com/mymmrac/telego v0.31.0
 	github.com/nicksnyder/go-i18n/v2 v2.4.0
 	github.com/op/go-logging v0.0.0-20160315200505-970db520ece7
-	github.com/pelletier/go-toml/v2 v2.2.1
+	github.com/pelletier/go-toml/v2 v2.2.2
 	github.com/robfig/cron/v3 v3.0.1
-	github.com/shirou/gopsutil/v3 v3.24.3
+	github.com/shirou/gopsutil/v4 v4.24.6
-	github.com/valyala/fasthttp v1.52.0
+	github.com/valyala/fasthttp v1.55.0
-	github.com/xtls/xray-core v1.8.10
+	github.com/xtls/xray-core v1.8.19
 	go.uber.org/atomic v1.11.0
-	golang.org/x/text v0.14.0
+	golang.org/x/text v0.16.0
-	google.golang.org/grpc v1.63.2
+	google.golang.org/grpc v1.65.0
-	gorm.io/driver/sqlite v1.5.5
+	gorm.io/driver/sqlite v1.5.6
-	gorm.io/gorm v1.25.9
+	gorm.io/gorm v1.25.11
 )
 require (
 	github.com/andybalholm/brotli v1.1.0 // indirect
-	github.com/bytedance/sonic v1.11.3 // indirect
+	github.com/bytedance/sonic v1.11.9 // indirect
-	github.com/chenzhuoyu/base64x v0.0.0-20230717121745-296ad89f973d // indirect
+	github.com/bytedance/sonic/loader v0.1.1 // indirect
-	github.com/chenzhuoyu/iasm v0.9.1 // indirect
+	github.com/cloudflare/circl v1.3.9 // indirect
-	github.com/cloudflare/circl v1.3.7 // indirect
+	github.com/cloudwego/base64x v0.1.4 // indirect
 	github.com/cloudwego/iasm v0.2.0 // indirect
 	github.com/dgryski/go-metro v0.0.0-20211217172704-adc40b04c140 // indirect
-	github.com/fasthttp/router v1.5.0 // indirect
+	github.com/fasthttp/router v1.5.2 // indirect
 	github.com/francoispqt/gojay v1.2.13 // indirect
-	github.com/gabriel-vasile/mimetype v1.4.3 // indirect
+	github.com/gabriel-vasile/mimetype v1.4.4 // 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.19.0 // indirect
+	github.com/go-playground/validator/v10 v10.22.0 // indirect
-	github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 // indirect
+	github.com/go-task/slim-sprig/v3 v3.0.0 // indirect
 	github.com/google/btree v1.1.2 // indirect
-	github.com/google/pprof v0.0.0-20240227163752-401108e1b7e7 // indirect
+	github.com/google/pprof v0.0.0-20240711041743-f6c9dda6c6da // 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
+	github.com/gorilla/sessions v1.3.0 // indirect
-	github.com/gorilla/websocket v1.5.1 // indirect
+	github.com/gorilla/websocket v1.5.3 // indirect
 	github.com/grbit/go-json v0.11.0 // indirect
 	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.7 // indirect
+	github.com/klauspost/compress v1.17.9 // indirect
-	github.com/klauspost/cpuid/v2 v2.2.7 // indirect
+	github.com/klauspost/cpuid/v2 v2.2.8 // indirect
 	github.com/leodido/go-urn v1.4.0 // indirect
-	github.com/lufia/plan9stats v0.0.0-20231016141302-07b5767bb0ed // indirect
+	github.com/lufia/plan9stats v0.0.0-20240513124658-fba389f38bae // indirect
 	github.com/mattn/go-isatty v0.0.20 // 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.16.0 // indirect
+	github.com/onsi/ginkgo/v2 v2.19.0 // indirect
 	github.com/pires/go-proxyproto v0.7.0 // indirect
-	github.com/power-devops/perfstat v0.0.0-20221212215047-62379fc7944b // indirect
+	github.com/power-devops/perfstat v0.0.0-20240221224432-82ca36839d55 // indirect
-	github.com/quic-go/quic-go v0.42.0 // indirect
+	github.com/quic-go/qpack v0.4.0 // indirect
-	github.com/refraction-networking/utls v1.6.3 // indirect
+	github.com/quic-go/quic-go v0.45.1 // indirect
 	github.com/refraction-networking/utls v1.6.7 // indirect
 	github.com/riobard/go-bloom v0.0.0-20200614022211-cdc8013cb5b3 // indirect
-	github.com/rogpeppe/go-internal v1.11.0 // indirect
+	github.com/rogpeppe/go-internal v1.12.0 // indirect
-	github.com/sagernet/sing v0.3.8 // indirect
+	github.com/sagernet/sing v0.4.1 // indirect
-	github.com/sagernet/sing-shadowsocks v0.2.6 // indirect
+	github.com/sagernet/sing-shadowsocks v0.2.7 // indirect
-	github.com/savsgio/gotils v0.0.0-20240303185622-093b76447511 // indirect
+	github.com/savsgio/gotils v0.0.0-20240704082632-aef3928b8a38 // indirect
-	github.com/seiflotfy/cuckoofilter v0.0.0-20220411075957-e3b120b3f5fb // indirect
+	github.com/seiflotfy/cuckoofilter v0.0.0-20240715131351-a2f2c23f1771 // indirect
 	github.com/shoenig/go-m1cpu v0.1.6 // indirect
-	github.com/tklauser/go-sysconf v0.3.12 // indirect
+	github.com/tklauser/go-sysconf v0.3.14 // indirect
-	github.com/tklauser/numcpus v0.6.1 // indirect
+	github.com/tklauser/numcpus v0.8.0 // indirect
 	github.com/twitchyliquid64/golang-asm v0.15.1 // indirect
 	github.com/ugorji/go/codec v1.2.12 // indirect
 	github.com/v2fly/ss-bloomring v0.0.0-20210312155135-28617310f63e // indirect
@@ -77,23 +79,24 @@ require (
 	github.com/valyala/fastjson v1.6.4 // indirect
 	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/xtls/reality v0.0.0-20240712055506-48f0b2d5ed6d // 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.7.0 // indirect
+	golang.org/x/arch v0.8.0 // indirect
-	golang.org/x/crypto v0.22.0 // indirect
+	golang.org/x/crypto v0.25.0 // indirect
-	golang.org/x/exp v0.0.0-20240222234643-814bf88cf225 // indirect
+	golang.org/x/exp v0.0.0-20240707233637-46b078467d37 // indirect
-	golang.org/x/mod v0.16.0 // indirect
+	golang.org/x/mod v0.19.0 // indirect
-	golang.org/x/net v0.24.0 // indirect
+	golang.org/x/net v0.27.0 // indirect
-	golang.org/x/sys v0.19.0 // indirect
+	golang.org/x/sync v0.7.0 // indirect
 	golang.org/x/sys v0.22.0 // indirect
 	golang.org/x/time v0.5.0 // indirect
-	golang.org/x/tools v0.19.0 // indirect
+	golang.org/x/tools v0.23.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-20240415180920-8c6c420018be // indirect
+	google.golang.org/genproto/googleapis/rpc v0.0.0-20240711142825-46eb208f015d // indirect
-	google.golang.org/protobuf v1.33.0 // indirect
+	google.golang.org/protobuf v1.34.2 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
-	gvisor.dev/gvisor v0.0.0-20231104011432-48a6d7d5bd0b // indirect
+	gvisor.dev/gvisor v0.0.0-20231202080848-1f7806d17489 // indirect
-	lukechampine.com/blake3 v1.2.1 // indirect
+	lukechampine.com/blake3 v1.3.0 // indirect
 )
--- a/go.sum
+++ b/go.sum
@@ -10,28 +10,25 @@ git.apache.org/thrift.git v0.0.0-20180902110319-2566ecd5d999/go.mod h1:fPE2ZNJGy
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
 github.com/BurntSushi/toml v1.3.2 h1:o7IhLm0Msx3BaB+n3Ag7L8EVlByGnpq14C4YWiu/gL8=
 github.com/BurntSushi/toml v1.3.2/go.mod h1:CxXYINrC8qIiEnFrOxCa7Jy5BFHlXnUU2pbicEuybxQ=
-github.com/Calidity/gin-sessions v1.3.1 h1:nF3dCBWa7TZ4j26iYLwGRmzZy9YODhWoOS3fmi+snyE=
+github.com/OmarTariq612/goech v0.0.0-20240405204721-8e2e1dafd3a0 h1:Wo41lDOevRJSGpevP+8Pk5bANX7fJacO2w04aqLiC5I=
-github.com/Calidity/gin-sessions v1.3.1/go.mod h1:I0+QE6qkO50TeN/n6If6novvxHk4Isvr23U8EdvPdns=
+github.com/OmarTariq612/goech v0.0.0-20240405204721-8e2e1dafd3a0/go.mod h1:FVGavL/QEBQDcBpr3fAojoK17xX5k9bicBphrOpP7uM=
 github.com/andybalholm/brotli v1.1.0 h1:eLKJA0d02Lf0mVpIDgYnqXcUn0GqVmEFny3VuID1U3M=
 github.com/andybalholm/brotli v1.1.0/go.mod h1:sms7XGricyQI9K10gOSf56VKKWS4oLer58Q+mhRPtnY=
 github.com/anmitsu/go-shlex v0.0.0-20161002113705-648efa622239/go.mod h1:2FmKhYUyUczH0OGQWaF5ceTx0UBShxjsH6f8oGKYe2c=
 github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q=
 github.com/bradfitz/go-smtpd v0.0.0-20170404230938-deb6d6237625/go.mod h1:HYsPBTaaSFSlLx/70C2HPIMNZpVV8+vt/A+FMnYP11g=
 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.11.9 h1:LFHENlIY/SLzDWverzdOvgMztTxcfcF+cqNsz9pK5zg=
-github.com/bytedance/sonic v1.10.0-rc/go.mod h1:ElCzW+ufi8qKqNW0FY314xriJhyJhuoJ3gFZdAHF7NM=
+github.com/bytedance/sonic v1.11.9/go.mod h1:LysEHSvpvDySVdC2f87zGWf6CIKJcAvqab1ZaiQtds4=
-github.com/bytedance/sonic v1.11.3 h1:jRN+yEjakWh8aK5FzrciUHG8OFXK+4/KrAX/ysEtHAA=
+github.com/bytedance/sonic/loader v0.1.1 h1:c+e5Pt1k/cy5wMveRDyk2X4B9hF4g7an8N3zCYjJFNM=
-github.com/bytedance/sonic v1.11.3/go.mod h1:iZcSUejdk5aukTND/Eu/ivjQuEL0Cu9/rf50Hi0u/g4=
+github.com/bytedance/sonic/loader v0.1.1/go.mod h1:ncP89zfokxS5LZrJxl5z0UJcsk4M4yY2JpfqGeCtNLU=
 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=
 github.com/chenzhuoyu/base64x v0.0.0-20230717121745-296ad89f973d/go.mod h1:8EPpVsBuRksnlj1mLy4AWzRNQYxauNi62uWcE3to6eA=
 github.com/chenzhuoyu/iasm v0.9.0/go.mod h1:Xjy2NpN3h7aUqeqM+woSuuvxmIe6+DDsiNLIrkAmYog=
 github.com/chenzhuoyu/iasm v0.9.1 h1:tUHQJXo3NhBqw6s33wkGn9SP3bvrWLdlVIJ3hQBL7P0=
 github.com/chenzhuoyu/iasm v0.9.1/go.mod h1:Xjy2NpN3h7aUqeqM+woSuuvxmIe6+DDsiNLIrkAmYog=
 github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
-github.com/cloudflare/circl v1.3.7 h1:qlCDlTPz2n9fu58M0Nh1J/JzcFpfgkFHHX3O35r5vcU=
+github.com/cloudflare/circl v1.3.9 h1:QFrlgFYf2Qpi8bSpVPK1HBvWpx16v/1TZivyo7pGuBE=
-github.com/cloudflare/circl v1.3.7/go.mod h1:sRTcRWXGLrKw6yIGJ+l7amYJFfAXbZG0kBSc8r4zxgA=
+github.com/cloudflare/circl v1.3.9/go.mod h1:PDRU+oXvdD7KCtgKxW95M5Z8BpSCJXQORiZFnBQS5QU=
 github.com/cloudwego/base64x v0.1.4 h1:jwCgWpFanWmN8xoIUHa2rtzmkd5J2plF/dnLS6Xd/0Y=
 github.com/cloudwego/base64x v0.1.4/go.mod h1:0zlkT4Wn5C6NdauXdJRhSKRlJvmclQ1hhJgA0rcu/8w=
 github.com/cloudwego/iasm v0.2.0 h1:1KNIy1I1H9hNNFEEH3DVnI4UujN+1zjpuk6gwHLTssg=
 github.com/cloudwego/iasm v0.2.0/go.mod h1:8rXZaNYT2n95jn+zTI1sDr+IgcD2GVs0nlbbQPiEFhY=
 github.com/coreos/go-systemd v0.0.0-20181012123002-c6f51f82210d/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
@@ -40,23 +37,25 @@ 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.5.0 h1:3Qbbo27HAPzwbpRzgiV5V9+2faPkPt3eNuRaDV6LYDA=
+github.com/fasthttp/router v1.5.2 h1:ckJCCdV7hWkkrMeId3WfEhz+4Gyyf6QPwxi/RHIMZ6I=
-github.com/fasthttp/router v1.5.0/go.mod h1:FddcKNXFZg1imHcy+uKB0oo/o6yE9zD3wNguqlhWDak=
+github.com/fasthttp/router v1.5.2/go.mod h1:C8EY53ozOwpONyevc/V7Gr8pqnEjwnkFFqPo1alAGs0=
 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=
 github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=
-github.com/gabriel-vasile/mimetype v1.4.3 h1:in2uUcidCuFcDKtdcBxlR0rJ1+fsokWf+uqxgUFjbI0=
+github.com/gabriel-vasile/mimetype v1.4.4 h1:QjV6pZ7/XZ7ryI2KuyeEDE8wnh7fHP9YnQy+R0LnH8I=
-github.com/gabriel-vasile/mimetype v1.4.3/go.mod h1:d8uq/6HKRL6CGdk+aubisF/M5GcPfT7nKyLpA0lbSSk=
+github.com/gabriel-vasile/mimetype v1.4.4/go.mod h1:JwLei5XPtWdGiMFB5Pjle1oEeoSeEuJfJE+TtfvdB/s=
 github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04=
 github.com/ghodss/yaml v1.0.1-0.20220118164431-d8423dcdf344 h1:Arcl6UOIS/kgO2nW3A65HN+7CMjSDP/gofXL4CZt1V4=
 github.com/ghodss/yaml v1.0.1-0.20220118164431-d8423dcdf344/go.mod h1:GIjDIg/heH5DOkXY3YJ/wNhfHsQHoXGjl8G8amsYQ1I=
-github.com/gin-contrib/gzip v1.0.0 h1:UKN586Po/92IDX6ie5CWLgMI81obiIp5nSP85T3wlTk=
+github.com/gin-contrib/gzip v1.0.1 h1:HQ8ENHODeLY7a4g1Au/46Z92bdGFl74OhxcZble9WJE=
-github.com/gin-contrib/gzip v1.0.0/go.mod h1:CtG7tQrPB3vIBo6Gat9FVUsis+1emjvQqd66ME5TdnE=
+github.com/gin-contrib/gzip v1.0.1/go.mod h1:njt428fdUNRvjuJf16tZMYZ2Yl+WQB53X5wmhDwXvC4=
 github.com/gin-contrib/sessions v1.0.1 h1:3hsJyNs7v7N8OtelFmYXFrulAf6zSR7nW/putcPEHxI=
 github.com/gin-contrib/sessions v1.0.1/go.mod h1:ouxSFM24/OgIud5MJYQJLpy6AwxQ5EYO9yLhbtObGkM=
 github.com/gin-contrib/sse v0.1.0 h1:Y/yl/+YNO8GZSjAhjMsSuLt29uWRFHdHYUb5lYOV9qE=
 github.com/gin-contrib/sse v0.1.0/go.mod h1:RHrZQHXnP2xjPF+u1gW/2HnVO7nvIa9PG3Gm+fLHvGI=
-github.com/gin-gonic/gin v1.9.1 h1:4idEAncQnU5cB7BeOkPtxjfCSye0AAm1R0RVIqJ+Jmg=
+github.com/gin-gonic/gin v1.10.0 h1:nTuyha1TYqgedzytsKYqna+DfLos46nTv2ygFy86HFU=
-github.com/gin-gonic/gin v1.9.1/go.mod h1:hPrL7YrpYKXt5YId3A/Tnip5kqbEAP+KLuI3SUcPTeU=
+github.com/gin-gonic/gin v1.10.0/go.mod h1:4PMNQiOhvDRa013RKVbsiNwoyezlm2rm0uX/T7kzp5Y=
 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.4.1 h1:pKouT5E8xu9zeFC39JXRDukb6JFQPXM5p5I91188VAQ=
@@ -70,12 +69,12 @@ github.com/go-playground/locales v0.14.1 h1:EWaQ/wswjilfKLTECiXz7Rh+3BjFhfDFKv/o
 github.com/go-playground/locales v0.14.1/go.mod h1:hxrqLVvrK65+Rwrd5Fc6F2O76J/NuW9t0sjnWqG1slY=
 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.19.0 h1:ol+5Fu+cSq9JD7SoSqe04GMI92cbn0+wvQ3bZ8b/AU4=
+github.com/go-playground/validator/v10 v10.22.0 h1:k6HsTZ0sTnROkhS//R0O+55JgM8C4Bx7ia+JlgcnOao=
-github.com/go-playground/validator/v10 v10.19.0/go.mod h1:dbuPbCMFw/DrkbEynArYaCwl3amGuJotoKCe95atGMM=
+github.com/go-playground/validator/v10 v10.22.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/v3 v3.0.0 h1:sUs3vkvUymDpBKi3qH1YSqBQk9+9D/8M2mN1vB6EwHI=
-github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572/go.mod h1:9Pwr4B2jHnOSGXyyzV8ROjYa2ojvAY6HCGYYfMoC3Ls=
+github.com/go-task/slim-sprig/v3 v3.0.0/go.mod h1:W848ghGpv3Qj3dhTPRyJypKRiqCdHZiAzKg9hl15HA8=
-github.com/goccy/go-json v0.10.2 h1:CrxCmQqYDkv1z7lO7Wbh2HN93uovUHgrECaO5ZrCXAU=
+github.com/goccy/go-json v0.10.3 h1:KZ5WoDbxAIgm2HNbYckL0se1fHD6rz5j4ywS6ebzDqA=
-github.com/goccy/go-json v0.10.2/go.mod h1:6MelG93GURQebXPDq3khkgXZkazVtN9CRI+MGFi0w8I=
+github.com/goccy/go-json v0.10.3/go.mod h1:oq7eo15ShAhp70Anwd5lgX2pLfOS3QCiwU/PULtXL6M=
 github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ=
 github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q=
 github.com/golang/lint v0.0.0-20180702182130-06c8688daad7/go.mod h1:tluoj9z5200jBnyusfRPU2LqT6J+DAorxEvtC7LHB+E=
@@ -85,14 +84,10 @@ github.com/golang/mock v1.7.0-rc.1 h1:YojYx61/OLFsiv6Rw1Z96LpldJIy31o+UHmwAUMJ6/
 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.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=
 github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M=
 github.com/google/go-cmp v0.5.6/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
 github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
 github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
 github.com/google/go-github v17.0.0+incompatible/go.mod h1:zLgOLi98H3fifZn+44m+umXrS52loVEgC2AApnigrVQ=
@@ -102,8 +97,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-20240227163752-401108e1b7e7 h1:y3N7Bm7Y9/CtpiVkw/ZWj6lSlDF3F74SfKwfTCer72Q=
+github.com/google/pprof v0.0.0-20240711041743-f6c9dda6c6da h1:xRmpO92tb8y+Z85iUOMOicpCfaYcv7o3Cg3wKrIpg8g=
-github.com/google/pprof v0.0.0-20240227163752-401108e1b7e7/go.mod h1:czg5+yv1E0ZGTi6S6vVK1mke0fV+FaUhNGcd6VRS9Ik=
+github.com/google/pprof v0.0.0-20240711041743-f6c9dda6c6da/go.mod h1:K1liHPHnj73Fdn/EKuT8nrFqBihUSKXoLYU0BuatOYo=
 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=
@@ -111,10 +106,10 @@ github.com/gorilla/context v1.1.2 h1:WRkNAv2uoa03QNIc1A6u4O7DAGMUVoopZhkiXWA2V1o
 github.com/gorilla/context v1.1.2/go.mod h1:KDPwT9i/MeWHiLl90fuTgrt4/wPcv75vFAZLaOOcbxM=
 github.com/gorilla/securecookie v1.1.2 h1:YCIWL56dvtr73r6715mJs5ZvhtnY73hBvEF8kXD8ePA=
 github.com/gorilla/securecookie v1.1.2/go.mod h1:NfCASbcHqRSY+3a8tlWJwsQap2VX5pwzwo4h3eOamfo=
-github.com/gorilla/sessions v1.2.2 h1:lqzMYz6bOfvn2WriPUjNByzeXIlVzURcPmgMczkmTjY=
+github.com/gorilla/sessions v1.3.0 h1:XYlkq7KcpOB2ZhHBPv5WpjMIxrQosiZanfoy1HLZFzg=
-github.com/gorilla/sessions v1.2.2/go.mod h1:ePLdVu+jbEgHH+KWw8I1z2wqd0BAdAQh/8LRvBeoNcQ=
+github.com/gorilla/sessions v1.3.0/go.mod h1:ePLdVu+jbEgHH+KWw8I1z2wqd0BAdAQh/8LRvBeoNcQ=
-github.com/gorilla/websocket v1.5.1 h1:gmztn0JnHVt9JZquRuzLw3g4wouNVzKL15iLr/zn/QY=
+github.com/gorilla/websocket v1.5.3 h1:saDtZ6Pbx/0u+bgYQ3q96pZgCzfhKXGPqt7kZ72aNNg=
-github.com/gorilla/websocket v1.5.1/go.mod h1:x3kM2JMyaluk02fnUJpQuwD2dCS5NDG2ZHL0uE0tcaY=
+github.com/gorilla/websocket v1.5.3/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
 github.com/grbit/go-json v0.11.0 h1:bAbyMdYrYl/OjYsSqLH99N2DyQ291mHy726Mx+sYrnc=
 github.com/grbit/go-json v0.11.0/go.mod h1:IYpHsdybQ386+6g3VE6AXQ3uTGa5mquBme5/ZWmtzek=
 github.com/gregjones/httpcache v0.0.0-20180305231024-9cad4c3443a7/go.mod h1:FecbI9+v66THATjSRHfNgh1IVFe/9kFxbXtjV0ctIMA=
@@ -129,11 +124,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.7 h1:ehO88t2UGzQK66LMdE8tibEd1ErmzZjNEqWkjLAKQQg=
+github.com/klauspost/compress v1.17.9 h1:6KIumPrER1LHsvBVuDa0r5xaG0Es51mhhB9BQB2qeMA=
-github.com/klauspost/compress v1.17.7/go.mod h1:Di0epgTjJY877eYKx5yC51cX2A2Vl2ibi7bDH9ttBbw=
+github.com/klauspost/compress v1.17.9/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.7 h1:ZWSB3igEs+d0qvnxR/ZBzXVmxkgt8DdzP6m9pfuVLDM=
+github.com/klauspost/cpuid/v2 v2.2.8 h1:+StwCXwm9PdpiEkPyzBXIy+M9KUb4ODm0Zarf1kS5BM=
-github.com/klauspost/cpuid/v2 v2.2.7/go.mod h1:Lcz8mBdAVJIBVzewtcLocK12l3Y+JytZYpaMropDUws=
+github.com/klauspost/cpuid/v2 v2.2.8/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.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE=
@@ -144,9 +139,8 @@ github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE=
 github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
 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-20240513124658-fba389f38bae h1:dIZY4ULFcto4tAFlj1FYZl8ztUZ13bdq+PLY+NOfbyI=
-github.com/lufia/plan9stats v0.0.0-20231016141302-07b5767bb0ed h1:036IscGBfJsFIgJQzlui7nK1Ncm0tp2ktmPj8xO4N/0=
+github.com/lufia/plan9stats v0.0.0-20240513124658-fba389f38bae/go.mod h1:ilwx/Dta8jXAgpFYFvSWEMwxmbWXyiUHkd5FwyKhb5k=
 github.com/lufia/plan9stats v0.0.0-20231016141302-07b5767bb0ed/go.mod h1:ilwx/Dta8jXAgpFYFvSWEMwxmbWXyiUHkd5FwyKhb5k=
 github.com/lunixbochs/vtclean v1.0.0/go.mod h1:pHhQNgMf3btfWnGBVipUOjRYhoOsdGqdm/+2c2E2WMI=
 github.com/mailru/easyjson v0.0.0-20190312143242-1de009706dbe/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc=
 github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWEY=
@@ -155,65 +149,66 @@ github.com/mattn/go-sqlite3 v1.14.22 h1:2gZY6PC6kBnID23Tichd1K+Z0oS6nE/XwU+Vz/5o
 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.58 h1:ca2Hdkz+cDg/7eNF6V56jjzuZ4aCAE+DbVkILdQWG/4=
+github.com/miekg/dns v1.1.61 h1:nLxbwF3XxhwVSm8g9Dghm9MHPaUZuqhPiGL+675ZmEs=
-github.com/miekg/dns v1.1.58/go.mod h1:Ypv+3b/KadlvW9vJfXOTf300O4UqaHFzFCuHz+rPkBY=
+github.com/miekg/dns v1.1.61/go.mod h1:mnAarhS3nWaW+NVP2wTkYVIZyHNJ098SJZUki3eykwQ=
 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=
 github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=
 github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9Gz0M=
 github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk=
-github.com/mymmrac/telego v0.29.2 h1:5+fQ/b8d8Ld6ihCJ0OLe1CwUdT3t1sIUl3RaSaSvRJs=
+github.com/mymmrac/telego v0.31.0 h1:vsN+JCNkh7Z9vfL/2/AHZ2xBsRk2GCMj3zydjCxkgIc=
-github.com/mymmrac/telego v0.29.2/go.mod h1:BsKr+GF9BHqaVaLBwsZeDnfuJcJx2olWuDEtKm4zHMc=
+github.com/mymmrac/telego v0.31.0/go.mod h1:MuqgVf2xXnIOWZs0prvsp3f4Yss80kCSjVEj4CRl7Ig=
 github.com/neelance/astrewrite v0.0.0-20160511093645-99348263ae86/go.mod h1:kHJEU3ofeGjhHklVoIGuVj85JJwZ6kWPaJwCIxgnFmo=
 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.16.0 h1:7q1w9frJDzninhXxjZd+Y/x54XNjG/UlRLIYPZafsPM=
+github.com/onsi/ginkgo/v2 v2.19.0 h1:9Cnnf7UHo57Hy3k6/m5k3dRfGTMXGvxhHFvkDTCTpvA=
-github.com/onsi/ginkgo/v2 v2.16.0/go.mod h1:llBI3WDLL9Z6taip6f33H76YcWtJv+7R3HigUjbIBOs=
+github.com/onsi/ginkgo/v2 v2.19.0/go.mod h1:rlwLi9PilAFJ8jCg9UE1QP6VBpd6/xj3SRC0d6TU0To=
-github.com/onsi/gomega v1.30.0 h1:hvMK7xYz4D3HapigLTeGdId/NcfQx1VHMJc60ew99+8=
+github.com/onsi/gomega v1.33.1 h1:dsYjIxxSR755MDmKVsaFQTE22ChNBcuuTWgkUDSubOk=
-github.com/onsi/gomega v1.30.0/go.mod h1:9sxs+SwGrKI0+PWe4Fxa9tFQQBG5xSsSbMXOI8PPpoQ=
+github.com/onsi/gomega v1.33.1/go.mod h1:U4R44UsT+9eLIaYRB2a5qajjtQYn0hauxvRm16AVYg0=
 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=
 github.com/pelletier/go-toml v1.9.5 h1:4yBQzkHv+7BHq2PQUZF3Mx0IYxG7LsP222s7Agd3ve8=
 github.com/pelletier/go-toml v1.9.5/go.mod h1:u1nR/EPcESfeI/szUZKdtJ0xRNbUoANCkoOuaOx1Y+c=
-github.com/pelletier/go-toml/v2 v2.2.1 h1:9TA9+T8+8CUCO2+WYnDLCgrYi9+omqKXyjDtosvtEhg=
+github.com/pelletier/go-toml/v2 v2.2.2 h1:aYUidT7k73Pcl9nb2gScu7NSrKCSHIDE89b3+6Wq+LM=
-github.com/pelletier/go-toml/v2 v2.2.1/go.mod h1:1t835xjRzz80PqgE6HHgN2JOsmgYu/h4qDAS4n929Rs=
+github.com/pelletier/go-toml/v2 v2.2.2/go.mod h1:1t835xjRzz80PqgE6HHgN2JOsmgYu/h4qDAS4n929Rs=
 github.com/pires/go-proxyproto v0.7.0 h1:IukmRewDQFWC7kfnb66CSomk2q/seBuilHBYFwyq0Hs=
 github.com/pires/go-proxyproto v0.7.0/go.mod h1:Vz/1JPY/OACxWGQNIRY2BeyDmpoaWmEP40O9LbuiFR4=
 github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
-github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c/go.mod h1:OmDBASR4679mdNQnz2pUhc2G8CO2JrUAVFDRBDP/hJE=
+github.com/power-devops/perfstat v0.0.0-20240221224432-82ca36839d55 h1:o4JXh1EVt9k/+g42oCprj/FisM4qX9L3sZB3upGN2ZU=
-github.com/power-devops/perfstat v0.0.0-20221212215047-62379fc7944b h1:0LFwY6Q3gMACTjAbMZBjXAqTOzOwFaj2Ld6cjeQ7Rig=
+github.com/power-devops/perfstat v0.0.0-20240221224432-82ca36839d55/go.mod h1:OmDBASR4679mdNQnz2pUhc2G8CO2JrUAVFDRBDP/hJE=
 github.com/power-devops/perfstat v0.0.0-20221212215047-62379fc7944b/go.mod h1:OmDBASR4679mdNQnz2pUhc2G8CO2JrUAVFDRBDP/hJE=
 github.com/prometheus/client_golang v0.8.0/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw=
 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/quic-go v0.42.0 h1:uSfdap0eveIl8KXnipv9K7nlwZ5IqLlYOpJ58u5utpM=
+github.com/quic-go/qpack v0.4.0 h1:Cr9BXA1sQS2SmDUWjSofMPNKmvF6IiIfDRmgU0w1ZCo=
-github.com/quic-go/quic-go v0.42.0/go.mod h1:132kz4kL3F9vxhW3CtQJLDVwcFe5wdWeJXXijhsO57M=
+github.com/quic-go/qpack v0.4.0/go.mod h1:UZVnYIfi5GRk+zI9UMaCPsmZ2xKJP7XBUvVyT1Knj9A=
-github.com/refraction-networking/utls v1.6.3 h1:MFOfRN35sSx6K5AZNIoESsBuBxS2LCgRilRIdHb6fDc=
+github.com/quic-go/quic-go v0.45.1 h1:tPfeYCk+uZHjmDRwHHQmvHRYL2t44ROTujLeFVBmjCA=
-github.com/refraction-networking/utls v1.6.3/go.mod h1:yil9+7qSl+gBwJqztoQseO6Pr3h62pQoY1lXiNR/FPs=
+github.com/quic-go/quic-go v0.45.1/go.mod h1:1dLehS7TIR64+vxGR70GDcatWTOtMX2PUtnKsjbTurI=
 github.com/refraction-networking/utls v1.6.7 h1:zVJ7sP1dJx/WtVuITug3qYUq034cDq9B2MR1K67ULZM=
 github.com/refraction-networking/utls v1.6.7/go.mod h1:BC3O4vQzye5hqpmDTWUqi4P5DDhzJfkV1tdqtawQIH0=
 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=
 github.com/robfig/cron/v3 v3.0.1/go.mod h1:eQICP3HwyT7UooqI/z+Ov+PtYAWygg1TEWWzGIFLtro=
-github.com/rogpeppe/go-internal v1.11.0 h1:cWPaGQEPrBb5/AsnsZesgZZ9yb1OQ+GOISoDNXVBh4M=
+github.com/rogpeppe/go-internal v1.12.0 h1:exVL4IDcn6na9z1rAb56Vxr+CgyK3nn3O+epU5NdKM8=
-github.com/rogpeppe/go-internal v1.11.0/go.mod h1:ddIwULY96R17DhadqLgMfk9H9tvdUzkipdSkR5nkCZA=
+github.com/rogpeppe/go-internal v1.12.0/go.mod h1:E+RYuTGaKKdloAfM02xzb0FW3Paa99yedzYV+kq4uf4=
 github.com/russross/blackfriday v1.5.2/go.mod h1:JO/DiYxRf+HjHt06OyowR9PTA263kcR/rfWxYHBV53g=
-github.com/sagernet/sing v0.3.8 h1:gm4JKalPhydMYX2zFOTnnd4TXtM/16WFRqSjMepYQQk=
+github.com/sagernet/sing v0.4.1 h1:zVlpE+7k7AFoC2pv6ReqLf0PIHjihL/jsBl5k05PQFk=
-github.com/sagernet/sing v0.3.8/go.mod h1:+60H3Cm91RnL9dpVGWDPHt0zTQImO9Vfqt9a4rSambI=
+github.com/sagernet/sing v0.4.1/go.mod h1:ieZHA/+Y9YZfXs2I3WtuwgyCZ6GPsIR7HdKb1SdEnls=
-github.com/sagernet/sing-shadowsocks v0.2.6 h1:xr7ylAS/q1cQYS8oxKKajhuQcchd5VJJ4K4UZrrpp0s=
+github.com/sagernet/sing-shadowsocks v0.2.7 h1:zaopR1tbHEw5Nk6FAkM05wCslV6ahVegEZaKMv9ipx8=
-github.com/sagernet/sing-shadowsocks v0.2.6/go.mod h1:j2YZBIpWIuElPFL/5sJAj470bcn/3QQ5lxZUNKLDNAM=
+github.com/sagernet/sing-shadowsocks v0.2.7/go.mod h1:0rIKJZBR65Qi0zwdKezt4s57y/Tl1ofkaq6NlkzVuyE=
-github.com/savsgio/gotils v0.0.0-20240303185622-093b76447511 h1:KanIMPX0QdEdB4R3CiimCAbxFrhB3j7h0/OvpYGVQa8=
+github.com/savsgio/gotils v0.0.0-20240704082632-aef3928b8a38 h1:D0vL7YNisV2yqE55+q0lFuGse6U8lxlg7fYTctlT5Gc=
-github.com/savsgio/gotils v0.0.0-20240303185622-093b76447511/go.mod h1:sM7Mt7uEoCeFSCBM+qBrqvEo+/9vdmj19wzp3yzUhmg=
+github.com/savsgio/gotils v0.0.0-20240704082632-aef3928b8a38/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-20240715131351-a2f2c23f1771 h1:emzAzMZ1L9iaKCTxdy3Em8Wv4ChIAGnfiz18Cda70g4=
-github.com/seiflotfy/cuckoofilter v0.0.0-20220411075957-e3b120b3f5fb/go.mod h1:bR6DqgcAl1zTcOX8/pE2Qkj9XO00eCNqmKb7lXP8EAg=
+github.com/seiflotfy/cuckoofilter v0.0.0-20240715131351-a2f2c23f1771/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.3 h1:eoUGJSmdfLzJ3mxIhmOAhgKEKgQkeOwKpz1NbhVnuPE=
+github.com/shirou/gopsutil/v4 v4.24.6 h1:9qqCSYF2pgOU+t+NgJtp7Co5+5mHF/HyKBUckySQL64=
-github.com/shirou/gopsutil/v3 v3.24.3/go.mod h1:JpND7O217xa72ewWz9zN2eIIkPWsDN/3pl0H8Qt0uwg=
+github.com/shirou/gopsutil/v4 v4.24.6/go.mod h1:aoebb2vxetJ/yIDZISmduFvVNPHqXQ9SEJwRXxkf0RA=
 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=
@@ -257,10 +252,10 @@ github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXl
 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.14 h1:g5vzr9iPFFz24v2KZXs/pvpvh8/V9Fw6vQK5ZZb78yU=
-github.com/tklauser/go-sysconf v0.3.12/go.mod h1:Ho14jnntGE1fpdOqQEEaiKRpvIavV0hSfmBq8nJbHYI=
+github.com/tklauser/go-sysconf v0.3.14/go.mod h1:1ym4lWMLUOhuBOPGtRcJm7tEGX4SCYNEEEtghGG/8uY=
-github.com/tklauser/numcpus v0.6.1 h1:ng9scYS7az0Bk4OZLvrNXNSAO2Pxr1XXRAPyjhIx+Fk=
+github.com/tklauser/numcpus v0.8.0 h1:Mx4Wwe/FjZLeQsK/6kt2EOepwwSl7SmJrK5bV/dXYgY=
-github.com/tklauser/numcpus v0.6.1/go.mod h1:1XfjsgE2zo8GVw7POkMbHENHzVg3GzmoZ9fESEdAacY=
+github.com/tklauser/numcpus v0.8.0/go.mod h1:ZJZlAY+dmR4eut8epnzf0u/VwodKmryxR8txiloSqBE=
 github.com/twitchyliquid64/golang-asm v0.15.1 h1:SU5vSMR7hnwNxj24w34ZyCi/FmDZTkS4MhqMhdFk5YI=
 github.com/twitchyliquid64/golang-asm v0.15.1/go.mod h1:a1lVb/DtPvCB8fslRZhAngC2+aY1QWCk3Cedj/Gdt08=
 github.com/ugorji/go/codec v1.2.12 h1:9LC83zGrHhuUA9l16C9AHXAqEV/2wBQ4nkvumAE65EE=
@@ -269,8 +264,8 @@ github.com/v2fly/ss-bloomring v0.0.0-20210312155135-28617310f63e h1:5QefA066A1tF
 github.com/v2fly/ss-bloomring v0.0.0-20210312155135-28617310f63e/go.mod h1:5t19P9LBIrNamL6AcMQOncg/r10y3Pc01AbHeMhwlpU=
 github.com/valyala/bytebufferpool v1.0.0 h1:GqA5TC/0021Y/b9FG4Oi9Mr3q7XYx6KllzawFIhcdPw=
 github.com/valyala/bytebufferpool v1.0.0/go.mod h1:6bBcMArwyJ5K/AmCkWv1jt77kVWyCJ6HpOuEn7z0Csc=
-github.com/valyala/fasthttp v1.52.0 h1:wqBQpxH71XW0e2g+Og4dzQM8pk34aFYlA1Ga8db7gU0=
+github.com/valyala/fasthttp v1.55.0 h1:Zkefzgt6a7+bVKHnu/YaYSOPfNYNisSVBo/unVCf8k8=
-github.com/valyala/fasthttp v1.52.0/go.mod h1:hf5C4QnVMkNXMspnsUlfM3WitlgYflyhHYoKol/szxQ=
+github.com/valyala/fasthttp v1.55.0/go.mod h1:NkY9JtkrpPKmgwV3HTaS2HWaJss9RSIsRVfcxxoHiOM=
 github.com/valyala/fastjson v1.6.4 h1:uAUNq9Z6ymTgGhcm0UynUAB6tlbakBrz6CQFax3BXVQ=
 github.com/valyala/fastjson v1.6.4/go.mod h1:CLCAqky6SMuOcxStkYQvblddUtoRxhYMGLrsQns1aXY=
 github.com/viant/assertly v0.4.8/go.mod h1:aGifi++jvCrUaklKEKT0BU95igDNaqkvz+49uaYMPRU=
@@ -280,10 +275,10 @@ github.com/vishvananda/netlink v1.2.1-beta.2.0.20230316163032-ced5aaba43e3/go.mo
 github.com/vishvananda/netns v0.0.0-20200728191858-db3c7e526aae/go.mod h1:DD4vA1DwXk04H54A1oHXtwZmA0grkVMdPxx/VGLCah0=
 github.com/vishvananda/netns v0.0.4 h1:Oeaw1EM2JMxD51g9uhtC0D7erkIjgmj8+JZc26m1YX8=
 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-20240712055506-48f0b2d5ed6d h1:+B97uD9uHLgAAulhigmys4BVwZZypzK7gPN3WtpgRJg=
-github.com/xtls/reality v0.0.0-20231112171332-de1173cf2b19/go.mod h1:dm4y/1QwzjGaK17ofi0Vs6NpKAHegZky8qk6J2JJZAE=
+github.com/xtls/reality v0.0.0-20240712055506-48f0b2d5ed6d/go.mod h1:dm4y/1QwzjGaK17ofi0Vs6NpKAHegZky8qk6J2JJZAE=
-github.com/xtls/xray-core v1.8.10 h1:qxae6gSteonpPI7EZyOyqw5HmRVRzmU07qs0l1GNqz4=
+github.com/xtls/xray-core v1.8.19 h1:mml7smcO2FM5HyyKdqnf5F2BUvi3br2ldrqmeemEFRE=
-github.com/xtls/xray-core v1.8.10/go.mod h1:Mc1t+kLBPE5a1EpsUNKjMLviGz3Y0XywxeEraJZAMlI=
+github.com/xtls/xray-core v1.8.19/go.mod h1:0CwyMPNA5Cs+ukPXHbYQGgne/ug0PuXOSVqBu7zyXOc=
 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=
@@ -295,22 +290,22 @@ go4.org v0.0.0-20180809161055-417644f6feb5/go.mod h1:MkTOUMDaeVYJUOUsaDXIhWPZYa1
 go4.org/netipx v0.0.0-20231129151722-fdeea329fbba h1:0b9z3AuHCjxk0x/opv64kcgZLBseWJUpBw5I82+2U4M=
 go4.org/netipx v0.0.0-20231129151722-fdeea329fbba/go.mod h1:PLyyIXexvUFg3Owu6p/WfdlivPbZJsZdgWZlrGope/Y=
 golang.org/x/arch v0.0.0-20210923205945-b76863e36670/go.mod h1:5om86z9Hs0C8fWVUuoMHwpExlXzs5Tkyp9hOrfG7pp8=
-golang.org/x/arch v0.7.0 h1:pskyeJh/3AmoQ8CPE95vxHLqp1G1GfGNXTmcl9NEKTc=
+golang.org/x/arch v0.8.0 h1:3wRIsP3pM4yUptoR96otTUOXI367OS0+c9eeRi9doIc=
-golang.org/x/arch v0.7.0/go.mod h1:FEVrYAQjsQXMVJ1nsMoVVXPZg6p2JE2mx8psSWTDQys=
+golang.org/x/arch v0.8.0/go.mod h1:FEVrYAQjsQXMVJ1nsMoVVXPZg6p2JE2mx8psSWTDQys=
 golang.org/x/build v0.0.0-20190111050920-041ab4dc3f9d/go.mod h1:OWs+y06UdEOHN4y+MfF/py+xQ/tYqIWW03b70/CG9Rw=
 golang.org/x/crypto v0.0.0-20181030102418-4d3f4d9ffa16/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
 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.22.0 h1:g1v0xeRhjcugydODzvb3mEM9SQ0HGp9s/nh3COQ/C30=
+golang.org/x/crypto v0.25.0 h1:ypSNr+bnYL2YhwoMt2zPxHFmbAN1KZs/njMG3hxUp30=
-golang.org/x/crypto v0.22.0/go.mod h1:vr6Su+7cTlO45qkww3VDJlzDn0ctJvRgYbC2NvXHt+M=
+golang.org/x/crypto v0.25.0/go.mod h1:T+wALwcMOSE0kXgUAnPAHqTLW+XHgcELELW8VaDgm/M=
 golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
-golang.org/x/exp v0.0.0-20240222234643-814bf88cf225 h1:LfspQV/FYTatPTr/3HzIcmiUFH7PGP+OQ6mgDYo3yuQ=
+golang.org/x/exp v0.0.0-20240707233637-46b078467d37 h1:uLDX+AfeFCct3a2C7uIWBKMJIR3CJMhcgfrUAqjRK6w=
-golang.org/x/exp v0.0.0-20240222234643-814bf88cf225/go.mod h1:CxmFvTBINI24O/j8iY7H1xHzx2i4OsyguNBmN/uPtqc=
+golang.org/x/exp v0.0.0-20240707233637-46b078467d37/go.mod h1:M4RDyNAINzryxdtnbRXRL/OHtkFuWGRjvuhBJpk2IlY=
 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.16.0 h1:QX4fJ0Rr5cPQCF7O9lh9Se4pmwfwskqZfq5moyldzic=
+golang.org/x/mod v0.19.0 h1:fEdghXQSo20giMthA7cd28ZC+jts4amQ3YMXiP5oMQ8=
-golang.org/x/mod v0.16.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c=
+golang.org/x/mod v0.19.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=
@@ -319,8 +314,8 @@ golang.org/x/net v0.0.0-20181106065722-10aee1819953/go.mod h1:mL1N/T3taQHkDXs73r
 golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 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.24.0 h1:1PcaxkF854Fu3+lvBIx5SYn9wRlBzzcnHZSiaFFAb0w=
+golang.org/x/net v0.27.0 h1:5K3Njcw06/l2y9vpGCSdcxWOYHOUk3dVNGDXN+FvAys=
-golang.org/x/net v0.24.0/go.mod h1:2Q7sJY5mzlzWjKtYUEXSlBWCdyaioyXzRB2RtU8KVE8=
+golang.org/x/net v0.27.0/go.mod h1:dDi0PyhWNoiUOrAS8uXv/vnScO4wnHQO4mj9fn/RytE=
 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=
@@ -330,8 +325,8 @@ golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJ
 golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20190227155943-e225da77a7e6/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.6.0 h1:5BMeUDZ7vkXGfEr1x9B4bRcTH4lpkTkpdh0T/J+qjbQ=
+golang.org/x/sync v0.7.0 h1:YsImfSBoP9QPYL0xyKJPq0gcaJdG3rInoqxTWbfQu9M=
-golang.org/x/sync v0.6.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
+golang.org/x/sync v0.7.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
 golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20181029174526-d69651ed3497/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
@@ -344,15 +339,12 @@ golang.org/x/sys v0.0.0-20220804214406-8e32c043e418/go.mod h1:oPkhp1MJrh7nUepCBc
 golang.org/x/sys v0.1.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.22.0 h1:RI27ohtqKCnwULzJLqkv897zojh5/DwS/ENaMzUOaWI=
-golang.org/x/sys v0.11.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.22.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
 golang.org/x/sys v0.18.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
 golang.org/x/sys v0.19.0 h1:q5f1RH2jigJ1MoAWp2KTp3gm5zAGFUTarQZ5U386+4o=
 golang.org/x/sys v0.19.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
 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=
-golang.org/x/text v0.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ=
+golang.org/x/text v0.16.0 h1:a94ExnEXNtEwYLGJSIUxnWoxoRz/ZcCsV63ROupILh4=
-golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
+golang.org/x/text v0.16.0/go.mod h1:GhwF1Be+LQoKShO3cGOHzqOgRrGaYc9AvblQOmPVHnI=
 golang.org/x/time v0.0.0-20180412165947-fbb02b2291d2/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 golang.org/x/time v0.5.0 h1:o7cqy6amK/52YcAKIPlM3a+Fpj35zvRj2TP+e1xFSfk=
@@ -361,9 +353,8 @@ golang.org/x/tools v0.0.0-20180828015842-6cd1fcedba52/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.19.0 h1:tfGCXNR1OsFG+sVdLAitlpjAvD/I6dHDKnYrpEZUHkw=
+golang.org/x/tools v0.23.0 h1:SGsXPZ+2l4JsgaCKkx+FQ9YZ5XEtA1GZYuoDjenLjvg=
-golang.org/x/tools v0.19.0/go.mod h1:qoJWxmGSIBmAeriMx19ogtrEPrGtDbPK634QFIcLAhc=
+golang.org/x/tools v0.23.0/go.mod h1:pnu6ufv6vQkll6szChhK3C3L/ruaIv5eBeztNG8wtsI=
 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=
 golang.zx2c4.com/wireguard v0.0.0-20231211153847-12269c276173 h1:/jFs0duh4rdb8uIfPMv78iAJGcPKDeqAFnaLBropIC4=
@@ -380,16 +371,16 @@ 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-20240415180920-8c6c420018be h1:LG9vZxsWGOmUKieR8wPAUR3u3MpnYFQZROPIMaXh7/A=
+google.golang.org/genproto/googleapis/rpc v0.0.0-20240711142825-46eb208f015d h1:JU0iKnSg02Gmb5ZdV8nYsKEKsP6o/FGVWTrw4i1DA9A=
-google.golang.org/genproto/googleapis/rpc v0.0.0-20240415180920-8c6c420018be/go.mod h1:WtryC6hu0hhx87FDGxWCDptyssuo68sk10vYjF+T9fY=
+google.golang.org/genproto/googleapis/rpc v0.0.0-20240711142825-46eb208f015d/go.mod h1:Ue6ibwXGpU+dqIcODieyLOcgj7z8+IcskoNIgZxtrFY=
 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.63.2 h1:MUeiw1B2maTVZthpU5xvASfTh3LDbxHd6IJ6QQVU+xM=
+google.golang.org/grpc v1.65.0 h1:bs/cUb4lp1G5iImFFd3u5ixQzweKizoZJAwBNLR42lc=
-google.golang.org/grpc v1.63.2/go.mod h1:WAX/8DgncnokcFUldAxq7GeB5DXHDbMF+lLvDomNkRA=
+google.golang.org/grpc v1.65.0/go.mod h1:WgYC2ypjlB0EiQi6wdKixMqukr6lBc0Vo+oOgjrM5ZQ=
-google.golang.org/protobuf v1.33.0 h1:uNO2rsAINq/JlFpSdYEKIZ0uKD/R9cpdv0T+yoGwGmI=
+google.golang.org/protobuf v1.34.2 h1:6xV6lTsCfpGD21XK49h7MhtcApnLqkfYgPcdHftf6hg=
-google.golang.org/protobuf v1.33.0/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos=
+google.golang.org/protobuf v1.34.2/go.mod h1:qYOHts0dSfpeUzUFpOMr/WGzszTmLH+DiWniOlNbLDw=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=
 gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q=
@@ -402,18 +393,18 @@ gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C
 gopkg.in/yaml.v3 v3.0.0-20200605160147-a5ece683394c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
 gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
-gorm.io/driver/sqlite v1.5.5 h1:7MDMtUZhV065SilG62E0MquljeArQZNfJnjd9i9gx3E=
+gorm.io/driver/sqlite v1.5.6 h1:fO/X46qn5NUEEOZtnjJRWRzZMe8nqJiQ9E+0hi+hKQE=
-gorm.io/driver/sqlite v1.5.5/go.mod h1:6NgQ7sQWAIFsPrJJl1lSNSu2TABh0ZZ/zm5fosATavE=
+gorm.io/driver/sqlite v1.5.6/go.mod h1:U+J8craQU6Fzkcvu8oLeAQmi50TkwPEhHDEjQZXDah4=
-gorm.io/gorm v1.25.9 h1:wct0gxZIELDk8+ZqF/MVnHLkA1rvYlBWUMv2EdsK1g8=
+gorm.io/gorm v1.25.11 h1:/Wfyg1B/je1hnDx3sMkX+gAlxrlZpn6X0BXRlwXlvHg=
-gorm.io/gorm v1.25.9/go.mod h1:hbnx/Oo0ChWMn1BIhpy1oYozzpM15i4YPuHDmfYtwg8=
+gorm.io/gorm v1.25.11/go.mod h1:xh7N7RHfYlNc5EmcI/El95gXusucDrQnHXe0+CgWcLQ=
 grpc.go4.org v0.0.0-20170609214715-11d0a25b4919/go.mod h1:77eQGdRu53HpSqPFJFmuJdjuHRquDANNeA4x7B8WQ9o=
-gvisor.dev/gvisor v0.0.0-20231104011432-48a6d7d5bd0b h1:yqkg3pTifuKukuWanp8spDsL4irJkHF5WI0J47hU87o=
+gvisor.dev/gvisor v0.0.0-20231202080848-1f7806d17489 h1:ze1vwAdliUAr68RQ5NtufWaXaOg8WUO2OACzEV+TNdE=
-gvisor.dev/gvisor v0.0.0-20231104011432-48a6d7d5bd0b/go.mod h1:10sU+Uh5KKNv1+2x2A0Gvzt8FjD3ASIhorV3YsauXhk=
+gvisor.dev/gvisor v0.0.0-20231202080848-1f7806d17489/go.mod h1:10sU+Uh5KKNv1+2x2A0Gvzt8FjD3ASIhorV3YsauXhk=
 honnef.co/go/tools v0.0.0-20180728063816-88497007e858/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
 honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
 honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
-lukechampine.com/blake3 v1.2.1 h1:YuqqRuaqsGV71BV/nm9xlI0MKUv4QC54jQnBChWbGnI=
+lukechampine.com/blake3 v1.3.0 h1:sJ3XhFINmHSrYCgl958hscfIa3bw8x4DqMP3u1YvoYE=
-lukechampine.com/blake3 v1.2.1/go.mod h1:0OFRp7fBtAylGVCO40o87sbupkyIGgbpv1+M1k1LM6k=
+lukechampine.com/blake3 v1.3.0/go.mod h1:0OFRp7fBtAylGVCO40o87sbupkyIGgbpv1+M1k1LM6k=
 nullprogram.com/x/optparse v1.0.0/go.mod h1:KdyPE+Igbe0jQUrVfMqDMeJQIJZEuyV7pjYmp6pbG50=
 rsc.io/pdf v0.1.1/go.mod h1:n8OzWcQ6Sp37PL01nO98y4iUCRdTGarVfzxY20ICaU4=
 sourcegraph.com/sourcegraph/go-diff v0.5.0/go.mod h1:kuch7UrkMzY0X+p9CRK03kfuPQ2zzQcaEFbx8wA8rck=
--- a/install.sh
+++ b/install.sh
@@ -49,6 +49,8 @@ elif [[ "${release}" == "manjaro" ]]; then
    echo "Your OS is Manjaro"
 elif [[ "${release}" == "armbian" ]]; then
    echo "Your OS is Armbian"
 elif [[ "${release}" == "opensuse-tumbleweed" ]]; then
    echo "Your OS is OpenSUSE Tumbleweed"
 elif [[ "${release}" == "centos" ]]; then
    if [[ ${os_version} -lt 8 ]]; then
        echo -e "${red} Please use CentOS 8 or higher ${plain}\n" && exit 1
@@ -91,12 +93,16 @@ else
    echo "- AlmaLinux 9+"
    echo "- Rocky Linux 9+"
    echo "- Oracle Linux 8+"
    echo "- OpenSUSE Tumbleweed"
    exit 1
 fi
 install_base() {
    case "${release}" in
    ubuntu | debian | armbian)
        apt-get update && apt-get install -y -q wget curl tar tzdata
        ;;
    centos | almalinux | rocky | oracle)
        yum -y update && yum install -y -q wget curl tar tzdata
        ;;
@@ -106,16 +112,25 @@ install_base() {
    arch | manjaro | parch)
        pacman -Syu && pacman -Syu --noconfirm wget curl tar tzdata
        ;;
    opensuse-tumbleweed)
        zypper refresh && zypper -q install -y wget curl tar timezone
        ;;
    *)
        apt-get update && apt install -y -q wget curl tar tzdata
        ;;
    esac
 }
 gen_random_string() {
    local length="$1"
    local random_string=$(LC_ALL=C tr -dc 'a-zA-Z0-9' < /dev/urandom | fold -w "$length" | head -n 1)
    echo "$random_string"
 }
 # This function will be called when user installed x-ui out of security
 config_after_install() {
    echo -e "${yellow}Install/update finished! For security it's recommended to modify panel settings ${plain}"
-    read -p "Do you want to continue with the modification [y/n]?": config_confirm
+    read -p "Would you like to customize the panel settings? (If not, random settings will be applied) [y/n]: " config_confirm
    if [[ "${config_confirm}" == "y" || "${config_confirm}" == "Y" ]]; then
        read -p "Please set up your username: " config_account
        echo -e "${yellow}Your username will be: ${config_account}${plain}"
@@ -123,25 +138,31 @@ config_after_install() {
        echo -e "${yellow}Your password will be: ${config_password}${plain}"
        read -p "Please set up the panel port: " config_port
        echo -e "${yellow}Your panel port is: ${config_port}${plain}"
        read -p "Please set up the web base path (ip:port/webbasepath/): " config_webBasePath
        echo -e "${yellow}Your web base path is: ${config_webBasePath}${plain}"
        echo -e "${yellow}Initializing, please wait...${plain}"
        /usr/local/x-ui/x-ui setting -username ${config_account} -password ${config_password}
        echo -e "${yellow}Account name and password set successfully!${plain}"
        /usr/local/x-ui/x-ui setting -port ${config_port}
        echo -e "${yellow}Panel port set successfully!${plain}"
        /usr/local/x-ui/x-ui setting -webBasePath ${config_webBasePath}
        echo -e "${yellow}Web base path set successfully!${plain}"
    else
-        echo -e "${red}cancel...${plain}"
+        echo -e "${red}Cancel...${plain}"
        if [[ ! -f "/etc/x-ui/x-ui.db" ]]; then
            local usernameTemp=$(head -c 6 /dev/urandom | base64)
            local passwordTemp=$(head -c 6 /dev/urandom | base64)
-            /usr/local/x-ui/x-ui setting -username ${usernameTemp} -password ${passwordTemp}
+            local webBasePathTemp=$(gen_random_string 10)
-            echo -e "this is a fresh installation,will generate random login info for security concerns:"
+            /usr/local/x-ui/x-ui setting -username ${usernameTemp} -password ${passwordTemp} -webBasePath ${webBasePathTemp}
            echo -e "This is a fresh installation, will generate random login info for security concerns:"
            echo -e "###############################################"
-            echo -e "${green}username:${usernameTemp}${plain}"
+            echo -e "${green}Username: ${usernameTemp}${plain}"
-            echo -e "${green}password:${passwordTemp}${plain}"
+            echo -e "${green}Password: ${passwordTemp}${plain}"
            echo -e "${green}WebBasePath: ${webBasePathTemp}${plain}"
            echo -e "###############################################"
-            echo -e "${red}if you forgot your login info,you can type x-ui and then type 8 to check after installation${plain}"
+            echo -e "${yellow}If you forgot your login info, you can type "x-ui settings" to check after installation${plain}"
        else
-            echo -e "${red} this is your upgrade,will keep old settings,if you forgot your login info,you can type x-ui and then type 8 to check${plain}"
+            echo -e "${yellow}This is your upgrade, will keep old settings. If you forgot your login info, you can type "x-ui settings" to check${plain}"
        fi
    fi
    /usr/local/x-ui/x-ui migrate
@@ -203,18 +224,21 @@ install_x-ui() {
    echo -e ""
    echo -e "x-ui control menu usages: "
    echo -e "----------------------------------------------"
-    echo -e "x-ui              - Enter     Admin menu"
+    echo -e "SUBCOMMANDS:"
-    echo -e "x-ui start        - Start     x-ui"
+    echo -e "x-ui              - Admin Management Script"
-    echo -e "x-ui stop         - Stop      x-ui"
+    echo -e "x-ui start        - Start"
-    echo -e "x-ui restart      - Restart   x-ui"
+    echo -e "x-ui stop         - Stop"
-    echo -e "x-ui status       - Show      x-ui status"
+    echo -e "x-ui restart      - Restart"
-    echo -e "x-ui enable       - Enable    x-ui on system startup"
+    echo -e "x-ui status       - Current Status"
-    echo -e "x-ui disable      - Disable   x-ui on system startup"
+    echo -e "x-ui settings     - Current Settings"
-    echo -e "x-ui log          - Check     x-ui logs"
+    echo -e "x-ui enable       - Enable Autostart on OS Startup"
    echo -e "x-ui disable      - Disable Autostart on OS Startup"
    echo -e "x-ui log          - Check logs"
    echo -e "x-ui banlog       - Check Fail2ban ban logs"
-    echo -e "x-ui update       - Update    x-ui"
+    echo -e "x-ui update       - Update"
-    echo -e "x-ui install      - Install   x-ui"
+    echo -e "x-ui custom       - custom version"
-    echo -e "x-ui uninstall    - Uninstall x-ui"
+    echo -e "x-ui install      - Install"
    echo -e "x-ui uninstall    - Uninstall"
    echo -e "----------------------------------------------"
 }
--- a/main.go
+++ b/main.go
@@ -21,7 +21,7 @@ import (
 )
 func runWebServer() {
-	log.Printf("%v %v", config.GetName(), config.GetVersion())
+	log.Printf("Starting %v %v", config.GetName(), config.GetVersion())
 	switch config.GetLogLevel() {
 	case config.Debug:
@@ -35,31 +35,29 @@ func runWebServer() {
 	case config.Error:
 		logger.InitLogger(logging.ERROR)
 	default:
-		log.Fatal("unknown log level:", config.GetLogLevel())
+		log.Fatalf("Unknown log level: %v", config.GetLogLevel())
 	}
 	err := database.InitDB(config.GetDBPath())
 	if err != nil {
-		log.Fatal(err)
+		log.Fatalf("Error initializing database: %v", err)
 	}
 	var server *web.Server
 	server = web.NewServer()
 	global.SetWebServer(server)
 	err = server.Start()
 	if err != nil {
-		log.Println(err)
+		log.Fatalf("Error starting web server: %v", err)
 		return
 	}
 	var subServer *sub.Server
 	subServer = sub.NewServer()
 	global.SetSubServer(subServer)
 	err = subServer.Start()
 	if err != nil {
-		log.Println(err)
+		log.Fatalf("Error starting sub server: %v", err)
 		return
 	}
@@ -71,34 +69,39 @@ func runWebServer() {
 		switch sig {
 		case syscall.SIGHUP:
 			logger.Info("Received SIGHUP signal. Restarting servers...")
 			err := server.Stop()
 			if err != nil {
-				logger.Warning("stop server err:", err)
+				logger.Warning("Error stopping web server:", err)
 			}
 			err = subServer.Stop()
 			if err != nil {
-				logger.Warning("stop server err:", err)
+				logger.Warning("Error stopping sub server:", err)
 			}
 			server = web.NewServer()
 			global.SetWebServer(server)
 			err = server.Start()
 			if err != nil {
-				log.Println(err)
+				log.Fatalf("Error restarting web server: %v", err)
 				return
 			}
 			log.Println("Web server restarted successfully.")
 			subServer = sub.NewServer()
 			global.SetSubServer(subServer)
 			err = subServer.Start()
 			if err != nil {
-				log.Println(err)
+				log.Fatalf("Error restarting sub server: %v", err)
 				return
 			}
 			log.Println("Sub server restarted successfully.")
 		default:
 			server.Stop()
 			subServer.Stop()
 			log.Println("Shutting down servers.")
 			return
 		}
 	}
@@ -107,16 +110,16 @@ func runWebServer() {
 func resetSetting() {
 	err := database.InitDB(config.GetDBPath())
 	if err != nil {
-		fmt.Println(err)
+		fmt.Println("Failed to initialize database:", err)
 		return
 	}
 	settingService := service.SettingService{}
 	err = settingService.ResetSettings()
 	if err != nil {
-		fmt.Println("reset setting failed:", err)
+		fmt.Println("Failed to reset settings:", err)
 	} else {
-		fmt.Println("reset setting success")
+		fmt.Println("Settings successfully reset.")
 	}
 }
@@ -127,38 +130,51 @@ func showSetting(show bool) {
 		if err != nil {
 			fmt.Println("get current port failed, error info:", err)
 		}
 		webBasePath, err := settingService.GetBasePath()
 		if err != nil {
 			fmt.Println("get webBasePath failed, error info:", err)
 		}
 		userService := service.UserService{}
 		userModel, err := userService.GetFirstUser()
 		if err != nil {
 			fmt.Println("get current user info failed, error info:", err)
 		}
 		username := userModel.Username
 		userpasswd := userModel.Password
-		if (username == "") || (userpasswd == "") {
+		if username == "" || userpasswd == "" {
 			fmt.Println("current username or password is empty")
 		}
 		fmt.Println("current panel settings as follows:")
 		fmt.Println("username:", username)
-		fmt.Println("userpasswd:", userpasswd)
+		fmt.Println("password:", userpasswd)
 		fmt.Println("port:", port)
 		if webBasePath != "" {
 			fmt.Println("webBasePath:", webBasePath)
 		} else {
 			fmt.Println("webBasePath is not set")
 		}
 	}
 }
 func updateTgbotEnableSts(status bool) {
 	settingService := service.SettingService{}
-	currentTgSts, err := settingService.GetTgbotenabled()
+	currentTgSts, err := settingService.GetTgbotEnabled()
 	if err != nil {
 		fmt.Println(err)
 		return
 	}
 	logger.Infof("current enabletgbot status[%v],need update to status[%v]", currentTgSts, status)
 	if currentTgSts != status {
-		err := settingService.SetTgbotenabled(status)
+		err := settingService.SetTgbotEnabled(status)
 		if err != nil {
 			fmt.Println(err)
 			return
 		} else {
-			logger.Infof("SetTgbotenabled[%v] success", status)
+			logger.Infof("SetTgbotEnabled[%v] success", status)
 		}
 	}
 }
@@ -166,7 +182,7 @@ func updateTgbotEnableSts(status bool) {
 func updateTgbotSetting(tgBotToken string, tgBotChatid string, tgBotRuntime string) {
 	err := database.InitDB(config.GetDBPath())
 	if err != nil {
-		fmt.Println(err)
+		fmt.Println("Error initializing database:", err)
 		return
 	}
@@ -175,59 +191,93 @@ func updateTgbotSetting(tgBotToken string, tgBotChatid string, tgBotRuntime stri
 	if tgBotToken != "" {
 		err := settingService.SetTgBotToken(tgBotToken)
 		if err != nil {
-			fmt.Println(err)
+			fmt.Printf("Error setting Telegram bot token: %v\n", err)
 			return
 		} else {
 			logger.Info("updateTgbotSetting tgBotToken success")
 		}
 		logger.Info("Successfully updated Telegram bot token.")
 	}
 	if tgBotRuntime != "" {
 		err := settingService.SetTgbotRuntime(tgBotRuntime)
 		if err != nil {
-			fmt.Println(err)
+			fmt.Printf("Error setting Telegram bot runtime: %v\n", err)
 			return
 		} else {
 			logger.Infof("updateTgbotSetting tgBotRuntime[%s] success", tgBotRuntime)
 		}
 		logger.Infof("Successfully updated Telegram bot runtime to [%s].", tgBotRuntime)
 	}
 	if tgBotChatid != "" {
 		err := settingService.SetTgBotChatId(tgBotChatid)
 		if err != nil {
-			fmt.Println(err)
+			fmt.Printf("Error setting Telegram bot chat ID: %v\n", err)
 			return
 		}
 		logger.Info("Successfully updated Telegram bot chat ID.")
 	}
 }
 func updateSetting(port int, username string, password string, webBasePath string) {
 	err := database.InitDB(config.GetDBPath())
 	if err != nil {
 		fmt.Println("Database initialization failed:", err)
 		return
 	}
 	settingService := service.SettingService{}
 	userService := service.UserService{}
 	if port > 0 {
 		err := settingService.SetPort(port)
 		if err != nil {
 			fmt.Println("Failed to set port:", err)
 		} else {
-			logger.Info("updateTgbotSetting tgBotChatid success")
+			fmt.Printf("Port set successfully: %v\n", port)
 		}
 	}
 	if username != "" || password != "" {
 		err := userService.UpdateFirstUser(username, password)
 		if err != nil {
 			fmt.Println("Failed to update username and password:", err)
 		} else {
 			fmt.Println("Username and password updated successfully")
 		}
 	}
 	if webBasePath != "" {
 		err := settingService.SetBasePath(webBasePath)
 		if err != nil {
 			fmt.Println("Failed to set base URI path:", err)
 		} else {
 			fmt.Println("Base URI path set successfully")
 		}
 	}
 }
-func updateSetting(port int, username string, password string) {
+func updateCert(publicKey string, privateKey string) {
 	err := database.InitDB(config.GetDBPath())
 	if err != nil {
 		fmt.Println(err)
 		return
 	}
 	if (privateKey != "" && publicKey != "") || (privateKey == "" && publicKey == "") {
 		settingService := service.SettingService{}
 		err = settingService.SetCertFile(publicKey)
 		if err != nil {
 			fmt.Println("set certificate public key failed:", err)
 		} else {
 			fmt.Println("set certificate public key success")
 		}
-	if port > 0 {
+		err = settingService.SetKeyFile(privateKey)
 		err := settingService.SetPort(port)
 		if err != nil {
-			fmt.Println("set port failed:", err)
+			fmt.Println("set certificate private key failed:", err)
 		} else {
-			fmt.Printf("set port %v success", port)
+			fmt.Println("set certificate private key success")
 		}
 	}
 	if username != "" || password != "" {
 		userService := service.UserService{}
 		err := userService.UpdateFirstUser(username, password)
 		if err != nil {
 			fmt.Println("set username and password failed:", err)
 	} else {
-			fmt.Println("set username and password success")
+		fmt.Println("both public and private key should be entered.")
 		}
 	}
 }
@@ -288,6 +338,9 @@ func main() {
 	var port int
 	var username string
 	var password string
 	var webBasePath string
 	var webCertFile string
 	var webKeyFile string
 	var tgbottoken string
 	var tgbotchatid string
 	var enabletgbot bool
@@ -295,16 +348,19 @@ func main() {
 	var reset bool
 	var show bool
 	var remove_secret bool
-	settingCmd.BoolVar(&reset, "reset", false, "reset all settings")
+	settingCmd.BoolVar(&reset, "reset", false, "Reset all settings")
-	settingCmd.BoolVar(&show, "show", false, "show current settings")
+	settingCmd.BoolVar(&show, "show", false, "Display current settings")
-	settingCmd.BoolVar(&remove_secret, "remove_secret", false, "remove secret")
+	settingCmd.BoolVar(&remove_secret, "remove_secret", false, "Remove secret key")
-	settingCmd.IntVar(&port, "port", 0, "set panel port")
+	settingCmd.IntVar(&port, "port", 0, "Set panel port number")
-	settingCmd.StringVar(&username, "username", "", "set login username")
+	settingCmd.StringVar(&username, "username", "", "Set login username")
-	settingCmd.StringVar(&password, "password", "", "set login password")
+	settingCmd.StringVar(&password, "password", "", "Set login password")
-	settingCmd.StringVar(&tgbottoken, "tgbottoken", "", "set telegram bot token")
+	settingCmd.StringVar(&webBasePath, "webBasePath", "", "Set base path for Panel")
-	settingCmd.StringVar(&tgbotRuntime, "tgbotRuntime", "", "set telegram bot cron time")
+	settingCmd.StringVar(&webCertFile, "webCert", "", "Set path to public key file for panel")
-	settingCmd.StringVar(&tgbotchatid, "tgbotchatid", "", "set telegram bot chat id")
+	settingCmd.StringVar(&webKeyFile, "webCertKey", "", "Set path to private key file for panel")
-	settingCmd.BoolVar(&enabletgbot, "enabletgbot", false, "enable telegram bot notify")
+	settingCmd.StringVar(&tgbottoken, "tgbottoken", "", "Set token for Telegram bot")
 	settingCmd.StringVar(&tgbotRuntime, "tgbotRuntime", "", "Set cron time for Telegram bot notifications")
 	settingCmd.StringVar(&tgbotchatid, "tgbotchatid", "", "Set chat ID for Telegram bot notifications")
 	settingCmd.BoolVar(&enabletgbot, "enabletgbot", false, "Enable notifications via Telegram bot")
 	oldUsage := flag.Usage
 	flag.Usage = func() {
@@ -341,7 +397,7 @@ func main() {
 		if reset {
 			resetSetting()
 		} else {
-			updateSetting(port, username, password)
+			updateSetting(port, username, password, webBasePath)
 		}
 		if show {
 			showSetting(show)
@@ -355,6 +411,18 @@ func main() {
 		if enabletgbot {
 			updateTgbotEnableSts(enabletgbot)
 		}
 	case "cert":
 		err := settingCmd.Parse(os.Args[2:])
 		if err != nil {
 			fmt.Println(err)
 			return
 		}
 		if reset {
 			updateCert("", "")
 		} else {
 			updateCert(webCertFile, webKeyFile)
 		}
 	default:
 		fmt.Println("Invalid subcommands")
 		fmt.Println()
--- a/sub/sub.go
+++ b/sub/sub.go
@@ -163,13 +163,13 @@ func (s *Server) Start() (err error) {
 			}
 			listener = network.NewAutoHttpsListener(listener)
 			listener = tls.NewListener(listener, c)
-			logger.Info("sub server run https on", listener.Addr())
+			logger.Info("Sub server running HTTPS on", listener.Addr())
 		} else {
-			logger.Error("error in loading certificates: ", err)
+			logger.Error("Error loading certificates:", err)
-			logger.Info("sub server run http on", listener.Addr())
+			logger.Info("Sub server running HTTP on", listener.Addr())
 		}
 	} else {
-		logger.Info("sub server run http on", listener.Addr())
+		logger.Info("Sub server running HTTP on", listener.Addr())
 	}
 	s.listener = listener
--- a/sub/subController.go
+++ b/sub/subController.go
@@ -2,7 +2,7 @@ package sub
 import (
 	"encoding/base64"
-	"strings"
+	"net"
 	"github.com/gin-gonic/gin"
 )
@@ -54,7 +54,17 @@ func (a *SUBController) initRouter(g *gin.RouterGroup) {
 func (a *SUBController) subs(c *gin.Context) {
 	subId := c.Param("subid")
-	host := strings.Split(c.Request.Host, ":")[0]
+	host := c.GetHeader("X-Forwarded-Host")
 	if host == "" {
 		host = c.GetHeader("X-Real-IP")
 	}
 	if host == "" {
 		var err error
 		host, _, err = net.SplitHostPort(c.Request.Host)
 		if err != nil {
 			host = c.Request.Host
 		}
 	}
 	subs, header, err := a.subService.GetSubs(subId, host)
 	if err != nil || len(subs) == 0 {
 		c.String(400, "Error!")
@@ -79,7 +89,17 @@ func (a *SUBController) subs(c *gin.Context) {
 func (a *SUBController) subJsons(c *gin.Context) {
 	subId := c.Param("subid")
-	host := strings.Split(c.Request.Host, ":")[0]
+	host := c.GetHeader("X-Forwarded-Host")
 	if host == "" {
 		host = c.GetHeader("X-Real-IP")
 	}
 	if host == "" {
 		var err error
 		host, _, err = net.SplitHostPort(c.Request.Host)
 		if err != nil {
 			host = c.Request.Host
 		}
 	}
 	jsonSub, header, err := a.subJsonService.GetJson(subId, host)
 	if err != nil || len(jsonSub) == 0 {
 		c.String(400, "Error!")
--- a/sub/subJsonService.go
+++ b/sub/subJsonService.go
@@ -211,7 +211,7 @@ func (s *SubJsonService) streamData(stream string) map[string]interface{} {
 	delete(streamSettings, "sockopt")
 	if s.fragment != "" {
-		streamSettings["sockopt"] = json_util.RawMessage(`{"dialerProxy": "fragment", "tcpKeepAliveIdle": 100, "tcpNoDelay": true}`)
+		streamSettings["sockopt"] = json_util.RawMessage(`{"dialerProxy": "fragment", "tcpKeepAliveIdle": 100, "tcpMptcp": true, "tcpNoDelay": true}`)
 	}
 	// remove proxy protocol
@@ -224,7 +224,6 @@ func (s *SubJsonService) streamData(stream string) map[string]interface{} {
 	case "httpupgrade":
 		streamSettings["httpupgradeSettings"] = s.removeAcceptProxy(streamSettings["httpupgradeSettings"])
 	}
 	return streamSettings
 }
--- a/sub/subService.go
+++ b/sub/subService.go
@@ -202,12 +202,11 @@ func (s *SubService) genVmessLink(inbound *model.Inbound, email string) string {
 	case "ws":
 		ws, _ := stream["wsSettings"].(map[string]interface{})
 		obj["path"] = ws["path"].(string)
-		obj["host"] = ws["host"].(string)
+		if host, ok := ws["host"].(string); ok && len(host) > 0 {
-		if headers, ok := ws["headers"].(map[string]interface{}); ok {
+			obj["host"] = host
-			hostFromHeaders := searchHost(headers)
+		} else {
-			if hostFromHeaders != "" {
+			headers, _ := ws["headers"].(map[string]interface{})
-				obj["host"] = hostFromHeaders
+			obj["host"] = searchHost(headers)
 			}
 		}
 	case "http":
 		obj["net"] = "h2"
@@ -230,12 +229,20 @@ func (s *SubService) genVmessLink(inbound *model.Inbound, email string) string {
 	case "httpupgrade":
 		httpupgrade, _ := stream["httpupgradeSettings"].(map[string]interface{})
 		obj["path"] = httpupgrade["path"].(string)
-		obj["host"] = httpupgrade["host"].(string)
+		if host, ok := httpupgrade["host"].(string); ok && len(host) > 0 {
-		if headers, ok := httpupgrade["headers"].(map[string]interface{}); ok {
+			obj["host"] = host
-			hostFromHeaders := searchHost(headers)
+		} else {
-			if hostFromHeaders != "" {
+			headers, _ := httpupgrade["headers"].(map[string]interface{})
-				obj["host"] = hostFromHeaders
+			obj["host"] = searchHost(headers)
 		}
 	case "splithttp":
 		splithttp, _ := stream["splithttpSettings"].(map[string]interface{})
 		obj["path"] = splithttp["path"].(string)
 		if host, ok := splithttp["host"].(string); ok && len(host) > 0 {
 			obj["host"] = host
 		} else {
 			headers, _ := splithttp["headers"].(map[string]interface{})
 			obj["host"] = searchHost(headers)
 		}
 	}
 	security, _ := stream["security"].(string)
@@ -352,13 +359,11 @@ func (s *SubService) genVlessLink(inbound *model.Inbound, email string) string {
 	case "ws":
 		ws, _ := stream["wsSettings"].(map[string]interface{})
 		params["path"] = ws["path"].(string)
-		params["host"] = ws["host"].(string)
+		if host, ok := ws["host"].(string); ok && len(host) > 0 {
 			params["host"] = host
 		} else {
 			headers, _ := ws["headers"].(map[string]interface{})
-		if headers != nil {
+			params["host"] = searchHost(headers)
 			hostFromHeaders := searchHost(headers)
 			if hostFromHeaders != "" {
 				params["host"] = hostFromHeaders
 			}
 		}
 	case "http":
 		http, _ := stream["httpSettings"].(map[string]interface{})
@@ -380,13 +385,20 @@ func (s *SubService) genVlessLink(inbound *model.Inbound, email string) string {
 	case "httpupgrade":
 		httpupgrade, _ := stream["httpupgradeSettings"].(map[string]interface{})
 		params["path"] = httpupgrade["path"].(string)
-		params["host"] = httpupgrade["host"].(string)
+		if host, ok := httpupgrade["host"].(string); ok && len(host) > 0 {
 			params["host"] = host
 		} else {
 			headers, _ := httpupgrade["headers"].(map[string]interface{})
-		if headers != nil {
+			params["host"] = searchHost(headers)
 			hostFromHeaders := searchHost(headers)
 			if hostFromHeaders != "" {
 				params["host"] = hostFromHeaders
 		}
 	case "splithttp":
 		splithttp, _ := stream["splithttpSettings"].(map[string]interface{})
 		params["path"] = splithttp["path"].(string)
 		if host, ok := splithttp["host"].(string); ok && len(host) > 0 {
 			params["host"] = host
 		} else {
 			headers, _ := splithttp["headers"].(map[string]interface{})
 			params["host"] = searchHost(headers)
 		}
 	}
 	security, _ := stream["security"].(string)
@@ -581,13 +593,11 @@ func (s *SubService) genTrojanLink(inbound *model.Inbound, email string) string
 	case "ws":
 		ws, _ := stream["wsSettings"].(map[string]interface{})
 		params["path"] = ws["path"].(string)
-		params["host"] = ws["host"].(string)
+		if host, ok := ws["host"].(string); ok && len(host) > 0 {
 			params["host"] = host
 		} else {
 			headers, _ := ws["headers"].(map[string]interface{})
-		if headers != nil {
+			params["host"] = searchHost(headers)
 			hostFromHeaders := searchHost(headers)
 			if hostFromHeaders != "" {
 				params["host"] = hostFromHeaders
 			}
 		}
 	case "http":
 		http, _ := stream["httpSettings"].(map[string]interface{})
@@ -609,13 +619,20 @@ func (s *SubService) genTrojanLink(inbound *model.Inbound, email string) string
 	case "httpupgrade":
 		httpupgrade, _ := stream["httpupgradeSettings"].(map[string]interface{})
 		params["path"] = httpupgrade["path"].(string)
-		params["host"] = httpupgrade["host"].(string)
+		if host, ok := httpupgrade["host"].(string); ok && len(host) > 0 {
 			params["host"] = host
 		} else {
 			headers, _ := httpupgrade["headers"].(map[string]interface{})
-		if headers != nil {
+			params["host"] = searchHost(headers)
 			hostFromHeaders := searchHost(headers)
 			if hostFromHeaders != "" {
 				params["host"] = hostFromHeaders
 		}
 	case "splithttp":
 		splithttp, _ := stream["splithttpSettings"].(map[string]interface{})
 		params["path"] = splithttp["path"].(string)
 		if host, ok := splithttp["host"].(string); ok && len(host) > 0 {
 			params["host"] = host
 		} else {
 			headers, _ := splithttp["headers"].(map[string]interface{})
 			params["host"] = searchHost(headers)
 		}
 	}
 	security, _ := stream["security"].(string)
@@ -811,13 +828,11 @@ func (s *SubService) genShadowsocksLink(inbound *model.Inbound, email string) st
 	case "ws":
 		ws, _ := stream["wsSettings"].(map[string]interface{})
 		params["path"] = ws["path"].(string)
-		params["host"] = ws["host"].(string)
+		if host, ok := ws["host"].(string); ok && len(host) > 0 {
 			params["host"] = host
 		} else {
 			headers, _ := ws["headers"].(map[string]interface{})
-		if headers != nil {
+			params["host"] = searchHost(headers)
 			hostFromHeaders := searchHost(headers)
 			if hostFromHeaders != "" {
 				params["host"] = hostFromHeaders
 			}
 		}
 	case "http":
 		http, _ := stream["httpSettings"].(map[string]interface{})
@@ -839,13 +854,20 @@ func (s *SubService) genShadowsocksLink(inbound *model.Inbound, email string) st
 	case "httpupgrade":
 		httpupgrade, _ := stream["httpupgradeSettings"].(map[string]interface{})
 		params["path"] = httpupgrade["path"].(string)
-		params["host"] = httpupgrade["host"].(string)
+		if host, ok := httpupgrade["host"].(string); ok && len(host) > 0 {
 			params["host"] = host
 		} else {
 			headers, _ := httpupgrade["headers"].(map[string]interface{})
-		if headers != nil {
+			params["host"] = searchHost(headers)
 			hostFromHeaders := searchHost(headers)
 			if hostFromHeaders != "" {
 				params["host"] = hostFromHeaders
 		}
 	case "splithttp":
 		splithttp, _ := stream["splithttpSettings"].(map[string]interface{})
 		params["path"] = splithttp["path"].(string)
 		if host, ok := splithttp["host"].(string); ok && len(host) > 0 {
 			params["host"] = host
 		} else {
 			headers, _ := splithttp["headers"].(map[string]interface{})
 			params["host"] = searchHost(headers)
 		}
 	}
@@ -985,9 +1007,36 @@ func (s *SubService) genRemark(inbound *model.Inbound, email string, extra strin
 			now := time.Now().Unix()
 			switch exp := stats.ExpiryTime / 1000; {
 			case exp > 0:
-				remark = append(remark, fmt.Sprintf("%d%s⏳", (exp-now)/86400, "Days"))
+				remainingSeconds := exp - now
 				days := remainingSeconds / 86400
 				hours := (remainingSeconds % 86400) / 3600
 				minutes := (remainingSeconds % 3600) / 60
 				if days > 0 {
 					if hours > 0 {
 						remark = append(remark, fmt.Sprintf("%dD,%dH⏳", days, hours))
 					} else {
 						remark = append(remark, fmt.Sprintf("%dD⏳", days))
 					}
 				} else if hours > 0 {
 					remark = append(remark, fmt.Sprintf("%dH⏳", hours))
 				} else {
 					remark = append(remark, fmt.Sprintf("%dM⏳", minutes))
 				}
 			case exp < 0:
-				remark = append(remark, fmt.Sprintf("%d%s⏳", exp/-86400, "Days"))
+				days := exp / -86400
 				hours := (exp % -86400) / 3600
 				minutes := (exp % -3600) / 60
 				if days > 0 {
 					if hours > 0 {
 						remark = append(remark, fmt.Sprintf("%dD,%dH⏳", days, hours))
 					} else {
 						remark = append(remark, fmt.Sprintf("%dD⏳", days))
 					}
 				} else if hours > 0 {
 					remark = append(remark, fmt.Sprintf("%dH⏳", hours))
 				} else {
 					remark = append(remark, fmt.Sprintf("%dM⏳", minutes))
 				}
 			}
 		}
 	}
--- a/util/sys/psutil.go
+++ b/util/sys/psutil.go
@@ -4,5 +4,5 @@ import (
 	_ "unsafe"
 )
-//go:linkname HostProc github.com/shirou/gopsutil/v3/internal/common.HostProc
+//go:linkname HostProc github.com/shirou/gopsutil/v4/internal/common.HostProc
 func HostProc(combineWith ...string) string
--- a/util/sys/sys_darwin.go
+++ b/util/sys/sys_darwin.go
@@ -4,7 +4,7 @@
 package sys
 import (
-	"github.com/shirou/gopsutil/v3/net"
+	"github.com/shirou/gopsutil/v4/net"
 )
 func GetTCPCount() (int, error) {
--- a/util/sys/sys_windows.go
+++ b/util/sys/sys_windows.go
@@ -6,7 +6,7 @@ package sys
 import (
 	"errors"
-	"github.com/shirou/gopsutil/v3/net"
+	"github.com/shirou/gopsutil/v4/net"
 )
 func GetConnectionCount(proto string) (int, error) {
--- a/web/assets/ant-design-vue@1.7.8/antd-with-locales.min.js
+++ b/web/assets/ant-design-vue@1.7.8/antd-with-locales.min.js
--- a/web/assets/ant-design-vue@1.7.8/antd.less
+++ b/web/assets/ant-design-vue@1.7.8/antd.less
--- a/web/assets/ant-design-vue@1.7.8/antd.min.css
+++ b/web/assets/ant-design-vue@1.7.8/antd.min.css
--- a/web/assets/ant-design-vue@1.7.8/antd.min.js
+++ b/web/assets/ant-design-vue@1.7.8/antd.min.js
--- a/web/assets/ant-design-vue@1.7.8/antd.min.js.map
+++ b/web/assets/ant-design-vue@1.7.8/antd.min.js.map
--- a/web/assets/axios/axios.min.js
+++ b/web/assets/axios/axios.min.js
--- a/web/assets/codemirror/codemirror.js
+++ b/web/assets/codemirror/codemirror.js
--- a/web/assets/codemirror/codemirror.min.css
+++ b/web/assets/codemirror/codemirror.min.css
--- a/web/assets/codemirror/codemirror.min.js
+++ b/web/assets/codemirror/codemirror.min.js
--- a/web/assets/codemirror/xq.css
+++ b/web/assets/codemirror/xq.css
@@ -1,86 +0,0 @@
 /*
 Copyright (C) 2011 by MarkLogic Corporation
 Author: Mike Brevoort <mike@brevoort.com>
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
 in the Software without restriction, including without limitation the rights
 to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
 copies of the Software, and to permit persons to whom the Software is
 furnished to do so, subject to the following conditions:
 The above copyright notice and this permission notice shall be included in
 all copies or substantial portions of the Software.
 THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
 IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
 FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
 AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 */
 .cm-s-xq.CodeMirror { border-radius: 1.5rem; border: 1px solid #d9d9d9; height: auto; }
 .cm-s-xq.CodeMirror:hover { background-color: rgb(232 244 242); border-color: #18947b; transition: all .3s; }
 .cm-s-xq .CodeMirror-gutters { border-right: 1px solid #ddd; background-color: rgb(221 221 221 / 20%); white-space: nowrap; }
 .cm-s-xq span.cm-keyword { line-height: 1em; font-weight: bold; color: #5A5CAD; }
 .cm-s-xq span.cm-atom { color: #7A316F; font-weight:bold; }
 .cm-s-xq span.cm-number { color: #e36209; }
 .cm-s-xq span.cm-def { text-decoration:underline; }
 .cm-s-xq span.cm-variable { color: black; }
 .cm-s-xq span.cm-variable-2 { color:black; }
 .cm-s-xq span.cm-variable-3, .cm-s-xq span.cm-type { color: black; }
 .cm-s-xq span.cm-property { color: #008771; }
 .cm-s-xq span.cm-operator {}
 .cm-s-xq span.cm-comment { color: #bbbbbb; font-style: italic; }
 .cm-s-xq span.cm-string {}
 .cm-s-xq span.cm-meta { color: yellow; }
 .cm-s-xq span.cm-qualifier { color: grey; }
 .cm-s-xq span.cm-builtin { color: #7EA656; }
 .cm-s-xq span.cm-bracket { color: #cc7; }
 .cm-s-xq span.cm-tag { color: #3F7F7F; }
 .cm-s-xq span.cm-attribute { color: #7F007F; }
 .cm-s-xq span.cm-error { color: #e04141; }
 .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: 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%); }
 .dark .cm-s-xq .CodeMirror-cursor { border-left: 1px solid white; }
 .dark .cm-s-xq span.cm-keyword { color: #FFBD40; }
 .dark .cm-s-xq span.cm-atom { color: #c099ff; }
 .dark .cm-s-xq span.cm-number { color: #9ccfd8; }
 .dark .cm-s-xq span.cm-def { color: #FFF; text-decoration:underline; }
 .dark .cm-s-xq span.cm-variable { color: #FFF; }
 .dark .cm-s-xq span.cm-variable-2 { color: #EEE; }
 .dark .cm-s-xq span.cm-variable-3, .dark .cm-s-xq span.cm-type { color: #DDD; }
 .dark .cm-s-xq span.cm-property { color: #f6c177; }
 .dark .cm-s-xq span.cm-operator {}
 .dark .cm-s-xq span.cm-comment { color: gray; }
 .dark .cm-s-xq span.cm-string {}
 .dark .cm-s-xq span.cm-meta { color: yellow; }
 .dark .cm-s-xq span.cm-qualifier { color: #FFF700; }
 .dark .cm-s-xq span.cm-builtin { color: #30a; }
 .dark .cm-s-xq span.cm-bracket { color: #cc7; }
 .dark .cm-s-xq span.cm-tag { color: #FFBD40; }
 .dark .cm-s-xq span.cm-attribute { color: #FFF700; }
 .dark .cm-s-xq span.cm-error { color: #e04141; }
 .dark .cm-s-xq .CodeMirror-activeline-background { background: #27282E; }
 .dark .cm-s-xq .CodeMirror-matchingbracket { outline:1px solid grey; color:white !important; }
 .Line-Hover{transition: all .2s;}
 .Line-Hover:hover{ background-color: rgba(0, 102, 85, 0.05) !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/codemirror/xq.min.css
+++ b/web/assets/codemirror/xq.min.css
@@ -0,0 +1 @@
 .CodeMirror{background-color:#f6fbfa;border:1px solid #d9d9d9}.cm-s-xq.CodeMirror{border-radius:1.5rem;height:auto;transition:background-color .3s,border-color 0.3s}.cm-s-xq.CodeMirror:hover{background-color:#e8f4f2;border-color:#18947b}.cm-s-xq div.CodeMirror-selected{background:rgb(0 102 85 / .1)}.cm-s-xq .CodeMirror-line::selection,.cm-s-xq .CodeMirror-line>span::selection,.cm-s-xq .CodeMirror-line>span>span::selection{background:rgb(0 102 85 / .1)}.cm-s-xq .CodeMirror-line::-moz-selection,.cm-s-xq .CodeMirror-line>span::-moz-selection,.cm-s-xq .CodeMirror-line>span>span::-moz-selection{background:rgb(0 102 85 / .1)}.cm-s-xq .CodeMirror-gutters{border-right:1px solid #ddd;background-color:rgb(221 221 221 / 20%);white-space:nowrap}.cm-s-xq span.cm-keyword{line-height:1em;font-weight:700;color:#5A5CAD}.cm-s-xq span.cm-atom{color:#7A316F;font-weight:700}.cm-s-xq span.cm-number{color:#e36209}.cm-s-xq span.cm-def{text-decoration:underline}.cm-s-xq span.cm-variable{color:#000}.cm-s-xq span.cm-variable-2{color:#000}.cm-s-xq span.cm-variable-3,.cm-s-xq span.cm-type{color:#000}.cm-s-xq span.cm-property{color:#008771}.cm-s-xq span.cm-comment{color:#bbb;font-style:italic}.cm-s-xq span.cm-meta{color:#ff0}.cm-s-xq span.cm-qualifier{color:grey}.cm-s-xq span.cm-builtin{color:#7EA656}.cm-s-xq span.cm-bracket{color:#cc7}.cm-s-xq span.cm-tag{color:#3F7F7F}.cm-s-xq span.cm-attribute{color:#7F007F}.cm-s-xq span.cm-error{color:#e04141}.cm-s-xq .CodeMirror-activeline-background{background:#e8f2ff}.cm-s-xq .CodeMirror-matchingbracket{outline:1px solid grey;color:black!important;background:#ff0}.dark .CodeMirror{background-color:var(--dark-color-surface-200);border-color:var(--dark-color-surface-300)}.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}.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%)}.dark .cm-s-xq .CodeMirror-cursor{border-left:1px solid #fff}.dark .cm-s-xq span.cm-keyword{color:#FFBD40}.dark .cm-s-xq span.cm-atom{color:#c099ff}.dark .cm-s-xq span.cm-number{color:#9ccfd8}.dark .cm-s-xq span.cm-def{color:#FFF;text-decoration:underline}.dark .cm-s-xq span.cm-variable{color:#FFF}.dark .cm-s-xq span.cm-variable-2{color:#EEE}.dark .cm-s-xq span.cm-variable-3,.dark .cm-s-xq span.cm-type{color:#DDD}.dark .cm-s-xq span.cm-property{color:#f6c177}.dark .cm-s-xq span.cm-comment{color:gray}.dark .cm-s-xq span.cm-meta{color:#ff0}.dark .cm-s-xq span.cm-qualifier{color:#FFF700}.dark .cm-s-xq span.cm-builtin{color:#30a}.dark .cm-s-xq span.cm-bracket{color:#cc7}.dark .cm-s-xq span.cm-tag{color:#FFBD40}.dark .cm-s-xq span.cm-attribute{color:#FFF700}.dark .cm-s-xq span.cm-error{color:#e04141}.dark .cm-s-xq .CodeMirror-activeline-background{background:#27282E}.dark .cm-s-xq .CodeMirror-matchingbracket{outline:1px solid grey;color:white!important}.Line-Hover{transition:all .2s}.CodeMirror pre.CodeMirror-line:hover,.CodeMirror pre.CodeMirror-line-like:hover{background-color:rgb(0 102 85 / .05)}.dark .CodeMirror pre.CodeMirror-line:hover,.CodeMirror pre.CodeMirror-line-like:hover{background-color:var(--dark-color-codemirror-line-hover)}.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:#fff;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
--- a/web/assets/css/custom.min.css
+++ b/web/assets/css/custom.min.css
--- a/web/assets/element-ui@2.15.0/theme-chalk/display.css
+++ b/web/assets/element-ui@2.15.0/theme-chalk/display.css
--- a/web/assets/js/model/outbound.js
+++ b/web/assets/js/model/outbound.js
@@ -194,7 +194,7 @@ class WsStreamSettings extends CommonClass {
    static fromJson(json={}) {
        return new WsStreamSettings(
            json.path,
-            json.host
+            json.host,
        );
    }
@@ -202,7 +202,6 @@ class WsStreamSettings extends CommonClass {
        return {
            path: this.path,
            host: this.host,
            headers: ObjectUtil.isEmpty(this.host) ? undefined : {Host: this.host},
        };
    }
 }
@@ -258,22 +257,22 @@ class QuicStreamSettings extends CommonClass {
 }
 class GrpcStreamSettings extends CommonClass {
-    constructor(serviceName="", multiMode=false, authority="") {
+    constructor(serviceName="", authority="", multiMode=false) {
        super();
        this.serviceName = serviceName;
        this.multiMode = multiMode;
        this.authority = authority;
        this.multiMode = multiMode;
    }
    static fromJson(json={}) {
-        return new GrpcStreamSettings(json.serviceName, json.multiMode,json.authority);
+        return new GrpcStreamSettings(json.serviceName, json.authority, json.multiMode );
    }
    toJson() {
        return {
            serviceName: this.serviceName,
-            multiMode: this.multiMode,
+            authority: this.authority,
-            authority: this.authority
+            multiMode: this.multiMode
        }
    }
 }
@@ -288,7 +287,29 @@ class HttpUpgradeStreamSettings extends CommonClass {
    static fromJson(json={}) {
        return new HttpUpgradeStreamSettings(
            json.path,
-            json.host
+            json.host,
        );
    }
    toJson() {
        return {
            path: this.path,
            host: this.host,
        };
    }
 }
 class SplitHTTPStreamSettings extends CommonClass {
    constructor(path='/', host='') {
        super();
        this.path = path;
        this.host = host;
    }
    static fromJson(json={}) {
        return new SplitHTTPStreamSettings(
            json.path,
            json.host,
        );
    }
@@ -296,7 +317,6 @@ class HttpUpgradeStreamSettings extends CommonClass {
        return {
            path: this.path,
            host: this.host,
            headers: ObjectUtil.isEmpty(this.host) ? undefined : {Host: this.host},
        };
    }
 }
@@ -361,11 +381,12 @@ class RealityStreamSettings extends CommonClass {
    }
 };
 class SockoptStreamSettings extends CommonClass {
-    constructor(dialerProxy = "", tcpFastOpen = false, tcpKeepAliveInterval = 0, tcpNoDelay = false) {
+    constructor(dialerProxy = "", tcpFastOpen = false, tcpKeepAliveInterval = 0, tcpMptcp = false, tcpNoDelay = false) {
        super();
        this.dialerProxy = dialerProxy;
        this.tcpFastOpen = tcpFastOpen;
        this.tcpKeepAliveInterval = tcpKeepAliveInterval;
        this.tcpMptcp = tcpMptcp;
        this.tcpNoDelay = tcpNoDelay;
    }
@@ -375,6 +396,7 @@ class SockoptStreamSettings extends CommonClass {
            json.dialerProxy,
            json.tcpFastOpen,
            json.tcpKeepAliveInterval,
            json.tcpMptcp,
            json.tcpNoDelay,
        );
    }
@@ -384,6 +406,7 @@ class SockoptStreamSettings extends CommonClass {
            dialerProxy: this.dialerProxy,
            tcpFastOpen: this.tcpFastOpen,
            tcpKeepAliveInterval: this.tcpKeepAliveInterval,
            tcpMptcp: this.tcpMptcp,
            tcpNoDelay: this.tcpNoDelay,
        };
    }
@@ -401,6 +424,7 @@ class StreamSettings extends CommonClass {
                quicSettings=new QuicStreamSettings(),
                grpcSettings=new GrpcStreamSettings(),
                httpupgradeSettings=new HttpUpgradeStreamSettings(),
                splithttpSettings=new SplitHTTPStreamSettings(),
                sockopt = undefined,
                ) {
        super();
@@ -415,6 +439,7 @@ class StreamSettings extends CommonClass {
        this.quic = quicSettings;
        this.grpc = grpcSettings;
        this.httpupgrade = httpupgradeSettings;
        this.splithttp = splithttpSettings;
        this.sockopt = sockopt;
    }
@@ -447,6 +472,7 @@ class StreamSettings extends CommonClass {
            QuicStreamSettings.fromJson(json.quicSettings),
            GrpcStreamSettings.fromJson(json.grpcSettings),
            HttpUpgradeStreamSettings.fromJson(json.httpupgradeSettings),
            SplitHTTPStreamSettings.fromJson(json.splithttpSettings),
            SockoptStreamSettings.fromJson(json.sockopt),
        );
    }
@@ -465,6 +491,7 @@ class StreamSettings extends CommonClass {
            quicSettings: network === 'quic' ? this.quic.toJson() : undefined,
            grpcSettings: network === 'grpc' ? this.grpc.toJson() : undefined,
            httpupgradeSettings: network === 'httpupgrade' ? this.httpupgrade.toJson() : undefined,
            splithttpSettings: network === 'splithttp' ? this.splithttp.toJson() : undefined,
            sockopt: this.sockopt != undefined ? this.sockopt.toJson() : undefined,
        };
    }
@@ -529,7 +556,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", "httpupgrade"].includes(this.stream.network);
+        return ["tcp", "ws", "http", "quic", "grpc", "httpupgrade" , "splithttp"].includes(this.stream.network);
    }
    //this is used for xtls-rprx-vision
@@ -550,6 +577,10 @@ class Outbound extends CommonClass {
    }
    canEnableMux() {
        if (this.settings.flow && this.settings.flow != ''){
            this.mux.enabled = false;
            return false;
        }
        return [Protocols.VMess, Protocols.VLESS, Protocols.Trojan, Protocols.Shadowsocks, Protocols.HTTP, Protocols.Socks].includes(this.protocol);
    }
@@ -650,6 +681,8 @@ class Outbound extends CommonClass {
            stream.grpc = new GrpcStreamSettings(json.path, json.authority, json.type == 'multi');
        } else if (network === 'httpupgrade') {
            stream.httpupgrade = new HttpUpgradeStreamSettings(json.path,json.host);
        } else if (network === 'splithttp') {
            stream.splithttp = new SplitHTTPStreamSettings(json.path,json.host);
        }
        if(json.tls && json.tls == 'tls'){
@@ -697,6 +730,8 @@ class Outbound extends CommonClass {
                url.searchParams.get('mode') == 'multi');
        } else if (type === 'httpupgrade') {
            stream.httpupgrade = new HttpUpgradeStreamSettings(path,host);
        } else if (type === 'splithttp') {
            stream.splithttp = new SplitHTTPStreamSettings(path,host);
        }
        if(security == 'tls'){
@@ -947,13 +982,14 @@ Outbound.TrojanSettings = class extends CommonClass {
    }
 };
 Outbound.ShadowsocksSettings = class extends CommonClass {
-    constructor(address, port, password, method, uot) {
+    constructor(address, port, password, method, uot, UoTVersion) {
        super();
        this.address = address;
        this.port = port;
        this.password = password;
        this.method = method;
        this.uot = uot;
        this.UoTVersion = UoTVersion;
    }
    static fromJson(json={}) {
@@ -965,6 +1001,7 @@ Outbound.ShadowsocksSettings = class extends CommonClass {
            servers[0].password,
            servers[0].method,
            servers[0].uot,
            servers[0].UoTVersion,
        );
    }
@@ -976,6 +1013,7 @@ Outbound.ShadowsocksSettings = class extends CommonClass {
                password: this.password,
                method: this.method,
                uot: this.uot,
                UoTVersion: this.UoTVersion,
            }],
        };
    }
--- a/web/assets/js/model/setting.js
+++ b/web/assets/js/model/setting.js
@@ -8,7 +8,7 @@ class AllSetting {
        this.webKeyFile = "";
        this.webBasePath = "/";
        this.sessionMaxAge = "";
-        this.pageSize = 0;
+        this.pageSize = 50;
        this.expireDiff = "";
        this.trafficDiff = "";
        this.remarkModel = "-ieo";
--- a/web/assets/js/model/xray.js
+++ b/web/assets/js/model/xray.js
@@ -84,14 +84,43 @@ const SNIFFING_OPTION = {
    FAKEDNS: "fakedns"
 };
 const USAGE_OPTION = {
    ENCIPHERMENT: "encipherment",
    VERIFY: "verify",
    ISSUE: "issue",
 };
 const DOMAIN_STRATEGY_OPTION = {
    AS_IS: "AsIs",
    USE_IP: "UseIP",
    USE_IPV6V4: "UseIPv6v4",
    USE_IPV6: "UseIPv6",
    USE_IPV4V6: "UseIPv4v6",
    USE_IPV4: "UseIPv4",
    FORCE_IP: "ForceIP",
    FORCE_IPV6V4: "ForceIPv6v4",
    FORCE_IPV6: "ForceIPv6",
    FORCE_IPV4V6: "ForceIPv4v6",
    FORCE_IPV4: "ForceIPv4",
 };
 const TCP_CONGESTION_OPTION = {
    BBR: "bbr",
    CUBIC: "cubic",
    RENO: "reno",
 };
 Object.freeze(Protocols);
 Object.freeze(SSMethods);
 Object.freeze(XTLS_FLOW_CONTROL);
 Object.freeze(TLS_FLOW_CONTROL);
 Object.freeze(TLS_VERSION_OPTION);
 Object.freeze(TLS_CIPHER_OPTION);
 Object.freeze(UTLS_FINGERPRINT);
 Object.freeze(ALPN_OPTION);
 Object.freeze(SNIFFING_OPTION);
 Object.freeze(USAGE_OPTION);
 Object.freeze(DOMAIN_STRATEGY_OPTION);
 Object.freeze(TCP_CONGESTION_OPTION);
 class XrayCommonClass {
@@ -212,15 +241,6 @@ TcpStreamSettings.TcpRequest = class extends XrayCommonClass {
        this.headers.push({ name: name, value: value });
    }
    getHeader(name) {
        for (const header of this.headers) {
            if (header.name.toLowerCase() === name.toLowerCase()) {
                return header.value;
            }
        }
        return null;
    }
    removeHeader(index) {
        this.headers.splice(index, 1);
    }
@@ -350,15 +370,6 @@ class WsStreamSettings extends XrayCommonClass {
        this.headers.push({ name: name, value: value });
    }
    getHeader(name) {
        for (const header of this.headers) {
            if (header.name.toLowerCase() === name.toLowerCase()) {
                return header.value;
            }
        }
        return null;
    }
    removeHeader(index) {
        this.headers.splice(index, 1);
    }
@@ -488,15 +499,6 @@ class HTTPUpgradeStreamSettings extends XrayCommonClass {
        this.headers.push({ name: name, value: value });
    }
    getHeader(name) {
        for (const header of this.headers) {
            if (header.name.toLowerCase() === name.toLowerCase()) {
                return header.value;
            }
        }
        return null;
    }
    removeHeader(index) {
        this.headers.splice(index, 1);
    }
@@ -520,14 +522,55 @@ class HTTPUpgradeStreamSettings extends XrayCommonClass {
    }
 }
 class SplitHTTPStreamSettings extends XrayCommonClass {
    constructor(path='/', host='', headers=[] , maxUploadSize= 1000000, maxConcurrentUploads= 10) {
        super();
        this.path = path;
        this.host = host;
        this.headers = headers;
        this.maxUploadSize = maxUploadSize;
        this.maxConcurrentUploads = maxConcurrentUploads;
    }
    addHeader(name, value) {
        this.headers.push({ name: name, value: value });
    }
    removeHeader(index) {
        this.headers.splice(index, 1);
    }
    static fromJson(json={}) {
        return new SplitHTTPStreamSettings(
            json.path,
            json.host,
            XrayCommonClass.toHeaders(json.headers),
            json.maxUploadSize,
            json.maxConcurrentUploads,
        );
    }
    toJson() {
        return {
            path: this.path,
            host: this.host,
            headers: XrayCommonClass.toV2Headers(this.headers, false),
            maxUploadSize: this.maxUploadSize,
            maxConcurrentUploads: this.maxConcurrentUploads,
        };
    }
 }
 class TlsStreamSettings extends XrayCommonClass {
    constructor(serverName='',
                minVersion = TLS_VERSION_OPTION.TLS12,
                maxVersion = TLS_VERSION_OPTION.TLS13,
                cipherSuites = '',
                rejectUnknownSni = false,
                disableSystemRoot = false,
                enableSessionResumption = false,
                certificates=[new TlsStreamSettings.Cert()],
-                alpn=[ALPN_OPTION.H2,ALPN_OPTION.HTTP1],
+                alpn=[ALPN_OPTION.H3,ALPN_OPTION.H2,ALPN_OPTION.HTTP1],
                settings=new TlsStreamSettings.Settings()) {
        super();
        this.sni = serverName;
@@ -535,6 +578,8 @@ class TlsStreamSettings extends XrayCommonClass {
        this.maxVersion = maxVersion;
        this.cipherSuites = cipherSuites;
        this.rejectUnknownSni = rejectUnknownSni;
        this.disableSystemRoot = disableSystemRoot;
        this.enableSessionResumption = enableSessionResumption;
        this.certs = certificates;
        this.alpn = alpn;
        this.settings = settings;
@@ -564,6 +609,8 @@ class TlsStreamSettings extends XrayCommonClass {
            json.maxVersion,
            json.cipherSuites,
            json.rejectUnknownSni,
            json.disableSystemRoot,
            json.enableSessionResumption,
            certs,
            json.alpn,
            settings,
@@ -577,6 +624,8 @@ class TlsStreamSettings extends XrayCommonClass {
            maxVersion: this.maxVersion,
            cipherSuites: this.cipherSuites,
            rejectUnknownSni: this.rejectUnknownSni,
            disableSystemRoot: this.disableSystemRoot,
            enableSessionResumption: this.enableSessionResumption,
            certificates: TlsStreamSettings.toJsonArray(this.certs),
            alpn: this.alpn,
            settings: this.settings,
@@ -585,7 +634,7 @@ class TlsStreamSettings extends XrayCommonClass {
 }
 TlsStreamSettings.Cert = class extends XrayCommonClass {
-    constructor(useFile=true, certificateFile='', keyFile='', certificate='', key='', ocspStapling=3600) {
+    constructor(useFile=true, certificateFile='', keyFile='', certificate='', key='', ocspStapling=3600, oneTimeLoading=false, usage=USAGE_OPTION.ENCIPHERMENT) {
        super();
        this.useFile = useFile;
        this.certFile = certificateFile;
@@ -593,6 +642,8 @@ TlsStreamSettings.Cert = class extends XrayCommonClass {
        this.cert = certificate instanceof Array ? certificate.join('\n') : certificate;
        this.key = key instanceof Array ? key.join('\n') : key;
        this.ocspStapling = ocspStapling;
        this.oneTimeLoading = oneTimeLoading;
        this.usage = usage;
    }
    static fromJson(json={}) {
@@ -602,6 +653,8 @@ TlsStreamSettings.Cert = class extends XrayCommonClass {
                json.certificateFile,
                json.keyFile, '', '',
                json.ocspStapling,
                json.oneTimeLoading,
                json.usage,
            );
        } else {
            return new TlsStreamSettings.Cert(
@@ -609,6 +662,8 @@ TlsStreamSettings.Cert = class extends XrayCommonClass {
                json.certificate.join('\n'),
                json.key.join('\n'),
                json.ocspStapling,
                json.oneTimeLoading,
                json.usage,
            );
        }
    }
@@ -619,12 +674,16 @@ TlsStreamSettings.Cert = class extends XrayCommonClass {
                certificateFile: this.certFile,
                keyFile: this.keyFile,
                ocspStapling: this.ocspStapling,
                oneTimeLoading: this.oneTimeLoading,
                usage: this.usage,
            };
        } else {
            return {
                certificate: this.cert.split('\n'),
                key: this.key.split('\n'),
                ocspStapling: this.ocspStapling,
                oneTimeLoading: this.oneTimeLoading,
                usage: this.usage,
            };
        }
    }
@@ -649,10 +708,11 @@ TlsStreamSettings.Settings = class extends XrayCommonClass {
        };
    }
 };
 class XtlsStreamSettings extends XrayCommonClass {
    constructor(serverName='',
                certificates=[new XtlsStreamSettings.Cert()],
-                alpn=[ALPN_OPTION.H2,ALPN_OPTION.HTTP1],
+                alpn=[ALPN_OPTION.H3,ALPN_OPTION.H2,ALPN_OPTION.HTTP1],
                settings=new XtlsStreamSettings.Settings()) {
        super();
        this.sni = serverName;
@@ -698,13 +758,16 @@ class XtlsStreamSettings extends XrayCommonClass {
 }
 XtlsStreamSettings.Cert = class extends XrayCommonClass {
-    constructor(useFile=true, certificateFile='', keyFile='', certificate='', key='') {
+    constructor(useFile=true, certificateFile='', keyFile='', certificate='', key='', ocspStapling=3600, oneTimeLoading=false, usage=USAGE_OPTION.ENCIPHERMENT) {
        super();
        this.useFile = useFile;
        this.certFile = certificateFile;
        this.keyFile = keyFile;
        this.cert = certificate instanceof Array ? certificate.join('\n') : certificate;
        this.key = key instanceof Array ? key.join('\n') : key;
        this.ocspStapling = ocspStapling;
        this.oneTimeLoading = oneTimeLoading;
        this.usage = usage;
    }
    static fromJson(json={}) {
@@ -712,13 +775,19 @@ XtlsStreamSettings.Cert = class extends XrayCommonClass {
            return new XtlsStreamSettings.Cert(
                true,
                json.certificateFile,
-                json.keyFile,
+                json.keyFile, '', '',
                json.ocspStapling,
                json.oneTimeLoading,
                json.usage,
            );
        } else {
            return new XtlsStreamSettings.Cert(
                false, '', '',
                json.certificate.join('\n'),
                json.key.join('\n'),
                json.ocspStapling,
                json.oneTimeLoading,
                json.usage,
            );
        }
    }
@@ -728,11 +797,17 @@ XtlsStreamSettings.Cert = class extends XrayCommonClass {
            return {
                certificateFile: this.certFile,
                keyFile: this.keyFile,
                ocspStapling: this.ocspStapling,
                oneTimeLoading: this.oneTimeLoading,
                usage: this.usage,
            };
        } else {
            return {
                certificate: this.cert.split('\n'),
                key: this.key.split('\n'),
                ocspStapling: this.ocspStapling,
                oneTimeLoading: this.oneTimeLoading,
                usage: this.usage,
            };
        }
    }
@@ -817,7 +892,7 @@ class RealityStreamSettings extends XrayCommonClass {
 }
 RealityStreamSettings.Settings = class extends XrayCommonClass {
-    constructor(publicKey = '', fingerprint = UTLS_FINGERPRINT.UTLS_FIREFOX, serverName = '', spiderX= '/') {
+    constructor(publicKey = '', fingerprint = UTLS_FINGERPRINT.UTLS_RANDOM, serverName = '', spiderX= '/') {
        super();
        this.publicKey = publicKey;
        this.fingerprint = fingerprint;
@@ -843,12 +918,41 @@ RealityStreamSettings.Settings = class extends XrayCommonClass {
 };
 class SockoptStreamSettings extends XrayCommonClass {
-    constructor(acceptProxyProtocol = false, tcpFastOpen = false, mark = 0, tproxy="off") {
+    constructor(
        acceptProxyProtocol = false,
        tcpFastOpen = false,
        mark = 0,
        tproxy="off",
        tcpMptcp = false,
        tcpNoDelay = false,
        domainStrategy = DOMAIN_STRATEGY_OPTION.USE_IP,
        tcpMaxSeg = 1440,
        dialerProxy = "",
        tcpKeepAliveInterval = 0,   
        tcpKeepAliveIdle = 300,
        tcpUserTimeout = 10000,
        tcpcongestion = TCP_CONGESTION_OPTION.BBR,
        V6Only = false,
        tcpWindowClamp = 600,
        interfaceName = "",
    ) {
        super();
        this.acceptProxyProtocol = acceptProxyProtocol;
        this.tcpFastOpen = tcpFastOpen;
        this.mark = mark;
        this.tproxy = tproxy;
        this.tcpMptcp = tcpMptcp;
        this.tcpNoDelay = tcpNoDelay;
        this.domainStrategy = domainStrategy;
        this.tcpMaxSeg = tcpMaxSeg;
        this.dialerProxy = dialerProxy;
        this.tcpKeepAliveInterval = tcpKeepAliveInterval;
        this.tcpKeepAliveIdle = tcpKeepAliveIdle;
        this.tcpUserTimeout = tcpUserTimeout;
        this.tcpcongestion = tcpcongestion;
        this.V6Only = V6Only;
        this.tcpWindowClamp = tcpWindowClamp;
        this.interfaceName = interfaceName;
    }
    static fromJson(json = {}) {
@@ -858,6 +962,18 @@ class SockoptStreamSettings extends XrayCommonClass {
            json.tcpFastOpen,
            json.mark,
            json.tproxy,
            json.tcpMptcp,
            json.tcpNoDelay,
            json.domainStrategy,
            json.tcpMaxSeg,
            json.dialerProxy,
            json.tcpKeepAliveInterval,
            json.tcpKeepAliveIdle,
            json.tcpUserTimeout,
            json.tcpcongestion,
            json.V6Only,
            json.tcpWindowClamp,
            json.interface,
        );
    }
@@ -867,6 +983,18 @@ class SockoptStreamSettings extends XrayCommonClass {
            tcpFastOpen: this.tcpFastOpen,
            mark: this.mark,
            tproxy: this.tproxy,
            tcpMptcp: this.tcpMptcp,
            tcpNoDelay: this.tcpNoDelay,
            domainStrategy: this.domainStrategy,
            tcpMaxSeg: this.tcpMaxSeg,
            dialerProxy: this.dialerProxy,
            tcpKeepAliveInterval: this.tcpKeepAliveInterval,
            tcpKeepAliveIdle: this.tcpKeepAliveIdle,
            tcpUserTimeout: this.tcpUserTimeout,
            tcpcongestion: this.tcpcongestion,
            V6Only: this.V6Only,
            tcpWindowClamp: this.tcpWindowClamp,
            interface: this.interfaceName,
        };
    }
 }
@@ -885,6 +1013,7 @@ class StreamSettings extends XrayCommonClass {
        quicSettings=new QuicStreamSettings(),
        grpcSettings=new GrpcStreamSettings(),
        httpupgradeSettings=new HTTPUpgradeStreamSettings(),
        splithttpSettings=new SplitHTTPStreamSettings(),
        sockopt = undefined,
        ) {
        super();
@@ -901,6 +1030,7 @@ class StreamSettings extends XrayCommonClass {
        this.quic = quicSettings;
        this.grpc = grpcSettings;
        this.httpupgrade = httpupgradeSettings;
        this.splithttp = splithttpSettings;
        this.sockopt = sockopt;
    }
@@ -964,6 +1094,7 @@ class StreamSettings extends XrayCommonClass {
            QuicStreamSettings.fromJson(json.quicSettings),
            GrpcStreamSettings.fromJson(json.grpcSettings),
            HTTPUpgradeStreamSettings.fromJson(json.httpupgradeSettings),
            SplitHTTPStreamSettings.fromJson(json.splithttpSettings),
            SockoptStreamSettings.fromJson(json.sockopt),
        );
    }
@@ -984,16 +1115,23 @@ class StreamSettings extends XrayCommonClass {
            quicSettings: network === 'quic' ? this.quic.toJson() : undefined,
            grpcSettings: network === 'grpc' ? this.grpc.toJson() : undefined,
            httpupgradeSettings: network === 'httpupgrade' ? this.httpupgrade.toJson() : undefined,
            splithttpSettings: network === 'splithttp' ? this.splithttp.toJson() : undefined,
            sockopt: this.sockopt != undefined ? this.sockopt.toJson() : undefined,
        };
    }
 }
 class Sniffing extends XrayCommonClass {
-    constructor(enabled=true, destOverride=['http', 'tls', 'quic', 'fakedns']) {
+    constructor(
        enabled=true,
        destOverride=['http', 'tls', 'quic', 'fakedns'],
        metadataOnly=false,
        routeOnly=false) {
        super();
        this.enabled = enabled;
        this.destOverride = destOverride;
        this.metadataOnly = metadataOnly;
        this.routeOnly = routeOnly;
    }
    static fromJson(json={}) {
@@ -1006,6 +1144,8 @@ class Sniffing extends XrayCommonClass {
        return new Sniffing(
            !!json.enabled,
            destOverride,
            json.metadataOnly,
            json.routeOnly,
        );
    }
 }
@@ -1104,6 +1244,10 @@ class Inbound extends XrayCommonClass {
        return this.network === "httpupgrade";
    }
    get isSplithttp() {
        return this.network === "splithttp";
    }
    // Shadowsocks
    get method() {
        switch (this.protocol) {
@@ -1127,25 +1271,26 @@ class Inbound extends XrayCommonClass {
        return "";
    }
    getHeader(obj, name) {
        for (const header of obj.headers) {
            if (header.name.toLowerCase() === name.toLowerCase()) {
                return header.value;
            }
        }
        return "";
    }
    get host() {
        if (this.isTcp) {
-            return this.stream.tcp.request.getHeader("Host");
+            return this.getHeader(this.stream.tcp.request, 'host');
        } else if (this.isWs) {
-            const hostHeader = this.stream.ws.getHeader("Host");
+            return this.stream.ws.host?.length>0 ? this.stream.ws.host : this.getHeader(this.stream.ws, 'host');
            if (hostHeader !== null) {
                return hostHeader;
            } else {
                return this.stream.ws.host;
            }        
        } else if (this.isH2) {
            return this.stream.http.host[0];
        } else if (this.isHttpupgrade) {
-            const hostHeader = this.stream.httpupgrade.getHeader("Host");
+            return this.stream.httpupgrade.host?.length>0 ? this.stream.httpupgrade.host : this.getHeader(this.stream.httpupgrade, 'host');
-            if (hostHeader !== null) {
+        } else if (this.isSplithttp) {
-                return hostHeader;
+            return this.stream.splithttp.host?.length>0 ? this.stream.splithttp.host : this.getHeader(this.stream.splithttp, 'host');
            } else {
                return this.stream.httpupgrade.host;
            }        
        }
        return null;
    }
@@ -1159,6 +1304,8 @@ class Inbound extends XrayCommonClass {
            return this.stream.http.path;
        } else if (this.isHttpupgrade) {
            return this.stream.httpupgrade.path;
        } else if (this.isSplithttp) {
            return this.stream.splithttp.path;
        }
        return null;
    }
@@ -1194,7 +1341,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", "httpupgrade"].includes(this.network);
+        return ["tcp", "ws", "http", "quic", "grpc", "httpupgrade" , "splithttp"].includes(this.network);
    }
    //this is used for xtls-rprx-vision
@@ -1244,30 +1391,24 @@ class Inbound extends XrayCommonClass {
            type: 'none',
            tls: security,
        };
-        let network = this.stream.network;
+        const network = this.stream.network;
        if (network === 'tcp') {
-            let tcp = this.stream.tcp;
+            const tcp = this.stream.tcp;
            obj.type = tcp.type;
            if (tcp.type === 'http') {
-                let request = tcp.request;
+                const request = tcp.request;
                obj.path = request.path.join(',');
-                let index = request.headers.findIndex(header => header.name.toLowerCase() === 'host');
+                const host = this.getHeader(request,'host');
-                if (index >= 0) {
+                if (host) obj.host = host;
                    obj.host = request.headers[index].value;
                }
            }
        } else if (network === 'kcp') {
-            let kcp = this.stream.kcp;
+            const kcp = this.stream.kcp;
            obj.type = kcp.type;
            obj.path = kcp.seed;
        } else if (network === 'ws') {
-            let ws = this.stream.ws;
+            const ws = this.stream.ws;
            obj.path = ws.path;
-            obj.host = ws.host;
+            obj.host = ws.host?.length>0 ? ws.host : this.getHeader(ws, 'host');
            let index = ws.headers.findIndex(header => header.name.toLowerCase() === 'host');
            if (index >= 0) {
                obj.host = ws.headers[index].value;
            }
        } else if (network === 'http') {
            obj.net = 'h2';
            obj.path = this.stream.http.path;
@@ -1283,13 +1424,13 @@ class Inbound extends XrayCommonClass {
                obj.type = 'multi'
            }
        } else if (network === 'httpupgrade') {
-            let httpupgrade = this.stream.httpupgrade;
+            const httpupgrade = this.stream.httpupgrade;
            obj.path = httpupgrade.path;
-            obj.host = httpupgrade.host;
+            obj.host = httpupgrade.host?.length>0 ? httpupgrade.host : this.getHeader(httpupgrade, 'host');
-            let index = httpupgrade.headers.findIndex(header => header.name.toLowerCase() === 'host');
+        } else if (network === 'splithttp') {
-            if (index >= 0) {
+            const splithttp = this.stream.splithttp;
-                obj.host = httpupgrade.headers[index].value;
+            obj.path = splithttp.path;
-            }
+            obj.host = splithttp.host?.length>0 ? splithttp.host : this.getHeader(splithttp, 'host');
        }
        if (security === 'tls') {
@@ -1322,9 +1463,9 @@ class Inbound extends XrayCommonClass {
                if (tcp.type === 'http') {
                    const request = tcp.request;
                    params.set("path", request.path.join(','));
-                    const tcpIndex = request.headers.findIndex(header => header.name.toLowerCase() === 'host');
+                    const index = request.headers.findIndex(header => header.name.toLowerCase() === 'host');
-                    if (tcpIndex >= 0) {
+                    if (index >= 0) {
-                        const host = request.headers[tcpIndex].value;
+                        const host = request.headers[index].value;
                        params.set("host", host);
                    }
                    params.set("headerType", 'http');
@@ -1338,12 +1479,7 @@ class Inbound extends XrayCommonClass {
            case "ws":
                const ws = this.stream.ws;
                params.set("path", ws.path);
-                params.set("host", ws.host);
+                params.set("host", ws.host?.length>0 ? ws.host : this.getHeader(ws, 'host'));
                const wsIndex = ws.headers.findIndex(header => header.name.toLowerCase() === 'host');
                if (wsIndex >= 0) {
                    const host = ws.headers[wsIndex].value;
                    params.set("host", host);
                }
                break;
            case "http":
                const http = this.stream.http;
@@ -1367,12 +1503,12 @@ class Inbound extends XrayCommonClass {
            case "httpupgrade":
                    const httpupgrade = this.stream.httpupgrade;
                    params.set("path", httpupgrade.path);
-                params.set("host", httpupgrade.host);
+                    params.set("host", httpupgrade.host?.length>0 ? httpupgrade.host : this.getHeader(httpupgrade, 'host'));
-                const httpupgradeIndex = httpupgrade.headers.findIndex(header => header.name.toLowerCase() === 'host');
+                break;
-                if (httpupgradeIndex >= 0) {
+            case "splithttp":
-                    const host = httpupgrade.headers[httpupgradeIndex].value;
+                    const splithttp = this.stream.splithttp;
-                    params.set("host", host);
+                    params.set("path", splithttp.path);
-                }
+                    params.set("host", splithttp.host?.length>0 ? splithttp.host : this.getHeader(splithttp, 'host'));
                break;
        }
@@ -1448,9 +1584,9 @@ class Inbound extends XrayCommonClass {
                if (tcp.type === 'http') {
                    const request = tcp.request;
                    params.set("path", request.path.join(','));
-                    const tcpIndex = request.headers.findIndex(header => header.name.toLowerCase() === 'host');
+                    const index = request.headers.findIndex(header => header.name.toLowerCase() === 'host');
-                    if (tcpIndex >= 0) {
+                    if (index >= 0) {
-                        const host = request.headers[tcpIndex].value;
+                        const host = request.headers[index].value;
                        params.set("host", host);
                    }
                    params.set("headerType", 'http');
@@ -1464,12 +1600,7 @@ class Inbound extends XrayCommonClass {
            case "ws":
                const ws = this.stream.ws;
                params.set("path", ws.path);
-                params.set("host", ws.host);
+                params.set("host", ws.host?.length>0 ? ws.host : this.getHeader(ws, 'host'));
                const wsIndex = ws.headers.findIndex(header => header.name.toLowerCase() === 'host');
                if (wsIndex >= 0) {
                    const host = ws.headers[wsIndex].value;
                    params.set("host", host);
                }
                break;
            case "http":
                const http = this.stream.http;
@@ -1493,12 +1624,12 @@ class Inbound extends XrayCommonClass {
            case "httpupgrade":
                    const httpupgrade = this.stream.httpupgrade;
                    params.set("path", httpupgrade.path);
-                params.set("host", httpupgrade.host);
+                    params.set("host", httpupgrade.host?.length>0 ? httpupgrade.host : this.getHeader(httpupgrade, 'host'));
-                const httpupgradeIndex = httpupgrade.headers.findIndex(header => header.name.toLowerCase() === 'host');
+                break;
-                if (httpupgradeIndex >= 0) {
+            case "splithttp":
-                    const host = httpupgrade.headers[httpupgradeIndex].value;
+                    const splithttp = this.stream.splithttp;
-                    params.set("host", host);
+                    params.set("path", splithttp.path);
-                }
+                    params.set("host", splithttp.host?.length>0 ? splithttp.host : this.getHeader(splithttp, 'host'));
                break;
        }
@@ -1541,9 +1672,9 @@ class Inbound extends XrayCommonClass {
                if (tcp.type === 'http') {
                    const request = tcp.request;
                    params.set("path", request.path.join(','));
-                    const tcpIndex = request.headers.findIndex(header => header.name.toLowerCase() === 'host');
+                    const index = request.headers.findIndex(header => header.name.toLowerCase() === 'host');
-                    if (tcpIndex >= 0) {
+                    if (index >= 0) {
-                        const host = request.headers[tcpIndex].value;
+                        const host = request.headers[index].value;
                        params.set("host", host);
                    }
                    params.set("headerType", 'http');
@@ -1557,12 +1688,7 @@ class Inbound extends XrayCommonClass {
            case "ws":
                const ws = this.stream.ws;
                params.set("path", ws.path);
-                params.set("host", ws.host);
+                params.set("host", ws.host?.length>0 ? ws.host : this.getHeader(ws, 'host'));
                const wsIndex = ws.headers.findIndex(header => header.name.toLowerCase() === 'host');
                if (wsIndex >= 0) {
                    const host = ws.headers[wsIndex].value;
                    params.set("host", host);
                }
                break;
            case "http":
                const http = this.stream.http;
@@ -1586,12 +1712,12 @@ class Inbound extends XrayCommonClass {
            case "httpupgrade":
                    const httpupgrade = this.stream.httpupgrade;
                    params.set("path", httpupgrade.path);
-                params.set("host", httpupgrade.host);
+                    params.set("host", httpupgrade.host?.length>0 ? httpupgrade.host : this.getHeader(httpupgrade, 'host'));
-                const httpUpgradeIndex = httpupgrade.headers.findIndex(header => header.name.toLowerCase() === 'host');
+                break;
-                if (httpUpgradeIndex >= 0) {
+            case "splithttp":
-                    const host = httpupgrade.headers[httpUpgradeIndex].value;
+                    const splithttp = this.stream.splithttp;
-                    params.set("host", host);
+                    params.set("path", splithttp.path);
-                }
+                    params.set("host", splithttp.host?.length>0 ? splithttp.host : this.getHeader(splithttp, 'host'));
                break;
        }
@@ -1848,7 +1974,7 @@ Inbound.VmessSettings = class extends Inbound.Settings {
    }
 };
 Inbound.VmessSettings.Vmess = class extends XrayCommonClass {
-    constructor(id=RandomUtil.randomUUID(), email=RandomUtil.randomLowerAndNum(8),limitIp=0, totalGB=0, expiryTime=0, enable=true, tgId=0, subId=RandomUtil.randomLowerAndNum(16), reset=0) {
+    constructor(id=RandomUtil.randomUUID(), email=RandomUtil.randomLowerAndNum(8),limitIp=0, totalGB=0, expiryTime=0, enable=true, tgId='', subId=RandomUtil.randomLowerAndNum(16), reset=0) {
        super();
        this.id = id;
        this.email = email;
@@ -1939,7 +2065,7 @@ Inbound.VLESSSettings = class extends Inbound.Settings {
 };
 Inbound.VLESSSettings.VLESS = class extends XrayCommonClass {
-    constructor(id=RandomUtil.randomUUID(), flow='', email=RandomUtil.randomLowerAndNum(8),limitIp=0, totalGB=0, expiryTime=0, enable=true, tgId=0, subId=RandomUtil.randomLowerAndNum(16), reset=0) {
+    constructor(id=RandomUtil.randomUUID(), flow='', email=RandomUtil.randomLowerAndNum(8),limitIp=0, totalGB=0, expiryTime=0, enable=true, tgId='', subId=RandomUtil.randomLowerAndNum(16), reset=0) {
        super();
        this.id = id;
        this.flow = flow;
@@ -2064,7 +2190,7 @@ Inbound.TrojanSettings = class extends Inbound.Settings {
    }
 };
 Inbound.TrojanSettings.Trojan = class extends XrayCommonClass {
-    constructor(password=RandomUtil.randomSeq(10), flow='', email=RandomUtil.randomLowerAndNum(8),limitIp=0, totalGB=0, expiryTime=0, enable=true, tgId=0, subId=RandomUtil.randomLowerAndNum(16), reset=0) {
+    constructor(password=RandomUtil.randomSeq(10), flow='', email=RandomUtil.randomLowerAndNum(8),limitIp=0, totalGB=0, expiryTime=0, enable=true, tgId='', subId=RandomUtil.randomLowerAndNum(16), reset=0) {
        super();
        this.password = password;
        this.flow = flow;
@@ -2209,7 +2335,7 @@ Inbound.ShadowsocksSettings = class extends Inbound.Settings {
 };
 Inbound.ShadowsocksSettings.Shadowsocks = class extends XrayCommonClass {
-    constructor(method='', password=RandomUtil.randomShadowsocksPassword(), email=RandomUtil.randomLowerAndNum(8),limitIp=0, totalGB=0, expiryTime=0, enable=true, tgId=0, subId=RandomUtil.randomLowerAndNum(16), reset=0) {
+    constructor(method='', password=RandomUtil.randomShadowsocksPassword(), email=RandomUtil.randomLowerAndNum(8),limitIp=0, totalGB=0, expiryTime=0, enable=true, tgId='', subId=RandomUtil.randomLowerAndNum(16), reset=0) {
        super();
        this.method = method;
        this.password = password;
@@ -2281,12 +2407,13 @@ Inbound.ShadowsocksSettings.Shadowsocks = class extends XrayCommonClass {
 };
 Inbound.DokodemoSettings = class extends Inbound.Settings {
-    constructor(protocol, address, port, network='tcp,udp', followRedirect=false) {
+    constructor(protocol, address, port, network='tcp,udp', followRedirect=false, timeout=0) {
        super(protocol);
        this.address = address;
        this.port = port;
        this.network = network;
        this.followRedirect = followRedirect;
        this.timeout = timeout;
    }
    static fromJson(json={}) {
@@ -2296,6 +2423,7 @@ Inbound.DokodemoSettings = class extends Inbound.Settings {
            json.port,
            json.network,
            json.followRedirect,
            json.timeout,
        );
    }
@@ -2305,6 +2433,7 @@ Inbound.DokodemoSettings = class extends Inbound.Settings {
            port: this.port,
            network: this.network,
            followRedirect: this.followRedirect,
            timeout: this.timeout,
        };
    }
 };
--- a/web/assets/js/util/date-util.js
+++ b/web/assets/js/util/date-util.js
@@ -128,7 +128,7 @@ Date.prototype.formatDateTime = function (split = ' ') {
 };
 class DateUtil {
-    // String string to date object
+    // String to date object
    static parseDate(str) {
        return new Date(str.replace(/-/g, '/'));
    }
@@ -143,4 +143,9 @@ class DateUtil {
        date.setMinTime();
        return date;
    }
    static convertToJalalian(date) {
        return date && moment.isMoment(date) ? date.format('jYYYY/jMM/jDD HH:mm:ss') : null;
    }
 }
--- a/web/assets/js/util/utils.js
+++ b/web/assets/js/util/utils.js
@@ -1,73 +1,57 @@
 class Msg {
-    constructor(success, msg, obj) {
+    constructor(success = false, msg = "", obj = null) {
        this.success = false;
        this.msg = "";
        this.obj = null;
        if (success != null) {
        this.success = success;
        }
        if (msg != null) {
        this.msg = msg;
        }
        if (obj != null) {
        this.obj = obj;
    }
 }
 }
 class HttpUtil {
    static _handleMsg(msg) {
-        if (!(msg instanceof Msg)) {
+        if (!(msg instanceof Msg) || msg.msg === "") {
            return;
        }
-        if (msg.msg === "") {
+        const messageType = msg.success ? 'success' : 'error';
-            return;
+        Vue.prototype.$message[messageType](msg.msg);
        }
        if (msg.success) {
            Vue.prototype.$message.success(msg.msg);
        } else {
            Vue.prototype.$message.error(msg.msg);
        }
    }
    static _respToMsg(resp) {
-        const data = resp.data;
+        const { data } = resp;
        if (data == null) {
            return new Msg(true);
-        } else if (typeof data === 'object') {
+        }
-            if (data.hasOwnProperty('success')) {
+        if (typeof data === 'object' && 'success' in data) {
            return new Msg(data.success, data.msg, data.obj);
            } else {
                return data;
            }
        } else {
            return new Msg(false, 'unknown data:', data);
        }
        return typeof data === 'object' ? data : new Msg(false, 'unknown data:', data);
    }
-    static async get(url, data, options) {
+    static async get(url, params, options = {}) {
        let msg;
        try {
-            const resp = await axios.get(url, data, options);
+            const resp = await axios.get(url, { params, ...options });
-            msg = this._respToMsg(resp);
+            const msg = this._respToMsg(resp);
        } catch (e) {
            msg = new Msg(false, e.toString());
        }
            this._handleMsg(msg);
            return msg;
        } catch (error) {
            console.error('GET request failed:', error);
            const errorMsg = new Msg(false, error.response?.data?.message || error.message);
            this._handleMsg(errorMsg);
            return errorMsg;
        }
    }
-    static async post(url, data, options) {
+    static async post(url, data, options = {}) {
        let msg;
        try {
            const resp = await axios.post(url, data, options);
-            msg = this._respToMsg(resp);
+            const msg = this._respToMsg(resp);
        } catch (e) {
            msg = new Msg(false, e.toString());
        }
            this._handleMsg(msg);
            return msg;
        } catch (error) {
            console.error('POST request failed:', error);
            const errorMsg = new Msg(false, error.response?.data?.message || error.message);
            this._handleMsg(errorMsg);
            return errorMsg;
        }
    }
    static async postWithModal(url, data, modal) {
--- a/web/controller/inbound.go
+++ b/web/controller/inbound.go
@@ -232,14 +232,12 @@ func (a *InboundController) resetClientTraffic(c *gin.Context) {
 	}
 	email := c.Param("email")
-	needRestart := true
+	needRestart, err := a.inboundService.ResetClientTraffic(id, email)
 	needRestart, err = a.inboundService.ResetClientTraffic(id, email)
 	if err != nil {
 		jsonMsg(c, "Something went wrong!", err)
 		return
 	}
-	jsonMsg(c, "traffic reseted", nil)
+	jsonMsg(c, "Traffic has been reset", nil)
 	if needRestart {
 		a.xrayService.SetToNeedRestart()
 	}
@@ -253,7 +251,7 @@ func (a *InboundController) resetAllTraffics(c *gin.Context) {
 	} else {
 		a.xrayService.SetToNeedRestart()
 	}
-	jsonMsg(c, "All traffics reseted", nil)
+	jsonMsg(c, "all traffic has been reset", nil)
 }
 func (a *InboundController) resetAllClientTraffics(c *gin.Context) {
@@ -270,7 +268,7 @@ func (a *InboundController) resetAllClientTraffics(c *gin.Context) {
 	} else {
 		a.xrayService.SetToNeedRestart()
 	}
-	jsonMsg(c, "All traffics of client reseted", nil)
+	jsonMsg(c, "All traffic from the client has been reset.", nil)
 }
 func (a *InboundController) importInbound(c *gin.Context) {
@@ -313,9 +311,9 @@ func (a *InboundController) delDepletedClients(c *gin.Context) {
 		jsonMsg(c, "Something went wrong!", err)
 		return
 	}
-	jsonMsg(c, "All delpeted clients are deleted", nil)
+	jsonMsg(c, "All depleted clients are deleted", nil)
 }
 func (a *InboundController) onlines(c *gin.Context) {
-	jsonObj(c, a.inboundService.GetOnlineClinets(), nil)
+	jsonObj(c, a.inboundService.GetOnlineClients(), nil)
 }
--- a/web/controller/index.go
+++ b/web/controller/index.go
@@ -2,6 +2,7 @@ package controller
 import (
 	"net/http"
 	"text/template"
 	"time"
 	"x-ui/logger"
@@ -64,37 +65,40 @@ func (a *IndexController) login(c *gin.Context) {
 	user := a.userService.CheckUser(form.Username, form.Password, form.LoginSecret)
 	timeStr := time.Now().Format("2006-01-02 15:04:05")
 	safeUser := template.HTMLEscapeString(form.Username)
 	safePass := template.HTMLEscapeString(form.Password)
 	safeSecret := template.HTMLEscapeString(form.LoginSecret)
 	if user == nil {
-		logger.Warningf("wrong username or password: \"%s\" \"%s\"", form.Username, form.Password)
+		logger.Warningf("wrong username or password or secret: \"%s\" \"%s\" \"%s\"", safeUser, safePass, safeSecret)
-		a.tgbot.UserLoginNotify(form.Username, getRemoteIp(c), timeStr, 0)
+		a.tgbot.UserLoginNotify(safeUser, safePass, getRemoteIp(c), timeStr, 0)
 		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))
+		logger.Infof("%s logged in successfully, Ip Address: %s\n", safeUser, getRemoteIp(c))
-		a.tgbot.UserLoginNotify(form.Username, getRemoteIp(c), timeStr, 1)
+		a.tgbot.UserLoginNotify(safeUser, ``, getRemoteIp(c), timeStr, 1)
 	}
 	sessionMaxAge, err := a.settingService.GetSessionMaxAge()
 	if err != nil {
-		logger.Warningf("Unable to get session's max age from DB")
+		logger.Warning("Unable to get session's max age from DB")
 	}
 	if sessionMaxAge > 0 {
 		err = session.SetMaxAge(c, sessionMaxAge*60)
 		if err != nil {
-			logger.Warningf("Unable to set session's max age")
+			logger.Warning("Unable to set session's max age")
 		}
 	}
 	err = session.SetLoginUser(c, user)
-	logger.Info("user", user.Id, "login success")
+	logger.Infof("%s logged in successfully", user.Username)
 	jsonMsg(c, I18nWeb(c, "pages.login.toasts.successLogin"), err)
 }
 func (a *IndexController) logout(c *gin.Context) {
 	user := session.GetLoginUser(c)
 	if user != nil {
-		logger.Info("user", user.Id, "logout")
+		logger.Infof("%s logged out successfully", user.Username)
 	}
 	session.ClearSession(c)
 	c.Redirect(http.StatusTemporaryRedirect, c.GetString("base_path"))
--- a/web/controller/server.go
+++ b/web/controller/server.go
@@ -105,7 +105,7 @@ func (a *ServerController) stopXrayService(c *gin.Context) {
 		jsonMsg(c, "", err)
 		return
 	}
-	jsonMsg(c, "Xray stoped", err)
+	jsonMsg(c, "Xray stopped", err)
 }
 func (a *ServerController) restartXrayService(c *gin.Context) {
--- a/web/controller/util.go
+++ b/web/controller/util.go
@@ -13,16 +13,19 @@ import (
 )
 func getRemoteIp(c *gin.Context) string {
-	value := c.GetHeader("X-Forwarded-For")
+	value := c.GetHeader("X-Real-IP")
 	if value != "" {
 		return value
 	}
 	value = c.GetHeader("X-Forwarded-For")
 	if value != "" {
 		ips := strings.Split(value, ",")
 		return ips[0]
-	} else {
+	}
 	addr := c.Request.RemoteAddr
 	ip, _, _ := net.SplitHostPort(addr)
 	return ip
 }
 }
 func jsonMsg(c *gin.Context, msg string, err error) {
 	jsonMsgObj(c, msg, nil, err)
@@ -61,7 +64,18 @@ func html(c *gin.Context, name string, title string, data gin.H) {
 		data = gin.H{}
 	}
 	data["title"] = title
-	data["host"] = strings.Split(c.Request.Host, ":")[0]
+	host := c.GetHeader("X-Forwarded-Host")
 	if host == "" {
 		host = c.GetHeader("X-Real-IP")
 	}
 	if host == "" {
 		var err error
 		host, _, err = net.SplitHostPort(c.Request.Host)
 		if err != nil {
 			host = c.Request.Host
 		}
 	}
 	data["host"] = host
 	data["request_uri"] = c.Request.RequestURI
 	data["base_path"] = c.GetString("base_path")
 	c.HTML(http.StatusOK, name, getContext(data))
--- a/web/controller/xray_setting.go
+++ b/web/controller/xray_setting.go
@@ -12,6 +12,7 @@ type XraySettingController struct {
 	InboundService     service.InboundService
 	OutboundService    service.OutboundService
 	XrayService        service.XrayService
 	WarpService        service.WarpService
 }
 func NewXraySettingController(g *gin.RouterGroup) *XraySettingController {
@@ -72,16 +73,18 @@ func (a *XraySettingController) warp(c *gin.Context) {
 	var err error
 	switch action {
 	case "data":
-		resp, err = a.XraySettingService.GetWarp()
+		resp, err = a.WarpService.GetWarpData()
 	case "del":
 		err = a.WarpService.DelWarpData()
 	case "config":
-		resp, err = a.XraySettingService.GetWarpConfig()
+		resp, err = a.WarpService.GetWarpConfig()
 	case "reg":
 		skey := c.PostForm("privateKey")
 		pkey := c.PostForm("publicKey")
-		resp, err = a.XraySettingService.RegWarp(skey, pkey)
+		resp, err = a.WarpService.RegWarp(skey, pkey)
 	case "license":
 		license := c.PostForm("license")
-		resp, err = a.XraySettingService.SetWarpLicence(license)
+		resp, err = a.WarpService.SetWarpLicense(license)
 	}
 	jsonObj(c, resp, err)
--- a/web/html/common/head.html
+++ b/web/html/common/head.html
@@ -4,9 +4,9 @@
  <meta name="renderer" content="webkit">
  <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
  <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <link rel="stylesheet" href="{{ .base_path }}assets/ant-design-vue@1.7.8/antd.min.css">
+  <link rel="stylesheet" href="{{ .base_path }}assets/ant-design-vue/antd.min.css">
-    <link rel="stylesheet" href="{{ .base_path }}assets/element-ui@2.15.0/theme-chalk/display.css">
+  <link rel="stylesheet" href="{{ .base_path }}assets/element-ui/theme-chalk/display.css">
-    <link rel="stylesheet" href="{{ .base_path }}assets/css/custom.css?{{ .cur_ver }}">
+  <link rel="stylesheet" href="{{ .base_path }}assets/css/custom.min.css?{{ .cur_ver }}">
  <style>
    [v-cloak] {
      display: none;
--- a/web/html/common/js.html
+++ b/web/html/common/js.html
@@ -1,7 +1,7 @@
 {{define "js"}}
 <script src="{{ .base_path }}assets/vue/vue.min.js?{{ .cur_ver }}"></script>
 <script src="{{ .base_path }}assets/moment/moment.min.js"></script>
-<script src="{{ .base_path }}assets/ant-design-vue@1.7.8/antd.min.js"></script>
+<script src="{{ .base_path }}assets/ant-design-vue/antd.min.js"></script>
 <script src="{{ .base_path }}assets/axios/axios.min.js?{{ .cur_ver }}"></script>
 <script src="{{ .base_path }}assets/qs/qs.min.js"></script>
 <script src="{{ .base_path }}assets/js/axios-init.js?{{ .cur_ver }}"></script>
--- a/web/html/common/qrcode_modal.html
+++ b/web/html/common/qrcode_modal.html
@@ -1,27 +1,41 @@
 {{define "qrcodeModal"}}
 <a-modal id="qrcode-modal" v-model="qrModal.visible" :title="qrModal.title"
-    :dialog-style="{ top: '20px' }"
+    :dialog-style="isMobileQr ? { top: '18px' } : {}"
    :closable="true"
    :class="themeSwitcher.currentTheme"
-    :footer="null" width="300px">
+    :footer="null" width="fit-content">
-  <a-tag color="green" style="margin-bottom: 10px;display: block;text-align: center;">
+  <tr-qr-modal class="qr-modal">
    {{ i18n "pages.inbounds.clickOnQRcode" }}
  </a-tag>
    <template v-if="app.subSettings.enable && qrModal.subId">
-    <a-divider>{{ i18n "pages.settings.subSettings"}}</a-divider>
+      <tr-qr-box class="qr-box">
-    <div class="qr-bg"><canvas @click="copyToClipboard('qrCode-sub',genSubLink(qrModal.client.subId))" id="qrCode-sub" class="qr-cv"></canvas></div>
+        <a-tag color="purple" class="qr-tag"><span>{{ i18n "pages.settings.subSettings"}}</span></a-tag>
-    <a-divider>{{ i18n "pages.settings.subSettings"}} Json</a-divider>
+        <tr-qr-bg class="qr-bg-sub">
-    <div class="qr-bg"><canvas @click="copyToClipboard('qrCode-subJson',genSubJsonLink(qrModal.client.subId))" id="qrCode-subJson" class="qr-cv"></canvas></div>
+          <tr-qr-bg-inner class="qr-bg-sub-inner">
            <canvas @click="copyToClipboard('qrCode-sub',genSubLink(qrModal.client.subId))" id="qrCode-sub" class="qr-cv"></canvas>
          </tr-qr-bg-inner>
        </tr-qr-bg>
      </tr-qr-box>
      <tr-qr-box class="qr-box">
        <a-tag color="purple" class="qr-tag"><span>{{ i18n "pages.settings.subSettings"}} Json</span></a-tag>
        <tr-qr-bg class="qr-bg-sub">
          <tr-qr-bg-inner class="qr-bg-sub-inner">
            <canvas @click="copyToClipboard('qrCode-subJson',genSubJsonLink(qrModal.client.subId))" id="qrCode-subJson" class="qr-cv"></canvas>
          </tr-qr-bg-inner>
        </tr-qr-bg>
      </tr-qr-box>
    </template>
  <a-divider>{{ i18n "pages.inbounds.client" }}</a-divider>
    <template v-for="(row, index) in qrModal.qrcodes">
-    <a-tag color="green" style="margin: 10px 0; display: block; text-align: center;">[[ row.remark ]]</a-tag>
+      <tr-qr-box class="qr-box">
-    <div class="qr-bg"><canvas @click="copyToClipboard('qrCode-'+index, row.link)" :id="'qrCode-'+index" class="qr-cv"></canvas></div>
+        <a-tag color="green" class="qr-tag"><span>[[ row.remark ]]</span></a-tag>
        <tr-qr-bg class="qr-bg">
          <canvas @click="copyToClipboard('qrCode-'+index, row.link)" :id="'qrCode-'+index" class="qr-cv"></canvas>
        </tr-qr-bg>
      </tr-qr-box>
    </template>
  </tr-qr-modal>
 </a-modal>
 <script>
-
+  const isMobileQr = window.innerWidth <= 768;
  const qrModal = {
    title: '',
    dbInbound: new DBInbound(),
@@ -58,7 +72,6 @@
      this.visible = false;
    },
  };
  const qrModalApp = new Vue({
    delimiters: ['[[', ']]'],
    el: '#qrcode-modal',
@@ -66,8 +79,8 @@
      qrModal: qrModal,
    },
    methods: {
-            copyToClipboard(elmentId, content) {
+      copyToClipboard(elementId, content) {
-                this.qrModal.clipboard = new ClipboardJS('#' + elmentId, {
+        this.qrModal.clipboard = new ClipboardJS('#' + elementId, {
          text: () => content,
        });
        this.qrModal.clipboard.on('success', () => {
@@ -75,9 +88,9 @@
          this.qrModal.clipboard.destroy();
        });
      },
-            setQrCode(elmentId, content) {
+      setQrCode(elementId, content) {
        new QRious({
-                    element: document.querySelector('#' + elmentId),
+          element: document.querySelector('#' + elementId),
          size: 400,
          value: content,
          background: 'white',
@@ -92,9 +105,24 @@
      },
      genSubJsonLink(subID) {
        return app.subSettings.subJsonURI + subID;
      },
      revertOverflow() {
        const elements = document.querySelectorAll(".qr-tag");
        elements.forEach((element) => {
          element.classList.remove("tr-marquee");
          element.children[0].style.animation = '';
          while (element.children.length > 1) {
            element.removeChild(element.lastChild);
          }
        });
      }
    },
    updated() {
      if (this.qrModal.visible) {
        fixOverflow();
      } else {
        this.revertOverflow();
      }
      if (qrModal.client && qrModal.client.subId) {
        qrModal.subId = qrModal.client.subId;
        this.setQrCode("qrCode-sub", this.genSubLink(qrModal.subId));
@@ -106,5 +134,32 @@
    }
  });
  function fixOverflow() {
    const elements = document.querySelectorAll(".qr-tag");
    elements.forEach((element) => {
      function isElementOverflowing(element) {
        const overflowX = element.offsetWidth < element.scrollWidth,
          overflowY = element.offsetHeight < element.scrollHeight;
        return overflowX || overflowY;
      }
      function wrapContentsInMarquee(element) {
        element.classList.add("tr-marquee");
        element.children[0].style.animation = `move-ltr ${
            (element.children[0].clientWidth / element.clientWidth) * 5
          }s ease-in-out infinite`;
        const marqueeText = element.children[0];
        if (element.children.length < 2) {
          for (let i = 0; i < 1; i++) {
            const marqueeText = element.children[0].cloneNode(true);
            element.children[0].after(marqueeText);
          }
        }
      }
      if (isElementOverflowing(element)) {
        wrapContentsInMarquee(element);
      }
    });
  }
 </script>
 {{end}}
--- a/web/html/login.html
+++ b/web/html/login.html
@@ -400,7 +400,7 @@
            </g>
          </svg>
        </div>
-        <a-row type="flex" justify="center" align="middle" style="height: 100%; overflow: auto;">
+        <a-row type="flex" justify="center" align="middle" style="height: 100%; overflow: auto; overflow-x: hidden;">
          <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%;">
@@ -461,7 +461,7 @@
                  </a-form-item>
                  <a-form-item>
                    <a-row justify="center" class="centered">
-                      <theme-switch></theme-switch>
+                      <theme-switch-login></theme-switch-login>
                    </a-row>
                  </a-form-item>
                </a-form>
@@ -482,7 +482,6 @@
      this.password = "";
    }
  }
  const app = new Vue({
    delimiters: ['[[', ']]'],
    el: '#app',
--- a/web/html/xui/client_bulk_modal.html
+++ b/web/html/xui/client_bulk_modal.html
@@ -20,10 +20,10 @@
            <a-input-number v-model="clientsBulkModal.lastNum" :min="clientsBulkModal.firstNum"></a-input-number>
        </a-form-item>
        <a-form-item label='{{ i18n "pages.client.prefix" }}' v-if="clientsBulkModal.emailMethod>0">
-            <a-input v-model="clientsBulkModal.emailPrefix"></a-input>
+            <a-input v-model.trim="clientsBulkModal.emailPrefix"></a-input>
        </a-form-item>
        <a-form-item label='{{ i18n "pages.client.postfix" }}' v-if="clientsBulkModal.emailMethod>2">
-            <a-input v-model="clientsBulkModal.emailPostfix"></a-input>
+            <a-input v-model.trim="clientsBulkModal.emailPostfix"></a-input>
        </a-form-item>
        <a-form-item label='{{ i18n "pages.client.clientCount" }}' v-if="clientsBulkModal.emailMethod < 2">
            <a-input-number v-model="clientsBulkModal.quantity" :min="1" :max="100"></a-input-number>
@@ -58,13 +58,13 @@
                    <template slot="title">
                        <span>{{ i18n "pages.inbounds.telegramDesc" }}</span>
                    </template>
-                    Telegram ID
+                    Telegram ChatID
                    <a-icon type="question-circle"></a-icon>
                </a-tooltip>
            </template>
-            <a-input-number style="width: 50%" v-model.trim="clientsBulkModal.tgId" min="0"></a-input-number>
+            <a-input-number style="width: 50%" v-model="clientsBulkModal.tgId" min="0"></a-input-number>
        </a-form-item>
-        <a-form-item>
+        <a-form-item v-if="app.ipLimitEnable">
            <template slot="label">
                <a-tooltip>
                    <template slot="title">
@@ -104,18 +104,20 @@
                    <a-icon type="question-circle"></a-icon>
                </a-tooltip>
            </template>
-            <a-date-picker v-if="datepicker == 'gregorian'" :show-time="{ format: 'HH:mm:ss' }" format="YYYY-MM-DD HH:mm:ss"
+            <a-date-picker v-if="datepicker == 'gregorian'" :show-time="{ format: 'HH:mm:ss' }"
-                :dropdown-class-name="themeSwitcher.currentTheme" v-model="clientsBulkModal.expiryTime"></a-date-picker>
+                format="YYYY-MM-DD HH:mm:ss" :dropdown-class-name="themeSwitcher.currentTheme"
                v-model="clientsBulkModal.expiryTime"></a-date-picker>
            <persian-datepicker v-else placeholder='{{ i18n "pages.settings.datepickerPlaceholder" }}'
-                                value="clientsBulkModal.expiryTime" v-model="clientsBulkModal.expiryTime"></persian-datepicker>
+                value="clientsBulkModal.expiryTime" v-model="clientsBulkModal.expiryTime">
            </persian-datepicker>
        </a-form-item>
        <a-form-item v-if="clientsBulkModal.expiryTime != 0">
            <template slot="label">
                <span>{{ i18n "pages.client.renew" }}</span>
                <a-tooltip>
                    <template slot="title">
                        <span>{{ i18n "pages.client.renewDesc" }}</span>
                    </template>
                    {{ i18n "pages.client.renew" }}
                    <a-icon type="question-circle"></a-icon>
                </a-tooltip>
            </template>
@@ -143,7 +145,7 @@
        emailPrefix: "",
        emailPostfix: "",
        subId: "",
-        tgId: 0,
+        tgId: '',
        flow: "",
        delayedStart: false,
        reset: 0,
@@ -165,7 +167,7 @@
                if (method == 4) newClient.email = "";
                newClient.email += useNum ? prefix + i.toString() + postfix : prefix + postfix;
                if (clientsBulkModal.subId.length > 0) newClient.subId = clientsBulkModal.subId;
-                if (clientsBulkModal.tgId.length > 0) newClient.tgId = clientsBulkModal.tgId;
+                newClient.tgId = clientsBulkModal.tgId;
                newClient.limitIp = clientsBulkModal.limitIp;
                newClient._totalGB = clientsBulkModal.totalGB;
                newClient._expiryTime = clientsBulkModal.expiryTime;
@@ -200,7 +202,7 @@
            this.emailPrefix = "";
            this.emailPostfix = "";
            this.subId = "";
-            this.tgId = 0;
+            this.tgId = '';
            this.flow = "";
            this.dbInbound = new DBInbound(dbInbound);
            this.inbound = dbInbound.toInbound();
--- a/web/html/xui/common_sider.html
+++ b/web/html/xui/common_sider.html
@@ -1,46 +1,50 @@
 {{define "menuItems"}}
 <a-menu-item key="{{ .base_path }}panel/">
  <a-icon type="dashboard"></a-icon>
-    <span><b>{{ i18n "menu.dashboard"}}</b></span>
+  <span>
    <b>{{ i18n "menu.dashboard"}}</b>
  </span>
 </a-menu-item>
 <a-menu-item key="{{ .base_path }}panel/inbounds">
  <a-icon type="user"></a-icon>
-    <span><b>{{ i18n "menu.inbounds"}}</b></span>
+  <span>
    <b>{{ i18n "menu.inbounds"}}</b>
  </span>
 </a-menu-item>
 <a-menu-item key="{{ .base_path }}panel/settings">
  <a-icon type="setting"></a-icon>
-    <span><b>{{ i18n "menu.settings"}}</b></span>
+  <span>
    <b>{{ i18n "menu.settings"}}</b>
  </span>
 </a-menu-item>
 <a-menu-item key="{{ .base_path }}panel/xray">
  <a-icon type="tool"></a-icon>
-    <span><b>{{ i18n "menu.xray"}}</b></span>
+  <span>
    <b>{{ i18n "menu.xray"}}</b>
  </span>
 </a-menu-item>
 <a-menu-item key="{{ .base_path }}logout">
  <a-icon type="logout"></a-icon>
-    <span><b>{{ i18n "menu.logout"}}</b></span>
+  <span>
    <b>{{ i18n "menu.logout"}}</b>
  </span>
 </a-menu-item>
 {{end}}
 {{define "commonSider"}}
-<a-layout-sider :theme="themeSwitcher.currentTheme" id="sider" collapsible breakpoint="md" collapsed-width="0">
+<a-layout-sider :theme="themeSwitcher.currentTheme" id="sider" collapsible breakpoint="md">
  <theme-switch></theme-switch>
-    <a-menu :theme="themeSwitcher.currentTheme" mode="inline" :selected-keys="['{{ .request_uri }}']"
+  <a-menu :theme="themeSwitcher.currentTheme" mode="inline" :selected-keys="['{{ .request_uri }}']" @click="({key}) => key.startsWith('http') ? window.open(key) : location.href = key">
            @click="({key}) => key.startsWith('http') ? window.open(key) : location.href = key">
    {{template "menuItems" .}}
  </a-menu>
 </a-layout-sider>
-<a-drawer id="sider-drawer" placement="left" :closable="false"
+<a-drawer id="sider-drawer" placement="left" :closable="false" @close="siderDrawer.close()" :visible="siderDrawer.visible" :wrap-class-name="themeSwitcher.currentTheme" :wrap-style="{ padding: 0 }">
          @close="siderDrawer.close()"
          :visible="siderDrawer.visible"
          :wrap-class-name="themeSwitcher.currentTheme"
          :wrap-style="{ padding: 0 }">
  <div class="drawer-handle" @click="siderDrawer.change()" slot="handle">
    <a-icon :type="siderDrawer.visible ? 'close' : 'menu-fold'"></a-icon>
  </div>
  <theme-switch></theme-switch>
-    <a-menu :theme="themeSwitcher.currentTheme" mode="inline" :selected-keys="['{{ .request_uri }}']"
+  <a-menu :theme="themeSwitcher.currentTheme" mode="inline" :selected-keys="['{{ .request_uri }}']" @click="({key}) => key.startsWith('http') ? window.open(key) : location.href = key">
        @click="({key}) => key.startsWith('http') ? window.open(key) : location.href = key">
    {{template "menuItems" .}}
  </a-menu>
 </a-drawer>
--- a/web/html/xui/component/sortableTable.html
+++ b/web/html/xui/component/sortableTable.html
@@ -10,7 +10,6 @@
 {{define "component/sortableTable"}}
 <script>
  const DRAGGABLE_ROW_CLASS = 'draggable-row';
  const findParentRowElement = (el) => {
    if (!el || !el.tagName) {
      return null;
@@ -22,7 +21,6 @@
      return null;
    }
  }
  Vue.component('a-table-sortable', {
    data() {
      return {
@@ -34,17 +32,14 @@
    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,
      }
@@ -101,23 +96,18 @@
        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 {
@@ -133,7 +123,6 @@
        const parentMethodResult = this.customRow?.(record, index) || {};
        const newIndex = this.newElementIndex;
        const currentIndex = this.sortingElementIndex;
        return {
          ...parentMethodResult,
          attrs: {
@@ -149,9 +138,7 @@
          class: {
            ...(parentMethodResult?.class || {}),
            [DRAGGABLE_ROW_CLASS]: true,
-                        ['dragging']: this.isDragging()
+            ['dragging']: this.isDragging() ? (newIndex === null ? index === currentIndex : index === newIndex) : false,
                            ? (newIndex === null ? index === currentIndex : index === newIndex)
                            : false,
          },
        };
      }
@@ -160,28 +147,22 @@
      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'],
@@ -203,7 +184,6 @@
    }
  })
 </script>
 <style>
  @media only screen and (max-width: 767px) {
    .sortable-icon {
--- a/web/html/xui/component/themeSwitch.html
+++ b/web/html/xui/component/themeSwitch.html
@@ -1,6 +1,23 @@
 {{define "component/themeSwitchTemplate"}}
 <template>
-  <a-menu class="change-theme" :theme="themeSwitcher.currentTheme" mode="inline" selected-keys="">
+  <a-menu :theme="themeSwitcher.currentTheme" mode="inline" selected-keys="">
    <a-sub-menu>
      <span slot="title">
        <a-icon type="bulb" :theme="themeSwitcher.isDarkTheme ? 'filled' : 'outlined'"></a-icon>
        <span>Theme</span>
      </span>
      <a-menu-item id="change-theme" class="ant-menu-theme-switch" @mousedown="themeSwitcher.animationsOff()"> Dark <a-switch style="margin-left: 2px;" size="small" :default-checked="themeSwitcher.isDarkTheme" @change="themeSwitcher.toggleTheme()"></a-switch>
      </a-menu-item>
      <a-menu-item id="change-theme-ultra" v-if="themeSwitcher.isDarkTheme" class="ant-menu-theme-switch" @mousedown="themeSwitcher.animationsOffUltra()"> Ultra <a-checkbox style="margin-left: 2px;" :checked="themeSwitcher.isUltra" @click="themeSwitcher.toggleUltra()"></a-checkbox>
      </a-menu-item>
    </a-sub-menu>
  </a-menu>
 </template>
 {{end}}
 {{define "component/themeSwitchTemplateLogin"}}
 <template>
  <a-menu @mousedown="themeSwitcher.animationsOff()" id="change-theme" :theme="themeSwitcher.currentTheme" mode="inline" selected-keys="">
    <a-menu-item mode="inline" class="ant-menu-theme-switch">
      <a-icon type="bulb" :theme="themeSwitcher.isDarkTheme ? 'filled' : 'outlined'"></a-icon>
      <a-switch size="small" :default-checked="themeSwitcher.isDarkTheme" @change="themeSwitcher.toggleTheme()"></a-switch>
@@ -23,6 +40,26 @@
    const theme = isDarkTheme ? 'dark' : 'light';
    document.querySelector('body').setAttribute('class', theme);
    return {
      animationsOff() {
        document.documentElement.setAttribute('data-theme-animations', 'off');
        const themeAnimations = document.querySelector('#change-theme');
        themeAnimations.addEventListener('mouseleave', () => {
          document.documentElement.removeAttribute('data-theme-animations');
        });
        themeAnimations.addEventListener('touchend', () => {
          document.documentElement.removeAttribute('data-theme-animations');
        });
      },
      animationsOffUltra() {
        document.documentElement.setAttribute('data-theme-animations', 'off');
        const themeAnimationsUltra = document.querySelector('#change-theme-ultra');
        themeAnimationsUltra.addEventListener('mouseleave', () => {
          document.documentElement.removeAttribute('data-theme-animations');
        });
        themeAnimationsUltra.addEventListener('touchend', () => {
          document.documentElement.removeAttribute('data-theme-animations');
        });
      },
      isDarkTheme,
      isUltra,
      get currentTheme() {
@@ -57,13 +94,19 @@
        getContainer: () => document.getElementById('message')
      });
      document.getElementById('message').className = themeSwitcher.currentTheme;
-      const themeAnimations = document.querySelector('.change-theme');
+    }
      themeAnimations.addEventListener('mousedown', () => {
        document.documentElement.setAttribute('data-theme-animations', 'off');
  });
-      themeAnimations.addEventListener('mouseleave', () => {
+  Vue.component('theme-switch-login', {
-        document.documentElement.removeAttribute('data-theme-animations');
+    props: [],
    template: `{{template "component/themeSwitchTemplateLogin"}}`,
    data: () => ({
      themeSwitcher
    }),
    mounted() {
      this.$message.config({
        getContainer: () => document.getElementById('message')
      });
      document.getElementById('message').className = themeSwitcher.currentTheme;
    }
  });
 </script>
--- a/web/html/xui/dns_modal.html
+++ b/web/html/xui/dns_modal.html
@@ -1,29 +1,25 @@
 {{define "dnsModal"}}
-<a-modal id="dns-modal" v-model="dnsModal.visible" :title="dnsModal.title" @ok="dnsModal.ok"
+<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">
         :closable="true" :mask-closable="false"
         :ok-text="dnsModal.okText" cancel-text='{{ i18n "close" }}' :class="themeSwitcher.currentTheme">
  <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-form-item label='{{ i18n "pages.xray.dns.domains" }}'>
-          <a-button size="small" type="primary" @click="dnsModal.dnsServer.domains.push('')">+</a-button>
+      <a-button icon="plus" size="small" type="primary" @click="dnsModal.dnsServer.domains.push('')"></a-button>
      <template v-for="(domain, index) in dnsModal.dnsServer.domains">
        <a-input v-model.trim="dnsModal.dnsServer.domains[index]">
-                  <a-button size="small" slot="addonAfter" @click="dnsModal.dnsServer.domains.splice(index,1)">-</a-button>
+          <a-button icon="minus" size="small" slot="addonAfter" @click="dnsModal.dnsServer.domains.splice(index,1)"></a-button>
        </a-input>
      </template>
    </a-form-item>
    <a-form-item label='{{ i18n "pages.xray.dns.strategy" }}' v-if="isAdvanced">
-          <a-select
+      <a-select v-model="dnsModal.dnsServer.queryStrategy" style="width: 100%" :dropdown-class-name="themeSwitcher.currentTheme">
-            v-model="dnsModal.dnsServer.queryStrategy"
+        <a-select-option :value="l" :label="l" v-for="l in ['UseIP', 'UseIPv4', 'UseIPv6']"> [[ l ]] </a-select-option>
            style="width: 100%"
            :dropdown-class-name="themeSwitcher.currentTheme">
            <a-select-option :value="l" :label="l" v-for="l in ['UseIP', 'UseIPv4', 'UseIPv6']">
                [[ l ]]
            </a-select-option>
      </a-select>
    </a-form-item>
    <a-form-item label='Skip Fallback' v-if="isAdvanced">
      <a-switch v-model="dnsModal.dnsServer.skipFallback"></a-switch>
    </a-form-item>
  </a-form>
 </a-modal>
 <script>
@@ -37,6 +33,7 @@
      address: "localhost",
      domains: [],
      queryStrategy: 'UseIP',
      skipFallback: true,
    },
    ok() {
      domains = dnsModal.dnsServer.domains.filter(d => d.length > 0);
@@ -44,7 +41,13 @@
      newDnsServer = domains.length > 0 ? dnsModal.dnsServer : dnsModal.dnsServer.address;
      ObjectUtil.execute(dnsModal.confirm, newDnsServer);
    },
-        show({ title='', okText='{{ i18n "confirm" }}', dnsServer, confirm=(dnsServer)=>{}, isEdit=false  }) {
+    show({
      title = '',
      okText = '{{ i18n "confirm" }}',
      dnsServer,
      confirm = (dnsServer) => {},
      isEdit = false
    }) {
      this.title = title;
      this.okText = okText;
      this.confirm = confirm;
@@ -53,13 +56,19 @@
        if (typeof dnsServer == 'object') {
          this.dnsServer = dnsServer;
        } else {
-                this.dnsServer.address = dnsServer?? '';
+          this.dnsServer = {
            address: dnsServer ?? "",
            domains: [],
            queryStrategy: 'UseIP',
            skipFallback: true,
          }
        }
      } else {
        this.dnsServer = {
          address: "localhost",
          domains: [],
          queryStrategy: 'UseIP',
          skipFallback: true,
        }
      }
      this.isEdit = isEdit;
@@ -68,7 +77,6 @@
      dnsModal.visible = false;
    },
  };
  new Vue({
    delimiters: ['[[', ']]'],
    el: '#dns-modal',
@@ -77,10 +85,11 @@
    },
    computed: {
      isAdvanced: {
-            get: function () { return dnsModal.dnsServer.domains.length>0 }
+        get: function() {
          return dnsModal.dnsServer.domains.length > 0
        }
      }
    }
  });
 </script>
 {{end}}
--- a/web/html/xui/form/client.html
+++ b/web/html/xui/form/client.html
@@ -75,7 +75,7 @@
        </template>
        <a-input-number v-model="client.limitIp" min="0"></a-input-number>
    </a-form-item>
-    <a-form-item v-if="client.limitIp > 0 && client.email && isEdit">
+    <a-form-item v-if="app.ipLimitEnable && client.limitIp > 0 && client.email && isEdit">
        <template slot="label">
            <a-tooltip>
                <template slot="title">
--- a/web/html/xui/form/inbound.html
+++ b/web/html/xui/form/inbound.html
@@ -54,11 +54,12 @@
                <a-icon type="question-circle"></a-icon>
            </a-tooltip>
        </template>
-            <a-date-picker style="width: 100%;" v-if="datepicker == 'gregorian'" :show-time="{ format: 'HH:mm:ss' }" format="YYYY-MM-DD HH:mm:ss"
+        <a-date-picker style="width: 100%;" v-if="datepicker == 'gregorian'" :show-time="{ format: 'HH:mm:ss' }"
-                :dropdown-class-name="themeSwitcher.currentTheme"
+            format="YYYY-MM-DD HH:mm:ss" :dropdown-class-name="themeSwitcher.currentTheme"
            v-model="dbInbound._expiryTime"></a-date-picker>
        <persian-datepicker v-else placeholder='{{ i18n "pages.settings.datepickerPlaceholder" }}'
-                            value="dbInbound._expiryTime" v-model="dbInbound._expiryTime"></persian-datepicker>
+            value="dbInbound._expiryTime" v-model="dbInbound._expiryTime">
        </persian-datepicker>
    </a-form-item>
 </a-form>
--- a/web/html/xui/form/outbound.html
+++ b/web/html/xui/form/outbound.html
@@ -18,23 +18,16 @@
      <!-- freedom settings-->
      <template v-if="outbound.protocol === Protocols.Freedom">
        <a-form-item label='Strategy'>
-            <a-select
+          <a-select v-model="outbound.settings.domainStrategy" :dropdown-class-name="themeSwitcher.currentTheme">
            v-model="outbound.settings.domainStrategy"
            :dropdown-class-name="themeSwitcher.currentTheme">
            <a-select-option v-for="s in OutboundDomainStrategies" :value="s">[[ s ]]</a-select-option>
          </a-select>
        </a-form-item>
        <a-form-item label='Fragment'>
-            <a-switch
+          <a-switch :checked="Object.keys(outbound.settings.fragment).length >0" @change="checked => outbound.settings.fragment = checked ? new Outbound.FreedomSettings.Fragment() : {}"></a-switch>
                :checked="Object.keys(outbound.settings.fragment).length >0"
                @change="checked => outbound.settings.fragment = checked ? new Outbound.FreedomSettings.Fragment() : {}">
            </a-switch>
        </a-form-item>
        <template v-if="Object.keys(outbound.settings.fragment).length >0">
          <a-form-item label='Packets'>
-            <a-select
+            <a-select v-model="outbound.settings.fragment.packets" :dropdown-class-name="themeSwitcher.currentTheme">
            v-model="outbound.settings.fragment.packets"
            :dropdown-class-name="themeSwitcher.currentTheme">
              <a-select-option v-for="s in ['1-3','tlshello']" :value="s">[[ s ]]</a-select-option>
            </a-select>
          </a-form-item>
@@ -50,9 +43,7 @@
      <!-- blackhole settings -->
      <template v-if="outbound.protocol === Protocols.Blackhole">
        <a-form-item label='Response Type'>
-        <a-select
+          <a-select v-model="outbound.settings.type" :dropdown-class-name="themeSwitcher.currentTheme">
        v-model="outbound.settings.type"
        :dropdown-class-name="themeSwitcher.currentTheme">
            <a-select-option v-for="s in ['', 'none','http']" :value="s">[[ s ]]</a-select-option>
          </a-select>
        </a-form-item>
@@ -61,9 +52,7 @@
      <!-- dns settings -->
      <template v-if="outbound.protocol === Protocols.DNS">
        <a-form-item label='{{ i18n "pages.inbounds.network" }}'>
-        <a-select
+          <a-select v-model="outbound.settings.network" :dropdown-class-name="themeSwitcher.currentTheme">
        v-model="outbound.settings.network"
        :dropdown-class-name="themeSwitcher.currentTheme">
            <a-select-option v-for="s in ['udp','tcp']" :value="s">[[ s ]]</a-select-option>
          </a-select>
        </a-form-item>
@@ -77,7 +66,8 @@
              <template slot="title">
                <span>{{ i18n "pages.xray.rules.useComma" }}</span>
              </template>
-                {{ i18n "pages.xray.outbound.address" }} <a-icon type="question-circle"></a-icon>
+              {{ i18n "pages.xray.outbound.address" }}
              <a-icon type="question-circle"></a-icon>
            </a-tooltip>
          </template>
          <a-input v-model.trim="outbound.settings.address"></a-input>
@@ -108,7 +98,7 @@
          <a-input-number v-model.number="outbound.settings.mtu"></a-input-number>
        </a-form-item>
        <a-form-item label='Workers'>
-        <a-input-number min="0" v-model.number="outbound.settings.workers"></a-input>
+          <a-input-number min="0" v-model.number="outbound.settings.workers"></a-input-number>
        </a-form-item>
        <a-form-item label='Kernel Mode'>
          <a-switch v-model="outbound.settings.kernelMode"></a-switch>
@@ -118,22 +108,17 @@
            <a-tooltip>
              <template slot="title">
                <span>{{ i18n "pages.xray.rules.useComma" }}</span>
-                </template>
+              </template> Reserved <a-icon type="question-circle"></a-icon>
                Reserved <a-icon type="question-circle"></a-icon>
            </a-tooltip>
          </template>
          <a-input v-model="outbound.settings.reserved"></a-input>
        </a-form-item>
        <a-form-item label="Peers">
-        <a-button type="primary" size="small" @click="outbound.settings.addPeer()">+</a-button>
+          <a-button icon="plus" type="primary" size="small" @click="outbound.settings.addPeer()"></a-button>
        </a-form-item>
        <a-form v-for="(peer, index) in outbound.settings.peers" :colon="false" :label-col="{ md: {span:8} }" :wrapper-col="{ md: {span:14} }">
-        <a-divider style="margin:0;">
+          <a-divider style="margin:0;"> Peer [[ index + 1 ]] <a-icon v-if="outbound.settings.peers.length>1" type="delete" @click="() => outbound.settings.delPeer(index)" style="color: rgb(255, 77, 79);cursor: pointer;"></a-icon>
            Peer [[ index + 1 ]]
            <a-icon v-if="outbound.settings.peers.length>1" type="delete" @click="() => outbound.settings.delPeer(index)"
                    style="color: rgb(255, 77, 79);cursor: pointer;"/>
          </a-divider>
          <a-form-item label='{{ i18n "pages.xray.wireguard.endpoint" }}'>
            <a-input v-model.trim="peer.endpoint"></a-input>
          </a-form-item>
@@ -145,16 +130,17 @@
          </a-form-item>
          <a-form-item>
            <template slot="label">
-                {{ i18n "pages.xray.wireguard.allowedIPs" }} <a-button type="primary" size="small" @click="peer.allowedIPs.push('')">+</a-button>
+              {{ i18n "pages.xray.wireguard.allowedIPs" }}
              <a-button icon="plus" type="primary" size="small" @click="peer.allowedIPs.push('')"></a-button>
            </template>
            <template v-for="(aip, index) in peer.allowedIPs" style="margin-bottom: 10px;">
              <a-input v-model.trim="peer.allowedIPs[index]">
-                    <a-button v-if="peer.allowedIPs.length>1" slot="addonAfter" size="small" @click="peer.allowedIPs.splice(index, 1)">-</a-button>
+                <a-button icon="minus" v-if="peer.allowedIPs.length>1" slot="addonAfter" size="small" @click="peer.allowedIPs.splice(index, 1)"></a-button>
              </a-input>
            </template>
          </a-form-item>
          <a-form-item label='Keep Alive'>
-            <a-input-number v-model.number="peer.keepAlive" :min="0"></a-input>
+            <a-input-number v-model.number="peer.keepAlive" :min="0"></a-input-number>
          </a-form-item>
        </a-form>
      </template>
@@ -174,6 +160,7 @@
        <a-form-item label='ID'>
          <a-input v-model.trim="outbound.settings.id"></a-input>
        </a-form-item>
        <!-- vless settings -->
        <template v-if="outbound.canEnableTlsFlow()">
          <a-form-item label='Flow'>
@@ -196,12 +183,14 @@
            <a-input v-model.trim="outbound.settings.pass"></a-input>
          </a-form-item>
        </template>
        <!-- trojan/shadowsocks -->
        <template v-if="[Protocols.Trojan, Protocols.Shadowsocks].includes(outbound.protocol)">
          <a-form-item label='{{ i18n "password" }}'>
            <a-input v-model.trim="outbound.settings.password"></a-input>
          </a-form-item>
        </template>
        <!-- shadowsocks -->
        <template v-if="outbound.protocol === Protocols.Shadowsocks">
          <a-form-item label='{{ i18n "encryption" }}'>
@@ -212,14 +201,16 @@
          <a-form-item label='UDP over TCP'>
            <a-switch v-model="outbound.settings.uot"></a-switch>
          </a-form-item>
          <a-form-item label='UoTVersion'>
            <a-input-number v-model.number="outbound.settings.UoTVersion" :min="1" :max="2"></a-input-number>
          </a-form-item>
        </template>
      </template>
      <!-- stream settings -->
      <template v-if="outbound.canEnableStream()">
        <a-form-item label='{{ i18n "transmission" }}'>
-        <a-select v-model="outbound.stream.network" @change="streamNetworkChange"
+          <a-select v-model="outbound.stream.network" @change="streamNetworkChange" :dropdown-class-name="themeSwitcher.currentTheme">
            :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>
@@ -227,13 +218,12 @@
            <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-option value="splithttp">SplitHTTP</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>
                @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" }}'>
@@ -350,6 +340,16 @@
            <a-input v-model.trim="outbound.stream.httpupgrade.path"></a-input>
          </a-form-item>
        </template>
        <!-- splithttp -->
        <template v-if="outbound.stream.network === 'splithttp'">
          <a-form-item label='{{ i18n "host" }}'>
            <a-input v-model="outbound.stream.splithttp.host"></a-input>
          </a-form-item>
          <a-form-item label='{{ i18n "path" }}'>
            <a-input v-model.trim="outbound.stream.splithttp.path"></a-input>
          </a-form-item>
        </template>
      </template>
      <!-- tls settings -->
@@ -366,16 +366,13 @@
            <a-input v-model.trim="outbound.stream.tls.serverName"></a-input>
          </a-form-item>
          <a-form-item label="uTLS">
-            <a-select v-model="outbound.stream.tls.fingerprint" 
+            <a-select v-model="outbound.stream.tls.fingerprint" :dropdown-class-name="themeSwitcher.currentTheme">
            :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>
            </a-select>
          </a-form-item>
          <a-form-item label="ALPN">
-            <a-select mode="multiple" 
+            <a-select mode="multiple" :dropdown-class-name="themeSwitcher.currentTheme" v-model="outbound.stream.tls.alpn">
            :dropdown-class-name="themeSwitcher.currentTheme"
                v-model="outbound.stream.tls.alpn">
              <a-select-option v-for="alpn in ALPN_OPTION" :value="alpn">[[ alpn ]]</a-select-option>
            </a-select>
          </a-form-item>
@@ -390,8 +387,7 @@
            <a-input v-model.trim="outbound.stream.reality.serverName"></a-input>
          </a-form-item>
          <a-form-item label="uTLS">
-            <a-select v-model="outbound.stream.reality.fingerprint" 
+            <a-select v-model="outbound.stream.reality.fingerprint" :dropdown-class-name="themeSwitcher.currentTheme">
            :dropdown-class-name="themeSwitcher.currentTheme">
              <a-select-option v-for="key in UTLS_FINGERPRINT" :value="key">[[ key ]]</a-select-option>
            </a-select>
          </a-form-item>
@@ -422,6 +418,9 @@
        </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="Multipath TCP">
          <a-switch v-model.trim="outbound.stream.sockopt.tcpMptcp"></a-switch>
      </a-form-item>
        <a-form-item label="TCP No-Delay">
          <a-switch v-model="outbound.stream.sockopt.tcpNoDelay"></a-switch>
@@ -447,13 +446,13 @@
          </a-form-item>
        </template>
      </template>
    </a-form>
  </a-tab-pane>
  <a-tab-pane key="2" tab="JSON" force-render="true">
-    <a-form-item style="margin: 10px 0">
+    <a-form-item style="margin: 10px 0"> Link: <a-input v-model.trim="outModal.link" style="width: 300px; margin-right: 5px;" placeholder="vmess:// vless:// trojan:// ss://"></a-input>
-        Link: <a-input v-model.trim="outModal.link" style="width: 300px; margin-right: 5px;" placeholder="vmess:// vless:// trojan:// ss://"></a-input>
+      <a-button @click="convertLink" type="primary">
-        <a-button @click="convertLink" type="primary"><a-icon type="form"></a-icon></a-button>
+        <a-icon type="form"></a-icon>
      </a-button>
    </a-form-item>
    <textarea style="position:absolute; left: -800px;" id="outboundJson"></textarea>
  </a-tab-pane>
--- a/web/html/xui/form/protocol/dokodemo.html
+++ b/web/html/xui/form/protocol/dokodemo.html
@@ -16,5 +16,8 @@
    <a-form-item label='Follow Redirect'>
        <a-switch v-model="inbound.settings.followRedirect"></a-switch>
    </a-form-item>
    <a-form-item label='Timeout'>
        <a-input-number v-model.number="inbound.settings.timeout" :min="0"></a-input-number>
    </a-form-item>
 </a-form>
 {{end}}
--- a/web/html/xui/form/protocol/http.html
+++ b/web/html/xui/form/protocol/http.html
@@ -4,7 +4,9 @@
    <tr>
      <td width="45%">{{ i18n "username" }}</td>
      <td width="45%">{{ i18n "password" }}</td>
-                <td><a-button size="small" @click="inbound.settings.addAccount(new Inbound.HttpSettings.HttpAccount())">+</a-button></td>
+      <td>
        <a-button icon="plus" size="small" @click="inbound.settings.addAccount(new Inbound.HttpSettings.HttpAccount())"></a-button>
      </td>
    </tr>
  </table>
  <a-input-group compact v-for="(account, index) in inbound.settings.accounts" style="margin-bottom: 10px;">
@@ -13,7 +15,7 @@
    </a-input>
    <a-input style="width: 50%" v-model.trim="account.pass" placeholder='{{ i18n "password" }}'>
      <template slot="addonAfter">
-                    <a-button size="small" @click="inbound.settings.delAccount(index)">-</a-button>
+        <a-button icon="minus" size="small" @click="inbound.settings.delAccount(index)"></a-button>
      </template>
    </a-input>
  </a-input-group>
--- a/web/html/xui/form/protocol/socks.html
+++ b/web/html/xui/form/protocol/socks.html
@@ -7,15 +7,16 @@
    <a-input v-model.trim="inbound.settings.ip"></a-input>
  </a-form-item>
  <a-form-item label='{{ i18n "password" }}'>
-        <a-switch :checked="inbound.settings.auth === 'password'"
+    <a-switch :checked="inbound.settings.auth === 'password'" @change="checked => inbound.settings.auth = checked ? 'password' : 'noauth'"></a-switch>
        @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: 1rem 0;">
      <tr>
        <td width="45%">{{ i18n "username" }}</td>
        <td width="45%">{{ i18n "password" }}</td>
-                <td><a-button size="small" @click="inbound.settings.addAccount(new Inbound.SocksSettings.SocksAccount())">+</a-button></td>
+        <td>
          <a-button icon="plus" size="small" @click="inbound.settings.addAccount(new Inbound.SocksSettings.SocksAccount())"></a-button>
        </td>
      </tr>
    </table>
    <a-input-group compact v-for="(account, index) in inbound.settings.accounts" style="margin-bottom: 10px;">
@@ -24,7 +25,7 @@
      </a-input>
      <a-input style="width: 50%" v-model.trim="account.pass" placeholder='{{ i18n "password" }}'>
        <template slot="addonAfter">
-                    <a-button size="small" @click="inbound.settings.delAccount(index)">-</a-button>
+          <a-button icon="minus" size="small" @click="inbound.settings.delAccount(index)"></a-button>
        </template>
      </a-input>
    </a-input-group>
--- a/web/html/xui/form/protocol/trojan.html
+++ b/web/html/xui/form/protocol/trojan.html
@@ -21,17 +21,13 @@
 <template v-if="inbound.isTcp && !inbound.stream.isReality">
  <a-form :colon="false" :label-col="{ md: {span:8} }" :wrapper-col="{ md: {span:14} }">
    <a-form-item label="Fallbacks">
-            <a-button type="primary" size="small" @click="inbound.settings.addFallback()">+</a-button>
+      <a-button icon="plus" 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:8} }"
+  <a-form v-for="(fallback, index) in inbound.settings.fallbacks" :colon="false" :label-col="{ md: {span:8} }" :wrapper-col="{ md: {span:14} }">
-        :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;"></a-icon>
        <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;" />
    </a-divider>
    <a-form-item label='SNI'>
      <a-input v-model="fallback.name"></a-input>
--- a/web/html/xui/form/protocol/vless.html
+++ b/web/html/xui/form/protocol/vless.html
@@ -23,17 +23,13 @@
 <template v-if="inbound.isTcp && !inbound.stream.isReality">
  <a-form :colon="false" :label-col="{ md: {span:8} }" :wrapper-col="{ md: {span:14} }">
    <a-form-item label="Fallbacks">
-            <a-button type="primary" size="small" @click="inbound.settings.addFallback()">+</a-button>
+      <a-button icon="plus" 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:8} }"
+  <a-form v-for="(fallback, index) in inbound.settings.fallbacks" :colon="false" :label-col="{ md: {span:8} }" :wrapper-col="{ md: {span:14} }">
-        :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;"></a-icon>
        <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;" />
    </a-divider>
    <a-form-item label='SNI'>
      <a-input v-model="fallback.name"></a-input>
--- a/web/html/xui/form/protocol/wireguard.html
+++ b/web/html/xui/form/protocol/wireguard.html
@@ -7,9 +7,7 @@
          <span>{{ i18n "reset" }}</span>
        </template>
        {{ i18n "pages.xray.wireguard.secretKey" }}
-                <a-icon type="sync"
+        <a-icon type="sync" @click="[inbound.settings.pubKey, inbound.settings.secretKey] = Object.values(Wireguard.generateKeypair())"></a-icon>
                    @click="[inbound.settings.pubKey, inbound.settings.secretKey] = Object.values(Wireguard.generateKeypair())">
                </a-icon>
      </a-tooltip>
    </template>
    <a-input v-model.trim="inbound.settings.secretKey"></a-input>
@@ -24,13 +22,10 @@
    <a-switch v-model="inbound.settings.kernelMode"></a-switch>
  </a-form-item>
  <a-form-item label="Peers">
-        <a-button type="primary" size="small" @click="inbound.settings.addPeer()">+</a-button>
+    <a-button icon="plus" 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:8} }" :wrapper-col="{ md: {span:14} }">
-        <a-divider style="margin:0;">
+    <a-divider style="margin:0;"> Peer [[ index + 1 ]] <a-icon v-if="inbound.settings.peers.length>1" type="delete" @click="() => inbound.settings.delPeer(index)" style="color: rgb(255, 77, 79);cursor: pointer;"></a-icon>
            Peer [[ index + 1 ]]
            <a-icon v-if="inbound.settings.peers.length>1" type="delete" @click="() => inbound.settings.delPeer(index)"
                    style="color: rgb(255, 77, 79);cursor: pointer;"/>
    </a-divider>
    <a-form-item>
      <template slot="label">
@@ -64,16 +59,17 @@
    </a-form-item>
    <a-form-item>
      <template slot="label">
-                {{ i18n "pages.xray.wireguard.allowedIPs" }} <a-button type="primary" size="small" @click="peer.allowedIPs.push('')">+</a-button>
+        {{ i18n "pages.xray.wireguard.allowedIPs" }}
        <a-button icon="plus" type="primary" size="small" @click="peer.allowedIPs.push('')"></a-button>
      </template>
      <template v-for="(aip, index) in peer.allowedIPs" style="margin-bottom: 10px;">
        <a-input v-model.trim="peer.allowedIPs[index]">
-                    <a-button v-if="peer.allowedIPs.length>1" slot="addonAfter" size="small" @click="peer.allowedIPs.splice(index, 1)">-</a-button>
+          <a-button icon="minus" v-if="peer.allowedIPs.length>1" slot="addonAfter" size="small" @click="peer.allowedIPs.splice(index, 1)"></a-button>
        </a-input>
      </template>
    </a-form-item>
    <a-form-item label='Keep Alive'>
-            <a-input-number v-model.number="peer.keepAlive" :min="0"></a-input>
+      <a-input-number v-model.number="peer.keepAlive" :min="0"></a-input-number>
    </a-form-item>
  </a-form>
 </a-form>
--- a/web/html/xui/form/sniffing.html
+++ b/web/html/xui/form/sniffing.html
@@ -13,10 +13,18 @@
    </span>
    <a-switch v-model="inbound.sniffing.enabled"></a-switch>
  </a-form-item>
  <template v-if="inbound.sniffing.enabled">
    <a-form-item :wrapper-col="{span:24}">
-    <a-checkbox-group v-model="inbound.sniffing.destOverride" v-if="inbound.sniffing.enabled">
+      <a-checkbox-group v-model="inbound.sniffing.destOverride">
        <a-checkbox v-for="key,value in SNIFFING_OPTION" :value="key">[[ value ]]</a-checkbox>
      </a-checkbox-group>
    </a-form-item>
    <a-form-item label='Metadata Only'>
      <a-switch v-model="inbound.sniffing.metadataOnly"></a-switch>
    </a-form-item>
    <a-form-item label='Route Only'>
      <a-switch v-model="inbound.sniffing.routeOnly"></a-switch>
    </a-form-item>
  </template>
 </a-form>
 {{end}}
--- a/web/html/xui/form/stream/external_proxy.html
+++ b/web/html/xui/form/stream/external_proxy.html
@@ -3,7 +3,7 @@
  <a-divider style="margin:5px 0 0;"></a-divider>
  <a-form-item label="External Proxy">
    <a-switch v-model="externalProxy"></a-switch>
-        <a-button v-if="externalProxy" type="primary" style="margin-left: 10px" size="small" @click="inbound.stream.externalProxy.push({forceTls: 'same', dest: '', port: 443, remark: ''})">+</a-button>
+    <a-button icon="plus" v-if="externalProxy" type="primary" style="margin-left: 10px" size="small" @click="inbound.stream.externalProxy.push({forceTls: 'same', dest: '', port: 443, remark: ''})"></a-button>
  </a-form-item>
  <a-input-group style="margin: 8px 0;" compact v-for="(row, index) in inbound.stream.externalProxy">
    <template>
@@ -19,8 +19,11 @@
    <a-tooltip title='{{ i18n "pages.inbounds.port" }}'>
      <a-input-number style="width: 15%;" v-model.number="row.port" min="1" max="65531"></a-input-number>
    </a-tooltip>
-        <a-input style="width: 20%" v-model.trim="row.remark" placeholder='{{ i18n "remark" }}'></a-input>
+    <a-input style="width: 30%; top: 0;" v-model.trim="row.remark" placeholder='{{ i18n "remark" }}'>
-        <a-button style="width: 10%; margin: 0px; border-radius: 0 1rem 1rem 0;" @click="inbound.stream.externalProxy.splice(index, 1)">-</a-button>
+      <template slot="addonAfter">
        <a-button icon="minus" size="small" @click="inbound.stream.externalProxy.splice(index, 1)"></a-button>
      </template>
    </a-input>
  </a-input-group>
 </a-form>
 {{end}}
--- a/web/html/xui/form/stream/stream_http.html
+++ b/web/html/xui/form/stream/stream_http.html
@@ -5,13 +5,11 @@
  </a-form-item>
  <a-form-item>
    <template slot="label">{{ i18n "host" }}
-            <a-button size="small" @click="inbound.stream.http.addHost()">+</a-button>
+      <a-button icon="plus" size="small" @click="inbound.stream.http.addHost()"></a-button>
    </template>
    <template v-for="(host, index) in inbound.stream.http.host">
      <a-input v-model.trim="inbound.stream.http.host[index]">
-                <a-button size="small" slot="addonAfter"
+        <a-button icon="minus" size="small" slot="addonAfter" @click="inbound.stream.http.removeHost(index)" v-if="inbound.stream.http.host.length>1"></a-button>
                @click="inbound.stream.http.removeHost(index)"
                v-if="inbound.stream.http.host.length>1">-</a-button>
      </a-input>
    </template>
  </a-form-item>
--- a/web/html/xui/form/stream/stream_httpupgrade.html
+++ b/web/html/xui/form/stream/stream_httpupgrade.html
@@ -1,6 +1,6 @@
 {{define "form/streamHTTPUpgrade"}}
 <a-form :colon="false" :label-col="{ md: {span:8} }" :wrapper-col="{ md: {span:14} }">
-    <a-form-item label="PROXY Protocol">
+  <a-form-item label="Proxy Protocol">
    <a-switch v-model="inbound.stream.httpupgrade.acceptProxyProtocol"></a-switch>
  </a-form-item>
  <a-form-item label='{{ i18n "host" }}'>
@@ -10,7 +10,7 @@
    <a-input v-model.trim="inbound.stream.httpupgrade.path"></a-input>
  </a-form-item>
  <a-form-item label='{{ i18n "pages.inbounds.stream.tcp.requestHeader" }}'>
-        <a-button size="small" @click="inbound.stream.httpupgrade.addHeader('host', '')">+</a-button>
+    <a-button icon="plus" size="small" @click="inbound.stream.httpupgrade.addHeader('host', '')"></a-button>
  </a-form-item>
  <a-form-item :wrapper-col="{span:24}">
    <a-input-group compact v-for="(header, index) in inbound.stream.httpupgrade.headers">
@@ -18,7 +18,7 @@
        <template slot="addonBefore" style="margin: 0;">[[ index+1 ]]</template>
      </a-input>
      <a-input style="width: 50%" v-model.trim="header.value" placeholder='{{ i18n "pages.inbounds.stream.general.value" }}'>
-                <a-button slot="addonAfter" size="small" @click="inbound.stream.httpupgrade.removeHeader(index)">-</a-button>
+        <a-button icon="minus" slot="addonAfter" size="small" @click="inbound.stream.httpupgrade.removeHeader(index)"></a-button>
      </a-input>
    </a-input-group>
  </a-form-item>
--- a/web/html/xui/form/stream/stream_settings.html
+++ b/web/html/xui/form/stream/stream_settings.html
@@ -11,6 +11,7 @@
            <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-option value="splithttp">SplitHTTP</a-select-option>
        </a-select>
    </a-form-item>
 </a-form>
@@ -50,6 +51,11 @@
    {{template "form/streamHTTPUpgrade"}}
 </template>
 <!-- splithttp -->
 <template v-if="inbound.stream.network === 'splithttp'">
    {{template "form/streamSplitHTTP"}}
 </template>
 <!-- sockopt -->
 <template>
    {{template "form/streamSockopt"}}
--- a/web/html/xui/form/stream/stream_sockopt.html
+++ b/web/html/xui/form/stream/stream_sockopt.html
@@ -1,26 +1,66 @@
 {{define "form/streamSockopt"}}
 <a-divider style="margin:5px 0 0;"></a-divider>
 <a-form :colon="false" :label-col="{ md: {span:8} }" :wrapper-col="{ md: {span:14} }">
-    <a-form-item label="TPROXY">
+    <a-form-item label="Sockopt">
        <a-switch v-model="inbound.stream.sockoptSwitch"></a-switch>
    </a-form-item>
    <template v-if="inbound.stream.sockoptSwitch">
-        <a-form-item label="PROXY Protocol">
+        <a-form-item label="Route Mark">
            <a-input-number v-model="inbound.stream.sockopt.mark" :min="0"></a-input-number>
        </a-form-item>
        <a-form-item label="TCP Keep Alive Interval">
            <a-input-number v-model="inbound.stream.sockopt.tcpKeepAliveInterval" :min="0"></a-input-number>
        </a-form-item>
        <a-form-item label="TCP Keep Alive Idle">
            <a-input-number v-model="inbound.stream.sockopt.tcpKeepAliveIdle" :min="0"></a-input-number>
        </a-form-item>
        <a-form-item label="TCP Max Seg">
            <a-input-number v-model="inbound.stream.sockopt.tcpMaxSeg" :min="0"></a-input-number>
        </a-form-item>
        <a-form-item label="TCP User Timeout">
            <a-input-number v-model="inbound.stream.sockopt.tcpUserTimeout" :min="0"></a-input-number>
        </a-form-item>
        <a-form-item label="TCP Window Clamp">
            <a-input-number v-model="inbound.stream.sockopt.tcpWindowClamp" :min="0"></a-input-number>
        </a-form-item>
        <a-form-item label="Proxy Protocol">
            <a-switch v-model="inbound.stream.sockopt.acceptProxyProtocol"></a-switch>
        </a-form-item>
        <a-form-item label="TCP Fast Open">
            <a-switch v-model.trim="inbound.stream.sockopt.tcpFastOpen"></a-switch>
        </a-form-item>
-        <a-form-item label="Route Mark">
+        <a-form-item label="Multipath TCP">
-            <a-input-number v-model="inbound.stream.sockopt.mark" :min="0"></a-input-number>
+            <a-switch v-model.trim="inbound.stream.sockopt.tcpMptcp"></a-switch>
        </a-form-item>
-        <a-form-item label="TPROXY">
+        <a-form-item label="TCP No-Delay">
-            <a-select v-model="inbound.stream.sockopt.tproxy" :dropdown-class-name="themeSwitcher.currentTheme">
+            <a-switch v-model.trim="inbound.stream.sockopt.tcpNoDelay"></a-switch>
        </a-form-item>
        <a-form-item label="V6 Only">
            <a-switch v-model.trim="inbound.stream.sockopt.V6Only"></a-switch>
        </a-form-item>
        <a-form-item label='Domain Strategy'>
            <a-select v-model="inbound.stream.sockopt.domainStrategy" style="width: 50%" :dropdown-class-name="themeSwitcher.currentTheme">
              <a-select-option v-for="key in DOMAIN_STRATEGY_OPTION" :value="key">[[ key ]]</a-select-option>
            </a-select>
        </a-form-item>
        <a-form-item label='TCP Congestion'>
            <a-select v-model="inbound.stream.sockopt.tcpcongestion" style="width: 50%" :dropdown-class-name="themeSwitcher.currentTheme">
              <a-select-option v-for="key in TCP_CONGESTION_OPTION" :value="key">[[ key ]]</a-select-option>
            </a-select>
        </a-form-item>
        <a-form-item label="TProxy">
            <a-select v-model="inbound.stream.sockopt.tproxy" style="width: 50%" :dropdown-class-name="themeSwitcher.currentTheme">
                <a-select-option value="off">Off</a-select-option>
                <a-select-option value="redirect">Redirect</a-select-option>
-                <a-select-option value="tproxy">TPROXY</a-select-option>
+                <a-select-option value="tproxy">TProxy</a-select-option>
            </a-select>
        </a-form-item>
        <a-form-item label="Dialer Proxy">
            <a-input v-model="inbound.stream.sockopt.dialerProxy"></a-input>
        </a-form-item>
        <a-form-item label="Interface Name">
            <a-input v-model="inbound.stream.sockopt.interfaceName"></a-input>
        </a-form-item>
    </template>
 </a-form>
 {{end}}
--- a/web/html/xui/form/stream/stream_splithttp.html
+++ b/web/html/xui/form/stream/stream_splithttp.html
@@ -0,0 +1,29 @@
 {{define "form/streamSplitHTTP"}}
 <a-form :colon="false" :label-col="{ md: {span:8} }" :wrapper-col="{ md: {span:14} }">
    <a-form-item label='{{ i18n "host" }}'>
        <a-input v-model.trim="inbound.stream.splithttp.host"></a-input>
    </a-form-item>
    <a-form-item label='{{ i18n "path" }}'>
      <a-input v-model.trim="inbound.stream.splithttp.path"></a-input>
    </a-form-item>
    <a-form-item label='{{ i18n "pages.inbounds.stream.tcp.requestHeader" }}'>
      <a-button icon="plus" size="small" @click="inbound.stream.splithttp.addHeader('host', '')"></a-button>
    </a-form-item>
    <a-form-item :wrapper-col="{span:24}">
        <a-input-group compact v-for="(header, index) in inbound.stream.splithttp.headers">
            <a-input style="width: 50%" v-model.trim="header.name" placeholder='{{ i18n "pages.inbounds.stream.general.name"}}'>
                <template slot="addonBefore" style="margin: 0;">[[ index+1 ]]</template>
            </a-input>
            <a-input style="width: 50%" v-model.trim="header.value" placeholder='{{ i18n "pages.inbounds.stream.general.value" }}'>
                <a-button slot="addonAfter" size="small" @click="inbound.stream.splithttp.removeHeader(index)">-</a-button>
            </a-input>
        </a-input-group>
    </a-form-item>
    <a-form-item label="Max Upload Size (MB)">
        <a-input-number v-model="inbound.stream.splithttp.maxUploadSize" :min="0"></a-input-number>
    </a-form-item>
    <a-form-item label="Max Concurrent Upload">
        <a-input-number v-model="inbound.stream.splithttp.maxConcurrentUploads" :min="0"></a-input-number>
    </a-form-item>
 </a-form>
 {{end}}
--- a/web/html/xui/form/stream/stream_tcp.html
+++ b/web/html/xui/form/stream/stream_tcp.html
@@ -1,18 +1,15 @@
 {{define "form/streamTCP"}}
 <!-- tcp type -->
 <a-form :colon="false" :label-col="{ md: {span:8} }" :wrapper-col="{ md: {span:14} }">
-    <a-form-item label="PROXY Protocol" v-if="inbound.canEnableTls()">
+  <a-form-item label="Proxy Protocol" v-if="inbound.canEnableTls()">
    <a-switch v-model="inbound.stream.tcp.acceptProxyProtocol"></a-switch>
  </a-form-item>
  <a-form-item label='HTTP {{ i18n "camouflage" }}'>
-        <a-switch :checked="inbound.stream.tcp.type === 'http'"
+    <a-switch :checked="inbound.stream.tcp.type === 'http'" @change="checked => inbound.stream.tcp.type = checked ? 'http' : 'none'"></a-switch>
            @change="checked => inbound.stream.tcp.type = checked ? 'http' : 'none'">
        </a-switch>
  </a-form-item>
 </a-form>
-<a-form v-if="inbound.stream.tcp.type === 'http'" :colon="false" :label-col="{ md: {span:8} }"
+<a-form v-if="inbound.stream.tcp.type === 'http'" :colon="false" :label-col="{ md: {span:8} }" :wrapper-col="{ md: {span:14} }">
    :wrapper-col="{ md: {span:14} }">
  <!-- tcp request -->
  <a-divider style="margin:0;">{{ i18n "pages.inbounds.stream.general.request" }}</a-divider>
  <a-form-item label='{{ i18n "pages.inbounds.stream.tcp.version" }}'>
@@ -23,28 +20,24 @@
  </a-form-item>
  <a-form-item>
    <template slot="label">{{ i18n "pages.inbounds.stream.tcp.path" }}
-            <a-button size="small" @click="inbound.stream.tcp.request.addPath('/')">+</a-button>
+      <a-button icon="plus" size="small" @click="inbound.stream.tcp.request.addPath('/')"></a-button>
    </template>
    <template v-for="(path, index) in inbound.stream.tcp.request.path">
      <a-input v-model.trim="inbound.stream.tcp.request.path[index]">
-                <a-button size="small" slot="addonAfter" @click="inbound.stream.tcp.request.removePath(index)"
+        <a-button icon="minus" size="small" slot="addonAfter" @click="inbound.stream.tcp.request.removePath(index)" v-if="inbound.stream.tcp.request.path.length>1"></a-button>
                    v-if="inbound.stream.tcp.request.path.length>1">-</a-button>
      </a-input>
    </template>
  </a-form-item>
  <a-form-item label='{{ i18n "pages.inbounds.stream.tcp.requestHeader" }}'>
-        <a-button size="small" @click="inbound.stream.tcp.request.addHeader('Host', '')">+</a-button>
+    <a-button icon="plus" size="small" @click="inbound.stream.tcp.request.addHeader('Host', '')"></a-button>
  </a-form-item>
  <a-form-item :wrapper-col="{span:24}">
    <a-input-group compact v-for="(header, index) in inbound.stream.tcp.request.headers">
-            <a-input style="width: 50%" v-model.trim="header.name"
+      <a-input style="width: 50%" v-model.trim="header.name" placeholder='{{ i18n "pages.inbounds.stream.general.name" }}'>
                placeholder='{{ i18n "pages.inbounds.stream.general.name" }}'>
        <template slot="addonBefore" style="margin: 0;">[[ index+1 ]]</template>
      </a-input>
-            <a-input style="width: 50%" v-model.trim="header.value"
+      <a-input style="width: 50%" v-model.trim="header.value" placeholder='{{ i18n "pages.inbounds.stream.general.value" }}'>
-                placeholder='{{ i18n "pages.inbounds.stream.general.value" }}'>
+        <a-button icon="minus" slot="addonAfter" size="small" @click="inbound.stream.tcp.request.removeHeader(index)"></a-button>
                <a-button slot="addonAfter" size="small"
                    @click="inbound.stream.tcp.request.removeHeader(index)">-</a-button>
      </a-input>
    </a-input-group>
  </a-form-item>
@@ -61,19 +54,16 @@
    <a-input v-model.trim="inbound.stream.tcp.response.reason"></a-input>
  </a-form-item>
  <a-form-item label='{{ i18n "pages.inbounds.stream.tcp.responseHeader" }}'>
-        <a-button size="small"
+    <a-button icon="plus" size="small" @click="inbound.stream.tcp.response.addHeader('Content-Type', 'application/octet-stream')"></a-button>
            @click="inbound.stream.tcp.response.addHeader('Content-Type', 'application/octet-stream')">+</a-button>
  </a-form-item>
  <a-form-item :wrapper-col="{span:24}">
    <a-input-group compact v-for="(header, index) in inbound.stream.tcp.response.headers">
-            <a-input style="width: 50%" v-model.trim="header.name"
+      <a-input style="width: 50%" v-model.trim="header.name" placeholder='{{ i18n "pages.inbounds.stream.general.name" }}'>
                placeholder='{{ i18n "pages.inbounds.stream.general.name" }}'>
        <template slot="addonBefore" style="margin: 0;">[[ index+1 ]]</template>
      </a-input>
-            <a-input style="width: 50%" v-model.trim="header.value"
+      <a-input style="width: 50%" v-model.trim="header.value" placeholder='{{ i18n "pages.inbounds.stream.general.value" }}'>
                placeholder='{{ i18n "pages.inbounds.stream.general.value" }}'>
        <template slot="addonAfter">
-                    <a-button size="small" @click="inbound.stream.tcp.response.removeHeader(index)">-</a-button>
+          <a-button icon="minus" size="small" @click="inbound.stream.tcp.response.removeHeader(index)"></a-button>
        </template>
      </a-input>
    </a-input-group>
--- a/web/html/xui/form/stream/stream_ws.html
+++ b/web/html/xui/form/stream/stream_ws.html
@@ -1,6 +1,6 @@
 {{define "form/streamWS"}}
 <a-form :colon="false" :label-col="{ md: {span:8} }" :wrapper-col="{ md: {span:14} }">
-    <a-form-item label="PROXY Protocol">
+  <a-form-item label="Proxy Protocol">
    <a-switch v-model="inbound.stream.ws.acceptProxyProtocol"></a-switch>
  </a-form-item>
  <a-form-item label='{{ i18n "host" }}'>
@@ -10,7 +10,7 @@
    <a-input v-model.trim="inbound.stream.ws.path"></a-input>
  </a-form-item>
  <a-form-item label='{{ i18n "pages.inbounds.stream.tcp.requestHeader" }}'>
-        <a-button size="small" @click="inbound.stream.ws.addHeader('host', '')">+</a-button>
+    <a-button icon="plus" size="small" @click="inbound.stream.ws.addHeader('host', '')"></a-button>
  </a-form-item>
  <a-form-item :wrapper-col="{span:24}">
    <a-input-group compact v-for="(header, index) in inbound.stream.ws.headers">
@@ -18,7 +18,7 @@
        <template slot="addonBefore" style="margin: 0;">[[ index+1 ]]</template>
      </a-input>
      <a-input style="width: 50%" v-model.trim="header.value" placeholder='{{ i18n "pages.inbounds.stream.general.value" }}'>
-                <a-button slot="addonAfter" size="small" @click="inbound.stream.ws.removeHeader(index)">-</a-button>
+        <a-button icon="minus" slot="addonAfter" size="small" @click="inbound.stream.ws.removeHeader(index)"></a-button>
      </a-input>
    </a-input-group>
  </a-form-item>
--- a/web/html/xui/form/tls_settings.html
+++ b/web/html/xui/form/tls_settings.html
@@ -43,15 +43,13 @@
      </a-input-group>
    </a-form-item>
    <a-form-item label="uTLS">
-            <a-select v-model="inbound.stream.tls.settings.fingerprint" style="width: 50%"
+      <a-select v-model="inbound.stream.tls.settings.fingerprint" style="width: 50%" :dropdown-class-name="themeSwitcher.currentTheme">
                :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>
      </a-select>
    </a-form-item>
    <a-form-item label="ALPN">
-            <a-select mode="multiple" :dropdown-class-name="themeSwitcher.currentTheme"
+      <a-select mode="multiple" :dropdown-class-name="themeSwitcher.currentTheme" v-model="inbound.stream.tls.alpn">
                v-model="inbound.stream.tls.alpn">
        <a-select-option v-for="alpn in ALPN_OPTION" :value="alpn">[[ alpn ]]</a-select-option>
      </a-select>
    </a-form-item>
@@ -61,16 +59,20 @@
    <a-form-item label="Reject Unknown SNI">
      <a-switch v-model="inbound.stream.tls.rejectUnknownSni"></a-switch>
    </a-form-item>
    <a-form-item label="Disable System Root">
      <a-switch v-model="inbound.stream.tls.settings.disableSystemRoot"></a-switch>
    </a-form-item>
    <a-form-item label="Session Resumption">
      <a-switch v-model="inbound.stream.tls.settings.enableSessionResumption"></a-switch>
    </a-form-item>
    <template v-for="cert,index in inbound.stream.tls.certs">
      <a-form-item label='{{ i18n "certificate" }}'>
        <a-radio-group v-model="cert.useFile" button-style="solid">
          <a-radio-button :value="true">{{ i18n "pages.inbounds.certificatePath" }}</a-radio-button>
          <a-radio-button :value="false">{{ i18n "pages.inbounds.certificateContent" }}</a-radio-button>
        </a-radio-group>
-                <a-button v-if="index === 0" type="primary" size="small" @click="inbound.stream.tls.addCert()"
+        <a-button icon="plus" v-if="index === 0" type="primary" size="small" @click="inbound.stream.tls.addCert()" style="margin-left: 10px"></a-button>
-                    style="margin-left: 10px">+</a-button>
+        <a-button icon="minus" v-if="inbound.stream.tls.certs.length>1" type="primary" size="small" @click="inbound.stream.tls.removeCert(index)" style="margin-left: 10px"></a-button>
                <a-button v-if="inbound.stream.tls.certs.length>1" type="primary" size="small"
                    @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.publicKey" }}'>
@@ -80,8 +82,7 @@
          <a-input v-model.trim="cert.keyFile"></a-input>
        </a-form-item>
        <a-form-item label=" ">
-                    <a-button type="primary" icon="import" @click="setDefaultCertData(index)">{{ i18n
+          <a-button type="primary" icon="import" @click="setDefaultCertData(index)">{{ i18n "pages.inbounds.setDefaultCert" }}</a-button>
                        "pages.inbounds.setDefaultCert" }}</a-button>
        </a-form-item>
      </template>
      <template v-else>
@@ -95,6 +96,14 @@
      <a-form-item label='OCSP stapling'>
        <a-input-number v-model.number="cert.ocspStapling" :min="0"></a-input-number>
      </a-form-item>
      <a-form-item label="One Time Loading">
        <a-switch v-model="cert.oneTimeLoading"></a-switch>
      </a-form-item>
      <a-form-item label='Usage Option'>
        <a-select v-model="cert.usage" style="width: 50%" :dropdown-class-name="themeSwitcher.currentTheme">
          <a-select-option v-for="key in USAGE_OPTION" :value="key">[[ key ]]</a-select-option>
        </a-select>
      </a-form-item>
    </template>
  </template>
@@ -104,8 +113,7 @@
      <a-input v-model.trim="inbound.stream.xtls.sni"></a-input>
    </a-form-item>
    <a-form-item label="ALPN">
-            <a-select mode="multiple" :dropdown-class-name="themeSwitcher.currentTheme"
+      <a-select mode="multiple" :dropdown-class-name="themeSwitcher.currentTheme" v-model="inbound.stream.xtls.alpn">
                v-model="inbound.stream.xtls.alpn">
        <a-select-option v-for="alpn in ALPN_OPTION" :value="alpn">[[ alpn ]]</a-select-option>
      </a-select>
    </a-form-item>
@@ -118,10 +126,8 @@
          <a-radio-button :value="true">{{ i18n "pages.inbounds.certificatePath" }}</a-radio-button>
          <a-radio-button :value="false">{{ i18n "pages.inbounds.certificateContent" }}</a-radio-button>
        </a-radio-group>
-                <a-button v-if="index === 0" type="primary" size="small" @click="inbound.stream.xtls.addCert()"
+        <a-button icon="plus" v-if="index === 0" type="primary" size="small" @click="inbound.stream.xtls.addCert()" style="margin-left: 10px"></a-button>
-                    style="margin-left: 10px">+</a-button>
+        <a-button icon="minus" v-if="inbound.stream.xtls.certs.length>1" type="primary" size="small" @click="inbound.stream.xtls.removeCert(index)" style="margin-left: 10px"></a-button>
                <a-button v-if="inbound.stream.xtls.certs.length>1" type="primary" size="small"
                    @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.publicKey" }}'>
@@ -131,8 +137,7 @@
          <a-input v-model.trim="cert.keyFile"></a-input>
        </a-form-item>
        <a-form-item label=" ">
-                    <a-button type="primary" icon="import" @click="setDefaultCertXtls(index)">{{ i18n
+          <a-button type="primary" icon="import" @click="setDefaultCertXtls(index)">{{ i18n "pages.inbounds.setDefaultCert" }}</a-button>
                        "pages.inbounds.setDefaultCert" }}</a-button>
        </a-form-item>
      </template>
      <template v-else>
@@ -143,8 +148,20 @@
          <a-input type="textarea" :rows="3" v-model="cert.key"></a-input>
        </a-form-item>
      </template>
      <a-form-item label='OCSP stapling'>
        <a-input-number v-model.number="cert.ocspStapling" :min="0"></a-input-number>
      </a-form-item>
      <a-form-item label="One Time Loading">
        <a-switch v-model="cert.oneTimeLoading"></a-switch>
      </a-form-item>
      <a-form-item label='Usage Option'>
        <a-select v-model="cert.usage" style="width: 50%" :dropdown-class-name="themeSwitcher.currentTheme">
          <a-select-option v-for="key in USAGE_OPTION" :value="key">[[ key ]]</a-select-option>
        </a-select>
      </a-form-item>
    </template>
  </template>
  <!-- reality settings -->
  <template v-if="inbound.stream.isReality">
    <a-form-item label='Show'>
@@ -154,8 +171,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" style="width: 50%"
+      <a-select v-model="inbound.stream.reality.settings.fingerprint" style="width: 50%" :dropdown-class-name="themeSwitcher.currentTheme">
                :dropdown-class-name="themeSwitcher.currentTheme">
        <a-select-option v-for="key in UTLS_FINGERPRINT" :value="key">[[ key ]]</a-select-option>
      </a-select>
    </a-form-item>
@@ -170,10 +186,8 @@
        <a-tooltip>
          <template slot="title">
            <span>{{ i18n "reset" }}</span>
-                    </template>
+          </template> Short ID <a-icon @click="inbound.stream.reality.shortIds = RandomUtil.randomShortId()" type="sync"></a-icon>
-                    Short ID
+        </a-tooltip>
                    <a-icon @click="inbound.stream.reality.shortIds = RandomUtil.randomShortId()" type="sync"> </a-icon>
                    </a-icon>
      </template>
      <a-input v-model.trim="inbound.stream.reality.shortIds"></a-input>
    </a-form-item>
--- a/web/html/xui/inbound_client_table.html
+++ b/web/html/xui/inbound_client_table.html
@@ -14,23 +14,16 @@
  </a-tooltip>
  <a-tooltip>
    <template slot="title">{{ i18n "pages.inbounds.resetTraffic" }}</template>
-        <a-popconfirm @confirm="resetClientTraffic(client,record.id,false)"
+    <a-popconfirm @confirm="resetClientTraffic(client,record.id,false)" title='{{ i18n "pages.inbounds.resetTrafficContent"}}' :overlay-class-name="themeSwitcher.currentTheme" ok-text='{{ i18n "reset"}}' cancel-text='{{ i18n "cancel"}}'>
            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: var(--color-primary-100)' : 'color: var(--color-primary-100)'"></a-icon>
      <a-icon style="font-size: 24px; cursor: pointer;" class="normal-icon" type="retweet" v-if="client.email.length > 0"></a-icon>
    </a-popconfirm>
  </a-tooltip>
  <a-tooltip>
-        <template slot="title"><span style="color: #FF4D4F"> {{ i18n "delete"}}</span></template>
+    <template slot="title">
-        <a-popconfirm @confirm="delClient(record.id,client,false)"
+      <span style="color: #FF4D4F"> {{ i18n "delete"}}</span>
-            title='{{ i18n "pages.inbounds.deleteClientContent"}}'
+    </template>
-            :overlay-class-name="themeSwitcher.currentTheme"
+    <a-popconfirm @confirm="delClient(record.id,client,false)" title='{{ i18n "pages.inbounds.deleteClientContent"}}' :overlay-class-name="themeSwitcher.currentTheme" ok-text='{{ i18n "delete"}}' ok-type="danger" cancel-text='{{ i18n "cancel"}}'>
            ok-text='{{ i18n "delete"}}'
            ok-type="danger"
            cancel-text='{{ i18n "cancel"}}'>
      <a-icon slot="icon" type="question-circle-o" style="color: #e04141"></a-icon>
      <a-icon style="font-size: 24px; cursor: pointer;" class="delete-icon" type="delete" v-if="isRemovable(record.id)"></a-icon>
    </a-popconfirm>
@@ -54,10 +47,8 @@
      <template v-else-if="!client.enable">{{ i18n "disabled" }}</template>
      <template v-else-if="client.enable && isClientOnline(client.email)">{{ i18n "online" }}</template>
    </template>
-    <a-badge :class="isClientOnline(client.email)? 'online-animation' : ''" :color="client.enable ? statsExpColor(record, client.email) : themeSwitcher.isDarkTheme ? '#2c3950' : '#bcbcbc'">
+    <a-badge :class="isClientOnline(client.email)? 'online-animation' : ''" :color="client.enable ? statsExpColor(record, client.email) : themeSwitcher.isDarkTheme ? '#2c3950' : '#bcbcbc'"></a-badge>
-    </a-badge>
+  </a-tooltip> [[ client.email ]]
    </a-tooltip>
    [[ client.email ]]
 </template>
 <template slot="traffic" slot-scope="text, client">
  <a-popover :overlay-class-name="themeSwitcher.currentTheme">
@@ -74,29 +65,20 @@
      </table>
    </template>
    <table>
-            <tr>
+      <tr class="tr-table-box">
-                <td width="80px" style="margin:0; text-align: right;font-size: 1em;">
+        <td class="tr-table-rt"> [[ sizeFormat(getSumStats(record, client.email)) ]] </td>
-                    [[ sizeFormat(getSumStats(record, client.email)) ]]
+        <td class="tr-table-bar" v-if="!client.enable">
          <a-progress :stroke-color="themeSwitcher.isDarkTheme ? 'rgb(72 84 105)' : '#bcbcbc'" :show-info="false" :percent="statsProgress(record, client.email)" />
        </td>
-                <td width="120px" v-if="!client.enable">
+        <td class="tr-table-bar" v-else-if="client.totalGB > 0">
-                    <a-progress :stroke-color="themeSwitcher.isDarkTheme ? 'rgb(72 84 105)' : '#bcbcbc'"
+          <a-progress :stroke-color="clientStatsColor(record, client.email)" :show-info="false" :status="isClientEnabled(record, client.email)? 'exception' : ''" :percent="statsProgress(record, client.email)" />
                                :show-info="false"
                                :percent="statsProgress(record, client.email)"/>
        </td>
-                <td width="120px" v-else-if="client.totalGB > 0">
+        <td v-else class="infinite-bar tr-table-bar">
-                    <a-progress :stroke-color="clientStatsColor(record, client.email)"
+          <a-progress :show-info="false" :percent="100"></a-progress>
                                :show-info="false"
                                :status="isClientEnabled(record, client.email)? 'exception' : ''"
                                :percent="statsProgress(record, client.email)"/>
        </td>
-                <td width="120px" v-else class="infinite-bar">
+        <td class="tr-table-lt">
                    <a-progress
                    :show-info="false"
                    :percent="100"></a-progress>
                </td>
                <td width="60px">
          <template v-if="client.totalGB > 0">[[ client._totalGB + "GB" ]]</template>
-                    <span v-else style="font-weight: 100;font-size: 14pt;">&infin;</span>
+          <span v-else class="tr-infinity-ch">&infin;</span>
        </td>
      </tr>
    </table>
@@ -106,20 +88,24 @@
  <template v-if="client.expiryTime !=0 && client.reset >0">
    <a-popover :overlay-class-name="themeSwitcher.currentTheme">
      <template slot="content">
-                <span v-if="client.expiryTime < 0">{{ i18n "pages.client.delayedStart" }}</span>
+        <span v-if="client.expiryTime < 0">{{ i18n "pages.client.delayedStart" }}
-                <span v-else>[[ DateUtil.formatMillis(client._expiryTime) ]]</span>
+        </span>
        <span v-else>
          <template v-if="app.datepicker === 'gregorian'">
            [[ DateUtil.formatMillis(client._expiryTime) ]]
          </template>
          <template v-else>
            [[ DateUtil.convertToJalalian(moment(client._expiryTime)) ]]
          </template>
        </span>
      </template>
      <table>
-                <tr>
+        <tr class="tr-table-box">
-                    <td width="80px" style="margin:0; text-align: right;font-size: 1em;">
+          <td class="tr-table-rt"> [[ remainedDays(client.expiryTime) ]] </td>
-                        [[ remainedDays(client.expiryTime) ]]
+          <td class="infinite-bar tr-table-bar">
            <a-progress :show-info="false" :status="isClientEnabled(record, client.email)? 'exception' : ''" :percent="expireProgress(client.expiryTime, client.reset)" />
          </td>
-                    <td width="120px" class="infinite-bar">
+          <td class="tr-table-lt">[[ client.reset + "d" ]]</td>
                        <a-progress :show-info="false"
                        :status="isClientEnabled(record, client.email)? 'exception' : ''"
                        :percent="expireProgress(client.expiryTime, client.reset)"/>
                    </td>
                    <td width="60px">[[ client.reset + "d" ]]</td>
        </tr>
      </table>
    </a-popover>
@@ -127,14 +113,24 @@
  <template v-else>
    <a-popover v-if="client.expiryTime != 0" :overlay-class-name="themeSwitcher.currentTheme">
      <template slot="content">
-                <span v-if="client.expiryTime < 0">{{ i18n "pages.client.delayedStart" }}</span>
+        <span v-if="client.expiryTime < 0">{{ i18n "pages.client.delayedStart" }}
-                <span v-else>[[ DateUtil.formatMillis(client._expiryTime) ]]</span>
+        </span>
        <span v-else>
          <template v-if="app.datepicker === 'gregorian'">
            [[ DateUtil.formatMillis(client._expiryTime) ]]
          </template>
-        <a-tag style="min-width: 50px; border: none;" :color="userExpiryColor(app.expireDiff, client, themeSwitcher.isDarkTheme)">
+          <template v-else>
-            [[ remainedDays(client.expiryTime) ]]
+            [[ DateUtil.convertToJalalian(moment(client._expiryTime)) ]]
-        </a-tag>
+          </template>
        </span>
      </template>
      <a-tag style="min-width: 50px; border: none;" :color="userExpiryColor(app.expireDiff, client, themeSwitcher.isDarkTheme)"> [[ remainedDays(client.expiryTime) ]] </a-tag>
    </a-popover>
-        <a-tag v-else :color="userExpiryColor(app.expireDiff, client, themeSwitcher.isDarkTheme)" style="border: none;" class="infinite-tag">&infin;</a-tag>
+    <a-tag v-else :color="userExpiryColor(app.expireDiff, client, themeSwitcher.isDarkTheme)" style="border: none;" class="infinite-tag">
      <svg height="10px" width="14px" viewBox="0 0 640 512" fill="currentColor">
        <path d="M484.4 96C407 96 349.2 164.1 320 208.5C290.8 164.1 233 96 155.6 96C69.75 96 0 167.8 0 256s69.75 160 155.6 160C233.1 416 290.8 347.9 320 303.5C349.2 347.9 407 416 484.4 416C570.3 416 640 344.2 640 256S570.3 96 484.4 96zM155.6 368C96.25 368 48 317.8 48 256s48.25-112 107.6-112c67.75 0 120.5 82.25 137.1 112C276 285.8 223.4 368 155.6 368zM484.4 368c-67.75 0-120.5-82.25-137.1-112C364 226.2 416.6 144 484.4 144C543.8 144 592 194.2 592 256S543.8 368 484.4 368z" fill="currentColor"></path>
      </svg>
    </a-tag>
  </template>
 </template>
 <template slot="actionMenu" slot-scope="text, client, index">
@@ -162,8 +158,7 @@
        <span style="color: #FF4D4F"> {{ i18n "delete"}}</span>
      </a-menu-item>
      <a-menu-item>
-                <a-switch v-model="client.enable" size="small" @change="switchEnableClient(record.id,client)">
+        <a-switch v-model="client.enable" size="small" @change="switchEnableClient(record.id,client)"></a-switch>
                </a-switch>
        {{ i18n "enable"}}
      </a-menu-item>
    </a-menu>
@@ -177,13 +172,9 @@
          <td colspan="3" style="text-align: center;">{{ i18n "pages.inbounds.traffic" }}</td>
        </tr>
        <tr>
-                    <td width="80px" style="margin:0; text-align: right;font-size: 1em;">
+          <td width="80px" style="margin:0; text-align: right;font-size: 1em;"> [[ sizeFormat(getUpStats(record, client.email) + getDownStats(record, client.email)) ]] </td>
                        [[ sizeFormat(getUpStats(record, client.email) + getDownStats(record, client.email)) ]]
                    </td>
          <td width="120px" v-if="!client.enable">
-                        <a-progress :stroke-color="themeSwitcher.isDarkTheme ? 'rgb(72 84 105)' : '#bcbcbc'"
+            <a-progress :stroke-color="themeSwitcher.isDarkTheme ? 'rgb(72 84 105)' : '#bcbcbc'" :show-info="false" :percent="statsProgress(record, client.email)" />
                                    :show-info="false"
                                    :percent="statsProgress(record, client.email)"/>
          </td>
          <td width="120px" v-else-if="client.totalGB > 0">
            <a-popover :overlay-class-name="themeSwitcher.currentTheme">
@@ -199,20 +190,15 @@
                  </tr>
                </table>
              </template>
-                            <a-progress :stroke-color="clientStatsColor(record, client.email)"
+              <a-progress :stroke-color="clientStatsColor(record, client.email)" :show-info="false" :status="isClientEnabled(record, client.email)? 'exception' : ''" :percent="statsProgress(record, client.email)" />
                                        :show-info="false"
                                        :status="isClientEnabled(record, client.email)? 'exception' : ''"
                                        :percent="statsProgress(record, client.email)"/>
            </a-popover>
          </td>
          <td width="120px" v-else class="infinite-bar">
-                        <a-progress :stroke-color="themeSwitcher.isDarkTheme ? '#2c1e32':'#F2EAF1'"
+            <a-progress :stroke-color="themeSwitcher.isDarkTheme ? '#2c1e32':'#F2EAF1'" :show-info="false" :percent="100"></a-progress>
                        :show-info="false"
                        :percent="100"></a-progress>
          </td>
          <td width="80px">
            <template v-if="client.totalGB > 0">[[ client._totalGB + "GB" ]]</template>
-                        <span v-else style="font-weight: 100;font-size: 14pt;">&infin;</span>
+            <span v-else class="tr-infinity-ch">&infin;</span>
          </td>
        </tr>
        <tr>
@@ -223,18 +209,22 @@
        </tr>
        <tr>
          <template v-if="client.expiryTime !=0 && client.reset >0">
-                    <td width="80px" style="margin:0; text-align: right;font-size: 1em;">
+            <td width="80px" style="margin:0; text-align: right;font-size: 1em;"> [[ remainedDays(client.expiryTime) ]] </td>
                        [[ remainedDays(client.expiryTime) ]]
                    </td>
            <td width="120px" class="infinite-bar">
              <a-popover :overlay-class-name="themeSwitcher.currentTheme">
                <template slot="content">
-                                <span v-if="client.expiryTime < 0">{{ i18n "pages.client.delayedStart" }}</span>
+                  <span v-if="client.expiryTime < 0">{{ i18n "pages.client.delayedStart" }}
-                                <span v-else>[[ DateUtil.formatMillis(client._expiryTime) ]]</span>
+                  </span>
                  <span v-else>
                    <template v-if="app.datepicker === 'gregorian'">
                      [[ DateUtil.formatMillis(client._expiryTime) ]]
                    </template>
-                            <a-progress :show-info="false"
+                    <template v-else>
-                            :status="isClientEnabled(record, client.email)? 'exception' : ''"
+                      [[ DateUtil.convertToJalalian(moment(client._expiryTime)) ]]
-                            :percent="expireProgress(client.expiryTime, client.reset)"/>
+                    </template>
                  </span>
                </template>
                <a-progress :show-info="false" :status="isClientEnabled(record, client.email)? 'exception' : ''" :percent="expireProgress(client.expiryTime, client.reset)" />
              </a-popover>
            </td>
            <td width="60px">[[ client.reset + "d" ]]</td>
@@ -243,15 +233,24 @@
            <td colspan="3" style="text-align: center;">
              <a-popover v-if="client.expiryTime != 0" :overlay-class-name="themeSwitcher.currentTheme">
                <template slot="content">
-                                    <span v-if="client.expiryTime < 0">{{ i18n "pages.client.delayedStart" }}</span>
+                  <span v-if="client.expiryTime < 0">{{ i18n "pages.client.delayedStart" }}
-                                    <span v-else>[[ DateUtil.formatMillis(client._expiryTime) ]]</span>
+                  </span>
                  <span v-else>
                    <template v-if="app.datepicker === 'gregorian'">
                      [[ DateUtil.formatMillis(client._expiryTime) ]]
                    </template>
-                                <a-tag style="min-width: 50px; border: none;" 
+                    <template v-else>
-                                    :color="userExpiryColor(app.expireDiff, client, themeSwitcher.isDarkTheme)">
+                      [[ DateUtil.convertToJalalian(moment(client._expiryTime)) ]]
-                                    [[ remainedDays(client.expiryTime) ]]
+                    </template>
-                                </a-tag>
+                  </span>
                </template>
                <a-tag style="min-width: 50px; border: none;" :color="userExpiryColor(app.expireDiff, client, themeSwitcher.isDarkTheme)"> [[ remainedDays(client.expiryTime) ]] </a-tag>
              </a-popover>
-                            <a-tag v-else :color="client.enable ? 'purple' : themeSwitcher.isDarkTheme ? '#2c3950' : '#bcbcbc'" class="infinite-tag">&infin;</a-tag>
+              <a-tag v-else :color="client.enable ? 'purple' : themeSwitcher.isDarkTheme ? '#2c3950' : '#bcbcbc'" class="infinite-tag">
                <svg height="10px" width="14px" viewBox="0 0 640 512" fill="currentColor">
                  <path d="M484.4 96C407 96 349.2 164.1 320 208.5C290.8 164.1 233 96 155.6 96C69.75 96 0 167.8 0 256s69.75 160 155.6 160C233.1 416 290.8 347.9 320 303.5C349.2 347.9 407 416 484.4 416C570.3 416 640 344.2 640 256S570.3 96 484.4 96zM155.6 368C96.25 368 48 317.8 48 256s48.25-112 107.6-112c67.75 0 120.5 82.25 137.1 112C276 285.8 223.4 368 155.6 368zM484.4 368c-67.75 0-120.5-82.25-137.1-112C364 226.2 416.6 144 484.4 144C543.8 144 592 194.2 592 256S543.8 368 484.4 368z" fill="currentColor"></path>
                </svg>
              </a-tag>
          </template>
          </td>
        </tr>
@@ -259,7 +258,9 @@
    </template>
    <a-badge>
      <a-icon v-if="!client.enable" slot="count" type="pause-circle" theme="filled" :style="'color: ' + themeSwitcher.isDarkTheme ? '#2c3950' : '#bcbcbc'"></a-icon>
-            <a-button shape="round" size="small" style="font-size: 14px; padding: 0 10px;"><a-icon type="solution"></a-icon></a-button>
+      <a-button shape="round" size="small" style="font-size: 14px; padding: 0 10px;">
        <a-icon type="solution"></a-icon>
      </a-button>
    </a-badge>
  </a-popover>
 </template>
--- a/web/html/xui/inbound_info_modal.html
+++ b/web/html/xui/inbound_info_modal.html
@@ -1,31 +1,40 @@
 {{define "inboundInfoModal"}}
-<a-modal id="inbound-info-modal"
+<a-modal id="inbound-info-modal" v-model="infoModal.visible" title='{{ i18n "pages.inbounds.details"}}' :closable="true" :mask-closable="true" :footer="null" width="600px" :class="themeSwitcher.currentTheme">
    v-model="infoModal.visible" title='{{ i18n "pages.inbounds.details"}}'
    :closable="true"
    :mask-closable="true"
    :footer="null"
    width="600px"
    :class="themeSwitcher.currentTheme"
    >
  <a-row>
    <a-col :xs="24" :md="12">
      <table>
-                <tr><td>{{ i18n "protocol" }}</td><td><a-tag color="purple">[[ dbInbound.protocol ]]</a-tag></td></tr>
+        <tr>
-                <tr><td>{{ i18n "pages.inbounds.address" }}</td><td>
+          <td>{{ i18n "protocol" }}</td>
          <td>
            <a-tag color="purple">[[ dbInbound.protocol ]]</a-tag>
          </td>
        </tr>
        <tr>
          <td>{{ i18n "pages.inbounds.address" }}</td>
          <td>
            <a-tooltip :title="[[ dbInbound.address ]]">
              <a-tag class="info-large-tag">[[ dbInbound.address ]]</a-tag>
            </a-tooltip>
-                </td></tr>
+          </td>
-                <tr><td>{{ i18n "pages.inbounds.port" }}</td><td><a-tag>[[ dbInbound.port ]]</a-tag></td></tr>
+        </tr>
        <tr>
          <td>{{ i18n "pages.inbounds.port" }}</td>
          <td>
            <a-tag>[[ dbInbound.port ]]</a-tag>
          </td>
        </tr>
      </table>
    </a-col>
    <a-col :xs="24" :md="12">
      <template v-if="dbInbound.isVMess || dbInbound.isVLess || dbInbound.isTrojan || dbInbound.isSS">
        <table>
          <tr>
-                    <td>{{ i18n "transmission" }}</td><td><a-tag color="green">[[ inbound.network ]]</a-tag></td>
+            <td>{{ i18n "transmission" }}</td>
            <td>
              <a-tag color="green">[[ inbound.network ]]</a-tag>
            </td>
          </tr>
-            <template v-if="inbound.isTcp || inbound.isWs || inbound.isH2 || inbound.isHttpupgrade ">
+          <template v-if="inbound.isTcp || inbound.isWs || inbound.isH2 || inbound.isHttpupgrade || inbound.isSplithttp">
            <tr>
              <td>{{ i18n "host" }}</td>
              <td v-if="inbound.host">
@@ -33,7 +42,10 @@
                  <a-tag class="info-large-tag">[[ inbound.host ]]</a-tag>
                </a-tooltip>
              </td>
-                    <td v-else><a-tag color="orange">{{ i18n "none" }}</a-tag></td></tr>
+              <td v-else>
                <a-tag color="orange">{{ i18n "none" }}</a-tag>
              </td>
            </tr>
            </tr>
            <tr>
              <td>{{ i18n "path" }}</td>
@@ -41,27 +53,58 @@
                <a-tooltip :title="[[ inbound.path ]]">
                  <a-tag class="info-large-tag">[[ inbound.path ]]</a-tag>
                </a-tooltip>
-                    <td v-else><a-tag color="orange">{{ i18n "none" }}</a-tag></td>
+              <td v-else>
                <a-tag color="orange">{{ i18n "none" }}</a-tag>
              </td>
            </tr>
          </template>
          <template v-if="inbound.isQuic">
-                <tr><td>quic {{ i18n "encryption" }}</td><td><a-tag>[[ inbound.quicSecurity ]]</a-tag></td></tr>
+            <tr>
-                <tr><td>quic {{ i18n "password" }}</td><td><a-tag>[[ inbound.quicKey ]]</a-tag></td></tr>
+              <td>quic {{ i18n "encryption" }}</td>
-                <tr><td>quic {{ i18n "camouflage" }}</td><td><a-tag>[[ inbound.quicType ]]</a-tag></td></tr>
+              <td>
                <a-tag>[[ inbound.quicSecurity ]]</a-tag>
              </td>
            </tr>
            <tr>
              <td>quic {{ i18n "password" }}</td>
              <td>
                <a-tag>[[ inbound.quicKey ]]</a-tag>
              </td>
            </tr>
            <tr>
              <td>quic {{ i18n "camouflage" }}</td>
              <td>
                <a-tag>[[ inbound.quicType ]]</a-tag>
              </td>
            </tr>
          </template>
          <template v-if="inbound.isKcp">
-                <tr><td>kcp {{ i18n "encryption" }}</td><td><a-tag>[[ inbound.kcpType ]]</a-tag></td></tr>
+            <tr>
-                <tr><td>kcp {{ i18n "password" }}</td><td><a-tag>[[ inbound.kcpSeed ]]</a-tag></td></tr>
+              <td>kcp {{ i18n "encryption" }}</td>
              <td>
                <a-tag>[[ inbound.kcpType ]]</a-tag>
              </td>
            </tr>
            <tr>
              <td>kcp {{ i18n "password" }}</td>
              <td>
                <a-tag>[[ inbound.kcpSeed ]]</a-tag>
              </td>
            </tr>
          </template>
          <template v-if="inbound.isGrpc">
-                <tr><td>grpc serviceName</td><td>
+            <tr>
              <td>grpc serviceName</td>
              <td>
                <a-tooltip :title="[[ inbound.serviceName ]]">
                  <a-tag class="info-large-tag">[[ inbound.serviceName ]]</a-tag>
                </a-tooltip>
-                <tr><td>grpc multiMode</td><td><a-tag>[[ inbound.stream.grpc.multiMode ]]</a-tag></td></tr>
+            <tr>
              <td>grpc multiMode</td>
              <td>
                <a-tag>[[ inbound.stream.grpc.multiMode ]]</a-tag>
              </td>
            </tr>
          </template>
        </table>
      </template>
@@ -72,23 +115,30 @@
      <br />
      <template v-if="inbound.stream.security != 'none'">
        {{ i18n "domainName" }}
-            <a-tag :color="inbound.serverName ? 'green' : 'orange'">[[ inbound.serverName ? inbound.serverName : '' ]]</a-tag>
+        <a-tag v-if="inbound.serverName" :color="inbound.serverName ? 'green' : 'orange'">[[ inbound.serverName ? inbound.serverName : '' ]]</a-tag>
        <a-tag v-else color="orange">{{ i18n "none" }}</a-tag>
      </template>
    </template>
    <table v-if="dbInbound.isSS" style="margin-bottom: 10px; width: 100%;">
      <tr>
        <td>{{ i18n "encryption" }}</td>
-            <td><a-tag color="green">[[ inbound.settings.method ]]</a-tag></td>
+        <td>
-        </tr><tr v-if="inbound.isSS2022">
+          <a-tag color="green">[[ inbound.settings.method ]]</a-tag>
        </td>
      </tr>
      <tr v-if="inbound.isSS2022">
        <td>{{ i18n "password" }}</td>
        <td>
          <a-tooltip :title="[[ inbound.settings.password  ]]">
            <a-tag class="info-large-tag">[[ inbound.settings.password ]]</a-tag>
          </a-tooltip>
        </td>
-        </tr><tr>
+      </tr>
      <tr>
        <td>{{ i18n "pages.inbounds.network" }}</td>
-            <td><a-tag color="green">[[ inbound.settings.network ]]</a-tag></td>
+        <td>
          <a-tag color="green">[[ inbound.settings.network ]]</a-tag>
        </td>
      </tr>
    </table>
    <template v-if="infoModal.clientSettings">
@@ -96,19 +146,36 @@
      <table style="margin-bottom: 10px;">
        <tr>
          <td>{{ i18n "pages.inbounds.email" }}</td>
-                <td><a-tag color="green">[[ infoModal.clientSettings.email ]]</a-tag></td>
+          <td v-if="infoModal.clientSettings.email">
            <a-tag color="green">[[ infoModal.clientSettings.email ]]</a-tag>
          </td>
          <td v-else>
            <a-tag color="red">{{ i18n "none" }}</a-tag>
          </td>
        </tr>
        <tr v-if="infoModal.clientSettings.id">
          <td>ID</td>
-                <td><a-tag>[[ infoModal.clientSettings.id ]]</a-tag></td>
+          <td>
            <a-tag>[[ infoModal.clientSettings.id ]]</a-tag>
          </td>
        </tr>
        <tr v-if="infoModal.inbound.canEnableTlsFlow()">
          <td>Flow</td>
-                <td><a-tag>[[ infoModal.clientSettings.flow ]]</a-tag></td>
+          <td v-if="infoModal.clientSettings.flow">
            <a-tag>[[ infoModal.clientSettings.flow ]]</a-tag>
          </td>
          <td v-else>
            <a-tag color="orange">{{ i18n "none" }}</a-tag>
          </td>
        </tr>
        <tr v-if="infoModal.inbound.xtls">
          <td>Flow</td>
-                <td><a-tag>[[ infoModal.clientSettings.flow ]]</a-tag></td>
+          <td v-if="infoModal.clientSettings.flow">
            <a-tag>[[ infoModal.clientSettings.flow ]]</a-tag>
          </td>
          <td v-else>
            <a-tag color="orange">{{ i18n "none" }}</a-tag>
          </td>
        </tr>
        <tr v-if="infoModal.clientSettings.password">
          <td>{{ i18n "password" }}</td>
@@ -134,7 +201,7 @@
          </td>
        </tr>
      </table>
-        <table style="margin-bottom: 10px; width: 100%; text-align: center;">
+      <table style="display: inline-table; margin-block: 10px; width: 100%; text-align: center;">
        <tr>
          <th>{{ i18n "remained" }}</th>
          <th>{{ i18n "pages.inbounds.totalFlow" }}</th>
@@ -142,139 +209,168 @@
        </tr>
        <tr>
          <td>
-                    <a-tag v-if="infoModal.clientStats && infoModal.clientSettings.totalGB > 0" :color="statsColor(infoModal.clientStats)">
+            <a-tag v-if="infoModal.clientStats && infoModal.clientSettings.totalGB > 0" :color="statsColor(infoModal.clientStats)"> [[ getRemStats() ]] </a-tag>
                        [[ getRemStats() ]]
                    </a-tag>
          </td>
          <td>
-                    <a-tag v-if="infoModal.clientSettings.totalGB > 0" :color="statsColor(infoModal.clientStats)">
+            <a-tag v-if="infoModal.clientSettings.totalGB > 0" :color="statsColor(infoModal.clientStats)"> [[ sizeFormat(infoModal.clientSettings.totalGB) ]] </a-tag>
-                        [[ sizeFormat(infoModal.clientSettings.totalGB) ]]
+            <a-tag v-else color="purple" class="infinite-tag">
              <svg height="10px" width="14px" viewBox="0 0 640 512" fill="currentColor">
                <path d="M484.4 96C407 96 349.2 164.1 320 208.5C290.8 164.1 233 96 155.6 96C69.75 96 0 167.8 0 256s69.75 160 155.6 160C233.1 416 290.8 347.9 320 303.5C349.2 347.9 407 416 484.4 416C570.3 416 640 344.2 640 256S570.3 96 484.4 96zM155.6 368C96.25 368 48 317.8 48 256s48.25-112 107.6-112c67.75 0 120.5 82.25 137.1 112C276 285.8 223.4 368 155.6 368zM484.4 368c-67.75 0-120.5-82.25-137.1-112C364 226.2 416.6 144 484.4 144C543.8 144 592 194.2 592 256S543.8 368 484.4 368z" fill="currentColor"></path>
              </svg>
            </a-tag>
                    <a-tag v-else color="purple" class="infinite-tag">&infin;</a-tag>
          </td>
          <td>
            <template v-if="infoModal.clientSettings.expiryTime > 0">
              <a-tag :color="usageColor(new Date().getTime(), app.expireDiff, infoModal.clientSettings.expiryTime)"> 
                <template v-if="app.datepicker === 'gregorian'">
                  [[ DateUtil.formatMillis(infoModal.clientSettings.expiryTime) ]]
                </template>
                <template v-else>
                  [[ DateUtil.convertToJalalian(moment(infoModal.clientSettings.expiryTime)) ]]
                </template>
              </a-tag>
            </template>
-                    <a-tag v-else-if="infoModal.clientSettings.expiryTime < 0" color="green">[[ infoModal.clientSettings.expiryTime / -86400000 ]] {{ i18n "pages.client.days" }}</a-tag>
+            <a-tag v-else-if="infoModal.clientSettings.expiryTime < 0" color="green">[[ infoModal.clientSettings.expiryTime / -86400000 ]] {{ i18n "pages.client.days" }}
-                    <a-tag v-else color="purple" class="infinite-tag">&infin;</a-tag>
+            </a-tag>
            <a-tag v-else color="purple" class="infinite-tag">
              <svg height="10px" width="14px" viewBox="0 0 640 512" fill="currentColor">
                <path d="M484.4 96C407 96 349.2 164.1 320 208.5C290.8 164.1 233 96 155.6 96C69.75 96 0 167.8 0 256s69.75 160 155.6 160C233.1 416 290.8 347.9 320 303.5C349.2 347.9 407 416 484.4 416C570.3 416 640 344.2 640 256S570.3 96 484.4 96zM155.6 368C96.25 368 48 317.8 48 256s48.25-112 107.6-112c67.75 0 120.5 82.25 137.1 112C276 285.8 223.4 368 155.6 368zM484.4 368c-67.75 0-120.5-82.25-137.1-112C364 226.2 416.6 144 484.4 144C543.8 144 592 194.2 592 256S543.8 368 484.4 368z" fill="currentColor"></path>
              </svg>
            </a-tag>
          </td>
        </tr>
      </table>
      <template v-if="app.subSettings.enable && infoModal.clientSettings.subId">
        <a-divider>Subscription URL</a-divider>
-            <a-row>
+        <tr-info-row class="tr-info-row">
-                <a-col :sx="24" :md="22">SUB: <a :href="[[ infoModal.subLink ]]" target="_blank">[[ infoModal.subLink ]]</a></a-col>
+          <tr-info-title class="tr-info-title">
-                <a-col :sx="24" :md="2" style="text-align: right;">
+            <a-tag color="purple">Subscription Link</a-tag>
            <a-tooltip title='{{ i18n "copy" }}'>
-                        <button class="ant-btn ant-btn-primary" id="copy-sub-link" @click="copyToClipboard('copy-sub-link', infoModal.subLink)">
+              <a-button size="small" icon="snippets" id="copy-sub-link" @click="copyToClipboard('copy-sub-link', infoModal.subLink)"></a-button>
                            <a-icon type="snippets"></a-icon>
                        </button>
            </a-tooltip>
-                </a-col>
+          </tr-info-title>
-            </a-row>
+          <a :href="[[ infoModal.subLink ]]" target="_blank">[[ infoModal.subLink ]]</a>
-            <a-row>
+        </tr-info-row>
-                <a-col :sx="24" :md="22">JSON: <a :href="[[ infoModal.subJsonLink ]]" target="_blank">[[ infoModal.subJsonLink ]]</a></a-col>
+        <tr-info-row class="tr-info-row">
-                <a-col :sx="24" :md="2" style="text-align: right; margin-top: 5px;">
+          <tr-info-title class="tr-info-title">
            <a-tag color="purple">Json Link</a-tag>
            <a-tooltip title='{{ i18n "copy" }}'>
-                        <button class="ant-btn ant-btn-primary" id="copy-subJson-link" @click="copyToClipboard('copy-subJson-link', infoModal.subJsonLink)">
+              <a-button size="small" icon="snippets" id="copy-subJson-link" @click="copyToClipboard('copy-subJson-link', infoModal.subJsonLink)"></a-button>
                            <a-icon type="snippets"></a-icon>
                        </button>
            </a-tooltip>
-                </a-col>
+          </tr-info-title>
-            </a-row>
+          <a :href="[[ infoModal.subJsonLink ]]" target="_blank">[[ infoModal.subJsonLink ]]</a>
        </tr-info-row>
      </template>
      <template v-if="app.tgBotEnable && infoModal.clientSettings.tgId">
-            <a-divider>Telegram ID</a-divider>
+        <a-divider>Telegram ChatID</a-divider>
-            <a-row>
+        <tr-info-row class="tr-info-row">
-                <a-col :sx="24" :md="22">[[ infoModal.clientSettings.tgId ]]</a-col>
+          <tr-info-title class="tr-info-title">
-                <a-col :sx="24" :md="2" style="text-align: right;">
+            <a-tag color="blue">[[ infoModal.clientSettings.tgId ]]</a-tag>
            <a-tooltip title='{{ i18n "copy" }}'>
-                        <button class="ant-btn ant-btn-primary" id="copy-tg-link" @click="copyToClipboard('copy-tg-link', infoModal.clientSettings.tgId)">
+              <a-button size="small" icon="snippets" id="copy-tg-link" @click="copyToClipboard('copy-tg-link', infoModal.clientSettings.tgId)"></a-button>
                            <a-icon type="snippets"></a-icon>
                        </button>
            </a-tooltip>
-                </a-col>
+          </tr-info-title>
-            </a-row>
+        </tr-info-row>
      </template>
      <template v-if="dbInbound.hasLink()">
        <a-divider>URL</a-divider>
-            <a-row v-for="(link,index) in infoModal.links">
+        <tr-info-row v-for="(link,index) in infoModal.links" class="tr-info-row">
-                <a-col :sx="24" :md="22"><a-tag color="green">[[ link.remark ]]</a-tag><br />[[ link.link ]]</a-col>
+          <tr-info-title class="tr-info-title">
-                <a-col :sx="24" :md="2" style="text-align: right;">
+            <a-tag class="tr-info-tag" color="green">[[ link.remark ]]</a-tag>
            <a-tooltip title='{{ i18n "copy" }}'>
-                        <button class="ant-btn ant-btn-primary" :id="'copy-url-link-'+index" @click="copyToClipboard('copy-url-link-'+index, link.link)">
+              <a-button style="min-width: 24px;" size="small" icon="snippets" :id="'copy-url-link-'+index" @click="copyToClipboard('copy-url-link-'+index, link.link)"></a-button>
                            <a-icon type="snippets"></a-icon>
                        </button>
            </a-tooltip>
-                </a-col>
+          </tr-info-title>
-            </a-row>
+          <code>[[ link.link ]]</code>
        </tr-info-row>
      </template>
    </template>
    <template v-else>
      <template v-if="dbInbound.isSS && !inbound.isSSMultiUser">
        <a-divider>URL</a-divider>
-            <a-row v-for="(link,index) in infoModal.links">
+        <tr-info-row v-for="(link,index) in infoModal.links" class="tr-info-row">
-                <a-col :span="22"><a-tag color="green">[[ link.remark ]]</a-tag><br />[[ link.link ]]</a-col>
+          <tr-info-title class="tr-info-title">
-                <a-col :span="2" style="text-align: right;">
+            <a-tag class="tr-info-tag" color="green">[[ link.remark ]]</a-tag>
            <a-tooltip title='{{ i18n "copy" }}'>
-                        <button class="ant-btn ant-btn-primary" :id="'copy-url-link-'+index" @click="copyToClipboard('copy-url-link-'+index, link.link)">
+              <a-button style="min-width: 24px;" size="small" icon="snippets" :id="'copy-url-link-'+index" @click="copyToClipboard('copy-url-link-'+index, link.link)"></a-button>
                            <a-icon type="snippets"></a-icon>
                        </button>
            </a-tooltip>
-                </a-col>
+          </tr-info-title>
-            </a-row>
+          <code>[[ link.link ]]</code>
        </tr-info-row>
      </template>
-        <table v-if="inbound.protocol == Protocols.DOKODEMO" style="margin-bottom: 10px; width: 100%;">
+      <table v-if="inbound.protocol == Protocols.DOKODEMO" class="tr-info-table">
        <tr>
          <th>{{ i18n "pages.inbounds.targetAddress" }}</th>
          <th>{{ i18n "pages.inbounds.destinationPort" }}</th>
          <th>{{ i18n "pages.inbounds.network" }}</th>
          <th>FollowRedirect</th>
-            </tr><tr>
+        </tr>
-                <td><a-tag color="green">[[ inbound.settings.address ]]</a-tag></td>
+        <tr>
-                <td><a-tag color="green">[[ inbound.settings.port ]]</a-tag></td>
+          <td>
-                <td><a-tag color="green">[[ inbound.settings.network ]]</a-tag></td>
+            <a-tag color="green">[[ inbound.settings.address ]]</a-tag>
-                <td><a-tag color="green">[[ inbound.settings.followRedirect ]]</a-tag></td>
+          </td>
          <td>
            <a-tag color="green">[[ inbound.settings.port ]]</a-tag>
          </td>
          <td>
            <a-tag color="green">[[ inbound.settings.network ]]</a-tag>
          </td>
          <td>
            <a-tag color="green">[[ inbound.settings.followRedirect ]]</a-tag>
          </td>
        </tr>
      </table>
-        <table v-if="dbInbound.isSocks" style="margin-bottom: 10px; width: 100%;">
+      <table v-if="dbInbound.isSocks" class="tr-info-table">
        <tr>
          <th>{{ i18n "password" }} Auth</th>
          <th>{{ i18n "pages.inbounds.enable" }} udp</th>
          <th>IP</th>
        </tr>
        <tr>
-                <td><a-tag color="green">[[ inbound.settings.auth ]]</a-tag></td>
+          <td>
-                <td><a-tag color="green">[[ inbound.settings.udp]]</a-tag></td>
+            <a-tag color="green">[[ inbound.settings.auth ]]</a-tag>
-                <td><a-tag color="green">[[ inbound.settings.ip ]]</a-tag></td>
+          </td>
          <td>
            <a-tag color="green">[[ inbound.settings.udp]]</a-tag>
          </td>
          <td>
            <a-tag color="green">[[ inbound.settings.ip ]]</a-tag>
          </td>
        </tr>
        <template v-if="inbound.settings.auth == 'password'">
          <tr>
            <td></td>
            <td>{{ i18n "username" }}</td>
            <td>{{ i18n "password" }}</td>
-            </tr><tr v-for="account,index in inbound.settings.accounts">
+          </tr>
          <tr v-for="account,index in inbound.settings.accounts">
            <td>[[ index ]]</td>
-                <td><a-tag color="green">[[ account.user ]]</a-tag></td>
+            <td>
-                <td><a-tag color="green">[[ account.pass ]]</a-tag></td>
+              <a-tag color="green">[[ account.user ]]</a-tag>
            </td>
            <td>
              <a-tag color="green">[[ account.pass ]]</a-tag>
            </td>
          </tr>
        </template>
      </table>
-        <table v-if="dbInbound.isHTTP" style="margin-bottom: 10px; width: 100%;">
+      <table v-if="dbInbound.isHTTP" class="tr-info-table">
        <tr>
          <th></th>
          <th>{{ i18n "username" }}</th>
          <th>{{ i18n "password" }}</th>
-            </tr><tr v-for="account,index in inbound.settings.accounts">
+        </tr>
        <tr v-for="account,index in inbound.settings.accounts">
          <td>[[ index ]]</td>
-                <td><a-tag color="green">[[ account.user ]]</a-tag></td>
+          <td>
-                <td><a-tag color="green">[[ account.pass ]]</a-tag></td>
+            <a-tag color="green">[[ account.user ]]</a-tag>
          </td>
          <td>
            <a-tag color="green">[[ account.pass ]]</a-tag>
          </td>
        </tr>
      </table>
-        <table v-if="dbInbound.isWireguard" style="margin-bottom: 10px; width: 100%;">
+      <table v-if="dbInbound.isWireguard" class="tr-info-table">
        <tr class="client-table-odd-row">
          <td>{{ i18n "pages.xray.wireguard.secretKey" }}</td>
          <td>[[ inbound.settings.secretKey ]]</td>
@@ -293,7 +389,9 @@
        </tr>
        <template v-for="(peer, index) in inbound.settings.peers">
          <tr>
-                <td colspan="2"><a-divider>Peer [[ index + 1 ]]</a-divider></td>
+            <td colspan="2">
              <a-divider>Peer [[ index + 1 ]]</a-divider>
            </td>
          </tr>
          <tr class="client-table-odd-row">
            <td>{{ i18n "pages.xray.wireguard.secretKey" }}</td>
@@ -317,24 +415,16 @@
          </tr>
          <tr>
            <td colspan="2">
-                    <a-row>
+              <tr-info-row v-for="(link,index) in infoModal.links" class="tr-info-row">
-                        <a-col :span="22" style="overflow-wrap: anywhere;">
+                <tr-info-title class="tr-info-title">
                  <a-tag color="blue">Config</a-tag>
                            <div 
                            v-html="infoModal.links[index].replaceAll(`\n`,`<br />`)"
                            style="border-radius: 1rem; padding: 0.5rem;"
                            class="client-table-odd-row"></div>
                        </a-col>
                        <a-col :span="2" style="text-align: right;">
                  <a-tooltip title='{{ i18n "copy" }}'>
-                                <button class="ant-btn ant-btn-primary"
+                    <a-button style="min-width: 24px;" size="small" icon="snippets" :id="'copy-url-link-'+index" @click="copyToClipboard('copy-url-link-'+index, infoModal.links[index])"></a-button>
                                    :id="'copy-url-link-'+index"
                                    @click="copyToClipboard('copy-url-link-'+index, infoModal.links[index])">
                                    <a-icon type="snippets"></a-icon>
                                </button>
                  </a-tooltip>
-                        </a-col>
+                </tr-info-title>
-                    </a-row>
+                <div v-html="infoModal.links[index].replaceAll(`\n`,`<br />`)" style="border-radius: 1rem; padding: 0.5rem;" class="client-table-odd-row">
                </div>
              </tr-info-row>
            </td>
          </tr>
      </table>
@@ -386,7 +476,6 @@
      return app.subSettings.subJsonURI + subID;
    }
  };
  const infoModalApp = new Vue({
    delimiters: ['[[', ']]'],
    el: '#inbound-info-modal',
@@ -412,8 +501,8 @@
      },
    },
    methods: {
-            copyToClipboard(elmentId,content) {
+      copyToClipboard(elementId, content) {
-                this.infoModal.clipboard = new ClipboardJS('#' + elmentId, {
+        this.infoModal.clipboard = new ClipboardJS('#' + elementId, {
          text: () => content,
        });
        this.infoModal.clipboard.on('success', () => {
@@ -429,8 +518,6 @@
        return remained > 0 ? sizeFormat(remained) : '-';
      },
    },
  });
 </script>
 {{end}}
--- a/web/html/xui/inbounds.html
+++ b/web/html/xui/inbounds.html
@@ -2,6 +2,34 @@
 <html lang="en">
 {{template "head" .}}
 <style>
  .ant-table:not(.ant-table-expanded-row .ant-table) {
    outline: 1px solid #f0f0f0;
    outline-offset: -1px;
    border-radius: 1rem;
    overflow-x: hidden;
  }
  .dark .ant-table:not(.ant-table-expanded-row .ant-table) {
    outline-color: var(--dark-color-table-ring);
  }
  .ant-table .ant-table-content .ant-table-scroll .ant-table-body {
    overflow-y: hidden;
  }
  .ant-table .ant-table-content .ant-table-tbody tr:last-child .ant-table-wrapper {
 	  margin:-10px 22px -10px !important;
  }
  .ant-table .ant-table-content .ant-table-tbody tr:last-child .ant-table-wrapper .ant-table {
    border-bottom-left-radius: 1rem;
    border-bottom-right-radius: 1rem;
  }
  .ant-table .ant-table-content .ant-table-tbody tr:last-child tr:last-child td {
 	  border-bottom-color: transparent;
  }
  .ant-table .ant-table-tbody tr:last-child.ant-table-expanded-row .ant-table-wrapper .ant-table-tbody>tr:last-child>td:first-child {
    border-bottom-left-radius: 6px;
  }
  .ant-table .ant-table-tbody tr:last-child.ant-table-expanded-row .ant-table-wrapper .ant-table-tbody>tr:last-child>td:last-child {
    border-bottom-right-radius: 6px;
  }
  @media (min-width: 769px) {
    .ant-layout-content {
      margin: 24px 16px;
@@ -11,6 +39,9 @@
    .ant-card-body {
      padding: .5rem;
    }
    .ant-table .ant-table-content .ant-table-tbody tr:last-child .ant-table-wrapper {
 	    margin:-10px 2px -10px !important;
    }
  }
  .ant-col-sm-24 {
    margin: 0.5rem -2rem 0.5rem 2rem;
@@ -22,13 +53,14 @@
    padding: 0 5px;
    border-radius: 2rem;
    min-width: 50px;
    min-height: 22px;
  }
  .infinite-bar .ant-progress-inner .ant-progress-bg {
    background-color: #F2EAF1;
    border: #D5BED2 solid 1px;
  }
  .dark .infinite-bar .ant-progress-inner .ant-progress-bg {
-    background-color: #7a316f;
+    background-color: #7a316f !important;
    border: #7a316f solid 1px;
  }
  .ant-collapse {
@@ -53,6 +85,41 @@
      opacity: .2;
    }
  }
  .tr-table-box {
    display: flex;
    gap: 4px;
    justify-content: center;
    align-items: center;
  }
  .tr-table-rt {
    flex-basis: 70px;
    min-width: 70px;
    text-align: end;
  }
  .tr-table-lt {
    flex-basis: 70px;
    min-width: 70px;
    text-align: start;
  }
  .tr-table-bar {
    flex-basis: 160px;
    min-width: 60px;
  }
  .tr-infinity-ch {
    font-size: 14pt;
    max-height: 24px;
    display: inline-flex;
    align-items: center;
  }
  .ant-table-expanded-row .ant-table .ant-table-body {
    overflow-x: hidden;
  }
  .ant-table-expanded-row .ant-table-tbody>tr>td {
    padding: 10px 2px;
  }
  .ant-table-expanded-row .ant-table-thead>tr>th {
    padding: 12px 2px;
  }
 </style>
 <body>
@@ -324,8 +391,8 @@
                        [[ sizeFormat(dbInbound.total) ]]
                    </template>
                    <template v-else>
-                      <svg style="fill: currentColor; height: 10px;" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 640 512">
+                      <svg height="10px" width="14px" viewBox="0 0 640 512" fill="currentColor">
-                        <path d="M484.4 96C407 96 349.2 164.1 320 208.5C290.8 164.1 233 96 155.6 96C69.75 96 0 167.8 0 256s69.75 160 155.6 160C233.1 416 290.8 347.9 320 303.5C349.2 347.9 407 416 484.4 416C570.3 416 640 344.2 640 256S570.3 96 484.4 96zM155.6 368C96.25 368 48 317.8 48 256s48.25-112 107.6-112c67.75 0 120.5 82.25 137.1 112C276 285.8 223.4 368 155.6 368zM484.4 368c-67.75 0-120.5-82.25-137.1-112C364 226.2 416.6 144 484.4 144C543.8 144 592 194.2 592 256S543.8 368 484.4 368z" />
+                        <path d="M484.4 96C407 96 349.2 164.1 320 208.5C290.8 164.1 233 96 155.6 96C69.75 96 0 167.8 0 256s69.75 160 155.6 160C233.1 416 290.8 347.9 320 303.5C349.2 347.9 407 416 484.4 416C570.3 416 640 344.2 640 256S570.3 96 484.4 96zM155.6 368C96.25 368 48 317.8 48 256s48.25-112 107.6-112c67.75 0 120.5 82.25 137.1 112C276 285.8 223.4 368 155.6 368zM484.4 368c-67.75 0-120.5-82.25-137.1-112C364 226.2 416.6 144 484.4 144C543.8 144 592 194.2 592 256S543.8 368 484.4 368z" fill="currentColor"></path>
                      </svg>
                    </template>
                  </a-tag>
@@ -336,14 +403,21 @@
              </template>
              <template slot="expiryTime" slot-scope="text, dbInbound">
                <a-popover v-if="dbInbound.expiryTime > 0" :overlay-class-name="themeSwitcher.currentTheme">
-                  <template slot="content">
+                  <template slot="content" v-if="app.datepicker === 'gregorian'">
                    [[ DateUtil.formatMillis(dbInbound.expiryTime) ]]
                  </template>
                  <template v-else slot="content">
                    [[ DateUtil.convertToJalalian(moment(dbInbound.expiryTime)) ]]
                  </template>
                  <a-tag style="min-width: 50px;" :color="usageColor(new Date().getTime(), app.expireDiff, dbInbound._expiryTime)">
                    [[ remainedDays(dbInbound._expiryTime) ]]
                  </a-tag>
                </a-popover>
-                <a-tag v-else color="purple" class="infinite-tag">&infin;</a-tag>
+                <a-tag v-else color="purple" class="infinite-tag">
                  <svg height="10px" width="14px" viewBox="0 0 640 512" fill="currentColor">
                    <path d="M484.4 96C407 96 349.2 164.1 320 208.5C290.8 164.1 233 96 155.6 96C69.75 96 0 167.8 0 256s69.75 160 155.6 160C233.1 416 290.8 347.9 320 303.5C349.2 347.9 407 416 484.4 416C570.3 416 640 344.2 640 256S570.3 96 484.4 96zM155.6 368C96.25 368 48 317.8 48 256s48.25-112 107.6-112c67.75 0 120.5 82.25 137.1 112C276 285.8 223.4 368 155.6 368zM484.4 368c-67.75 0-120.5-82.25-137.1-112C364 226.2 416.6 144 484.4 144C543.8 144 592 194.2 592 256S543.8 368 484.4 368z" fill="currentColor"></path>
                  </svg>
                </a-tag>
              </template>
              <template slot="info" slot-scope="text, dbInbound">
                <a-popover placement="bottomRight" :overlay-class-name="themeSwitcher.currentTheme" trigger="click">
@@ -415,7 +489,11 @@
                                <template v-if="dbInbound.total > 0">
                                    [[ sizeFormat(dbInbound.total) ]]
                                </template>
-                              <template v-else>&infin;</template>
+                              <template v-else>
                                <svg height="10px" width="14px" viewBox="0 0 640 512" fill="currentColor">
                                  <path d="M484.4 96C407 96 349.2 164.1 320 208.5C290.8 164.1 233 96 155.6 96C69.75 96 0 167.8 0 256s69.75 160 155.6 160C233.1 416 290.8 347.9 320 303.5C349.2 347.9 407 416 484.4 416C570.3 416 640 344.2 640 256S570.3 96 484.4 96zM155.6 368C96.25 368 48 317.8 48 256s48.25-112 107.6-112c67.75 0 120.5 82.25 137.1 112C276 285.8 223.4 368 155.6 368zM484.4 368c-67.75 0-120.5-82.25-137.1-112C364 226.2 416.6 144 484.4 144C543.8 144 592 194.2 592 256S543.8 368 484.4 368z" fill="currentColor"></path>
                                </svg>
                              </template>
                            </a-tag>
                          </a-popover>
                        </td>
@@ -423,10 +501,20 @@
                      <tr>
                        <td>{{ i18n "pages.inbounds.expireDate" }}</td>
                        <td>
-                          <a-tag style="min-width: 50px; text-align: center;" v-if="dbInbound.expiryTime > 0" :color="dbInbound.isExpiry? 'red': 'blue'">
+                          <a-tag style="min-width: 50px; text-align: center;" v-if="dbInbound.expiryTime > 0"
                            :color="dbInbound.isExpiry? 'red': 'blue'">
                            <template v-if="app.datepicker === 'gregorian'">
                              [[ DateUtil.formatMillis(dbInbound.expiryTime) ]]
                            </template>
                            <template v-else>
                              [[ DateUtil.convertToJalalian(moment(dbInbound.expiryTime)) ]]
                            </template>
                          </a-tag>
                          <a-tag v-else style="text-align: center;" color="purple" class="infinite-tag">
                            <svg height="10px" width="14px" viewBox="0 0 640 512" fill="currentColor">
                              <path d="M484.4 96C407 96 349.2 164.1 320 208.5C290.8 164.1 233 96 155.6 96C69.75 96 0 167.8 0 256s69.75 160 155.6 160C233.1 416 290.8 347.9 320 303.5C349.2 347.9 407 416 484.4 416C570.3 416 640 344.2 640 256S570.3 96 484.4 96zM155.6 368C96.25 368 48 317.8 48 256s48.25-112 107.6-112c67.75 0 120.5 82.25 137.1 112C276 285.8 223.4 368 155.6 368zM484.4 368c-67.75 0-120.5-82.25-137.1-112C364 226.2 416.6 144 484.4 144C543.8 144 592 194.2 592 256S543.8 368 484.4 368z" fill="currentColor"></path>
                            </svg>
                          </a-tag>
                          <a-tag v-else style="text-align: center;" color="purple" class="infinite-tag">&infin;</a-tag>
                        </td>
                      </tr>
                    </table>
@@ -445,7 +533,7 @@
                  :columns="isMobile ? innerMobileColumns : innerColumns"
                  :data-source="getInboundClients(record)"
                  :pagination=pagination(getInboundClients(record))
-                  :style="isMobile ? 'margin: -12px 2px -13px;' : 'margin: -12px 22px -13px;'">
+                  :style="isMobile ? 'margin: -10px 2px -11px;' : 'margin: -10px 22px -11px;'">
                  {{template "client_table"}}
                </a-table>
              </template>
@@ -543,7 +631,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: 100, align: 'center', scopedSlots: { customRender: 'expiryTime' } },
+        { title: '{{ i18n "pages.inbounds.expireDate" }}', width: 80, align: 'center', scopedSlots: { customRender: 'expiryTime' } },
    ];
    const innerMobileColumns = [
@@ -585,7 +673,7 @@
            tgBotEnable: false,
            showAlert: false,
            ipLimitEnable: false,
-            pageSize: 0,
+            pageSize: 50,
            isMobile: window.innerWidth <= 768,
        },
        methods: {
@@ -979,7 +1067,7 @@
            resetTraffic(dbInboundId) {
                dbInbound = this.dbInbounds.find(row => row.id === dbInboundId);
                this.$confirm({
-                    title: '{{ i18n "pages.inbounds.resetTraffic"}}',
+                    title: '{{ i18n "pages.inbounds.resetTraffic"}}' + ' #' + dbInboundId,
                    content: '{{ i18n "pages.inbounds.resetTrafficContent"}}',
                    class: themeSwitcher.currentTheme,
                    okText: '{{ i18n "reset"}}',
@@ -1089,7 +1177,7 @@
            resetClientTraffic(client, dbInboundId, confirmation = true) {
                if (confirmation){
                    this.$confirm({
-                        title: '{{ i18n "pages.inbounds.resetTraffic"}}',
+                        title: '{{ i18n "pages.inbounds.resetTraffic"}}' + ' ' + client.email,
                        content: '{{ i18n "pages.inbounds.resetTrafficContent"}}',
                        class: themeSwitcher.currentTheme,
                        okText: '{{ i18n "reset"}}',
@@ -1206,12 +1294,12 @@
                return this.onlineClients.includes(email);
            },
            isRemovable(dbInboundId) {
-                return this.getInboundClients(this.dbInbounds.find(row => row.id === dbInboundId)).length > 1
+                return this.getInboundClients(this.dbInbounds.find(row => row.id === dbInboundId)).length > 1;
            },
            inboundLinks(dbInboundId) {
                dbInbound = this.dbInbounds.find(row => row.id === dbInboundId);
                newDbInbound = this.checkFallback(dbInbound);
-                txtModal.show('{{ i18n "pages.inbounds.export"}}', newDbInbound.genInboundLinks(), newDbInbound.remark);
+                txtModal.show('{{ i18n "pages.inbounds.export"}}', newDbInbound.genInboundLinks(this.remarkModel), newDbInbound.remark);
            },
            exportSubs(dbInboundId) {
                const dbInbound = this.dbInbounds.find(row => row.id === dbInboundId);
--- a/web/html/xui/index.html
+++ b/web/html/xui/index.html
@@ -9,6 +9,9 @@
    .ant-card-hoverable {
      margin-inline: 0.3rem;
    }
    .ant-alert-error {
      margin-inline: 0.3rem;
    }
  }
  .ant-col-sm-24 {
    margin-top: 10px;
@@ -42,8 +45,13 @@
                        <a-progress type="dashboard" status="normal"
                          :stroke-color="status.cpu.color"
                          :percent="status.cpu.percent"></a-progress>
-                        <div><b>CPU:</b> [[ cpuCoreFormat(status.cpuCores) ]]</div>
+                        <div><b>CPU:</b> [[ cpuCoreFormat(status.cpuCores) ]] <a-tooltip>
                          <a-icon type="area-chart"></a-icon> 
                          <template slot="title">
                            <div><b>Logical Processors:</b> [[ (status.logicalPro) ]]</div>
                            <div><b>Speed:</b> [[ cpuSpeedFormat(status.cpuSpeedMhz) ]]</div>
                          </template>
                        </a-tooltip></div>
                      </a-col>
                      <a-col :span="12" style="text-align: center">
                        <a-progress type="dashboard" status="normal"
@@ -364,6 +372,7 @@
        constructor(data) {
            this.cpu = new CurTotal(0, 0);
            this.cpuCores = 0;
            this.logicalPro = 0;
            this.cpuSpeedMhz = 0;
            this.disk = new CurTotal(0, 0);
            this.loads = [0, 0, 0];
@@ -384,6 +393,7 @@
            }
            this.cpu = new CurTotal(data.cpu, 100);
            this.cpuCores = data.cpuCores;
            this.logicalPro = data.logicalPro;
            this.cpuSpeedMhz = data.cpuSpeedMhz;
            this.disk = new CurTotal(data.disk.current, data.disk.total);
            this.loads = data.loads.map(load => toFixed(load, 2));
--- a/web/html/xui/settings.html
+++ b/web/html/xui/settings.html
@@ -407,6 +407,7 @@
        streamSettings: {
          sockopt: {
            tcpKeepAliveIdle: 100,
            tcpMptcp: true,
            tcpNoDelay: true
          }
        }
@@ -502,6 +503,7 @@
        this.loading(false);
        if (msg.success) {
          this.user = {};
          window.location.replace(basePath + "logout");
        }
      },
      async restartPanel() {
--- a/web/html/xui/warp_modal.html
+++ b/web/html/xui/warp_modal.html
@@ -24,19 +24,22 @@
                <td>[[ warpModal.warpData.private_key ]]</td>
            </tr>
        </table>
        <a-button @click="delConfig" :loading="warpModal.confirmLoading" type="danger">{{ i18n "delete" }}</a-button>
        <a-divider style="margin: 0;">{{ i18n "pages.xray.outbound.settings" }}</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-item label="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-button @click="updateLicense(warpPlus)" :disabled="warpPlus.length<26"
                            :loading="warpModal.confirmLoading">{{ i18n "pages.inbounds.update" }}</a-button>
                    </a-form-item>
                </a-form>
            </a-collapse-panel>
        </a-collapse>
        <a-divider style="margin: 0;">{{ i18n "pages.xray.outbound.accountInfo" }}</a-divider>
-        <a-button icon="sync" @click="getConfig" style="margin-top: 5px; margin-bottom: 10px;" :loading="warpModal.confirmLoading" type="primary">{{ i18n "info" }}</a-button>
+        <a-button icon="sync" @click="getConfig" style="margin-top: 5px; margin-bottom: 10px;"
            :loading="warpModal.confirmLoading" type="primary">{{ i18n "info" }}</a-button>
        <template v-if="!ObjectUtil.isEmpty(warpModal.warpConfig)">
            <table style="width: 100%">
                <tr class="client-table-odd-row">
@@ -101,7 +104,6 @@
            this.visible = true;
            this.warpConfig = null;
            this.getData();
        },
        close() {
            this.visible = false;
@@ -138,7 +140,8 @@
                        settings: {
                            mtu: 1420,
                            secretKey: warpModal.warpData.private_key,
-                            address: Object.values(config.interface.addresses),
+                            address: this.getAddresses(config.interface.addresses),
                            reserved: this.getResolved(config.client_id),
                            domainStrategy: 'ForceIP',
                            peers: [{
                                publicKey: peer.public_key,
@@ -149,6 +152,28 @@
                    });
                }
            },
            getAddresses(addrs) {
                let addresses = [];
                if (addrs.v4) addresses.push(addrs.v4 + "/32");
                if (addrs.v6) addresses.push(addrs.v6 + "/128");
                return addresses;
            },
            getResolved(client_id) {
                let reserved = [];
                let decoded = atob(client_id);
                let hexString = '';
                for (let i = 0; i < decoded.length; i++) {
                    let hex = decoded.charCodeAt(i).toString(16);
                    hexString += (hex.length === 1 ? '0' : '') + hex;
                }
                for (let i = 0; i < hexString.length; i += 2) {
                    let hexByte = hexString.slice(i, i + 2);
                    let decValue = parseInt(hexByte, 16);
                    reserved.push(decValue);
                }
                return reserved;
            },
            async register() {
                warpModal.loading(true);
                keys = Wireguard.generateKeypair();
@@ -180,6 +205,16 @@
                    this.collectConfig();
                }
            },
            async delConfig() {
                warpModal.loading(true);
                const msg = await HttpUtil.post('/panel/xray/warp/del');
                warpModal.loading(false);
                if (msg.success) {
                    warpModal.warpData = null;
                    warpModal.warpConfig = null;
                    this.delOutbound();
                }
            },
            addOutbound() {
                app.templateSettings.outbounds.push(warpModal.warpOutbound.toJson());
                app.outboundSettings = JSON.stringify(app.templateSettings.outbounds);
@@ -189,6 +224,13 @@
                app.templateSettings.outbounds[this.warpOutboundIndex] = warpModal.warpOutbound.toJson();
                app.outboundSettings = JSON.stringify(app.templateSettings.outbounds);
                warpModal.close();
            },
            delOutbound() {
                if (this.warpOutboundIndex != -1) {
                    app.templateSettings.outbounds.splice(this.warpOutboundIndex, 1);
                    app.outboundSettings = JSON.stringify(app.templateSettings.outbounds);
                }
                warpModal.close();
            }
        },
        computed: {
--- 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?{{ .cur_ver }}">
+<link rel="stylesheet" href="{{ .base_path }}assets/codemirror/codemirror.min.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/xq.min.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?{{ .cur_ver }}"></script>
+<script src="{{ .base_path }}assets/codemirror/codemirror.min.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>
@@ -443,7 +443,7 @@
                <a-table :columns="outboundColumns" bordered
                    :row-key="r => r.key"
                    :data-source="outboundData"
-                    :scroll="isMobile ? {} : { x: 200 }"
+                    :scroll="isMobile ? {} : { x: 800 }"
                    :pagination="false"
                    :indent-size="0"
                    :style="isMobile ? 'padding: 5px 5px' : 'margin-right: 1px;'">
@@ -1054,12 +1054,13 @@
                });
            },
            changeObsCode() {
                if (this.obsSettings == ''){
                    return
                }
                if(this.cm != null) {
                    this.cm.toTextArea();
                }
                if (this.obsSettings == ''){
                    this.cm = null;
                    return
                }
                textAreaObj = document.getElementById('obsSetting');
                textAreaObj.value = this[this.obsSettings];
                this.cm = CodeMirror.fromTextArea(textAreaObj, this.cmOptions);
@@ -1267,7 +1268,8 @@
                    balancer: {
                        tag: '',
                        strategy: 'random',
-                        selector: []
+                        selector: [],
                        fallbackTag: ''
                    },
                    confirm: (balancer) => {
                        balancerModal.loading();
@@ -1277,27 +1279,18 @@
                        }
                        let tmpBalancer = {
                            'tag': balancer.tag,
-                            'selector': balancer.selector
+                            'selector': balancer.selector,
                            'fallbackTag': balancer.fallbackTag
                        };
                        if (balancer.strategy && balancer.strategy != 'random') {
                            tmpBalancer.strategy = {
                                'type': balancer.strategy
                            };
                            if (balancer.strategy == 'leastPing'){
                                if (!newTemplateSettings.observatory)
                                    newTemplateSettings.observatory = this.defaultObservatory;
                                if (!newTemplateSettings.observatory.subjectSelector.includes(balancer.tag))
                                    newTemplateSettings.observatory.subjectSelector.push(balancer.tag);
                            }
                            if (balancer.strategy == 'leastLoad'){
                                if (!newTemplateSettings.burstObservatory)
                                    newTemplateSettings.burstObservatory = this.defaultBurstObservatory;
                                if (!newTemplateSettings.burstObservatory.subjectSelector.includes(balancer.tag))
                                    newTemplateSettings.burstObservatory.subjectSelector.push(balancer.tag);
                            }
                        }
                        newTemplateSettings.routing.balancers.push(tmpBalancer);
                        this.templateSettings = newTemplateSettings;
                        if (balancer.strategy == 'leastPing' || balancer.strategy == 'leastLoad')
                            this.updateObservatorySelectors();
                        balancerModal.close();
                        this.changeObsCode();
                    },
@@ -1317,7 +1310,8 @@
                        let tmpBalancer = {
                            'tag': balancer.tag,
-                            'selector': balancer.selector
+                            'selector': balancer.selector,
                            'fallbackTag': balancer.fallbackTag
                        };
                        // Remove old tag
@@ -1332,18 +1326,6 @@
                            tmpBalancer.strategy = {
                                'type': balancer.strategy
                            };
                            if (balancer.strategy == 'leastPing'){
                                if (!newTemplateSettings.observatory)
                                    newTemplateSettings.observatory = this.defaultObservatory;
                                if (!newTemplateSettings.observatory.subjectSelector.includes(balancer.tag))
                                    newTemplateSettings.observatory.subjectSelector.push(balancer.tag);
                            }
                            if (balancer.strategy == 'leastLoad'){
                                if (!newTemplateSettings.burstObservatory)
                                    newTemplateSettings.burstObservatory = this.defaultBurstObservatory;
                                if (!newTemplateSettings.burstObservatory.subjectSelector.includes(balancer.tag))
                                    newTemplateSettings.burstObservatory.subjectSelector.push(balancer.tag);
                            }
                        }
                        newTemplateSettings.routing.balancers[index] = tmpBalancer;
@@ -1356,14 +1338,49 @@
                            });
                        }
                        this.templateSettings = newTemplateSettings;
                        if (balancer.strategy == 'leastPing' || balancer.strategy == 'leastLoad')
                            this.updateObservatorySelectors();
                        balancerModal.close();
                        this.changeObsCode();
                    },
                    isEdit: true
                });
            },
            updateObservatorySelectors(){
                newTemplateSettings = this.templateSettings;
                const leastPings = this.balancersData.filter((b) => b.strategy == 'leastPing');
                const leastLoads = this.balancersData.filter((b) => b.strategy == 'leastLoad');
                if (leastPings.length>0){
                    if (!newTemplateSettings.observatory)
                        newTemplateSettings.observatory = this.defaultObservatory;
                    newTemplateSettings.observatory.subjectSelector = [];
                    leastPings.forEach((b) => {
                        b.selector.forEach((s) => {
                            if (!newTemplateSettings.observatory.subjectSelector.includes(s))
                                newTemplateSettings.observatory.subjectSelector.push(s);
                        });
                    });
                } else {
                    delete newTemplateSettings.observatory
                }
                if (leastLoads.length>0){
                    if (!newTemplateSettings.burstObservatory)
                        newTemplateSettings.burstObservatory = this.defaultBurstObservatory;
                    newTemplateSettings.burstObservatory.subjectSelector = [];
                    leastLoads.forEach((b) => {
                        b.selector.forEach((s) => {
                            if (!newTemplateSettings.burstObservatory.subjectSelector.includes(s))
                                newTemplateSettings.burstObservatory.subjectSelector.push(s);
                        });
                    });
                } else {
                    delete newTemplateSettings.burstObservatory
                }
                this.templateSettings = newTemplateSettings;
                this.changeObsCode();
            },
            deleteBalancer(index) {
-                let newTemplateSettings = { ...this.templateSettings };
+                newTemplateSettings = this.templateSettings;
                // Remove from balancers
                const removedBalancer = this.balancersData.splice(index, 1)[0];
@@ -1372,26 +1389,13 @@
                let realIndex = newTemplateSettings.routing.balancers.findIndex((b) => b.tag === removedBalancer.tag);
                newTemplateSettings.routing.balancers.splice(realIndex, 1);
                // Remove tag from observatory
                if (newTemplateSettings.observatory){
                    newTemplateSettings.observatory.subjectSelector = newTemplateSettings.observatory.subjectSelector.filter(s => s != removedBalancer.tag);
                }
                if (newTemplateSettings.burstObservatory){
                    newTemplateSettings.burstObservatory.subjectSelector = newTemplateSettings.burstObservatory.subjectSelector.filter(s => s != removedBalancer.tag);
                }
                // Remove related routing rules
                newTemplateSettings.routing.rules.forEach((rule) => {
                    if (rule.balancerTag === removedBalancer.tag) {
                        delete rule.balancerTag;
                    }
                });
                // 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;
                this.updateObservatorySelectors();
                this.obsSettings = '';
                this.changeObsCode()
            },
            addDNSServer(){
@@ -1622,7 +1626,8 @@
                                'key': index,
                                'tag': o.tag ? o.tag : "",
                                'strategy': o.strategy?.type ?? "random",
-                                'selector': o.selector ? o.selector : []
+                                'selector': o.selector ? o.selector : [],
                                'fallbackTag': o.fallbackTag?? '',
                            });
                        });
                    }
@@ -1649,22 +1654,8 @@
                    this.templateSettings = newTemplateSettings;
                },
            },
-            observatoryEnable: {
+            observatoryEnable: function () { return this.templateSettings != null && this.templateSettings.observatory != undefined },
-                get: function () { return this.templateSettings != null && this.templateSettings.observatory },
+            burstObservatoryEnable: function () { return this.templateSettings != null && this.templateSettings.burstObservatory != undefined },
                set: function (v) {
                    newTemplateSettings = this.templateSettings;
                    newTemplateSettings.observatory = v ? this.defaultObservatory : undefined;
                    this.templateSettings = newTemplateSettings;
                }
            },
            burstObservatoryEnable: {
                get: function () { return this.templateSettings != null && this.templateSettings.burstObservatory },
                set: function (v) {
                    newTemplateSettings = this.templateSettings;
                    newTemplateSettings.burstObservatory = v ? this.defaultBurstObservatory : undefined;
                    this.templateSettings = newTemplateSettings;
                }
            },
            freedomStrategy: {
                get: function () {
                    if (!this.templateSettings) return "AsIs";
--- a/web/html/xui/xray_balancer_modal.html
+++ b/web/html/xui/xray_balancer_modal.html
@@ -32,6 +32,12 @@
                <a-select-option v-for="tag in balancerModal.outboundTags" :value="tag">[[ tag ]]</a-select-option>
            </a-select>
        </a-form-item>
        <a-form-item label="Fallback">
            <a-select v-model="balancerModal.balancer.fallbackTag" clearable
                :dropdown-class-name="themeSwitcher.currentTheme">
                <a-select-option v-for="tag in [ '', ...balancerModal.outboundTags]" :value="tag">[[ tag ]]</a-select-option>
            </a-select>
        </a-form-item>
        </table>
    </a-form>
 </a-modal>
@@ -48,7 +54,8 @@
        balancer: {
            tag: '',
            strategy: 'random',
-            selector: []
+            selector: [],
            fallbackTag: ''
        },
        outboundTags: [],
        balancerTags:[],
@@ -71,7 +78,8 @@
                balancerModal.balancer = {
                    tag: '',
                    strategy: 'random',
-                    selector: []
+                    selector: [],
                    fallbackTag: ''
                };
            }
            this.balancerTags = balancerTags.filter((tag) => tag != balancer.tag);
--- a/web/html/xui/xray_rule_modal.html
+++ b/web/html/xui/xray_rule_modal.html
@@ -1,7 +1,5 @@
 {{define "ruleModal"}}
-<a-modal id="rule-modal" v-model="ruleModal.visible" :title="ruleModal.title" @ok="ruleModal.ok"
+<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">
         :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:8} }" :wrapper-col="{ md: {span:14} }">
    <a-form-item label='Domain Matcher'>
      <a-select v-model="ruleModal.rule.domainMatcher" :dropdown-class-name="themeSwitcher.currentTheme">
@@ -13,8 +11,7 @@
        <a-tooltip>
          <template slot="title">
            <span>{{ i18n "pages.xray.rules.useComma" }}</span>
-                    </template>
+          </template> Source IPs <a-icon type="question-circle"></a-icon>
                    Source IPs <a-icon type="question-circle"></a-icon>
        </a-tooltip>
      </template>
      <a-input v-model.trim="ruleModal.rule.source"></a-input>
@@ -24,8 +21,7 @@
        <a-tooltip>
          <template slot="title">
            <span>{{ i18n "pages.xray.rules.useComma" }}</span>
-                    </template>
+          </template> Source Port <a-icon type="question-circle"></a-icon>
                    Source Port <a-icon type="question-circle"></a-icon>
        </a-tooltip>
      </template>
      <a-input v-model.trim="ruleModal.rule.sourcePort"></a-input>
@@ -41,7 +37,7 @@
      </a-select>
    </a-form-item>
    <a-form-item label='Attributes'>
-            <a-button size="small" style="margin-left: 10px" @click="ruleModal.rule.attrs.push(['', ''])">+</a-button>
+      <a-button icon="plus" size="small" style="margin-left: 10px" @click="ruleModal.rule.attrs.push(['', ''])"></a-button>
    </a-form-item>
    <a-form-item :wrapper-col="{span: 24}">
      <a-input-group compact v-for="(attr,index) in ruleModal.rule.attrs">
@@ -49,7 +45,7 @@
          <template slot="addonBefore" style="margin: 0;">[[ index+1 ]]</template>
        </a-input>
        <a-input style="width: 50%" v-model="attr[1]" placeholder='{{ i18n "pages.inbounds.stream.general.value" }}'>
-                    <a-button slot="addonAfter" size="small" @click="ruleModal.rule.attrs.splice(index,1)">-</a-button>
+          <a-button icon="minus" slot="addonAfter" size="small" @click="ruleModal.rule.attrs.splice(index,1)"></a-button>
        </a-input>
      </a-input-group>
    </a-form-item>
@@ -58,8 +54,7 @@
        <a-tooltip>
          <template slot="title">
            <span>{{ i18n "pages.xray.rules.useComma" }}</span>
-                    </template>
+          </template> IP <a-icon type="question-circle"></a-icon>
                    IP <a-icon type="question-circle"></a-icon>
        </a-tooltip>
      </template>
      <a-input v-model.trim="ruleModal.rule.ip"></a-input>
@@ -69,8 +64,7 @@
        <a-tooltip>
          <template slot="title">
            <span>{{ i18n "pages.xray.rules.useComma" }}</span>
-                    </template>
+          </template> Domain <a-icon type="question-circle"></a-icon>
                    Domain <a-icon type="question-circle"></a-icon>
        </a-tooltip>
      </template>
      <a-input v-model.trim="ruleModal.rule.domain"></a-input>
@@ -80,8 +74,7 @@
        <a-tooltip>
          <template slot="title">
            <span>{{ i18n "pages.xray.rules.useComma" }}</span>
-                    </template>
+          </template> User <a-icon type="question-circle"></a-icon>
                    User <a-icon type="question-circle"></a-icon>
        </a-tooltip>
      </template>
      <a-input v-model.trim="ruleModal.rule.user"></a-input>
@@ -91,8 +84,7 @@
        <a-tooltip>
          <template slot="title">
            <span>{{ i18n "pages.xray.rules.useComma" }}</span>
-                    </template>
+          </template> Port <a-icon type="question-circle"></a-icon>
                    Port <a-icon type="question-circle"></a-icon>
        </a-tooltip>
      </template>
      <a-input v-model.trim="ruleModal.rule.port"></a-input>
@@ -112,19 +104,16 @@
        <a-tooltip>
          <template slot="title">
            <span>{{ i18n "pages.xray.balancer.balancerDesc" }}</span>
-                    </template>
+          </template> Balancer Tag <a-icon type="question-circle"></a-icon>
                    Balancer Tag <a-icon type="question-circle"></a-icon>
        </a-tooltip>
      </template>
      <a-select v-model="ruleModal.rule.balancerTag" :dropdown-class-name="themeSwitcher.currentTheme">
        <a-select-option v-for="tag in ruleModal.balancerTags" :value="tag">[[ tag ]]</a-select-option>
      </a-select>
    </a-form-item>
    </table>
  </a-form>
 </a-modal>
 <script>
  const ruleModal = {
    title: '',
    visible: false,
@@ -156,7 +145,13 @@
      newRule = ruleModal.getResult();
      ObjectUtil.execute(ruleModal.confirm, newRule);
    },
-        show({ title='', okText='{{ i18n "sure" }}', rule, confirm=(rule)=>{}, isEdit=false  }) {
+    show({
      title = '',
      okText = '{{ i18n "sure" }}',
      rule,
      confirm = (rule) => {},
      isEdit = false
    }) {
      this.title = title;
      this.okText = okText;
      this.confirm = confirm;
@@ -203,7 +198,6 @@
        }
        if (app.templateSettings.reverse.portals) this.outboundTags.push(...app.templateSettings.reverse.portals.map(b => b.tag));
      }
      if (app.templateSettings.routing && app.templateSettings.routing.balancers) {
        this.balancerTags = ["", ...app.templateSettings.routing.balancers.filter((o) => !ObjectUtil.isEmpty(o.tag)).map(obj => obj.tag)];
      }
@@ -233,22 +227,14 @@
      rule.attrs = Object.fromEntries(value.attrs);
      rule.outboundTag = value.outboundTag == "" ? undefined : value.outboundTag;
      rule.balancerTag = value.balancerTag == "" ? undefined : value.balancerTag;
      for (const [key, value] of Object.entries(rule)) {
-                if (
+        if (value !== null && value !== undefined && !(Array.isArray(value) && value.length === 0) && !(typeof value === 'object' && Object.keys(value).length === 0) && value !== '') {
                value !== null &&
                value !== undefined &&
                !(Array.isArray(value) && value.length === 0) &&
                !(typeof value === 'object' && Object.keys(value).length === 0) &&
                value !== ''
                ) {
          newRule[key] = value;
        }
      }
      return newRule;
    }
  };
  new Vue({
    delimiters: ['[[', ']]'],
    el: '#rule-modal',
@@ -256,6 +242,5 @@
      ruleModal: ruleModal,
    }
  });
 </script>
 {{end}}
--- a/web/job/check_client_ip_job.go
+++ b/web/job/check_client_ip_job.go
@@ -252,46 +252,55 @@ func (j *CheckClientIpJob) addInboundClientIps(clientEmail string, ips []string)
 func (j *CheckClientIpJob) updateInboundClientIps(inboundClientIps *model.InboundClientIps, clientEmail string, ips []string) bool {
 	jsonIps, err := json.Marshal(ips)
-	j.checkError(err)
+	if err != nil {
 		logger.Error("failed to marshal IPs to JSON:", err)
 		return false
 	}
 	inboundClientIps.ClientEmail = clientEmail
 	inboundClientIps.Ips = string(jsonIps)
-	// check inbound limitation
+	// Fetch inbound settings by client email
 	inbound, err := j.getInboundByEmail(clientEmail)
-	j.checkError(err)
+	if err != nil {
-
+		logger.Errorf("failed to fetch inbound settings for email %s: %s", clientEmail, err)
 	if inbound.Settings == "" {
 		logger.Debug("wrong data ", inbound)
 		return false
 	}
 	if inbound.Settings == "" {
 		logger.Debug("wrong data:", inbound)
 		return false
 	}
 	// Unmarshal settings to get client limits
 	settings := map[string][]model.Client{}
 	json.Unmarshal([]byte(inbound.Settings), &settings)
 	clients := settings["clients"]
 	shouldCleanLog := false
 	j.disAllowedIps = []string{}
-	// create iplimit log file channel
+	// Open log file for IP limits
-	logIpFile, err := os.OpenFile(xray.GetIPLimitLogPath(), os.O_CREATE|os.O_APPEND|os.O_WRONLY, 0o644)
+	logIpFile, err := os.OpenFile(xray.GetIPLimitLogPath(), os.O_CREATE|os.O_APPEND|os.O_WRONLY, 0644)
 	if err != nil {
-		logger.Errorf("failed to create or open ip limit log file: %s", err)
+		logger.Errorf("failed to open IP limit log file: %s", err)
 		return false
 	}
 	defer logIpFile.Close()
 	log.SetOutput(logIpFile)
 	log.SetFlags(log.LstdFlags)
 	// Check client IP limits
 	for _, client := range clients {
 		if client.Email == clientEmail {
 			limitIp := client.LimitIP
-			if limitIp != 0 {
+			if limitIp > 0 && inbound.Enable {
 				shouldCleanLog = true
-				if limitIp < len(ips) && inbound.Enable {
+				if limitIp < len(ips) {
 					j.disAllowedIps = append(j.disAllowedIps, ips[limitIp:]...)
 					for i := limitIp; i < len(ips); i++ {
-						log.Printf("[LIMIT_IP] Email = %s || SRC = %s", clientEmail, ips[i])
+						logger.Debugf("[LIMIT_IP] Email = %s || SRC = %s", clientEmail, ips[i])
 					}
 				}
 			}
@@ -301,12 +310,15 @@ func (j *CheckClientIpJob) updateInboundClientIps(inboundClientIps *model.Inboun
 	sort.Strings(j.disAllowedIps)
 	if len(j.disAllowedIps) > 0 {
-		logger.Debug("disAllowedIps ", j.disAllowedIps)
+		logger.Debug("disAllowedIps:", j.disAllowedIps)
 	}
 	db := database.GetDB()
 	err = db.Save(inboundClientIps).Error
-	j.checkError(err)
+	if err != nil {
 		logger.Error("failed to save inboundClientIps:", err)
 		return false
 	}
 	return shouldCleanLog
 }
--- a/web/job/check_cpu_usage.go
+++ b/web/job/check_cpu_usage.go
@@ -6,7 +6,7 @@ import (
 	"x-ui/web/service"
-	"github.com/shirou/gopsutil/v3/cpu"
+	"github.com/shirou/gopsutil/v4/cpu"
 )
 type CheckCpuJob struct {
--- a/web/job/clear_logs_job.go
+++ b/web/job/clear_logs_job.go
@@ -3,6 +3,7 @@ package job
 import (
 	"io"
 	"os"
 	"path/filepath"
 	"x-ui/logger"
 	"x-ui/xray"
@@ -14,28 +15,53 @@ func NewClearLogsJob() *ClearLogsJob {
 	return new(ClearLogsJob)
 }
 // ensureFileExists creates the necessary directories and file if they don't exist
 func ensureFileExists(path string) error {
 	dir := filepath.Dir(path)
 	if err := os.MkdirAll(dir, 0755); err != nil {
 		return err
 	}
 	file, err := os.OpenFile(path, os.O_CREATE|os.O_RDWR, 0644)
 	if err != nil {
 		return err
 	}
 	file.Close()
 	return nil
 }
 // Here Run is an interface method of the Job interface
 func (j *ClearLogsJob) Run() {
 	logFiles := []string{xray.GetIPLimitLogPath(), xray.GetIPLimitBannedLogPath(), xray.GetAccessPersistentLogPath()}
 	logFilesPrev := []string{xray.GetIPLimitBannedPrevLogPath(), xray.GetAccessPersistentPrevLogPath()}
-	// clear log files and copy to previous logs
+	// Ensure all log files and their paths exist
-	for i := 0; i < len(logFiles); i++ {
+	for _, path := range append(logFiles, logFilesPrev...) {
-		if i > 0 {
+		if err := ensureFileExists(path); err != nil {
-			// copy to previous logs
+			logger.Warning("Failed to ensure log file exists:", path, "-", err)
-			logFilePrev, err := os.OpenFile(logFilesPrev[i-1], os.O_CREATE|os.O_TRUNC|os.O_WRONLY, 0644)
+		}
-			if err != nil {
+	}
-				logger.Warning("clear logs job err:", err)
+
 	// Clear log files and copy to previous logs
 	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_TRUNC|os.O_WRONLY, 0644)
 			if err != nil {
 				logger.Warning("Failed to open previous log file for writing:", logFilesPrev[i-1], "-", err)
 				continue
 			}
 			logFile, err := os.OpenFile(logFiles[i], os.O_RDONLY, 0644)
 			if err != nil {
 				logger.Warning("Failed to open current log file for reading:", logFiles[i], "-", err)
 				logFilePrev.Close()
 				continue
 			}
 			logFile, err :=  os.OpenFile(logFiles[i], os.O_CREATE|os.O_RDONLY, 0644)
 			if err == nil {
 			_, err = io.Copy(logFilePrev, logFile)
 			if err != nil {
-					logger.Warning("clear logs job err:", err)
+				logger.Warning("Failed to copy log file:", logFiles[i], "to", logFilesPrev[i-1], "-", err)
 				}
 			} else {
 				logger.Warning("clear logs job err:", err)
 			}
 			logFile.Close()
@@ -44,7 +70,7 @@ func (j *ClearLogsJob) Run() {
 		err := os.Truncate(logFiles[i], 0)
 		if err != nil {
-			logger.Warning("clear logs job err:", err)
+			logger.Warning("Failed to truncate log file:", logFiles[i], "-", err)
 		}
 	}
 }
--- a/web/job/xray_traffic_job.go
+++ b/web/job/xray_traffic_job.go
@@ -19,10 +19,8 @@ func (j *XrayTrafficJob) Run() {
 	if !j.xrayService.IsXrayRunning() {
 		return
 	}
 	traffics, clientTraffics, err := j.xrayService.GetXrayTraffic()
 	if err != nil {
 		logger.Warning("get xray traffic failed:", err)
 		return
 	}
 	err, needRestart0 := j.inboundService.AddTraffic(traffics, clientTraffics)
--- a/web/middleware/domainValidator.go
+++ b/web/middleware/domainValidator.go
@@ -1,6 +1,7 @@
 package middleware
 import (
 	"net"
 	"net/http"
 	"strings"
@@ -9,7 +10,16 @@ import (
 func DomainValidatorMiddleware(domain string) gin.HandlerFunc {
 	return func(c *gin.Context) {
-		host := strings.Split(c.Request.Host, ":")[0]
+		host := c.GetHeader("X-Forwarded-Host")
 		if host == "" {
 			host = c.GetHeader("X-Real-IP")
 		}
 		if host == "" {
 			host = c.Request.Host
 			if colonIndex := strings.LastIndex(host, ":"); colonIndex != -1 {
 				host, _, _ = net.SplitHostPort(host)
 			}
 		}
 		if host != domain {
 			c.AbortWithStatus(http.StatusForbidden)
--- a/web/service/inbound.go
+++ b/web/service/inbound.go
@@ -595,7 +595,7 @@ func (s *InboundService) UpdateInboundClient(data *model.Inbound, clientId strin
 		return false, err
 	}
-	inerfaceClients := settings["clients"].([]interface{})
+	interfaceClients := settings["clients"].([]interface{})
 	oldInbound, err := s.GetInbound(data.Id)
 	if err != nil {
@@ -609,7 +609,7 @@ func (s *InboundService) UpdateInboundClient(data *model.Inbound, clientId strin
 	oldEmail := ""
 	newClientId := ""
-	clientIndex := 0
+	clientIndex := -1
 	for index, oldClient := range oldClients {
 		oldClientId := ""
 		if oldInbound.Protocol == "trojan" {
@@ -630,7 +630,7 @@ func (s *InboundService) UpdateInboundClient(data *model.Inbound, clientId strin
 	}
 	// Validate new client ID
-	if newClientId == "" {
+	if newClientId == "" || clientIndex == -1 {
 		return false, common.NewError("empty client ID")
 	}
@@ -650,7 +650,7 @@ func (s *InboundService) UpdateInboundClient(data *model.Inbound, clientId strin
 		return false, err
 	}
 	settingsClients := oldSettings["clients"].([]interface{})
-	settingsClients[clientIndex] = inerfaceClients[0]
+	settingsClients[clientIndex] = interfaceClients[0]
 	oldSettings["clients"] = settingsClients
 	newSettings, err := json.MarshalIndent(oldSettings, "", "  ")
@@ -696,8 +696,12 @@ func (s *InboundService) UpdateInboundClient(data *model.Inbound, clientId strin
 	needRestart := false
 	if len(oldEmail) > 0 {
 		s.xrayApi.Init(p.GetAPIPort())
-		if s.xrayApi.RemoveUser(oldInbound.Tag, oldEmail) == nil {
+		err1 := s.xrayApi.RemoveUser(oldInbound.Tag, oldEmail)
 		if err1 == nil {
 			logger.Debug("Old client deleted by api:", clients[0].Email)
 		} else {
 			logger.Debug("Error in deleting client by api:", err1)
 			needRestart = true
 		}
 		if clients[0].Enable {
 			cipher := ""
@@ -1130,7 +1134,6 @@ func (s *InboundService) DelClientStat(tx *gorm.DB, email string) error {
 }
 func (s *InboundService) DelClientIPs(tx *gorm.DB, email string) error {
 	logger.Warning(email)
 	return tx.Where("client_email = ?", email).Delete(model.InboundClientIps{}).Error
 }
@@ -1139,7 +1142,7 @@ func (s *InboundService) GetClientInboundByTrafficID(trafficId int) (traffic *xr
 	var traffics []*xray.ClientTraffic
 	err = db.Model(xray.ClientTraffic{}).Where("id = ?", trafficId).Find(&traffics).Error
 	if err != nil {
-		logger.Warning(err)
+		logger.Warningf("Error retrieving ClientTraffic with trafficId %d: %v", trafficId, err)
 		return nil, nil, err
 	}
 	if len(traffics) > 0 {
@@ -1154,7 +1157,7 @@ func (s *InboundService) GetClientInboundByEmail(email string) (traffic *xray.Cl
 	var traffics []*xray.ClientTraffic
 	err = db.Model(xray.ClientTraffic{}).Where("email = ?", email).Find(&traffics).Error
 	if err != nil {
-		logger.Warning(err)
+		logger.Warningf("Error retrieving ClientTraffic with email %s: %v", email, err)
 		return nil, nil, err
 	}
 	if len(traffics) > 0 {
@@ -1685,21 +1688,30 @@ func (s *InboundService) DelDepletedClients(id int) (err error) {
 	}
 	err = tx.Where(whereText+" and enable = ?", id, false).Delete(xray.ClientTraffic{}).Error
 	if err != nil {
 		return err
 	}
 	return nil
 }
 func (s *InboundService) GetClientTrafficTgBot(tgId int64) ([]*xray.ClientTraffic, error) {
 	db := database.GetDB()
 	var inbounds []*model.Inbound
-	err := db.Model(model.Inbound{}).Where("settings like ?", fmt.Sprintf(`%%"tgId": %d%%`, tgId)).Find(&inbounds).Error
+
 	// Retrieve inbounds where settings contain the given tgId
 	err := db.Model(model.Inbound{}).Where("settings LIKE ?", fmt.Sprintf(`%%"tgId": %d%%`, tgId)).Find(&inbounds).Error
 	if err != nil && err != gorm.ErrRecordNotFound {
 		logger.Errorf("Error retrieving inbounds with tgId %d: %v", tgId, err)
 		return nil, err
 	}
 	var emails []string
 	for _, inbound := range inbounds {
 		clients, err := s.GetClients(inbound)
 		if err != nil {
-			logger.Error("Unable to get clients from inbound")
+			logger.Errorf("Error retrieving clients for inbound %d: %v", inbound.Id, err)
 			continue
 		}
 		for _, client := range clients {
 			if client.TgID == tgId {
@@ -1707,15 +1719,19 @@ func (s *InboundService) GetClientTrafficTgBot(tgId int64) ([]*xray.ClientTraffi
 			}
 		}
 	}
 	var traffics []*xray.ClientTraffic
 	err = db.Model(xray.ClientTraffic{}).Where("email IN ?", emails).Find(&traffics).Error
 	if err != nil {
 		if err == gorm.ErrRecordNotFound {
-			logger.Warning(err)
+			logger.Warning("No ClientTraffic records found for emails:", emails)
 			return nil, nil
 		}
 		logger.Errorf("Error retrieving ClientTraffic for emails %v: %v", emails, err)
 		return nil, err
 	}
-	}
+
-	return traffics, err
+	return traffics, nil
 }
 func (s *InboundService) GetClientTrafficByEmail(email string) (traffic *xray.ClientTraffic, err error) {
@@ -1724,7 +1740,7 @@ func (s *InboundService) GetClientTrafficByEmail(email string) (traffic *xray.Cl
 	err = db.Model(xray.ClientTraffic{}).Where("email = ?", email).Find(&traffics).Error
 	if err != nil {
-		logger.Warning(err)
+		logger.Warningf("Error retrieving ClientTraffic with email %s: %v", email, err)
 		return nil, err
 	}
 	if len(traffics) > 0 {
@@ -1739,38 +1755,51 @@ func (s *InboundService) SearchClientTraffic(query string) (traffic *xray.Client
 	inbound := &model.Inbound{}
 	traffic = &xray.ClientTraffic{}
-	err = db.Model(model.Inbound{}).Where("settings like ?", "%\""+query+"\"%").First(inbound).Error
+	// Search for inbound settings that contain the query
 	err = db.Model(model.Inbound{}).Where("settings LIKE ?", "%\""+query+"\"%").First(inbound).Error
 	if err != nil {
 		if err == gorm.ErrRecordNotFound {
-			logger.Warning(err)
+			logger.Warningf("Inbound settings containing query %s not found: %v", query, err)
 			return nil, err
 		}
 		logger.Errorf("Error searching for inbound settings with query %s: %v", query, err)
 		return nil, err
 	}
 	traffic.InboundId = inbound.Id
-	// get settings clients
+	// Unmarshal settings to get clients
 	settings := map[string][]model.Client{}
-	json.Unmarshal([]byte(inbound.Settings), &settings)
+	if err := json.Unmarshal([]byte(inbound.Settings), &settings); err != nil {
 		logger.Errorf("Error unmarshalling inbound settings for inbound ID %d: %v", inbound.Id, err)
 		return nil, err
 	}
 	clients := settings["clients"]
 	for _, client := range clients {
-		if client.ID == query && client.Email != "" {
+		if (client.ID == query || client.Password == query) && client.Email != "" {
 			traffic.Email = client.Email
 			break
 		}
 		if client.Password == query && client.Email != "" {
 			traffic.Email = client.Email
 			break
 		}
 	}
 	if traffic.Email == "" {
-		return nil, err
+		logger.Warningf("No client found with query %s in inbound ID %d", query, inbound.Id)
 		return nil, gorm.ErrRecordNotFound
 	}
 	// Retrieve ClientTraffic based on the found email
 	err = db.Model(xray.ClientTraffic{}).Where("email = ?", traffic.Email).First(traffic).Error
 	if err != nil {
-		logger.Warning(err)
+		if err == gorm.ErrRecordNotFound {
 			logger.Warningf("ClientTraffic for email %s not found: %v", traffic.Email, err)
 			return nil, err
 		}
-	return traffic, err
+		logger.Errorf("Error retrieving ClientTraffic for email %s: %v", traffic.Email, err)
 		return nil, err
 	}
 	return traffic, nil
 }
 func (s *InboundService) GetInboundClientIps(clientEmail string) (string, error) {
@@ -1940,6 +1969,6 @@ func (s *InboundService) MigrateDB() {
 	s.MigrationRemoveOrphanedTraffics()
 }
-func (s *InboundService) GetOnlineClinets() []string {
+func (s *InboundService) GetOnlineClients() []string {
 	return p.GetOnlineClients()
 }
--- a/web/service/outbound.go
+++ b/web/service/outbound.go
@@ -70,7 +70,7 @@ func (s *OutboundService) GetOutboundsTraffic() ([]*model.OutboundTraffics, erro
 	err := db.Model(model.OutboundTraffics{}).Find(&traffics).Error
 	if err != nil {
-		logger.Warning(err)
+		logger.Warning("Error retrieving OutboundTraffics: ", err)
 		return nil, err
 	}
--- a/web/service/panel.go
+++ b/web/service/panel.go
@@ -19,7 +19,7 @@ func (s *PanelService) RestartPanel(delay time.Duration) error {
 		time.Sleep(delay)
 		err := p.Signal(syscall.SIGHUP)
 		if err != nil {
-			logger.Error("send signal SIGHUP failed:", err)
+			logger.Error("failed to send SIGHUP signal:", err)
 		}
 	}()
 	return nil
--- a/web/service/server.go
+++ b/web/service/server.go
@@ -23,12 +23,12 @@ import (
 	"x-ui/util/sys"
 	"x-ui/xray"
-	"github.com/shirou/gopsutil/v3/cpu"
+	"github.com/shirou/gopsutil/v4/cpu"
-	"github.com/shirou/gopsutil/v3/disk"
+	"github.com/shirou/gopsutil/v4/disk"
-	"github.com/shirou/gopsutil/v3/host"
+	"github.com/shirou/gopsutil/v4/host"
-	"github.com/shirou/gopsutil/v3/load"
+	"github.com/shirou/gopsutil/v4/load"
-	"github.com/shirou/gopsutil/v3/mem"
+	"github.com/shirou/gopsutil/v4/mem"
-	"github.com/shirou/gopsutil/v3/net"
+	"github.com/shirou/gopsutil/v4/net"
 )
 type ProcessState string
@@ -43,6 +43,7 @@ type Status struct {
 	T           time.Time `json:"-"`
 	Cpu         float64   `json:"cpu"`
 	CpuCores    int       `json:"cpuCores"`
 	LogicalPro  int       `json:"logicalPro"`
 	CpuSpeedMhz float64   `json:"cpuSpeedMhz"`
 	Mem         struct {
 		Current uint64 `json:"current"`
@@ -131,6 +132,13 @@ func (s *ServerService) GetStatus(lastStatus *Status) *Status {
 		logger.Warning("get cpu cores count failed:", err)
 	}
 	status.LogicalPro = runtime.NumCPU()
 	if p != nil && p.IsRunning() {
 		status.AppStats.Uptime = p.GetUptime()
 	} else {
 		status.AppStats.Uptime = 0
 	}
 	cpuInfos, err := cpu.Info()
 	if err != nil {
 		logger.Warning("get cpu info failed:", err)
@@ -304,6 +312,16 @@ func (s *ServerService) downloadXRay(version string) (string, error) {
 		arch = "64"
 	case "arm64":
 		arch = "arm64-v8a"
 	case "armv7":
 		arch = "arm32-v7a"
 	case "armv6":
 		arch = "arm32-v6"
 	case "armv5":
 		arch = "arm32-v5"
 	case "386":
 		arch = "32"
 	case "s390x":
 		arch = "s390x"
 	}
 	fileName := fmt.Sprintf("Xray-%s-%s.zip", osName, arch)
--- a/web/service/setting.go
+++ b/web/service/setting.go
@@ -33,7 +33,7 @@ var defaultValueMap = map[string]string{
 	"secret":             random.Seq(32),
 	"webBasePath":        "/",
 	"sessionMaxAge":      "0",
-	"pageSize":           "0",
+	"pageSize":           "50",
 	"expireDiff":         "0",
 	"trafficDiff":        "0",
 	"remarkModel":        "-ieo",
@@ -269,11 +269,11 @@ func (s *SettingService) SetTgBotChatId(chatIds string) error {
 	return s.setString("tgBotChatId", chatIds)
 }
-func (s *SettingService) GetTgbotenabled() (bool, error) {
+func (s *SettingService) GetTgbotEnabled() (bool, error) {
 	return s.getBool("tgBotEnable")
 }
-func (s *SettingService) SetTgbotenabled(value bool) error {
+func (s *SettingService) SetTgbotEnabled(value bool) error {
 	return s.setBool("tgBotEnable", value)
 }
@@ -309,10 +309,18 @@ func (s *SettingService) SetPort(port int) error {
 	return s.setInt("webPort", port)
 }
 func (s *SettingService) SetCertFile(webCertFile string) error {
 	return s.setString("webCertFile", webCertFile)
 }
 func (s *SettingService) GetCertFile() (string, error) {
 	return s.getString("webCertFile")
 }
 func (s *SettingService) SetKeyFile(webKeyFile string) error {
 	return s.setString("webKeyFile", webKeyFile)
 }
 func (s *SettingService) GetKeyFile() (string, error) {
 	return s.getString("webKeyFile")
 }
@@ -352,6 +360,16 @@ func (s *SettingService) GetSecret() ([]byte, error) {
 	return []byte(secret), err
 }
 func (s *SettingService) SetBasePath(basePath string) error {
 	if !strings.HasPrefix(basePath, "/") {
 		basePath = "/" + basePath
 	}
 	if !strings.HasSuffix(basePath, "/") {
 		basePath += "/"
 	}
 	return s.setString("webBasePath", basePath)
 }
 func (s *SettingService) GetBasePath() (string, error) {
 	basePath, err := s.getString("webBasePath")
 	if err != nil {
@@ -506,7 +524,7 @@ func (s *SettingService) GetDefaultSettings(host string) (interface{}, error) {
 		"pageSize":      func() (interface{}, error) { return s.GetPageSize() },
 		"defaultCert":   func() (interface{}, error) { return s.GetCertFile() },
 		"defaultKey":    func() (interface{}, error) { return s.GetKeyFile() },
-		"tgBotEnable":   func() (interface{}, error) { return s.GetTgbotenabled() },
+		"tgBotEnable":   func() (interface{}, error) { return s.GetTgbotEnabled() },
 		"subEnable":     func() (interface{}, error) { return s.GetSubEnable() },
 		"subURI":        func() (interface{}, error) { return s.GetSubURI() },
 		"subJsonURI":    func() (interface{}, error) { return s.GetSubJsonURI() },
--- a/web/service/tgbot.go
+++ b/web/service/tgbot.go
@@ -64,52 +64,59 @@ func (t *Tgbot) GetHashStorage() *global.HashStorage {
 }
 func (t *Tgbot) Start(i18nFS embed.FS) error {
 	// Initialize localizer
 	err := locale.InitLocalizer(i18nFS, &t.settingService)
 	if err != nil {
 		return err
 	}
-	// init hash storage => store callback queries
+	// Initialize hash storage to store callback queries
 	hashStorage = global.NewHashStorage(20 * time.Minute)
 	t.SetHostname()
-	tgBottoken, err := t.settingService.GetTgBotToken()
+
-	if err != nil || tgBottoken == "" {
+	// Get Telegram bot token
-		logger.Warning("Get TgBotToken failed:", err)
+	tgBotToken, err := t.settingService.GetTgBotToken()
 	if err != nil || tgBotToken == "" {
 		logger.Warning("Failed to get Telegram bot token:", err)
 		return err
 	}
-	tgBotid, err := t.settingService.GetTgBotChatId()
+	// Get Telegram bot chat ID(s)
 	tgBotID, err := t.settingService.GetTgBotChatId()
 	if err != nil {
-		logger.Warning("Get GetTgBotChatId failed:", err)
+		logger.Warning("Failed to get Telegram bot chat ID:", err)
 		return err
 	}
-	if tgBotid != "" {
+	// Parse admin IDs from comma-separated string
-		for _, adminId := range strings.Split(tgBotid, ",") {
+	if tgBotID != "" {
-			id, err := strconv.Atoi(adminId)
+		for _, adminID := range strings.Split(tgBotID, ",") {
 			id, err := strconv.Atoi(adminID)
 			if err != nil {
-				logger.Warning("Failed to get IDs from GetTgBotChatId:", err)
+				logger.Warning("Failed to parse admin ID from Telegram bot chat ID:", err)
 				return err
 			}
 			adminIds = append(adminIds, int64(id))
 		}
 	}
 	// Get Telegram bot proxy URL
 	tgBotProxy, err := t.settingService.GetTgBotProxy()
 	if err != nil {
-		logger.Warning("Failed to get ProxyUrl:", err)
+		logger.Warning("Failed to get Telegram bot proxy URL:", err)
 	}
-	bot, err = t.NewBot(tgBottoken, tgBotProxy)
+	// Create new Telegram bot instance
 	bot, err = t.NewBot(tgBotToken, tgBotProxy)
 	if err != nil {
-		fmt.Println("Get tgbot's api error:", err)
+		logger.Error("Failed to initialize Telegram bot API:", err)
 		return err
 	}
-	// listen for TG bot income messages
+	// Start receiving Telegram bot messages
 	if !isRunning {
-		logger.Info("Starting Telegram receiver ...")
+		logger.Info("Telegram bot receiver started")
 		go t.OnReceive()
 		isRunning = true
 	}
@@ -201,7 +208,7 @@ func (t *Tgbot) OnReceive() {
 	}, th.AnyCommand())
 	botHandler.HandleCallbackQuery(func(_ *telego.Bot, query telego.CallbackQuery) {
-		t.asnwerCallback(&query, checkAdmin(query.From.ID))
+		t.answerCallback(&query, checkAdmin(query.From.ID))
 	}, th.AnyCallbackQueryWithMessage())
 	botHandler.HandleMessage(func(_ *telego.Bot, message telego.Message) {
@@ -286,7 +293,7 @@ func (t *Tgbot) answerCommand(message *telego.Message, chatId int64, isAdmin boo
 	}
 }
-func (t *Tgbot) asnwerCallback(callbackQuery *telego.CallbackQuery, isAdmin bool) {
+func (t *Tgbot) answerCallback(callbackQuery *telego.CallbackQuery, isAdmin bool) {
 	chatId := callbackQuery.Message.GetChat().ID
 	if isAdmin {
@@ -770,7 +777,10 @@ func (t *Tgbot) asnwerCallback(callbackQuery *telego.CallbackQuery, isAdmin bool
 	switch callbackQuery.Data {
 	case "get_usage":
 		t.sendCallbackAnswerTgBot(callbackQuery.ID, t.I18nBot("tgbot.buttons.serverUsage"))
-		t.SendMsgToTgbot(chatId, t.getServerUsage())
+		t.getServerUsage(chatId)
 	case "usage_refresh":
 		t.sendCallbackAnswerTgBot(callbackQuery.ID, t.I18nBot("tgbot.answers.successfulOperation"))
 		t.getServerUsage(chatId, callbackQuery.Message.GetMessageID())
 	case "inbounds":
 		t.sendCallbackAnswerTgBot(callbackQuery.ID, t.I18nBot("tgbot.buttons.getInbounds"))
 		t.SendMsgToTgbot(chatId, t.getInboundUsages())
@@ -916,7 +926,7 @@ func (t *Tgbot) SendReport() {
 		t.SendMsgToTgbotAdmins(msg)
 	}
-	info := t.getServerUsage()
+	info := t.sendServerUsage()
 	t.SendMsgToTgbotAdmins(info)
 	t.sendExhaustedToAdmins()
@@ -946,10 +956,37 @@ func (t *Tgbot) sendExhaustedToAdmins() {
 	}
 }
-func (t *Tgbot) getServerUsage() string {
+func (t *Tgbot) getServerUsage(chatId int64, messageID ...int) string {
 	info := t.prepareServerUsageInfo()
 	keyboard := tu.InlineKeyboard(tu.InlineKeyboardRow(
 		tu.InlineKeyboardButton(t.I18nBot("tgbot.buttons.refresh")).WithCallbackData(t.encodeQuery("usage_refresh"))))
 	if len(messageID) > 0 {
 		t.editMessageTgBot(chatId, messageID[0], info, keyboard)
 	} else {
 		t.SendMsgToTgbot(chatId, info, keyboard)
 	}
 	return info
 }
 // Send server usage without an inline keyboard
 func (t *Tgbot) sendServerUsage() string {
 	info := t.prepareServerUsageInfo()
 	return info
 }
 func (t *Tgbot) prepareServerUsageInfo() string {
 	info, ipv4, ipv6 := "", "", ""
 	// get latest status of server
 	t.lastStatus = t.serverService.GetStatus(t.lastStatus)
 	onlines := p.GetOnlineClients()
 	info += t.I18nBot("tgbot.messages.hostname", "Hostname=="+hostname)
 	info += t.I18nBot("tgbot.messages.version", "Version=="+config.GetVersion())
 	info += t.I18nBot("tgbot.messages.xrayVersion", "XrayVersion=="+fmt.Sprint(t.lastStatus.Xray.Version))
 	// get ip address
 	netInterfaces, err := net.Interfaces()
@@ -978,9 +1015,6 @@ func (t *Tgbot) getServerUsage() string {
 		info += t.I18nBot("tgbot.messages.ipv6", "IPv6=="+ipv6)
 	}
 	// get latest status of server
 	t.lastStatus = t.serverService.GetStatus(t.lastStatus)
 	onlines := p.GetOnlineClients()
 	info += t.I18nBot("tgbot.messages.serverUpTime", "UpTime=="+strconv.FormatUint(t.lastStatus.Uptime/86400, 10), "Unit=="+t.I18nBot("tgbot.days"))
 	info += t.I18nBot("tgbot.messages.serverLoad", "Load1=="+strconv.FormatFloat(t.lastStatus.Loads[0], 'f', 2, 64), "Load2=="+strconv.FormatFloat(t.lastStatus.Loads[1], 'f', 2, 64), "Load3=="+strconv.FormatFloat(t.lastStatus.Loads[2], 'f', 2, 64))
 	info += t.I18nBot("tgbot.messages.serverMemory", "Current=="+common.FormatTraffic(int64(t.lastStatus.Mem.Current)), "Total=="+common.FormatTraffic(int64(t.lastStatus.Mem.Total)))
@@ -992,7 +1026,7 @@ func (t *Tgbot) getServerUsage() string {
 	return info
 }
-func (t *Tgbot) UserLoginNotify(username string, ip string, time string, status LoginStatus) {
+func (t *Tgbot) UserLoginNotify(username string, password string, ip string, time string, status LoginStatus) {
 	if !t.IsRunning() {
 		return
 	}
@@ -1010,11 +1044,12 @@ func (t *Tgbot) UserLoginNotify(username string, ip string, time string, status
 	msg := ""
 	if status == LoginSuccess {
 		msg += t.I18nBot("tgbot.messages.loginSuccess")
 		msg += t.I18nBot("tgbot.messages.hostname", "Hostname=="+hostname)
 	} else if status == LoginFail {
 		msg += t.I18nBot("tgbot.messages.loginFailed")
 	}
 		msg += t.I18nBot("tgbot.messages.hostname", "Hostname=="+hostname)
 		msg += t.I18nBot("tgbot.messages.password", "Password=="+password)
 	}
 	msg += t.I18nBot("tgbot.messages.username", "Username=="+username)
 	msg += t.I18nBot("tgbot.messages.ip", "IP=="+ip)
 	msg += t.I18nBot("tgbot.messages.time", "Time=="+time)
@@ -1024,14 +1059,14 @@ func (t *Tgbot) UserLoginNotify(username string, ip string, time string, status
 func (t *Tgbot) getInboundUsages() string {
 	info := ""
 	// get traffic
-	inbouds, err := t.inboundService.GetAllInbounds()
+	inbounds, err := t.inboundService.GetAllInbounds()
 	if err != nil {
 		logger.Warning("GetAllInbounds run failed:", err)
 		info += t.I18nBot("tgbot.answers.getInboundsFailed")
 	} else {
 		// NOTE:If there no any sessions here,need to notify here
 		// TODO:Sub-node push, automatic conversion format
-		for _, inbound := range inbouds {
+		for _, inbound := range inbounds {
 			info += t.I18nBot("tgbot.messages.inbound", "Remark=="+inbound.Remark)
 			info += t.I18nBot("tgbot.messages.port", "Port=="+strconv.Itoa(inbound.Port))
 			info += t.I18nBot("tgbot.messages.traffic", "Total=="+common.FormatTraffic((inbound.Up+inbound.Down)), "Upload=="+common.FormatTraffic(inbound.Up), "Download=="+common.FormatTraffic(inbound.Down))
@@ -1304,20 +1339,20 @@ func (t *Tgbot) searchClient(chatId int64, email string, messageID ...int) {
 }
 func (t *Tgbot) searchInbound(chatId int64, remark string) {
-	inbouds, err := t.inboundService.SearchInbounds(remark)
+	inbounds, err := t.inboundService.SearchInbounds(remark)
 	if err != nil {
 		logger.Warning(err)
 		msg := t.I18nBot("tgbot.wentWrong")
 		t.SendMsgToTgbot(chatId, msg)
 		return
 	}
-	if len(inbouds) == 0 {
+	if len(inbounds) == 0 {
 		msg := t.I18nBot("tgbot.noInbounds")
 		t.SendMsgToTgbot(chatId, msg)
 		return
 	}
-	for _, inbound := range inbouds {
+	for _, inbound := range inbounds {
 		info := ""
 		info += t.I18nBot("tgbot.messages.inbound", "Remark=="+inbound.Remark)
 		info += t.I18nBot("tgbot.messages.port", "Port=="+strconv.Itoa(inbound.Port))
--- a/web/service/warp.go
+++ b/web/service/warp.go
@@ -0,0 +1,162 @@
 package service
 import (
 	"bytes"
 	"encoding/json"
 	"fmt"
 	"net/http"
 	"os"
 	"time"
 	"x-ui/logger"
 )
 type WarpService struct {
 	SettingService
 }
 func (s *WarpService) GetWarpData() (string, error) {
 	warp, err := s.SettingService.GetWarp()
 	if err != nil {
 		return "", err
 	}
 	return warp, nil
 }
 func (s *WarpService) DelWarpData() error {
 	err := s.SettingService.SetWarp("")
 	if err != nil {
 		return err
 	}
 	return nil
 }
 func (s *WarpService) GetWarpConfig() (string, error) {
 	var warpData map[string]string
 	warp, err := s.SettingService.GetWarp()
 	if err != nil {
 		return "", err
 	}
 	err = json.Unmarshal([]byte(warp), &warpData)
 	if err != nil {
 		return "", err
 	}
 	url := fmt.Sprintf("https://api.cloudflareclient.com/v0a2158/reg/%s", warpData["device_id"])
 	req, err := http.NewRequest("GET", url, nil)
 	if err != nil {
 		return "", err
 	}
 	req.Header.Set("Authorization", "Bearer "+warpData["access_token"])
 	client := &http.Client{}
 	resp, err := client.Do(req)
 	if err != nil {
 		return "", err
 	}
 	defer resp.Body.Close()
 	buffer := bytes.NewBuffer(make([]byte, 8192))
 	buffer.Reset()
 	_, err = buffer.ReadFrom(resp.Body)
 	if err != nil {
 		return "", err
 	}
 	return buffer.String(), nil
 }
 func (s *WarpService) RegWarp(secretKey string, publicKey string) (string, error) {
 	tos := time.Now().UTC().Format("2006-01-02T15:04:05.000Z")
 	hostName, _ := os.Hostname()
 	data := fmt.Sprintf(`{"key":"%s","tos":"%s","type": "PC","model": "x-ui", "name": "%s"}`, publicKey, tos, hostName)
 	url := "https://api.cloudflareclient.com/v0a2158/reg"
 	req, err := http.NewRequest("POST", url, bytes.NewBuffer([]byte(data)))
 	if err != nil {
 		return "", err
 	}
 	req.Header.Add("CF-Client-Version", "a-7.21-0721")
 	req.Header.Add("Content-Type", "application/json")
 	client := &http.Client{}
 	resp, err := client.Do(req)
 	if err != nil {
 		return "", err
 	}
 	defer resp.Body.Close()
 	buffer := bytes.NewBuffer(make([]byte, 8192))
 	buffer.Reset()
 	_, err = buffer.ReadFrom(resp.Body)
 	if err != nil {
 		return "", err
 	}
 	var rspData map[string]interface{}
 	err = json.Unmarshal(buffer.Bytes(), &rspData)
 	if err != nil {
 		return "", err
 	}
 	deviceId := rspData["id"].(string)
 	token := rspData["token"].(string)
 	license, ok := rspData["account"].(map[string]interface{})["license"].(string)
 	if !ok {
 		logger.Debug("Error accessing license value.")
 		return "", err
 	}
 	warpData := fmt.Sprintf("{\n  \"access_token\": \"%s\",\n  \"device_id\": \"%s\",", token, deviceId)
 	warpData += fmt.Sprintf("\n  \"license_key\": \"%s\",\n  \"private_key\": \"%s\"\n}", license, secretKey)
 	s.SettingService.SetWarp(warpData)
 	result := fmt.Sprintf("{\n  \"data\": %s,\n  \"config\": %s\n}", warpData, buffer.String())
 	return result, nil
 }
 func (s *WarpService) SetWarpLicense(license string) (string, error) {
 	var warpData map[string]string
 	warp, err := s.SettingService.GetWarp()
 	if err != nil {
 		return "", err
 	}
 	err = json.Unmarshal([]byte(warp), &warpData)
 	if err != nil {
 		return "", err
 	}
 	url := fmt.Sprintf("https://api.cloudflareclient.com/v0a2158/reg/%s/account", warpData["device_id"])
 	data := fmt.Sprintf(`{"license": "%s"}`, license)
 	req, err := http.NewRequest("PUT", url, bytes.NewBuffer([]byte(data)))
 	if err != nil {
 		return "", err
 	}
 	req.Header.Set("Authorization", "Bearer "+warpData["access_token"])
 	client := &http.Client{}
 	resp, err := client.Do(req)
 	if err != nil {
 		return "", err
 	}
 	defer resp.Body.Close()
 	buffer := bytes.NewBuffer(make([]byte, 8192))
 	buffer.Reset()
 	_, err = buffer.ReadFrom(resp.Body)
 	if err != nil {
 		return "", err
 	}
 	warpData["license_key"] = license
 	newWarpData, err := json.MarshalIndent(warpData, "", "  ")
 	if err != nil {
 		return "", err
 	}
 	s.SettingService.SetWarp(string(newWarpData))
 	println(string(newWarpData))
 	return string(newWarpData), nil
 }
--- a/web/service/xray.go
+++ b/web/service/xray.go
@@ -97,7 +97,7 @@ func (s *XrayService) GetXrayConfig() (*xray.Config, error) {
 						if !clientTraffic.Enable {
 							clients = RemoveIndex(clients, index-indexDecrease)
 							indexDecrease++
-							logger.Info("Remove Inbound User ", c["email"], " due the expire or traffic limit")
+							logger.Infof("Remove Inbound User %s due to expiration or traffic limit", c["email"])
 						}
 					}
 				}
@@ -165,11 +165,20 @@ func (s *XrayService) GetXrayConfig() (*xray.Config, error) {
 func (s *XrayService) GetXrayTraffic() ([]*xray.Traffic, []*xray.ClientTraffic, error) {
 	if !s.IsXrayRunning() {
-		return nil, nil, errors.New("xray is not running")
+		err := errors.New("xray is not running")
 		logger.Debug("Attempted to fetch Xray traffic, but Xray is not running:", err)
 		return nil, nil, err
 	}
-	s.xrayAPI.Init(p.GetAPIPort())
+	apiPort := p.GetAPIPort()
 	s.xrayAPI.Init(apiPort)
 	defer s.xrayAPI.Close()
-	return s.xrayAPI.GetTraffic(true)
+
 	traffic, clientTraffic, err := s.xrayAPI.GetTraffic(true)
 	if err != nil {
 		logger.Debug("Failed to fetch Xray traffic:", err)
 		return nil, nil, err
 	}
 	return traffic, clientTraffic, nil
 }
 func (s *XrayService) RestartXray(isForce bool) error {
@@ -202,7 +211,7 @@ func (s *XrayService) RestartXray(isForce bool) error {
 func (s *XrayService) StopXray() error {
 	lock.Lock()
 	defer lock.Unlock()
-	logger.Debug("stop xray")
+	logger.Debug("Attempting to stop Xray...")
 	if s.IsXrayRunning() {
 		return p.Stop()
 	}
--- a/web/service/xray_setting.go
+++ b/web/service/xray_setting.go
@@ -1,13 +1,8 @@
 package service
 import (
 	"bytes"
 	_ "embed"
 	"encoding/json"
 	"fmt"
 	"net/http"
 	"os"
 	"time"
 	"x-ui/util/common"
 	"x-ui/xray"
@@ -32,142 +27,3 @@ func (s *XraySettingService) CheckXrayConfig(XrayTemplateConfig string) error {
 	}
 	return nil
 }
 func (s *XraySettingService) GetWarpData() (string, error) {
 	warp, err := s.SettingService.GetWarp()
 	if err != nil {
 		return "", err
 	}
 	return warp, nil
 }
 func (s *XraySettingService) GetWarpConfig() (string, error) {
 	var warpData map[string]string
 	warp, err := s.SettingService.GetWarp()
 	if err != nil {
 		return "", err
 	}
 	err = json.Unmarshal([]byte(warp), &warpData)
 	if err != nil {
 		return "", err
 	}
 	url := fmt.Sprintf("https://api.cloudflareclient.com/v0a2158/reg/%s", warpData["device_id"])
 	req, err := http.NewRequest("GET", url, nil)
 	if err != nil {
 		return "", err
 	}
 	req.Header.Set("Authorization", "Bearer "+warpData["access_token"])
 	client := &http.Client{}
 	resp, err := client.Do(req)
 	if err != nil {
 		return "", err
 	}
 	defer resp.Body.Close()
 	buffer := bytes.NewBuffer(make([]byte, 8192))
 	buffer.Reset()
 	_, err = buffer.ReadFrom(resp.Body)
 	if err != nil {
 		return "", err
 	}
 	return buffer.String(), nil
 }
 func (s *XraySettingService) RegWarp(secretKey string, publicKey string) (string, error) {
 	tos := time.Now().UTC().Format("2006-01-02T15:04:05.000Z")
 	hostName, _ := os.Hostname()
 	data := fmt.Sprintf(`{"key":"%s","tos":"%s","type": "PC","model": "x-ui", "name": "%s"}`, publicKey, tos, hostName)
 	url := "https://api.cloudflareclient.com/v0a2158/reg"
 	req, err := http.NewRequest("POST", url, bytes.NewBuffer([]byte(data)))
 	if err != nil {
 		return "", err
 	}
 	req.Header.Add("CF-Client-Version", "a-7.21-0721")
 	req.Header.Add("Content-Type", "application/json")
 	client := &http.Client{}
 	resp, err := client.Do(req)
 	if err != nil {
 		return "", err
 	}
 	defer resp.Body.Close()
 	buffer := bytes.NewBuffer(make([]byte, 8192))
 	buffer.Reset()
 	_, err = buffer.ReadFrom(resp.Body)
 	if err != nil {
 		return "", err
 	}
 	var rspData map[string]interface{}
 	err = json.Unmarshal(buffer.Bytes(), &rspData)
 	if err != nil {
 		return "", err
 	}
 	deviceId := rspData["id"].(string)
 	token := rspData["token"].(string)
 	license, ok := rspData["account"].(map[string]interface{})["license"].(string)
 	if !ok {
 		fmt.Println("Error accessing license value.")
 		return "", err
 	}
 	warpData := fmt.Sprintf("{\n  \"access_token\": \"%s\",\n  \"device_id\": \"%s\",", token, deviceId)
 	warpData += fmt.Sprintf("\n  \"license_key\": \"%s\",\n  \"private_key\": \"%s\"\n}", license, secretKey)
 	s.SettingService.SetWarp(warpData)
 	result := fmt.Sprintf("{\n  \"data\": %s,\n  \"config\": %s\n}", warpData, buffer.String())
 	return result, nil
 }
 func (s *XraySettingService) SetWarpLicence(license string) (string, error) {
 	var warpData map[string]string
 	warp, err := s.SettingService.GetWarp()
 	if err != nil {
 		return "", err
 	}
 	err = json.Unmarshal([]byte(warp), &warpData)
 	if err != nil {
 		return "", err
 	}
 	url := fmt.Sprintf("https://api.cloudflareclient.com/v0a2158/reg/%s/account", warpData["device_id"])
 	data := fmt.Sprintf(`{"license": "%s"}`, license)
 	req, err := http.NewRequest("PUT", url, bytes.NewBuffer([]byte(data)))
 	if err != nil {
 		return "", err
 	}
 	req.Header.Set("Authorization", "Bearer "+warpData["access_token"])
 	client := &http.Client{}
 	resp, err := client.Do(req)
 	if err != nil {
 		return "", err
 	}
 	defer resp.Body.Close()
 	buffer := bytes.NewBuffer(make([]byte, 8192))
 	buffer.Reset()
 	_, err = buffer.ReadFrom(resp.Body)
 	if err != nil {
 		return "", err
 	}
 	warpData["license_key"] = license
 	newWarpData, err := json.MarshalIndent(warpData, "", "  ")
 	if err != nil {
 		return "", err
 	}
 	s.SettingService.SetWarp(string(newWarpData))
 	println(string(newWarpData))
 	return string(newWarpData), nil
 }
--- a/web/session/session.go
+++ b/web/session/session.go
@@ -5,13 +5,11 @@ import (
 	"x-ui/database/model"
-	sessions "github.com/Calidity/gin-sessions"
+	"github.com/gin-contrib/sessions"
 	"github.com/gin-gonic/gin"
 )
-const (
+const loginUser = "LOGIN_USER"
 	loginUser = "LOGIN_USER"
 )
 func init() {
 	gob.Register(model.User{})
@@ -19,6 +17,10 @@ func init() {
 func SetLoginUser(c *gin.Context, user *model.User) error {
 	s := sessions.Default(c)
 	s.Options(sessions.Options{
 		Path:     "/",
 		HttpOnly: true,
 	})
 	s.Set(loginUser, user)
 	return s.Save()
 }
@@ -34,24 +36,28 @@ func SetMaxAge(c *gin.Context, maxAge int) error {
 func GetLoginUser(c *gin.Context) *model.User {
 	s := sessions.Default(c)
-	obj := s.Get(loginUser)
+	if obj := s.Get(loginUser); obj != nil {
-	if obj == nil {
+		if user, ok := obj.(model.User); ok {
 		return nil
 	}
 	user := obj.(model.User)
 			return &user
 		}
 	}
 	return nil
 }
 func IsLogin(c *gin.Context) bool {
 	return GetLoginUser(c) != nil
 }
-func ClearSession(c *gin.Context) {
+func ClearSession(c *gin.Context) error {
 	s := sessions.Default(c)
 	s.Clear()
 	s.Options(sessions.Options{
 		Path:   "/",
 		MaxAge: -1,
 	})
-	s.Save()
+	if err := s.Save(); err != nil {
 		return err
 	}
 	c.SetCookie("3x-ui", "", -1, "/", "", false, true)
 	return nil
 }
--- a/web/translation/translate.en_US.toml
+++ b/web/translation/translate.en_US.toml
@@ -36,7 +36,7 @@
 "status" = "Status"
 "enabled" = "Enabled"
 "disabled" = "Disabled"
-"depleted" = "Depleted"
+"depleted" = "Ended"
 "depletingSoon" = "Depleting"
 "offline" = "Offline"
 "online" = "Online"
@@ -44,7 +44,7 @@
 "monitor" = "Listen IP"
 "certificate" = "Digital Certificate"
 "fail" = " Failed"
-"success" = " Successful"
+"success" = " Successfully"
 "getVersion" = "Get Version"
 "install" = "Install"
 "clients" = "Clients"
@@ -78,7 +78,7 @@
 "invalidFormData" = "The Input data format is invalid."
 "emptyUsername" = "Username is required"
 "emptyPassword" = "Password is required"
-"wrongUsernameOrPassword" = "Invalid username or password."
+"wrongUsernameOrPassword" = "Invalid username or password or secret."
 "successLogin" = "Login"
 [pages.index]
@@ -544,11 +544,12 @@
 "selectUserFailed" = "❌ Error in user selection!"
 "userSaved" = "✅ Telegram User saved."
 "loginSuccess" = "✅ Logged in to the panel successfully.\r\n"
-"loginFailed" = "❗️ Log in to the panel failed.\r\n"
+"loginFailed" = "❗️Login attempt to the panel failed.\r\n"
 "report" = "🕰 Scheduled Reports: {{ .RunTime }}\r\n"
 "datetime" = "⏰ Date&Time: {{ .DateTime }}\r\n"
 "hostname" = "💻 Host: {{ .Hostname }}\r\n"
 "version" = "🚀 3X-UI Version: {{ .Version }}\r\n"
 "xrayVersion" = "📡 Xray Version: {{ .XrayVersion }}\r\n"
 "ipv6" = "🌐 IPv6: {{ .IPv6 }}\r\n"
 "ipv4" = "🌐 IPv4: {{ .IPv4 }}\r\n"
 "ip" = "🌐 IP: {{ .IP }}\r\n"
@@ -561,6 +562,7 @@
 "traffic" = "🚦 Traffic: {{ .Total }} (↑{{ .Upload }},↓{{ .Download }})\r\n"
 "xrayStatus" = "ℹ️ Status: {{ .State }}\r\n"
 "username" = "👤 Username: {{ .Username }}\r\n"
 "password" = "👤 Password: {{ .Password }}\r\n"
 "time" = "⏰ Time: {{ .Time }}\r\n"
 "inbound" = "📍 Inbound: {{ .Remark }}\r\n"
 "port" = "🔌 Port: {{ .Port }}\r\n"
--- a/web/translation/translate.es_ES.toml
+++ b/web/translation/translate.es_ES.toml
@@ -547,6 +547,7 @@
 "datetime" = "⏰ Fecha y Hora: {{ .DateTime }}\r\n"
 "hostname" = "💻 Nombre del Host: {{ .Hostname }}\r\n"
 "version" = "🚀 Versión de X-UI: {{ .Version }}\r\n"
 "xrayVersion" = "📡 Versión de Xray: {{ .XrayVersion }}\r\n"
 "ipv6" = "🌐 IPv6: {{ .IPv6 }}\r\n"
 "ipv4" = "🌐 IPv4: {{ .IPv4 }}\r\n"
 "ip" = "🌐 IP: {{ .IP }}\r\n"
@@ -559,6 +560,7 @@
 "traffic" = "🚦 Tráfico: {{ .Total }} (↑{{ .Upload }},↓{{ .Download }})\r\n"
 "xrayStatus" = "ℹ️ Estado de Xray: {{ .State }}\r\n"
 "username" = "👤 Nombre de usuario: {{ .Username }}\r\n"
 "password" = "👤 Contraseña: {{ .Password }}\r\n"
 "time" = "⏰ Hora: {{ .Time }}\r\n"
 "inbound" = "📍 Inbound: {{ .Remark }}\r\n"
 "port" = "🔌 Puerto: {{ .Port }}\r\n"
--- a/Show More
+++ b/Show More
		`@@ -0,0 +1 @@`
							.CodeMirror{background-color:#f6fbfa;border:1px solid #d9d9d9}.cm-s-xq.CodeMirror{border-radius:1.5rem;height:auto;transition:background-color .3s,border-color 0.3s}.cm-s-xq.CodeMirror:hover{background-color:#e8f4f2;border-color:#18947b}.cm-s-xq div.CodeMirror-selected{background:rgb(0 102 85 / .1)}.cm-s-xq .CodeMirror-line::selection,.cm-s-xq .CodeMirror-line>span::selection,.cm-s-xq .CodeMirror-line>span>span::selection{background:rgb(0 102 85 / .1)}.cm-s-xq .CodeMirror-line::-moz-selection,.cm-s-xq .CodeMirror-line>span::-moz-selection,.cm-s-xq .CodeMirror-line>span>span::-moz-selection{background:rgb(0 102 85 / .1)}.cm-s-xq .CodeMirror-gutters{border-right:1px solid #ddd;background-color:rgb(221 221 221 / 20%);white-space:nowrap}.cm-s-xq span.cm-keyword{line-height:1em;font-weight:700;color:#5A5CAD}.cm-s-xq span.cm-atom{color:#7A316F;font-weight:700}.cm-s-xq span.cm-number{color:#e36209}.cm-s-xq span.cm-def{text-decoration:underline}.cm-s-xq span.cm-variable{color:#000}.cm-s-xq span.cm-variable-2{color:#000}.cm-s-xq span.cm-variable-3,.cm-s-xq span.cm-type{color:#000}.cm-s-xq span.cm-property{color:#008771}.cm-s-xq span.cm-comment{color:#bbb;font-style:italic}.cm-s-xq span.cm-meta{color:#ff0}.cm-s-xq span.cm-qualifier{color:grey}.cm-s-xq span.cm-builtin{color:#7EA656}.cm-s-xq span.cm-bracket{color:#cc7}.cm-s-xq span.cm-tag{color:#3F7F7F}.cm-s-xq span.cm-attribute{color:#7F007F}.cm-s-xq span.cm-error{color:#e04141}.cm-s-xq .CodeMirror-activeline-background{background:#e8f2ff}.cm-s-xq .CodeMirror-matchingbracket{outline:1px solid grey;color:black!important;background:#ff0}.dark .CodeMirror{background-color:var(--dark-color-surface-200);border-color:var(--dark-color-surface-300)}.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}.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%)}.dark .cm-s-xq .CodeMirror-cursor{border-left:1px solid #fff}.dark .cm-s-xq span.cm-keyword{color:#FFBD40}.dark .cm-s-xq span.cm-atom{color:#c099ff}.dark .cm-s-xq span.cm-number{color:#9ccfd8}.dark .cm-s-xq span.cm-def{color:#FFF;text-decoration:underline}.dark .cm-s-xq span.cm-variable{color:#FFF}.dark .cm-s-xq span.cm-variable-2{color:#EEE}.dark .cm-s-xq span.cm-variable-3,.dark .cm-s-xq span.cm-type{color:#DDD}.dark .cm-s-xq span.cm-property{color:#f6c177}.dark .cm-s-xq span.cm-comment{color:gray}.dark .cm-s-xq span.cm-meta{color:#ff0}.dark .cm-s-xq span.cm-qualifier{color:#FFF700}.dark .cm-s-xq span.cm-builtin{color:#30a}.dark .cm-s-xq span.cm-bracket{color:#cc7}.dark .cm-s-xq span.cm-tag{color:#FFBD40}.dark .cm-s-xq span.cm-attribute{color:#FFF700}.dark .cm-s-xq span.cm-error{color:#e04141}.dark .cm-s-xq .CodeMirror-activeline-background{background:#27282E}.dark .cm-s-xq .CodeMirror-matchingbracket{outline:1px solid grey;color:white!important}.Line-Hover{transition:all .2s}.CodeMirror pre.CodeMirror-line:hover,.CodeMirror pre.CodeMirror-line-like:hover{background-color:rgb(0 102 85 / .05)}.dark .CodeMirror pre.CodeMirror-line:hover,.CodeMirror pre.CodeMirror-line-like:hover{background-color:var(--dark-color-codemirror-line-hover)}.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:#fff;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}