v1.7.2

x86 Arch Support

.github/workflows/docker.yml

@@ -50,6 +50,6 @@ jobs:
       with:
         context: .
         push: true
-        platforms: linux/amd64,linux/arm64/v8
+        platforms: linux/amd64,linux/arm64/v8, linux/arm/v7, linux/386
         tags: ${{ steps.meta.outputs.tags }}
         labels: ${{ steps.meta.outputs.labels }}

.github/workflows/release.yml

@@ -1,4 +1,5 @@
-name: Release X-ui
+name: Release X-UI
+
 on:
   push:
     tags:
@@ -6,127 +7,96 @@ on:
   workflow_dispatch:
 
 jobs:
-  linuxamd64build:
+  build:
-    name: build x-ui amd64 version
+    strategy:
+      matrix:
+        platform:
+          - amd64
+          - arm64
+          - armv7
+          - 386
     runs-on: ubuntu-20.04
     steps:
-      - uses: actions/checkout@v4
+      - name: Checkout repository
-      - name: Set up Go
+        uses: actions/checkout@v4.1.1
-        uses: actions/setup-go@v5
+
+      - name: Setup Go
+        uses: actions/setup-go@v5.0.0
         with:
-          go-version: '1.21'
+          go-version: '1.22'
-      - name: build linux amd64 version
+
-        run: |
+      - name: Install dependencies
-          CGO_ENABLED=1 GOOS=linux GOARCH=amd64 go build -o xui-release -v main.go
-          mkdir x-ui
-          cp xui-release x-ui/xui-release
-          cp x-ui.service x-ui/x-ui.service
-          cp x-ui.sh x-ui/x-ui.sh
-          cd x-ui
-          mv xui-release x-ui
-          mkdir bin
-          cd bin
-          wget https://github.com/XTLS/Xray-core/releases/download/v1.8.6/Xray-linux-64.zip
-          unzip Xray-linux-64.zip
-          rm -f Xray-linux-64.zip geoip.dat geosite.dat LICENSE README.md
-          wget https://github.com/Loyalsoldier/v2ray-rules-dat/releases/latest/download/geoip.dat
-          wget https://github.com/Loyalsoldier/v2ray-rules-dat/releases/latest/download/geosite.dat
-          wget -O geoip_IR.dat https://github.com/chocolate4u/Iran-v2ray-rules/releases/latest/download/geoip.dat
-          wget -O geosite_IR.dat https://github.com/chocolate4u/Iran-v2ray-rules/releases/latest/download/geosite.dat
-          mv xray xray-linux-amd64
-          cd ..
-          cd ..
-      - name: package
-        run: tar -zcvf x-ui-linux-amd64.tar.gz x-ui
-      - name: upload
-        uses: svenstaro/upload-release-action@2.7.0
-        with:
-          repo_token: ${{ secrets.GITHUB_TOKEN }}
-          tag: ${{ github.ref }}
-          file: x-ui-linux-amd64.tar.gz
-          asset_name: x-ui-linux-amd64.tar.gz
-          prerelease: true
-  linuxarm64build:
-    name: build x-ui arm64 version
-    runs-on: ubuntu-20.04
-    steps:
-      - uses: actions/checkout@v4
-      - name: Set up Go
-        uses: actions/setup-go@v5
-        with:
-          go-version: '1.21'
-      - name: build linux arm64 version
         run: |
           sudo apt-get update
-          sudo apt install gcc-aarch64-linux-gnu
+          if [ "${{ matrix.platform }}" == "arm64" ]; then
-          CGO_ENABLED=1 GOOS=linux GOARCH=arm64 CC=aarch64-linux-gnu-gcc go build -o xui-release -v main.go
+            sudo apt install gcc-aarch64-linux-gnu
-          mkdir x-ui
+          elif [ "${{ matrix.platform }}" == "armv7" ]; then
-          cp xui-release x-ui/xui-release
+            sudo apt install gcc-arm-linux-gnueabihf
-          cp x-ui.service x-ui/x-ui.service
+          elif [ "${{ matrix.platform }}" == "386" ]; then
-          cp x-ui.sh x-ui/x-ui.sh
+            sudo apt install gcc-i686-linux-gnu
-          cd x-ui
+          fi
-          mv xui-release x-ui
+
-          mkdir bin
+      - name: Build x-ui
-          cd bin
-          wget https://github.com/xtls/xray-core/releases/download/v1.8.6/Xray-linux-arm64-v8a.zip
-          unzip Xray-linux-arm64-v8a.zip
-          rm -f Xray-linux-arm64-v8a.zip geoip.dat geosite.dat LICENSE README.md
-          wget https://github.com/Loyalsoldier/v2ray-rules-dat/releases/latest/download/geoip.dat
-          wget https://github.com/Loyalsoldier/v2ray-rules-dat/releases/latest/download/geosite.dat
-          wget -O geoip_IR.dat https://github.com/chocolate4u/Iran-v2ray-rules/releases/latest/download/geoip.dat
-          wget -O geosite_IR.dat https://github.com/chocolate4u/Iran-v2ray-rules/releases/latest/download/geosite.dat
-          mv xray xray-linux-arm64
-          cd ..
-          cd ..
-      - name: package
-        run: tar -zcvf x-ui-linux-arm64.tar.gz x-ui
-      - name: upload
-        uses: svenstaro/upload-release-action@2.7.0
-        with:
-          repo_token: ${{ secrets.GITHUB_TOKEN }}
-          tag: ${{ github.ref }}
-          file: x-ui-linux-arm64.tar.gz
-          asset_name: x-ui-linux-arm64.tar.gz
-          prerelease: true
-  linuxs390xbuild:
-    name: build x-ui s390x version
-    runs-on: ubuntu-20.04
-    steps:
-      - uses: actions/checkout@v4
-      - name: Set up Go
-        uses: actions/setup-go@v5
-        with:
-          go-version: '1.21'
-      - name: build linux s390x version
         run: |
-          sudo apt-get update
+          export CGO_ENABLED=1
-          sudo apt install gcc-s390x-linux-gnu -y
+          export GOOS=linux
-          CGO_ENABLED=1 GOOS=linux GOARCH=s390x CC=s390x-linux-gnu-gcc go build -o xui-release -v main.go
+          export GOARCH=${{ matrix.platform }}
+          if [ "${{ matrix.platform }}" == "arm64" ]; then
+            export GOARCH=arm64
+            export CC=aarch64-linux-gnu-gcc
+          elif [ "${{ matrix.platform }}" == "armv7" ]; then
+            export GOARCH=arm
+            export GOARM=7
+            export CC=arm-linux-gnueabihf-gcc
+          elif [ "${{ matrix.platform }}" == "386" ]; then
+            export GOARCH=386
+            export CC=i686-linux-gnu-gcc
+          fi
+          go build -o xui-release -v main.go
+          
           mkdir x-ui
-          cp xui-release x-ui/xui-release
+          cp xui-release x-ui/
-          cp x-ui.service x-ui/x-ui.service
+          cp x-ui.service x-ui/
-          cp x-ui.sh x-ui/x-ui.sh
+          cp x-ui.sh x-ui/
-          cd x-ui
+          mv x-ui/xui-release x-ui/x-ui
-          mv xui-release x-ui
+          mkdir x-ui/bin
-          mkdir bin
+          cd x-ui/bin
-          cd bin
+          
-          wget https://github.com/xtls/xray-core/releases/download/v1.8.6/Xray-linux-s390x.zip
+          # Download dependencies
-          unzip Xray-linux-s390x.zip
+          Xray_URL="https://github.com/XTLS/Xray-core/releases/download/v1.8.7/"
-          rm -f Xray-linux-s390x.zip geoip.dat geosite.dat LICENSE README.md
+          if [ "${{ matrix.platform }}" == "amd64" ]; then
+            wget ${Xray_URL}Xray-linux-64.zip
+            unzip Xray-linux-64.zip
+            rm -f Xray-linux-64.zip
+          elif [ "${{ matrix.platform }}" == "arm64" ]; then
+            wget ${Xray_URL}Xray-linux-arm64-v8a.zip
+            unzip Xray-linux-arm64-v8a.zip
+            rm -f Xray-linux-arm64-v8a.zip
+          elif [ "${{ matrix.platform }}" == "armv7" ]; then
+            wget ${Xray_URL}Xray-linux-arm32-v7a.zip
+            unzip Xray-linux-arm32-v7a.zip
+            rm -f Xray-linux-arm32-v7a.zip
+          elif [ "${{ matrix.platform }}" == "386" ]; then
+            wget ${Xray_URL}Xray-linux-32.zip
+            unzip Xray-linux-32.zip
+            rm -f Xray-linux-32.zip
+          fi
+          rm -f geoip.dat geosite.dat
           wget https://github.com/Loyalsoldier/v2ray-rules-dat/releases/latest/download/geoip.dat
           wget https://github.com/Loyalsoldier/v2ray-rules-dat/releases/latest/download/geosite.dat
           wget -O geoip_IR.dat https://github.com/chocolate4u/Iran-v2ray-rules/releases/latest/download/geoip.dat
           wget -O geosite_IR.dat https://github.com/chocolate4u/Iran-v2ray-rules/releases/latest/download/geosite.dat
-          mv xray xray-linux-s390x
+          mv xray xray-linux-${{ matrix.platform }}
-          cd ..
+          cd ../..
-          cd ..
+          
-      - name: package
+      - name: Package
-        run: tar -zcvf x-ui-linux-s390x.tar.gz x-ui
+        run: tar -zcvf x-ui-linux-${{ matrix.platform }}.tar.gz x-ui
-      - name: upload
+        
-        uses: svenstaro/upload-release-action@2.7.0
+      - name: Upload files to GH release
+        uses: MHSanaei/upload-release-action@2.8.0
         with:
           repo_token: ${{ secrets.GITHUB_TOKEN }}
           tag: ${{ github.ref }}
-          file: x-ui-linux-s390x.tar.gz
+          file: x-ui-linux-${{ matrix.platform }}.tar.gz
-          asset_name: x-ui-linux-s390x.tar.gz
+          asset_name: x-ui-linux-${{ matrix.platform }}.tar.gz
           prerelease: true

DockerInitFiles.sh

@@ -1,17 +1,29 @@
 #!/bin/sh
-if [ $1 == "amd64" ]; then
+case $1 in
-    ARCH="64";
+    amd64)
-    FNAME="amd64";
+        ARCH="64"
-elif [ $1 == "arm64" ]; then
+        FNAME="amd64"
-    ARCH="arm64-v8a"
+        ;;
-    FNAME="arm64";
+    i386)
-else
+        ARCH="32"
-    ARCH="64";
+        FNAME="i386"
-    FNAME="amd64";
+        ;;
-fi
+    armv8 | arm64 | aarch64)
+        ARCH="arm64-v8a"
+        FNAME="arm64"
+        ;;
+    armv7 | arm | arm32)
+        ARCH="arm32-v7a"
+        FNAME="arm32"
+        ;;
+    *)
+        ARCH="64"
+        FNAME="amd64"
+        ;;
+esac
 mkdir -p build/bin
 cd build/bin
-wget "https://github.com/XTLS/Xray-core/releases/download/v1.8.6/Xray-linux-${ARCH}.zip"
+wget "https://github.com/XTLS/Xray-core/releases/download/v1.8.7/Xray-linux-${ARCH}.zip"
 unzip "Xray-linux-${ARCH}.zip"
 rm -f "Xray-linux-${ARCH}.zip" geoip.dat geosite.dat LICENSE README.md
 mv xray "xray-linux-${FNAME}"

Dockerfile

@@ -1,9 +1,11 @@
-FROM golang:1.21-alpine AS builder
+FROM golang:1.22-alpine AS builder
 WORKDIR /app
 ARG TARGETARCH 
 RUN apk --no-cache --update add build-base gcc wget unzip
 COPY . .
-RUN env CGO_ENABLED=1 go build -o build/x-ui main.go
+ENV CGO_ENABLED=1
+ENV CGO_CFLAGS="-D_LARGEFILE64_SOURCE"
+RUN go build -o build/x-ui main.go
 RUN ./DockerInitFiles.sh "$TARGETARCH"
 
 FROM alpine

README.md

@@ -1,5 +1,5 @@
 # X-UI
-**Advanced GUI panel based on Xray Core supports multiple protocols and languages**
+**An Advanced Web Panel • Built on Xray Core**
 
 ![](https://img.shields.io/github/v/release/alireza0/x-ui.svg)
 ![](https://img.shields.io/docker/pulls/alireza7/x-ui.svg)
@@ -7,32 +7,30 @@
 [![Downloads](https://img.shields.io/github/downloads/alireza0/x-ui/total.svg)](https://img.shields.io/github/downloads/alireza0/x-ui/total.svg)
 [![License](https://img.shields.io/badge/license-GPL%20V3-blue.svg?longCache=true)](https://www.gnu.org/licenses/gpl-3.0.en.html)
 
-> **Disclaimer: This project is only for personal learning and communication, please do not use it for illegal purposes, please do not use it in a production environment**
+> **Disclaimer:** This project is only for personal learning and communication, please do not use it for illegal purposes, please do not use it in a production environment
 
+**If you think this project is helpful to you, you may wish to give a**:star2:
 
-**If you think this project is helpful to you, you may wish to give a** :star2:
+<img width="125" alt="image"
+src="https://github.com/alireza0/x-ui/assets/115543613/dd4f10dd-8bb0-40cf-846f-1fe1de7a6275">
 
-**Buy Me a Coffee :**
+- USDT (TRC20): `TYTq73Gj6dJ67qe58JVPD9zpjW2cc9XgVz`
-
-- USDT Tron (TRC20): `TYTq73Gj6dJ67qe58JVPD9zpjW2cc9XgVz`
 - Tezos (XTZ):
 `tz2Wnh2SsY1eezXrcLChu6idWpgdHzUFQcts`
 
 
-## Quick Look
+## Quick Overview
 | Features                               |      Enable?       |
 | -------------------------------------- | :----------------: |
 | Multi-Protocol                         | :heavy_check_mark: |
 | Multi-Language                         | :heavy_check_mark: |
-| Multi-User Inbounds                    | :heavy_check_mark: |
+| Multi-Client/Inbound                   | :heavy_check_mark: |
-| Advanced Traffic Routing               | :heavy_check_mark: |
+| Advanced Traffic Routing Interface     | :heavy_check_mark: |
+| Client & Traffic & System Status       | :heavy_check_mark: |
+| Date & Traffic Cap Based on First Use  | :heavy_check_mark: |
 | REST API                               | :heavy_check_mark: |
-|Show Online Users                       | :heavy_check_mark: |
+| TG Bot (DB backup + admin + client)    | :heavy_check_mark: |
-| Manage Users Traffic Data & Expiry Date| :heavy_check_mark: |
+| Subscription Service (link + info)     | :heavy_check_mark: |
-| Apply Expiry Date based on First Usage | :heavy_check_mark: |
-| Telegram Bot (admin + clients)         | :heavy_check_mark: |
-| Database Backup using Telegram Bot     | :heavy_check_mark: |
-| Subscription Link + UserInfo           | :heavy_check_mark: |
 | Search in Deep                         | :heavy_check_mark: |
 | Dark/Light Theme                       | :heavy_check_mark: |
 
@@ -45,22 +43,45 @@ bash <(curl -Ls https://raw.githubusercontent.com/alireza0/x-ui/master/install.s
 
 ## Install Custom Version
 
-To install your desired version you can add the version to the end of install command. Example for ver `0.5.2`:
+**Step 1:** To install your desired version, add the version to the end of the installation command. e.g., ver `1.7.1`:
 
 ```sh
-bash <(curl -Ls https://raw.githubusercontent.com/alireza0/x-ui/master/install.sh) 0.5.2
+bash <(curl -Ls https://raw.githubusercontent.com/alireza0/x-ui/master/install.sh) 1.7.1
 ```
 
 ## Manual Install & Upgrade
 
-1. First download the latest compressed package from https://github.com/alireza0/x-ui/releases, generally choose Architecture `amd64`
+<details>
-2. Then upload the compressed package to the server's `/root/` directory and login to the server with user `root` 
+  <summary>Click for details</summary>
   
-> If your server cpu architecture is not `amd64` replace another architecture
+### Usage
+
+1. To download the latest version of the compressed package directly to your server, run the following command:
 
 ```sh
 ARCH=$(uname -m)
-[[ "${ARCH}" == "s390x" ]] && XUI_ARCH="s390x" || [[ "${ARCH}" == "aarch64" || "${ARCH}" == "arm64" ]] && XUI_ARCH="arm64" || XUI_ARCH="amd64"
+case "${ARCH}" in
+  x86_64 | x64 | amd64) XUI_ARCH="amd64" ;;
+  i*86 | x86) XUI_ARCH="386" ;;
+  armv8* | armv8 | arm64 | aarch64) XUI_ARCH="arm64" ;;
+  armv7* | armv7) XUI_ARCH="armv7" ;;
+  *) XUI_ARCH="amd64" ;;
+esac
+
+wget https://github.com/alireza0/x-ui/releases/latest/download/x-ui-linux-${XUI_ARCH}.tar.gz
+```
+
+2. Once the compressed package is downloaded, execute the following commands to install or upgrade x-ui:
+
+```sh
+ARCH=$(uname -m)
+case "${ARCH}" in
+  x86_64 | x64 | amd64) XUI_ARCH="amd64" ;;
+  i*86 | x86) XUI_ARCH="386" ;;
+  armv8* | armv8 | arm64 | aarch64) XUI_ARCH="arm64" ;;
+  armv7* | armv7) XUI_ARCH="armv7" ;;
+  *) XUI_ARCH="amd64" ;;
+esac
 cd /root/
 rm x-ui/ /usr/local/x-ui/ /usr/bin/x-ui -rf
 tar zxvf x-ui-linux-${XUI_ARCH}.tar.gz
@@ -73,15 +94,35 @@ systemctl enable x-ui
 systemctl restart x-ui
 ```
 
-## Install Using Docker
+</details>
 
-1. Install Docker
+## Install using Docker
+
+<details>
+   <summary>Click for details</summary>
+
+### Usage
+
+**Step 1:** Install Docker
 
 ```shell
 curl -fsSL https://get.docker.com | sh
 ```
 
-2. Install X-UI
+**Step 2:** Clone the Project Repository:
+
+   ```sh
+   git clone https://github.com/alireza0/x-ui.git
+   cd x-ui
+   ```
+
+**Step 3:** Start the Service
+
+   ```sh
+   docker compose up -d
+   ```
+
+   OR
 
 ```shell
 mkdir x-ui && cd x-ui
@@ -94,12 +135,32 @@ docker run -itd \
     alireza7/x-ui:latest
 ```
 
+update to latest version
+
+   ```sh
+    cd x-ui
+    docker compose down
+    docker compose pull x-ui
+    docker compose up -d
+   ```
+
+remove x-ui from docker 
+
+   ```sh
+    docker stop x-ui
+    docker rm x-ui
+    cd --
+    rm -r x-ui
+   ```
+
 > Build your own image
 
 ```shell
 docker build -t x-ui .
 ```
 
+</details>
+
 ## Languages
 
 - English
@@ -110,22 +171,21 @@ docker build -t x-ui .
 
 ## Features
 
-- Supported protocols: VMess, VLESS, Trojan, Shadowsocks, Dokodemo-door, SOCKS, HTTP
+- Supports protocols including VLESS, VMess, Trojan, Shadowsocks, Dokodemo-door, SOCKS, HTTP, Wireguard
-- Support XTLS native encryptions (Vision, REALITY)
+- Supports XTLS protocols, including Vision and REALITY
-- Support advanced JSON editor GUI for Xray-Core configuration 
+- An advanced interface for routing traffic, incorporating PROXY Protocol, Reverse, External, and Transparent Proxy, along with Multi-Domain, SSL Certificate, and Port
-- Support advanced GUI for routing traffic (Reverse and Transparent proxy, Multi-Domain, Multi-Certificate, Multi-Port per inbound)
+- Support auto generate Cloudflare WARP using Wireguard outbound
-- Support Multi-User per inbound
+- An interactive JSON interface for Xray template configuration
-- Support applying traffic data limits and expiry dates per user/inbound
+- An advanced interface for inbound and outbound configuration
-- Support system status monitoring
+- Clients’ traffic cap and expiration date based on first use
-- Support deep database search
+- Displays online clients, traffic statistics, and system status monitoring
-- Show traffic statistics
+- Deep database search
-- Show online users
+- Displays depleted clients with expired dates or exceeded traffic cap
-- Show users with expired date or exceeded traffic limits
+- Subscription service with (multi)link
-- Support subscription (multi) link
+- Importing and exporting databases
-- Support import/export database
+- One-Click SSL certificate application and automatic renewal
-- Support One-Click SSL certificate application and automatic renewal
+- HTTPS for secure access to the web panel and subscription service (self-provided domain + SSL certificate)
-- Support HTTPS for panel (self-provided domain name + SSL certificate)
+- Dark/Light theme
-- Support Dark/Light theme UI
 
 ## Recommended OS
 
@@ -134,12 +194,13 @@ docker build -t x-ui .
 - Debian 10+
 - Fedora 36+
 
-## Screenshots
+## Preview
 
 ![inbounds](./media/inbounds.png)
 ![Dark inbounds](./media/inbounds-dark.png)
 ![outbounds](./media/outbounds.png)
 ![rules](./media/rules.png)
+![warp](./media/warp.png)
 
 
 ## API Routes
@@ -199,6 +260,17 @@ docker build -t x-ui .
 <details>
   <summary>Click for details</summary>
 
+### Cloudflare 
+
+The admin management script has 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 has been resolved to the current server through cloudflare
+
+**Step 1:** Run the`x-ui`command on the server's terminal and then choose `17`. Then enter the information as requested.
+
+
 ### Certbot
 
 ```bash
@@ -218,40 +290,42 @@ certbot certonly --standalone --register-unsafely-without-email --non-interactiv
 
 ### Usage
 
-X-UI supports daily traffic notification, panel login reminder and other functions through the Tg robot. To use the Tg robot, you need to apply for the specific application tutorial. You can refer to the [blog](https://coderfan.net/how-to-use-telegram-bot-to-alarm-you-when-someone-login-into-your-vps.html)
+The web panel supports daily traffic, panel login, database backup, system status, client info, and other notification and functions through the Telegram Bot. To use the bot, you need to set the bot-related parameters in the panel, including:
-Set the robot-related parameters in the panel background, including:
 
-- Tg robot Token
+- Telegram Token
-- Tg robot ChatId
+- Admin Chat ID(s)
-- Tg robot cycle runtime, in crontab syntax
+- Notification Time (in cron syntax)
-- Tg robot Expiration threshold
+- Database Backup
-- Tg robot Traffic threshold
+- CPU Load Threshold Notification
-- Tg robot Enable send backup in cycle runtime
+
-- Tg robot Enable CPU usage alarm threshold
+**Crontab Time Format**
 
 Reference syntax:
 
-- 30 \* \* \* \* \* //Notify at the 30s of each point
+- `*/30 * * * *` - Notify every 30 minutes, every hour
-- 0 \*/10 \* \* \* \* //Notify at the first second of each 10 minutes
+- `30 * * * * *` - Notify at the 30th second of each minute
-- @hourly // hourly notification
+- `0 */10 * * * *` - Notify at the start of every 10 minutes
-- @daily // Daily notification (00:00 in the morning)
+- `@hourly` - Hourly notification
-- @every 8h // notify every 8 hours
+- `@daily` - Daily notification (00:00 AM)
+- `@every 8h` - Notify every 8 hours
+
+For more info about [Crontab](https://acquia.my.site.com/s/article/360004224494-Cron-time-string-format)
 
 ### Features
 
-- Report periodic
+- Periodic reporting
-- Login notification
+- Login notifications
-- CPU threshold notification
+- CPU load threshold notifications
-- Threshold for Expiration time and Traffic to report in advance
+- Advance notifications for expiration time and traffic
-- Support client report menu if client's telegram ID or telegram UserName added to the user's configurations
+- Client reporting menu with Telegram ID or username in configurations
-- Support telegram traffic report searched with UUID (VMESS/VLESS) or Password (TROJAN) - anonymously
+- Anonymous traffic reports, search by UUID (VLESS/VMess) or Password (Trojan/Shadowsocks)
-- Menu based bot
+- Menu-based bot
-- Search client by email ( only admin )
+- Client search by email (admin only)
-- Check all inbounds
+- Inbound checks
-- Check server status
+- System status check
-- Check depleted users
+- Depleted client checks
-- Receive backup by request and in periodic reports
+- Backup on request and in periodic reports
-- Multi language bot
+- Multilingual support
 </details>
 
 ## Troubleshoots
@@ -261,50 +335,58 @@ Reference syntax:
 
 ### Enable Traffic Usage
 
-Please be aware if you upgrade from an old X-UI version or other forks, by default data traffic usage for users may not work! it's recommended to follow below steps for enabeling:
+If you are upgrading from an older version or other forks and find that data traffic usage for clients may not work by default, follow the steps below to enable it:
 
-1. Find this section in config file
+**Step 1: Locate the Configuration Section**
 
-```json
+Find the following section in the config file:
- "policy": {
-    "system": {
-```
-
-2. Add below section just after ` "policy": {` :
-
-```json
-    "levels": {
-      "0": {
-        "statsUserUplink": true,
-        "statsUserDownlink": true
-      }
-    },
-```
-
-- The final output is like:
 
 ```json
   "policy": {
-    "levels": {
-      "0": {
-        "statsUserUplink": true,
-        "statsUserDownlink": true
-      }
-    },
-
     "system": {
-      "statsInboundDownlink": true,
+      // Other policy configurations
-      "statsInboundUplink": true
     }
   },
-  "routing": {
 ```
+**Step 2: Add the Required Configuration**
 
-3. Save and restart panel
+Add the following section just after `"policy": {`:
 
+```json
+"levels": {
+  "0": {
+    "statsUserUplink": true,
+    "statsUserDownlink": true
+  }
+},
+```
+**Step 3: Final Configuration**
+
+Your final config should look like this:
+
+```json
+"policy": {
+  "levels": {
+    "0": {
+      "statsUserUplink": true,
+      "statsUserDownlink": true
+    }
+  },
+  "system": {
+    "statsInboundDownlink": true,
+    "statsInboundUplink": true
+  }
+},
+"routing": {
+  // Other routing configurations
+},
+```
+**Step 4: Save and Restart**
+
+Save your changes and restart the Xray Service
 </details>
 
-## a Special Thanks to
+## A Special Thanks to
 
 - [HexaSoftwareTech](https://github.com/HexaSoftwareTech/)
 - [MHSanaei](https://github.com/MHSanaei)

config/version

@@ -1 +1 @@
-1.6.1
+1.7.2

go.mod

@@ -1,94 +1,93 @@
 module x-ui
 
-go 1.21.4
+go 1.22.0
 
 require (
-	github.com/Workiva/go-datastructures v1.1.1
+	github.com/Calidity/gin-sessions v1.3.1
-	github.com/gin-contrib/sessions v0.0.4
 	github.com/gin-gonic/gin v1.9.1
 	github.com/go-telegram-bot-api/telegram-bot-api/v5 v5.5.1
 	github.com/goccy/go-json v0.10.2
-	github.com/nicksnyder/go-i18n/v2 v2.3.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.1.0
+	github.com/pelletier/go-toml/v2 v2.1.1
 	github.com/robfig/cron/v3 v3.0.1
-	github.com/shirou/gopsutil/v3 v3.23.11
+	github.com/shirou/gopsutil/v3 v3.24.1
-	github.com/xtls/xray-core v1.8.6
+	github.com/xtls/xray-core v1.8.7
 	go.uber.org/atomic v1.11.0
 	golang.org/x/text v0.14.0
-	google.golang.org/grpc v1.59.0
+	google.golang.org/grpc v1.61.1
-	gorm.io/driver/sqlite v1.5.4
+	gorm.io/driver/sqlite v1.5.5
-	gorm.io/gorm v1.25.5
+	gorm.io/gorm v1.25.7
 )
 
+require github.com/chenzhuoyu/iasm v0.9.1 // indirect
+
 require (
-	github.com/andybalholm/brotli v1.0.6 // indirect
+	github.com/andybalholm/brotli v1.1.0 // indirect
-	github.com/bytedance/sonic v1.9.1 // indirect
+	github.com/bytedance/sonic v1.11.0 // indirect
-	github.com/chenzhuoyu/base64x v0.0.0-20221115062448-fe3a3abad311 // indirect
+	github.com/chenzhuoyu/base64x v0.0.0-20230717121745-296ad89f973d // indirect
-	github.com/cloudflare/circl v1.3.6 // indirect
+	github.com/cloudflare/circl v1.3.7 // indirect
 	github.com/dgryski/go-metro v0.0.0-20211217172704-adc40b04c140 // indirect
 	github.com/francoispqt/gojay v1.2.13 // indirect
-	github.com/gabriel-vasile/mimetype v1.4.2 // indirect
+	github.com/gabriel-vasile/mimetype v1.4.3 // indirect
-	github.com/gaukas/godicttls v0.0.4 // indirect
 	github.com/gin-contrib/gzip v0.0.6
 	github.com/gin-contrib/sse v0.1.0 // indirect
-	github.com/go-ole/go-ole v1.2.6 // 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.14.0 // indirect
+	github.com/go-playground/validator/v10 v10.18.0 // indirect
 	github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 // indirect
 	github.com/golang/protobuf v1.5.3 // indirect
 	github.com/google/btree v1.1.2 // indirect
-	github.com/google/pprof v0.0.0-20231101202521-4ca4178f5c7a // indirect
+	github.com/google/pprof v0.0.0-20240207164012-fb44976bdcd5 // indirect
-	github.com/gorilla/context v1.1.1 // indirect
+	github.com/gorilla/context v1.1.2 // indirect
-	github.com/gorilla/securecookie v1.1.1 // indirect
+	github.com/gorilla/securecookie v1.1.2 // indirect
-	github.com/gorilla/sessions v1.2.1 // indirect
+	github.com/gorilla/sessions v1.2.2 // indirect
 	github.com/gorilla/websocket v1.5.1 // 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.2 // indirect
+	github.com/klauspost/compress v1.17.6 // indirect
 	github.com/klauspost/cpuid/v2 v2.2.6 // indirect
-	github.com/leodido/go-urn v1.2.4 // indirect
+	github.com/leodido/go-urn v1.4.0 // indirect
-	github.com/lufia/plan9stats v0.0.0-20230326075908-cb1d2100619a // indirect
+	github.com/lufia/plan9stats v0.0.0-20231016141302-07b5767bb0ed // indirect
-	github.com/mattn/go-isatty v0.0.19 // indirect
+	github.com/mattn/go-isatty v0.0.20 // indirect
-	github.com/mattn/go-sqlite3 v1.14.17 // indirect
+	github.com/mattn/go-sqlite3 v1.14.22 // indirect
 	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
 	github.com/modern-go/reflect2 v1.0.2 // indirect
-	github.com/onsi/ginkgo/v2 v2.13.1 // indirect
+	github.com/onsi/ginkgo/v2 v2.15.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-20240219145905-2259734c190a // indirect
-	github.com/quic-go/qtls-go1-20 v0.4.1 // indirect
+	github.com/quic-go/quic-go v0.41.0 // indirect
-	github.com/quic-go/quic-go v0.40.0 // indirect
+	github.com/refraction-networking/utls v1.6.2 // indirect
-	github.com/refraction-networking/utls v1.5.4 // indirect
 	github.com/riobard/go-bloom v0.0.0-20200614022211-cdc8013cb5b3 // indirect
-	github.com/sagernet/sing v0.2.17 // indirect
+	github.com/sagernet/sing v0.3.0 // indirect
-	github.com/sagernet/sing-shadowsocks v0.2.5 // indirect
+	github.com/sagernet/sing-shadowsocks v0.2.6 // indirect
 	github.com/seiflotfy/cuckoofilter v0.0.0-20220411075957-e3b120b3f5fb // indirect
 	github.com/shoenig/go-m1cpu v0.1.6 // indirect
-	github.com/tklauser/go-sysconf v0.3.12 // indirect
+	github.com/tklauser/go-sysconf v0.3.13 // indirect
-	github.com/tklauser/numcpus v0.6.1 // indirect
+	github.com/tklauser/numcpus v0.7.0 // indirect
 	github.com/twitchyliquid64/golang-asm v0.15.1 // indirect
-	github.com/ugorji/go/codec v1.2.11 // indirect
+	github.com/ugorji/go/codec v1.2.12 // indirect
 	github.com/v2fly/ss-bloomring v0.0.0-20210312155135-28617310f63e // 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/yusufpapurcu/wmi v1.2.3 // indirect
+	github.com/yusufpapurcu/wmi v1.2.4 // indirect
-	go.uber.org/mock v0.3.0 // indirect
+	go.uber.org/mock v0.4.0 // indirect
-	go4.org/netipx v0.0.0-20230824141953-6213f710f925 // indirect
+	go4.org/netipx v0.0.0-20231129151722-fdeea329fbba // indirect
-	golang.org/x/arch v0.3.0 // indirect
+	golang.org/x/arch v0.7.0 // indirect
-	golang.org/x/crypto v0.15.0 // indirect
+	golang.org/x/crypto v0.19.0 // indirect
-	golang.org/x/exp v0.0.0-20231110203233-9a3e6036ecaa // indirect
+	golang.org/x/exp v0.0.0-20240213143201-ec583247a57a // indirect
-	golang.org/x/mod v0.14.0 // indirect
+	golang.org/x/mod v0.15.0 // indirect
-	golang.org/x/net v0.18.0 // indirect
+	golang.org/x/net v0.21.0 // indirect
-	golang.org/x/sys v0.15.0 // indirect
+	golang.org/x/sys v0.17.0 // indirect
-	golang.org/x/time v0.4.0 // indirect
+	golang.org/x/time v0.5.0 // indirect
-	golang.org/x/tools v0.15.0 // indirect
+	golang.org/x/tools v0.18.0 // indirect
 	golang.zx2c4.com/wintun v0.0.0-20230126152724-0fa3db229ce2 // indirect
-	golang.zx2c4.com/wireguard v0.0.0-20231022001213-2e0774f246fb // indirect
+	golang.zx2c4.com/wireguard v0.0.0-20231211153847-12269c276173 // indirect
-	google.golang.org/genproto/googleapis/rpc v0.0.0-20231106174013-bbf56f31fb17 // indirect
+	google.golang.org/genproto/googleapis/rpc v0.0.0-20240213162025-012b6fc9bca9 // indirect
-	google.golang.org/protobuf v1.31.0 // indirect
+	google.golang.org/protobuf v1.32.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 	gvisor.dev/gvisor v0.0.0-20231104011432-48a6d7d5bd0b // indirect
 	lukechampine.com/blake3 v1.2.1 // indirect

go.sum

@@ -10,27 +10,28 @@ 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/Workiva/go-datastructures v1.1.1 h1:9G5u1UqKt6ABseAffHGNfbNQd7omRlWE5QaxNruzhE0=
+github.com/Calidity/gin-sessions v1.3.1 h1:nF3dCBWa7TZ4j26iYLwGRmzZy9YODhWoOS3fmi+snyE=
-github.com/Workiva/go-datastructures v1.1.1/go.mod h1:1yZL+zfsztete+ePzZz/Zb1/t5BnDuE2Ya2MMGhzP6A=
+github.com/Calidity/gin-sessions v1.3.1/go.mod h1:I0+QE6qkO50TeN/n6If6novvxHk4Isvr23U8EdvPdns=
-github.com/andybalholm/brotli v1.0.6 h1:Yf9fFpf49Zrxb9NlQaluyE92/+X7UVHlhMNJN2sxfOI=
+github.com/andybalholm/brotli v1.1.0 h1:eLKJA0d02Lf0mVpIDgYnqXcUn0GqVmEFny3VuID1U3M=
-github.com/andybalholm/brotli v1.0.6/go.mod h1:fO7iG3H7G2nSZ7m0zPUDn85XEX2GTukHGRSepvi9Eig=
+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/antonlindstrom/pgstore v0.0.0-20200229204646-b08ebf1105e0/go.mod h1:2Ti6VUHVxpC0VSmTZzEvpzysnaGAfGBOoMIz5ykPyyw=
 github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q=
-github.com/boj/redistore v0.0.0-20180917114910-cd5dcc76aeff/go.mod h1:+RTT1BOk5P97fT2CiHkbFQwkK3mjsFAP6zCYV2aXtjw=
 github.com/bradfitz/go-smtpd v0.0.0-20170404230938-deb6d6237625/go.mod h1:HYsPBTaaSFSlLx/70C2HPIMNZpVV8+vt/A+FMnYP11g=
-github.com/bradfitz/gomemcache v0.0.0-20190913173617-a41fca850d0b/go.mod h1:H0wQNHz2YrLsuXOZozoeDmnHXkNCRmMW0gwFWDfEZDA=
-github.com/bradleypeabody/gorilla-sessions-memcache v0.0.0-20181103040241-659414f458e1/go.mod h1:dkChI7Tbtx7H1Tj7TqGSZMOeGpMP5gLHtjroHd4agiI=
 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.9.1 h1:6iJ6NqdoxCDr6mbY8h18oSO+cShGSMRGCEo7F2h0x8s=
+github.com/bytedance/sonic v1.10.0-rc/go.mod h1:ElCzW+ufi8qKqNW0FY314xriJhyJhuoJ3gFZdAHF7NM=
-github.com/bytedance/sonic v1.9.1/go.mod h1:i736AoUSYt75HyZLoJW9ERYxcy6eaN6h4BZXU064P/U=
+github.com/bytedance/sonic v1.11.0 h1:FwNNv6Vu4z2Onf1++LNzxB/QhitD8wuTdpZzMTGITWo=
+github.com/bytedance/sonic v1.11.0/go.mod h1:iZcSUejdk5aukTND/Eu/ivjQuEL0Cu9/rf50Hi0u/g4=
 github.com/chenzhuoyu/base64x v0.0.0-20211019084208-fb5309c8db06/go.mod h1:DH46F32mSOjUmXrMHnKwZdA8wcEefY7UVqBKYGjpdQY=
-github.com/chenzhuoyu/base64x v0.0.0-20221115062448-fe3a3abad311 h1:qSGYFH7+jGhDF8vLC+iwCD4WpbV1EBDSzWkJODFLams=
 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.6 h1:/xbKIqSHbZXHwkhbrhrt2YOHIwYJlXH94E3tI/gDlUg=
+github.com/cloudflare/circl v1.3.7 h1:qlCDlTPz2n9fu58M0Nh1J/JzcFpfgkFHHX3O35r5vcU=
-github.com/cloudflare/circl v1.3.6/go.mod h1:5XYMA4rFBvNIrhs50XuiBJ15vF2pZn4nnUKZrLbUZFA=
+github.com/cloudflare/circl v1.3.7/go.mod h1:sRTcRWXGLrKw6yIGJ+l7amYJFfAXbZG0kBSc8r4zxgA=
 github.com/coreos/go-systemd v0.0.0-20181012123002-c6f51f82210d/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4=
 github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
@@ -44,45 +45,37 @@ github.com/flynn/go-shlex v0.0.0-20150515145356-3f9db97f8568/go.mod h1:xEzjJPgXI
 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.2 h1:w5qFW6JKBz9Y393Y4q372O9A7cUSequkh1Q7OhCmWKU=
+github.com/gabriel-vasile/mimetype v1.4.3 h1:in2uUcidCuFcDKtdcBxlR0rJ1+fsokWf+uqxgUFjbI0=
-github.com/gabriel-vasile/mimetype v1.4.2/go.mod h1:zApsH/mKG4w07erKIaJPFiX0Tsq9BFQgN3qGY5GnNgA=
+github.com/gabriel-vasile/mimetype v1.4.3/go.mod h1:d8uq/6HKRL6CGdk+aubisF/M5GcPfT7nKyLpA0lbSSk=
-github.com/gaukas/godicttls v0.0.4 h1:NlRaXb3J6hAnTmWdsEKb9bcSBD6BvcIjdGdeb0zfXbk=
-github.com/gaukas/godicttls v0.0.4/go.mod h1:l6EenT4TLWgTdwslVb4sEMOCf7Bv0JAK67deKr9/NCI=
 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 v0.0.6 h1:NjcunTcGAj5CO1gn4N8jHOSIeRFHIbn51z6K+xaN4d4=
 github.com/gin-contrib/gzip v0.0.6/go.mod h1:QOJlmV2xmayAjkNS2Y8NQsMneuRShOU/kjovCXNuzzk=
-github.com/gin-contrib/sessions v0.0.4 h1:gq4fNa1Zmp564iHP5G6EBuktilEos8VKhe2sza1KMgo=
-github.com/gin-contrib/sessions v0.0.4/go.mod h1:pQ3sIyviBBGcxgyR8mkeJuXbeV3h3NYmhJADQTq5+Vo=
 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.7.4/go.mod h1:jD2toBW3GZUr5UMcdrwQA10I7RuaFOl/SGeDjXkfUtY=
 github.com/gin-gonic/gin v1.8.1/go.mod h1:ji8BvRH1azfM+SYow9zQ6SZMvR8qOMZHmsCuWR9tTTk=
 github.com/gin-gonic/gin v1.9.1 h1:4idEAncQnU5cB7BeOkPtxjfCSye0AAm1R0RVIqJ+Jmg=
 github.com/gin-gonic/gin v1.9.1/go.mod h1:hPrL7YrpYKXt5YId3A/Tnip5kqbEAP+KLuI3SUcPTeU=
 github.com/gliderlabs/ssh v0.1.1/go.mod h1:U7qILu1NlMHj9FlMhZLlkCdDnU1DBEAqr0aevW3Awn0=
-github.com/globalsign/mgo v0.0.0-20181015135952-eeefdecb41b8/go.mod h1:xkRDCp4j0OGD1HRkm4kmhM+pmpv3AKq5SU7GMg4oO/Q=
 github.com/go-errors/errors v1.0.1/go.mod h1:f4zRHt4oKfwPJE5k8C9vpYG+aDHdBFUsgrm6/TyX73Q=
 github.com/go-logr/logr v1.3.0 h1:2y3SDp0ZXuc6/cjLSZ+Q3ir+QB9T/iG5yYRXqsagWSY=
 github.com/go-logr/logr v1.3.0/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY=
-github.com/go-ole/go-ole v1.2.6 h1:/Fpf6oFPoeFik9ty7siob0G6Ke8QvQEuVcuChpwXzpY=
 github.com/go-ole/go-ole v1.2.6/go.mod h1:pprOEPIfldk/42T2oK7lQ4v4JSDwmV0As9GaiUsvbm0=
+github.com/go-ole/go-ole v1.3.0 h1:Dt6ye7+vXGIKZ7Xtk4s6/xVdGDQynvom7xCFEdWr6uE=
+github.com/go-ole/go-ole v1.3.0/go.mod h1:5LS6F96DhAwUc7C+1HLexzMXY1xGRSryjyPPKW6zv78=
 github.com/go-playground/assert/v2 v2.0.1/go.mod h1:VDjEfimB/XKnb+ZQfWdccd7VUvScMdVu0Titje2rxJ4=
 github.com/go-playground/assert/v2 v2.2.0 h1:JvknZsQTYeFEAhQwI4qEt9cyV5ONwRHC+lYKSsYSR8s=
 github.com/go-playground/assert/v2 v2.2.0/go.mod h1:VDjEfimB/XKnb+ZQfWdccd7VUvScMdVu0Titje2rxJ4=
-github.com/go-playground/locales v0.13.0/go.mod h1:taPMhCMXrRLJO55olJkUXHZBHCxTMfnGwq/HNwmWNS8=
 github.com/go-playground/locales v0.14.0/go.mod h1:sawfccIbzZTqEDETgFXqTho0QybSa7l++s0DH+LDiLs=
 github.com/go-playground/locales v0.14.1 h1:EWaQ/wswjilfKLTECiXz7Rh+3BjFhfDFKv/oXslEjJA=
 github.com/go-playground/locales v0.14.1/go.mod h1:hxrqLVvrK65+Rwrd5Fc6F2O76J/NuW9t0sjnWqG1slY=
-github.com/go-playground/universal-translator v0.17.0/go.mod h1:UkSxE5sNxxRwHyU+Scu5vgOQjsIJAF8j9muTVoKLVtA=
 github.com/go-playground/universal-translator v0.18.0/go.mod h1:UvRDBj+xPUEGrFYl+lu/H90nyDXpg0fqeB/AQUGNTVA=
 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.4.1/go.mod h1:nlOn6nFhuKACm19sB/8EGNn9GlaMV7XkbRSipzJ0Ii4=
 github.com/go-playground/validator/v10 v10.10.0/go.mod h1:74x4gJWsvQexRdW8Pn3dXSGrTK4nAUsbPlLADvpJkos=
-github.com/go-playground/validator/v10 v10.14.0 h1:vgvQWe3XCz3gIeFDm/HnTIbj6UGmg/+t63MyGU2n5js=
+github.com/go-playground/validator/v10 v10.18.0 h1:BvolUXjp4zuvkZ5YN5t7ebzbhlUtPsPm2S9NAZ5nl9U=
-github.com/go-playground/validator/v10 v10.14.0/go.mod h1:9iXMNT7sEkjXb0I+enO7QXmzG6QCsPWY4zveKFVRSyU=
+github.com/go-playground/validator/v10 v10.18.0/go.mod h1:dbuPbCMFw/DrkbEynArYaCwl3amGuJotoKCe95atGMM=
 github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 h1:tfuBGBXKqDEevZMzYi5KSi8KkcZtzBcTgAUUtapy0OI=
 github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572/go.mod h1:9Pwr4B2jHnOSGXyyzV8ROjYa2ojvAY6HCGYYfMoC3Ls=
 github.com/go-telegram-bot-api/telegram-bot-api/v5 v5.5.1 h1:wG8n/XJQ07TmjbITcGiUaOtXxdrINDz1b0J1w0SzqDc=
@@ -99,11 +92,9 @@ github.com/golang/mock v1.6.0 h1:ErTB+efbowRARo13NNdxyJji2egdxLGQhRaY+DUumQc=
 github.com/golang/mock v1.6.0/go.mod h1:p6yTPP+5HYm5mzsMV8JkE6ZKdX+/wYM6Hr+LicevLPs=
 github.com/golang/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.3.3/go.mod h1:vzj43D7+SQXF/4pzW/hwtAqwc6iTitCiVSaWz5lYuqw=
 github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk=
 github.com/golang/protobuf v1.5.3 h1:KhyjKVUg7Usr/dYsdSqoFveMYd5ko72D+zANwlG1mmg=
 github.com/golang/protobuf v1.5.3/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY=
-github.com/gomodule/redigo v2.0.0+incompatible/go.mod h1:B4C85qUVwatsJoIUNIfCRsp7qO0iAmpGFZ4EELWSbC4=
 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=
@@ -116,21 +107,21 @@ github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeN
 github.com/google/go-github v17.0.0+incompatible/go.mod h1:zLgOLi98H3fifZn+44m+umXrS52loVEgC2AApnigrVQ=
 github.com/google/go-querystring v1.0.0/go.mod h1:odCYkC5MyYFN7vkCjXpyrEuKhc/BUO6wN/zVPAxq5ck=
 github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
+github.com/google/gofuzz v1.2.0 h1:xRy4A+RhZaiKjJ1bPfwQ8sedCA+YS2YcCHW6ec7JMi0=
+github.com/google/gofuzz v1.2.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
 github.com/google/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-20231101202521-4ca4178f5c7a h1:fEBsGL/sjAuJrgah5XqmmYsTLzJp/TO9Lhy39gkverk=
+github.com/google/pprof v0.0.0-20240207164012-fb44976bdcd5 h1:E/LAvt58di64hlYjx7AsNS6C/ysHWYo+2qPCZKTQhRo=
-github.com/google/pprof v0.0.0-20231101202521-4ca4178f5c7a/go.mod h1:czg5+yv1E0ZGTi6S6vVK1mke0fV+FaUhNGcd6VRS9Ik=
+github.com/google/pprof v0.0.0-20240207164012-fb44976bdcd5/go.mod h1:czg5+yv1E0ZGTi6S6vVK1mke0fV+FaUhNGcd6VRS9Ik=
 github.com/googleapis/gax-go v2.0.0+incompatible/go.mod h1:SFVmujtThgffbyetf+mdk2eWhX2bMyUtNHzFKcPA9HY=
 github.com/googleapis/gax-go/v2 v2.0.3/go.mod h1:LLvjysVCY1JZeum8Z6l8qUty8fiNwE08qbEPm1M08qg=
 github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY=
-github.com/gorilla/context v1.1.1 h1:AWwleXJkX/nhcU9bZSnZoi3h/qGYqQAGhq6zZe/aQW8=
+github.com/gorilla/context v1.1.2 h1:WRkNAv2uoa03QNIc1A6u4O7DAGMUVoopZhkiXWA2V1o=
-github.com/gorilla/context v1.1.1/go.mod h1:kBGZzfjB9CEq2AlWe17Uuf7NDRt0dE0s8S51q0aT7Yg=
+github.com/gorilla/context v1.1.2/go.mod h1:KDPwT9i/MeWHiLl90fuTgrt4/wPcv75vFAZLaOOcbxM=
-github.com/gorilla/securecookie v1.1.1 h1:miw7JPhV+b/lAHSXz4qd/nN9jRiAFV5FwjeKyCS8BvQ=
+github.com/gorilla/securecookie v1.1.2 h1:YCIWL56dvtr73r6715mJs5ZvhtnY73hBvEF8kXD8ePA=
-github.com/gorilla/securecookie v1.1.1/go.mod h1:ra0sb63/xPlUeL+yeDciTfxMRAA+MP+HVt/4epWDjd4=
+github.com/gorilla/securecookie v1.1.2/go.mod h1:NfCASbcHqRSY+3a8tlWJwsQap2VX5pwzwo4h3eOamfo=
-github.com/gorilla/sessions v1.1.1/go.mod h1:8KCfur6+4Mqcc6S0FEfKuN15Vl5MgXW92AE8ovaJD0w=
+github.com/gorilla/sessions v1.2.2 h1:lqzMYz6bOfvn2WriPUjNByzeXIlVzURcPmgMczkmTjY=
-github.com/gorilla/sessions v1.2.0/go.mod h1:dk2InVEVJ0sfLlnXv9EAgkf6ecYs/i80K/zI+bUmuGM=
+github.com/gorilla/sessions v1.2.2/go.mod h1:ePLdVu+jbEgHH+KWw8I1z2wqd0BAdAQh/8LRvBeoNcQ=
-github.com/gorilla/sessions v1.2.1 h1:DHd3rPN5lE3Ts3D8rKkQ8x/0kqfeNmBAaiSi+o7FsgI=
-github.com/gorilla/sessions v1.2.1/go.mod h1:dk2InVEVJ0sfLlnXv9EAgkf6ecYs/i80K/zI+bUmuGM=
 github.com/gorilla/websocket v1.5.1 h1:gmztn0JnHVt9JZquRuzLw3g4wouNVzKL15iLr/zn/QY=
 github.com/gorilla/websocket v1.5.1/go.mod h1:x3kM2JMyaluk02fnUJpQuwD2dCS5NDG2ZHL0uE0tcaY=
 github.com/gregjones/httpcache v0.0.0-20180305231024-9cad4c3443a7/go.mod h1:FecbI9+v66THATjSRHfNgh1IVFe/9kFxbXtjV0ctIMA=
@@ -141,17 +132,16 @@ github.com/jinzhu/inflection v1.0.0/go.mod h1:h+uFLlag+Qp1Va5pdKtLDYj+kHp5pxUVkr
 github.com/jinzhu/now v1.1.5 h1:/o9tlHleP7gOFmsnYNz3RGnqzefHA47wQpKrrdTIwXQ=
 github.com/jinzhu/now v1.1.5/go.mod h1:d3SSVoowX0Lcu0IBviAWJpolVfI5UJVZZ7cO71lE/z8=
 github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU=
-github.com/json-iterator/go v1.1.9/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4=
 github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM=
 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/kidstuff/mongostore v0.0.0-20181113001930-e650cd85ee4b/go.mod h1:g2nVr8KZVXJSS97Jo8pJ0jgq29P6H7dG0oplUA86MQw=
 github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck=
-github.com/klauspost/compress v1.17.2 h1:RlWWUY/Dr4fL8qk9YG7DTZ7PDgME2V4csBXA8L/ixi4=
+github.com/klauspost/compress v1.17.6 h1:60eq2E/jlfwQXtvZEeBUYADs+BwKBWURIY+Gj2eRGjI=
-github.com/klauspost/compress v1.17.2/go.mod h1:ntbaceVETuRiXiv4DpjP66DpAtAGkEQskQzEyD//IeE=
+github.com/klauspost/compress v1.17.6/go.mod h1:/dCuZOvVtNoHsyb+cuJD3itjs3NbnF6KH9zAO4BDxPM=
 github.com/klauspost/cpuid/v2 v2.0.9/go.mod h1:FInQzS24/EEf25PyTYn52gqo7WaD8xa0213Md/qVLRg=
 github.com/klauspost/cpuid/v2 v2.2.6 h1:ndNyv040zDGIDh8thGkXYjnFtiN02M1PVVF+JE/48xc=
 github.com/klauspost/cpuid/v2 v2.2.6/go.mod h1:Lcz8mBdAVJIBVzewtcLocK12l3Y+JytZYpaMropDUws=
+github.com/knz/go-libedit v1.10.1/go.mod h1:MZTVkCWyz0oBc7JOWP3wNAzd002ZbM/5hgShxwh4x8M=
 github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
 github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI=
 github.com/kr/pretty v0.3.0 h1:WgNl7dwNpEZ6jJ9k1snq4pZsg7DOEN8hP9Xw0Tsjwk0=
@@ -161,72 +151,64 @@ github.com/kr/pty v1.1.3/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
 github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
 github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
 github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
-github.com/leodido/go-urn v1.2.0/go.mod h1:+8+nEpDfqqsY+g338gtMEUOtuK+4dEMhiQEgxpxOKII=
 github.com/leodido/go-urn v1.2.1/go.mod h1:zt4jvISO2HfUBqxjfIshjdMTYS56ZS/qv49ictyFfxY=
-github.com/leodido/go-urn v1.2.4 h1:XlAE/cm/ms7TE/VMVoduSpNBoyc2dOxHs5MZSwAN63Q=
+github.com/leodido/go-urn v1.4.0 h1:WT9HwE9SGECu3lg4d/dIA+jxlljEa1/ffXKmRjqdmIQ=
-github.com/leodido/go-urn v1.2.4/go.mod h1:7ZrI8mTSeBSHl/UaRyKQW1qZeMgak41ANeCNaVckg+4=
+github.com/leodido/go-urn v1.4.0/go.mod h1:bvxc+MVxLKB4z00jd1z+Dvzr47oO32F/QSNjSBOlFxI=
-github.com/lib/pq v1.10.3/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o=
 github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0/go.mod h1:zJYVVT2jmtg6P3p1VtQj7WsuWi/y4VnjVBn7F8KPB3I=
-github.com/lufia/plan9stats v0.0.0-20230326075908-cb1d2100619a h1:N9zuLhTvBSRt0gWSiJswwQ2HqDmtX/ZCDJURnKUt1Ik=
+github.com/lufia/plan9stats v0.0.0-20231016141302-07b5767bb0ed h1:036IscGBfJsFIgJQzlui7nK1Ncm0tp2ktmPj8xO4N/0=
-github.com/lufia/plan9stats v0.0.0-20230326075908-cb1d2100619a/go.mod h1:JKx41uQRwqlTZabZc+kILPrO/3jlKnQ2Z8b7YiVw5cE=
+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.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU=
 github.com/mattn/go-isatty v0.0.14/go.mod h1:7GGIvUiUoEMVVmxf/4nioHXj79iQHKdU27kJ6hsGG94=
-github.com/mattn/go-isatty v0.0.19 h1:JITubQf0MOLdlGRuRq+jtsDlekdYPia9ZFsB8h/APPA=
+github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWEY=
-github.com/mattn/go-isatty v0.0.19/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y=
+github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y=
-github.com/mattn/go-sqlite3 v1.14.17 h1:mCRHCLDUBXgpKAqIKsaAaAsrAlbkeomtRFKXh2L6YIM=
+github.com/mattn/go-sqlite3 v1.14.22 h1:2gZY6PC6kBnID23Tichd1K+Z0oS6nE/XwU+Vz/5o4kU=
-github.com/mattn/go-sqlite3 v1.14.17/go.mod h1:2eHXhiwb8IkHr+BDWZGa96P6+rkvnG63S2DGjv9HUNg=
+github.com/mattn/go-sqlite3 v1.14.22/go.mod h1:Uh1q+B4BYcTPb+yiD3kU8Ct7aC0hY9fxUwlHK0RXw+Y=
+github.com/mattn/go-sqlite3 v2.0.3+incompatible h1:gXHsfypPkaMZrKbD5209QV9jbUTJKjyR5WD3HYQSd+U=
+github.com/mattn/go-sqlite3 v2.0.3+incompatible/go.mod h1:FPy6KqzDD04eiIsT53CuJW3U88zkxoIYsOqkbpncsNc=
 github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0=
-github.com/memcachier/mc v2.0.1+incompatible/go.mod h1:7bkvFE61leUBvXz+yxsOnGBQSZpBSPIMUQSmmSHvuXc=
 github.com/microcosm-cc/bluemonday v1.0.1/go.mod h1:hsXNsILzKxV+sX77C5b8FSuKF00vh2OMYv+xgHpAMF4=
 github.com/miekg/dns v1.1.57 h1:Jzi7ApEIzwEPLHWRcafCN9LZSBbqQpxjt/wpgvg7wcM=
 github.com/miekg/dns v1.1.57/go.mod h1:uqRjCRUuEAA6qsOiJvDd+CFo/vW+y5WR6SNmHE55hZk=
 github.com/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 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=
 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/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.3.0 h1:2NPsCsNFCVd7i+Su0xYsBrIhS3bE2XMv5gNTft2O+PQ=
+github.com/nicksnyder/go-i18n/v2 v2.4.0 h1:3IcvPOAvnCKwNm0TB0dLDTuawWEj+ax/RERNC+diLMM=
-github.com/nicksnyder/go-i18n/v2 v2.3.0/go.mod h1:nxYSZE9M0bf3Y70gPQjN9ha7XNHX7gMc814+6wVyEI4=
+github.com/nicksnyder/go-i18n/v2 v2.4.0/go.mod h1:nxYSZE9M0bf3Y70gPQjN9ha7XNHX7gMc814+6wVyEI4=
-github.com/onsi/ginkgo/v2 v2.13.1 h1:LNGfMbR2OVGBfXjvRZIZ2YCTQdGKtPLvuI1rMCCj3OU=
+github.com/onsi/ginkgo/v2 v2.15.0 h1:79HwNRBAZHOEwrczrgSOPy+eFTTlIGELKy5as+ClttY=
-github.com/onsi/ginkgo/v2 v2.13.1/go.mod h1:XStQ8QcGwLyF4HdfcZB8SFOS/MWCgDuXMSBe6zrvLgM=
+github.com/onsi/ginkgo/v2 v2.15.0/go.mod h1:HlxMHtYF57y6Dpf+mc5529KKmSq9h2FpCF+/ZkwUxKM=
-github.com/onsi/gomega v1.29.0 h1:KIA/t2t5UBzoirT4H9tsML45GEbo3ouUnBHsCfD2tVg=
+github.com/onsi/gomega v1.30.0 h1:hvMK7xYz4D3HapigLTeGdId/NcfQx1VHMJc60ew99+8=
-github.com/onsi/gomega v1.29.0/go.mod h1:9sxs+SwGrKI0+PWe4Fxa9tFQQBG5xSsSbMXOI8PPpoQ=
+github.com/onsi/gomega v1.30.0/go.mod h1:9sxs+SwGrKI0+PWe4Fxa9tFQQBG5xSsSbMXOI8PPpoQ=
 github.com/op/go-logging v0.0.0-20160315200505-970db520ece7 h1:lDH9UUVJtmYCjyT0CI4q8xvlXPxeZ0gYCVvWbmPlp88=
 github.com/op/go-logging v0.0.0-20160315200505-970db520ece7/go.mod h1:HzydrMdWErDVzsI23lYNej1Htcns9BCg93Dk0bBINWk=
 github.com/openzipkin/zipkin-go v0.1.1/go.mod h1:NtoC/o8u3JlF1lSlyPNswIbeQH9bJTmOf0Erfk+hxe8=
 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.0.1/go.mod h1:r9LEWfGN8R5k0VXJ+0BkIe7MYkRdwZOjgMj2KwnJFUo=
-github.com/pelletier/go-toml/v2 v2.1.0 h1:FnwAJ4oYMvbT/34k9zzHuZNrhlz48GB3/s6at6/MHO4=
+github.com/pelletier/go-toml/v2 v2.1.1 h1:LWAJwfNvjQZCFIDKWYQaM62NcYeYViCmWIwmOStowAI=
-github.com/pelletier/go-toml/v2 v2.1.0/go.mod h1:tJU2Z3ZkXwnxa4DPO899bsyIoywizdUvyaeZurnPPDc=
+github.com/pelletier/go-toml/v2 v2.1.1/go.mod h1:tJU2Z3ZkXwnxa4DPO899bsyIoywizdUvyaeZurnPPDc=
-github.com/philhofer/fwd v1.1.1/go.mod h1:gk3iGcWd9+svBvR0sR+KPcfE+RNWozjowpeBVG3ZVNU=
 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/diff v0.0.0-20210226163009-20ebb0f2a09e/go.mod h1:pJLUxLENpZxwdsKMEsNbx1VGcRFpLqf3715MtcvvzbA=
 github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
-github.com/pkg/errors v0.9.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-20221212215047-62379fc7944b h1:0LFwY6Q3gMACTjAbMZBjXAqTOzOwFaj2Ld6cjeQ7Rig=
+github.com/power-devops/perfstat v0.0.0-20240219145905-2259734c190a h1:XCUtNgBnZfUBhdfCX2QK+fslr9vevSsUg3W3peZwlak=
-github.com/power-devops/perfstat v0.0.0-20221212215047-62379fc7944b/go.mod h1:OmDBASR4679mdNQnz2pUhc2G8CO2JrUAVFDRBDP/hJE=
+github.com/power-devops/perfstat v0.0.0-20240219145905-2259734c190a/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/quasoft/memstore v0.0.0-20191010062613-2bce066d2b0b/go.mod h1:wTPjTepVu7uJBYgZ0SdWHQlIas582j6cn2jgk4DDdlg=
+github.com/quic-go/quic-go v0.41.0 h1:aD8MmHfgqTURWNJy48IYFg2OnxwHT3JL7ahGs73lb4k=
-github.com/quic-go/qtls-go1-20 v0.4.1 h1:D33340mCNDAIKBqXuAvexTNMUByrYmFYVfKfDN5nfFs=
+github.com/quic-go/quic-go v0.41.0/go.mod h1:qCkNjqczPEvgsOnxZ0eCD14lv+B2LHlFAB++CNOh9hA=
-github.com/quic-go/qtls-go1-20 v0.4.1/go.mod h1:X9Nh97ZL80Z+bX/gUXMbipO6OxdiDi58b/fMC9mAL+k=
+github.com/refraction-networking/utls v1.6.2 h1:iTeeGY0o6nMNcGyirxkD5bFIsVctP5InGZ3E0HrzS7k=
-github.com/quic-go/quic-go v0.40.0 h1:GYd1iznlKm7dpHD7pOVpUvItgMPo/jrMgDWZhMCecqw=
+github.com/refraction-networking/utls v1.6.2/go.mod h1:yil9+7qSl+gBwJqztoQseO6Pr3h62pQoY1lXiNR/FPs=
-github.com/quic-go/quic-go v0.40.0/go.mod h1:PeN7kuVJ4xZbxSv/4OX6S1USOX8MJvydwpTx31vx60c=
-github.com/refraction-networking/utls v1.5.4 h1:9k6EO2b8TaOGsQ7Pl7p9w6PUhx18/ZCeT0WNTZ7Uw4o=
-github.com/refraction-networking/utls v1.5.4/go.mod h1:SPuDbBmgLGp8s+HLNc83FuavwZCFoMmExj+ltUHiHUw=
 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=
@@ -235,15 +217,15 @@ github.com/rogpeppe/go-internal v1.6.1/go.mod h1:xXDCJY+GAPziupqXw64V24skbSoqbTE
 github.com/rogpeppe/go-internal v1.8.0 h1:FCbCCtXNOY3UtUuHUYaghJg4y7Fd14rXifAYUAtL9R8=
 github.com/rogpeppe/go-internal v1.8.0/go.mod h1:WmiCO8CzOY8rg0OYDC4/i/2WRWAB6poM+XZ2dLUbcbE=
 github.com/russross/blackfriday v1.5.2/go.mod h1:JO/DiYxRf+HjHt06OyowR9PTA263kcR/rfWxYHBV53g=
-github.com/sagernet/sing v0.2.17 h1:vMPKb3MV0Aa5ws4dCJkRI8XEjrsUcDn810czd0FwmzI=
+github.com/sagernet/sing v0.3.0 h1:PIDVFZHnQAAYRL1UYqNM+0k5s8f/tb1lUW6UDcQiOc8=
-github.com/sagernet/sing v0.2.17/go.mod h1:OL6k2F0vHmEzXz2KW19qQzu172FDgSbUSODylighuVo=
+github.com/sagernet/sing v0.3.0/go.mod h1:9pfuAH6mZfgnz/YjP6xu5sxx882rfyjpcrTdUpd6w3g=
-github.com/sagernet/sing-shadowsocks v0.2.5 h1:qxIttos4xu6ii7MTVJYA8EFQR7Q3KG6xMqmLJIFtBaY=
+github.com/sagernet/sing-shadowsocks v0.2.6 h1:xr7ylAS/q1cQYS8oxKKajhuQcchd5VJJ4K4UZrrpp0s=
-github.com/sagernet/sing-shadowsocks v0.2.5/go.mod h1:MGWGkcU2xW2G2mfArT9/QqpVLOGU+dBaahZCtPHdt7A=
+github.com/sagernet/sing-shadowsocks v0.2.6/go.mod h1:j2YZBIpWIuElPFL/5sJAj470bcn/3QQ5lxZUNKLDNAM=
 github.com/seiflotfy/cuckoofilter v0.0.0-20220411075957-e3b120b3f5fb h1:XfLJSPIOUX+osiMraVgIrMR27uMXnRJWGm1+GL8/63U=
 github.com/seiflotfy/cuckoofilter v0.0.0-20220411075957-e3b120b3f5fb/go.mod h1:bR6DqgcAl1zTcOX8/pE2Qkj9XO00eCNqmKb7lXP8EAg=
 github.com/sergi/go-diff v1.0.0/go.mod h1:0CfEIISq7TuYL3j771MWULgwwjU+GofnZX9QAmXWZgo=
-github.com/shirou/gopsutil/v3 v3.23.11 h1:i3jP9NjCPUz7FiZKxlMnODZkdSIp2gnzfrvsu9CuWEQ=
+github.com/shirou/gopsutil/v3 v3.24.1 h1:R3t6ondCEvmARp3wxODhXMTLC/klMa87h2PHUw5m7QI=
-github.com/shirou/gopsutil/v3 v3.23.11/go.mod h1:1FrWgea594Jp7qmjHUUPlJDTPgcsb9mGnXDxavtikzM=
+github.com/shirou/gopsutil/v3 v3.24.1/go.mod h1:UU7a2MSBQa+kW1uuDq8DeEBS8kmrnQwsv2b5O513rwU=
 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=
@@ -277,30 +259,26 @@ github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSS
 github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo=
 github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
 github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
-github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
 github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
 github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
-github.com/stretchr/testify v1.8.2/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
 github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk=
 github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=
 github.com/tarm/serial v0.0.0-20180830185346-98f6abe2eb07/go.mod h1:kDXzergiv9cbyO7IOYJZWg1U88JhDg3PB6klq9Hg2pA=
-github.com/tinylib/msgp v1.1.5/go.mod h1:eQsjooMTnV42mHu917E26IogZ2930nFyBQdofk10Udg=
-github.com/tklauser/go-sysconf v0.3.12 h1:0QaGUFOdQaIVdPgfITYzaTegZvdCjmYO52cSFAEVmqU=
 github.com/tklauser/go-sysconf v0.3.12/go.mod h1:Ho14jnntGE1fpdOqQEEaiKRpvIavV0hSfmBq8nJbHYI=
-github.com/tklauser/numcpus v0.6.1 h1:ng9scYS7az0Bk4OZLvrNXNSAO2Pxr1XXRAPyjhIx+Fk=
+github.com/tklauser/go-sysconf v0.3.13 h1:GBUpcahXSpR2xN01jhkNAbTLRk2Yzgggk8IM08lq3r4=
+github.com/tklauser/go-sysconf v0.3.13/go.mod h1:zwleP4Q4OehZHGn4CYZDipCgg9usW5IJePewFCGVEa0=
 github.com/tklauser/numcpus v0.6.1/go.mod h1:1XfjsgE2zo8GVw7POkMbHENHzVg3GzmoZ9fESEdAacY=
-github.com/ttacon/chalk v0.0.0-20160626202418-22c06c80ed31/go.mod h1:onvgF043R+lC5RZ8IT9rBXDaEDnpnw/Cl+HFiw+v/7Q=
+github.com/tklauser/numcpus v0.7.0 h1:yjuerZP127QG9m5Zh/mSO4wqurYil27tHrqwRoRjpr4=
+github.com/tklauser/numcpus v0.7.0/go.mod h1:bb6dMVcj8A42tSE7i32fsIUCbQNllK5iDguyOZRUzAY=
 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 v1.1.7/go.mod h1:kZn38zHttfInRq0xu/PH0az30d+z6vm202qpg1oXVMw=
 github.com/ugorji/go v1.2.7/go.mod h1:nF9osbDWLy6bDVv/Rtoh6QgnvNDpmCalQV5urGCCS6M=
-github.com/ugorji/go/codec v1.1.7/go.mod h1:Ax+UKWsSmolVDwsd+7N3ZtXu+yMGCf907BLYF3GoBXY=
 github.com/ugorji/go/codec v1.2.7/go.mod h1:WGN1fab3R1fzQlVQTkfxVtIBhWDRqOviHU95kRgeqEY=
-github.com/ugorji/go/codec v1.2.11 h1:BMaWp1Bb6fHwEtbplGBGJ498wD+LKlNSl25MjdZY4dU=
+github.com/ugorji/go/codec v1.2.12 h1:9LC83zGrHhuUA9l16C9AHXAqEV/2wBQ4nkvumAE65EE=
-github.com/ugorji/go/codec v1.2.11/go.mod h1:UNopzCgEMSXjBc6AOMqYvWC1ktqTAfzJZUZgYf6w6lg=
+github.com/ugorji/go/codec v1.2.12/go.mod h1:UNopzCgEMSXjBc6AOMqYvWC1ktqTAfzJZUZgYf6w6lg=
 github.com/v2fly/ss-bloomring v0.0.0-20210312155135-28617310f63e h1:5QefA066A1tF8gHIiADmOVOV5LS43gt3ONnlEl3xkwI=
 github.com/v2fly/ss-bloomring v0.0.0-20210312155135-28617310f63e/go.mod h1:5t19P9LBIrNamL6AcMQOncg/r10y3Pc01AbHeMhwlpU=
 github.com/viant/assertly v0.4.8/go.mod h1:aGifi++jvCrUaklKEKT0BU95igDNaqkvz+49uaYMPRU=
@@ -312,40 +290,37 @@ github.com/vishvananda/netns v0.0.4 h1:Oeaw1EM2JMxD51g9uhtC0D7erkIjgmj8+JZc26m1Y
 github.com/vishvananda/netns v0.0.4/go.mod h1:SpkAiCQRtJ6TvvxPnOSyH3BMl6unz3xZlaprSwhNNJM=
 github.com/xtls/reality v0.0.0-20231112171332-de1173cf2b19 h1:capMfFYRgH9BCLd6A3Er/cH3A9Nz3CU2KwxwOQZIePI=
 github.com/xtls/reality v0.0.0-20231112171332-de1173cf2b19/go.mod h1:dm4y/1QwzjGaK17ofi0Vs6NpKAHegZky8qk6J2JJZAE=
-github.com/xtls/xray-core v1.8.6 h1:tr3nk/fZnFfCsmgZv7B3RC72N5qUC88oMGVLlybDey8=
+github.com/xtls/xray-core v1.8.7 h1:lb8O1l3/eAg3YAXA6tLm5M6N7BsX8wxW9sJLjU3dHkA=
-github.com/xtls/xray-core v1.8.6/go.mod h1:hj2EB8rtcLdlTC8zxiWm5xL+C0k2Aie9Pk0mXtDEP6U=
+github.com/xtls/xray-core v1.8.7/go.mod h1:9rFpflfQbgFeH1VKJw7yUmEy7myOyDCgNXXl0bmmyOo=
-github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
-github.com/yusufpapurcu/wmi v1.2.3 h1:E1ctvB7uKFMOJw3fdOW32DwGE9I7t++CRUEMKvFoFiw=
 github.com/yusufpapurcu/wmi v1.2.3/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQmPyzfmi0=
+github.com/yusufpapurcu/wmi v1.2.4 h1:zFUKzehAFReQwLys1b/iSMl+JQGSCSjtVqQn9bBrPo0=
+github.com/yusufpapurcu/wmi v1.2.4/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQmPyzfmi0=
 go.opencensus.io v0.18.0/go.mod h1:vKdFvxhtzZ9onBp9VKHK8z/sRpBMnKAsufL7wlDrCOA=
 go.uber.org/atomic v1.11.0 h1:ZvwS0R+56ePWxUNi+Atn9dWONBPp/AUETXlHW0DxSjE=
 go.uber.org/atomic v1.11.0/go.mod h1:LUxbIzbOniOlMKjJjyPfpl4v+PKK2cNJn91OQbhoJI0=
-go.uber.org/mock v0.3.0 h1:3mUxI1No2/60yUYax92Pt8eNOEecx2D3lcXZh2NEZJo=
+go.uber.org/mock v0.4.0 h1:VcM4ZOtdbR4f6VXfiOpwpVJDL6lCReaZ6mw31wqh7KU=
-go.uber.org/mock v0.3.0/go.mod h1:a6FSlNadKUHUa9IP5Vyt1zh4fC7uAwxMutEAscFbkZc=
+go.uber.org/mock v0.4.0/go.mod h1:a6FSlNadKUHUa9IP5Vyt1zh4fC7uAwxMutEAscFbkZc=
 go4.org v0.0.0-20180809161055-417644f6feb5/go.mod h1:MkTOUMDaeVYJUOUsaDXIhWPZYa1yOyC1qaOBpL57BhE=
-go4.org/netipx v0.0.0-20230824141953-6213f710f925 h1:eeQDDVKFkx0g4Hyy8pHgmZaK0EqB4SD6rvKbUdN3ziQ=
+go4.org/netipx v0.0.0-20231129151722-fdeea329fbba h1:0b9z3AuHCjxk0x/opv64kcgZLBseWJUpBw5I82+2U4M=
-go4.org/netipx v0.0.0-20230824141953-6213f710f925/go.mod h1:PLyyIXexvUFg3Owu6p/WfdlivPbZJsZdgWZlrGope/Y=
+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.3.0 h1:02VY4/ZcO/gBOH6PUaoiptASxtXU10jazRCP865E97k=
+golang.org/x/arch v0.7.0 h1:pskyeJh/3AmoQ8CPE95vxHLqp1G1GfGNXTmcl9NEKTc=
-golang.org/x/arch v0.3.0/go.mod h1:5om86z9Hs0C8fWVUuoMHwpExlXzs5Tkyp9hOrfG7pp8=
+golang.org/x/arch v0.7.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.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
-golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
 golang.org/x/crypto v0.0.0-20210711020723-a769d52b0f97/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
-golang.org/x/crypto v0.15.0 h1:frVn1TEaCEaZcn3Tmd7Y2b5KKPaZ+I32Q2OA3kYp5TA=
+golang.org/x/crypto v0.19.0 h1:ENy+Az/9Y1vSrlrvBSyna3PITt4tiZLf7sgCjZBX7Wo=
-golang.org/x/crypto v0.15.0/go.mod h1:4ChreQoLWfG3xLDer1WdlH5NdlQ3+mwnQq1YTKY+72g=
+golang.org/x/crypto v0.19.0/go.mod h1:Iy9bg/ha4yyC70EfRS8jz+B6ybOBKMaSxLj6P6oBDfU=
 golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
-golang.org/x/exp v0.0.0-20231110203233-9a3e6036ecaa h1:FRnLl4eNAQl8hwxVVC17teOw8kdjVDVAiFMtgUdTSRQ=
+golang.org/x/exp v0.0.0-20240213143201-ec583247a57a h1:HinSgX1tJRX3KsL//Gxynpw5CTOAIPhgL4W8PNiIpVE=
-golang.org/x/exp v0.0.0-20231110203233-9a3e6036ecaa/go.mod h1:zk2irFbV9DP96SEBUUAy67IdHUaZuSnrz1n472HUCLE=
+golang.org/x/exp v0.0.0-20240213143201-ec583247a57a/go.mod h1:CxmFvTBINI24O/j8iY7H1xHzx2i4OsyguNBmN/uPtqc=
 golang.org/x/lint v0.0.0-20180702182130-06c8688daad7/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
 golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
 golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU=
-golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
+golang.org/x/mod v0.15.0 h1:SernR4v+D55NyBH2QiEQrlBAnj1ECL6AGrA5+dPaMY8=
-golang.org/x/mod v0.14.0 h1:dGoOF9QVLYng8IHTm7BAyWqCqSheQ5pYWGhzW00YJr0=
+golang.org/x/mod v0.15.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c=
-golang.org/x/mod v0.14.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=
@@ -354,12 +329,9 @@ 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.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
-golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
-golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
 golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
-golang.org/x/net v0.18.0 h1:mIYleuAkSbHh0tCv7RvjL3F6ZVbLjq4+R7zbOn3Kokg=
+golang.org/x/net v0.21.0 h1:AQyQV4dYCvJ7vGmJyKki9+PBdyvhkSd8EIx/qb0AYv4=
-golang.org/x/net v0.18.0/go.mod h1:/czyP5RqHAH4odGYxBJ1qz0+CE5WZ+2j1YgoEo8F2jQ=
+golang.org/x/net v0.21.0/go.mod h1:bIjVDfnllIU7BJ2DNgfnXvpSvtn8VRwhlsaeUTyUS44=
 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=
@@ -369,61 +341,52 @@ 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.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.6.0 h1:5BMeUDZ7vkXGfEr1x9B4bRcTH4lpkTkpdh0T/J+qjbQ=
-golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.6.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
-golang.org/x/sync v0.5.0 h1:60k92dhOjHxJkrqnwsfl8KuaHbn/5dl0lUPUklKo3qE=
-golang.org/x/sync v0.5.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=
 golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190316082340-a2f829d7f35f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190916202348-b4ddaad3f8a3/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200217220822-9197077df867/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20201204225414-ed752295db88/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20210806184541-e5e7981a1069/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220804214406-8e32c043e418/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+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.11.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.15.0 h1:h48lPFYpsTvQJZF4EKyI4aLHaev3CxivZmv7yZig9pc=
+golang.org/x/sys v0.16.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
-golang.org/x/sys v0.15.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
+golang.org/x/sys v0.17.0 h1:25cE3gD+tdBA7lp7QfhuV+rJiE9YXTcS3VG1SqssI/Y=
+golang.org/x/sys v0.17.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
-golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
 golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/text v0.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ=
 golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
 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.4.0 h1:Z81tqI5ddIoXDPvVQ7/7CC9TnLM7ubaFG2qXYd5BbYY=
+golang.org/x/time v0.5.0 h1:o7cqy6amK/52YcAKIPlM3a+Fpj35zvRj2TP+e1xFSfk=
-golang.org/x/time v0.4.0/go.mod h1:3BpzKBy/shNhVucY/MWOyx10tF3SFh9QdLuxbVysPQM=
+golang.org/x/time v0.5.0/go.mod h1:3BpzKBy/shNhVucY/MWOyx10tF3SFh9QdLuxbVysPQM=
 golang.org/x/tools v0.0.0-20180828015842-6cd1fcedba52/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 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.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
+golang.org/x/tools v0.18.0 h1:k8NLag8AGHnn+PHbl7g43CtqZAwG60vZkLqgyZgIHgQ=
-golang.org/x/tools v0.0.0-20201022035929-9cf592e881e9/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
+golang.org/x/tools v0.18.0/go.mod h1:GL7B4CwcLLeo59yx/9UWWuNOW1n3VZ4f5axWfML7Lcg=
-golang.org/x/tools v0.15.0 h1:zdAyfUGbYmuVokhzVmghFl2ZJh5QhcfebBgmVPFYA+8=
-golang.org/x/tools v0.15.0/go.mod h1:hpksKq4dtpQWS1uQ61JkdqWM3LscIS6Slf+VVkm+wQk=
-golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
-golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
-golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/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-20231022001213-2e0774f246fb h1:c5tyN8sSp8jSDxdCCDXVOpJwYXXhmTkNMt+g0zTSOic=
+golang.zx2c4.com/wireguard v0.0.0-20231211153847-12269c276173 h1:/jFs0duh4rdb8uIfPMv78iAJGcPKDeqAFnaLBropIC4=
-golang.zx2c4.com/wireguard v0.0.0-20231022001213-2e0774f246fb/go.mod h1:tkCQ4FQXmpAgYVh++1cq16/dH4QJtmvpRv19DWGAHSA=
+golang.zx2c4.com/wireguard v0.0.0-20231211153847-12269c276173/go.mod h1:tkCQ4FQXmpAgYVh++1cq16/dH4QJtmvpRv19DWGAHSA=
 google.golang.org/api v0.0.0-20180910000450-7ca32eb868bf/go.mod h1:4mhQ8q/RsB7i+udVvVy5NUi08OU8ZlA0gRVgrF7VFY0=
 google.golang.org/api v0.0.0-20181030000543-1d582fd0359e/go.mod h1:4mhQ8q/RsB7i+udVvVy5NUi08OU8ZlA0gRVgrF7VFY0=
 google.golang.org/api v0.1.0/go.mod h1:UGEZY7KEX120AnNLIHFMKIo4obdJhkp2tPbaPlQx13Y=
@@ -436,19 +399,19 @@ 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-20231106174013-bbf56f31fb17 h1:Jyp0Hsi0bmHXG6k9eATXoYtjd6e2UzZ1SCn/wIupY14=
+google.golang.org/genproto/googleapis/rpc v0.0.0-20240213162025-012b6fc9bca9 h1:hZB7eLIaYlW9qXRfCq/qDaPdbeY3757uARz5Vvfv+cY=
-google.golang.org/genproto/googleapis/rpc v0.0.0-20231106174013-bbf56f31fb17/go.mod h1:oQ5rr10WTTMvP4A36n8JpR1OrO1BEiV4f78CneXZxkA=
+google.golang.org/genproto/googleapis/rpc v0.0.0-20240213162025-012b6fc9bca9/go.mod h1:YUWgXUFRPfoYK1IHMuxH5K6nPEXSCzIMljnQ59lLRCk=
 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.59.0 h1:Z5Iec2pjwb+LEOqzpB2MR12/eKFhDPhuqW91O+4bwUk=
+google.golang.org/grpc v1.61.1 h1:kLAiWrZs7YeDM6MumDe7m3y4aM6wacLzM1Y/wiLP9XY=
-google.golang.org/grpc v1.59.0/go.mod h1:aUPDwccQo6OTjy7Hct4AfBPD1GptF4fyUjIkQ9YtF98=
+google.golang.org/grpc v1.61.1/go.mod h1:VUbo7IFqmF1QtCAstipjG0GIoq49KvMe9+h1jFLBNJs=
 google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw=
 google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
 google.golang.org/protobuf v1.28.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=
-google.golang.org/protobuf v1.31.0 h1:g0LDEJHgrBl9N9r17Ru3sqWhkIx2NB67okBHPwC7hs8=
+google.golang.org/protobuf v1.32.0 h1:pPC6BG5ex8PDFnkbrGU3EixyhKcQ2aDuBS36lqK/C7I=
-google.golang.org/protobuf v1.31.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=
+google.golang.org/protobuf v1.32.0/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=
@@ -457,7 +420,6 @@ gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI=
 gopkg.in/inf.v0 v0.9.1/go.mod h1:cWUDdTG/fYaXco+Dcufb5Vnc6Gp2YChqWtbxRZE0mXw=
 gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
-gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY=
 gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
 gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
@@ -465,18 +427,21 @@ gopkg.in/yaml.v3 v3.0.0-20200605160147-a5ece683394c/go.mod h1:K4uyk7z7BCEPqu6E+C
 gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/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.4 h1:IqXwXi8M/ZlPzH/947tn5uik3aYQslP9BVveoax0nV0=
+gorm.io/driver/sqlite v1.5.5 h1:7MDMtUZhV065SilG62E0MquljeArQZNfJnjd9i9gx3E=
-gorm.io/driver/sqlite v1.5.4/go.mod h1:qxAuCol+2r6PannQDpOP1FP6ag3mKi4esLnB/jHed+4=
+gorm.io/driver/sqlite v1.5.5/go.mod h1:6NgQ7sQWAIFsPrJJl1lSNSu2TABh0ZZ/zm5fosATavE=
-gorm.io/gorm v1.25.5 h1:zR9lOiiYf09VNh5Q1gphfyia1JpiClIWG9hQaxB/mls=
+gorm.io/gorm v1.25.7 h1:VsD6acwRjz2zFxGO50gPO6AkNs7KKnvfzUjHQhZDz/A=
-gorm.io/gorm v1.25.5/go.mod h1:hbnx/Oo0ChWMn1BIhpy1oYozzpM15i4YPuHDmfYtwg8=
+gorm.io/gorm v1.25.7/go.mod h1:hbnx/Oo0ChWMn1BIhpy1oYozzpM15i4YPuHDmfYtwg8=
 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-20231104011432-48a6d7d5bd0b/go.mod h1:10sU+Uh5KKNv1+2x2A0Gvzt8FjD3ASIhorV3YsauXhk=
+gvisor.dev/gvisor v0.0.0-20240216214558-53d2b511e78e h1:BAmOamSGzOqvWRcyoAZvud9SuInvUn2qYIK495rjF+4=
+gvisor.dev/gvisor v0.0.0-20240216214558-53d2b511e78e/go.mod h1:YcCCAniKhCIGGvWxOobcre6euvNQON7nZCtMcVYO9rA=
 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.2.1/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=
 sourcegraph.com/sqs/pbtypes v0.0.0-20180604144634-d3ebe8f20ae4/go.mod h1:ketZ/q3QxT9HOBeFhu6RdvsftgpsbFHBF5Cas6cDKZ0=

install.sh

@@ -23,25 +23,16 @@ else
 fi
 echo "The OS release is: $release"
 
-arch=$(arch)
+arch() {
-
+    case "$(uname -m)" in
-if [[ $arch == "x86_64" || $arch == "x64" || $arch == "amd64" ]]; then
+    x86_64 | x64 | amd64) echo 'amd64' ;;
-    arch="amd64"
+    i*86 | x86) echo '386' ;;
-elif [[ $arch == "aarch64" || $arch == "arm64" ]]; then
+    armv8* | armv8 | arm64 | aarch64) echo 'arm64' ;;
-    arch="arm64"
+    armv7* | armv7 | arm) echo 'armv7' ;;
-elif [[ $arch == "s390x" ]]; then
+    *) echo -e "${green}Unsupported CPU architecture! ${plain}" && rm -f install.sh && exit 1 ;;
-    arch="s390x"
+    esac
-else
+}
-    arch="amd64"
+echo "arch: $(arch)"
-    echo -e "${red} Failed to check system arch, will use default arch: ${arch}${plain}"
-fi
-
-echo "arch: ${arch}"
-
-if [ $(getconf WORD_BIT) != '32' ] && [ $(getconf LONG_BIT) != '64' ]; then
-    echo "x-ui dosen't support 32-bit(x86) system, please use 64 bit operating system(x86_64) instead, if there is something wrong, please get in touch with me!"
-    exit -1
-fi
 
 os_version=""
 os_version=$(grep -i version_id /etc/os-release | cut -d \" -f2 | cut -d . -f1)
@@ -50,7 +41,7 @@ if [[ "${release}" == "centos" ]]; then
     if [[ ${os_version} -lt 8 ]]; then
         echo -e "${red} Please use CentOS 8 or higher ${plain}\n" && exit 1
     fi
-elif [[ "${release}" ==  "ubuntu" ]]; then
+elif [[ "${release}" == "ubuntu" ]]; then
     if [[ ${os_version} -lt 20 ]]; then
         echo -e "${red}please use Ubuntu 20 or higher version! ${plain}\n" && exit 1
     fi
@@ -68,13 +59,18 @@ else
     echo -e "${red}Failed to check the OS version, please contact the author!${plain}" && exit 1
 fi
 
-
+install_dependencies() {
-install_base() {
+    case "${release}" in
-    if [[ "${release}" == "centos" ]] || [[ "${release}" == "fedora" ]] ; then
+    centos)
-        yum install wget curl tar -y
+        yum -y update && yum install -y -q wget curl tar tzdata
-    else
+        ;;
-        apt install wget curl tar -y
+    fedora)
-    fi
+        dnf -y update && dnf install -y -q wget curl tar tzdata
+        ;;
+    *)
+        apt-get update && apt install -y -q wget curl tar tzdata
+        ;;
+    esac
 }
 
 #This function will be called when user installed x-ui out of sercurity
@@ -113,6 +109,21 @@ config_after_install() {
 }
 
 install_x-ui() {
+    # checks if the installation backup dir exist. if existed then ask user if they want to restore it else continue installation.
+    if [[ -e /usr/local/x-ui-backup/ ]]; then
+        read -p "Failed installation detected. Do you want to restore previously installed version? [y/n]? ": restore_confirm
+        if [[ "${restore_confirm}" == "y" || "${restore_confirm}" == "Y" ]]; then
+            systemctl stop x-ui
+            mv /usr/local/x-ui-backup/x-ui.db /etc/x-ui/ -f
+            mv /usr/local/x-ui-backup/ /usr/local/x-ui/ -f
+            systemctl start x-ui
+            echo -e "${green}previous installed x-ui restored successfully${plain}, it is up and running now..."
+            exit 0
+        else
+            echo -e "Continuing installing x-ui ..."
+        fi
+    fi
+
     cd /usr/local/
 
     if [ $# == 0 ]; then
@@ -122,36 +133,45 @@ install_x-ui() {
             exit 1
         fi
         echo -e "Got x-ui latest version: ${last_version}, beginning the installation..."
-        wget -N --no-check-certificate -O /usr/local/x-ui-linux-${arch}.tar.gz https://github.com/alireza0/x-ui/releases/download/${last_version}/x-ui-linux-${arch}.tar.gz
+        wget -N --no-check-certificate -O /usr/local/x-ui-linux-$(arch).tar.gz https://github.com/alireza0/x-ui/releases/download/${last_version}/x-ui-linux-$(arch).tar.gz
         if [[ $? -ne 0 ]]; then
-            echo -e "${red}Dowanloading x-ui failed, please be sure that your server can access Github ${plain}"
+            echo -e "${red}Downloading x-ui failed, please be sure that your server can access Github ${plain}"
             exit 1
         fi
     else
         last_version=$1
-        url="https://github.com/alireza0/x-ui/releases/download/${last_version}/x-ui-linux-${arch}.tar.gz"
+        url="https://github.com/alireza0/x-ui/releases/download/${last_version}/x-ui-linux-$(arch).tar.gz"
-        echo -e "Begining to install x-ui v$1"
+        echo -e "Beginning to install x-ui v$1"
-        wget -N --no-check-certificate -O /usr/local/x-ui-linux-${arch}.tar.gz ${url}
+        wget -N --no-check-certificate -O /usr/local/x-ui-linux-$(arch).tar.gz ${url}
         if [[ $? -ne 0 ]]; then
-            echo -e "${red}dowanload x-ui v$1 failed,please check the verison exists${plain}"
+            echo -e "${red}download x-ui v$1 failed,please check the version exists${plain}"
             exit 1
         fi
     fi
 
     if [[ -e /usr/local/x-ui/ ]]; then
         systemctl stop x-ui
-        rm /usr/local/x-ui/ -rf
+        mv /usr/local/x-ui/ /usr/local/x-ui-backup/ -f
+        cp /etc/x-ui/x-ui.db /usr/local/x-ui-backup/ -f
     fi
 
-    tar zxvf x-ui-linux-${arch}.tar.gz
+    tar zxvf x-ui-linux-$(arch).tar.gz
-    rm x-ui-linux-${arch}.tar.gz -f
+    rm x-ui-linux-$(arch).tar.gz -f
     cd x-ui
-    chmod +x x-ui bin/xray-linux-${arch}
+    chmod +x x-ui
+
+    # Check the system's architecture and rename the file accordingly
+    if [[ $(arch) == "armv7" ]]; then
+        mv bin/xray-linux-$(arch) bin/xray-linux-arm
+        chmod +x bin/xray-linux-arm
+    fi
+    chmod +x x-ui bin/xray-linux-$(arch)
     cp -f x-ui.service /etc/systemd/system/
     wget --no-check-certificate -O /usr/bin/x-ui https://raw.githubusercontent.com/alireza0/x-ui/main/x-ui.sh
     chmod +x /usr/local/x-ui/x-ui.sh
     chmod +x /usr/bin/x-ui
     config_after_install
+    rm /usr/local/x-ui-backup/ -rf
     #echo -e "If it is a new installation, the default web port is ${green}54321${plain}, The username and password are ${green}admin${plain} by default"
     #echo -e "Please make sure that this port is not occupied by other procedures,${yellow} And make sure that port 54321 has been released${plain}"
     #    echo -e "If you want to modify the 54321 to other ports and enter the x-ui command to modify it, you must also ensure that the port you modify is also released"
@@ -163,22 +183,24 @@ install_x-ui() {
     systemctl start x-ui
     echo -e "${green}x-ui v${last_version}${plain} installation finished, it is up and running now..."
     echo -e ""
-    echo -e "x-ui control menu usages: "
+    echo "X-UI Control Menu Usage"
-    echo -e "----------------------------------------------"
+    echo "------------------------------------------"
-    echo -e "x-ui              - Enter     Admin menu"
+    echo "SUBCOMMANDS:"
-    echo -e "x-ui start        - Start     x-ui"
+    echo "x-ui              - Admin Management Script"
-    echo -e "x-ui stop         - Stop      x-ui"
+    echo "x-ui start        - Start"
-    echo -e "x-ui restart      - Restart   x-ui"
+    echo "x-ui stop         - Stop"
-    echo -e "x-ui status       - Show      x-ui status"
+    echo "x-ui restart      - Restart"
-    echo -e "x-ui enable       - Enable    x-ui on system startup"
+    echo "x-ui status       - Current Status"
-    echo -e "x-ui disable      - Disable   x-ui on system startup"
+    echo "x-ui enable       - Enable Autostart on OS Startup"
-    echo -e "x-ui log          - Check     x-ui logs"
+    echo "x-ui disable      - Disable Autostart on OS Startup"
-    echo -e "x-ui update       - Update    x-ui"
+    echo "x-ui log          - Check Logs"
-    echo -e "x-ui install      - Install   x-ui"
+    echo "x-ui update       - Update"
-    echo -e "x-ui uninstall    - Uninstall x-ui"
+    echo "x-ui install      - Install"
-    echo -e "----------------------------------------------"
+    echo "x-ui uninstall    - Uninstall"
+    echo "x-ui help         - Control Menu Usage"
+    echo "------------------------------------------"
 }
 
-echo -e "${green}Excuting...${plain}"
+echo -e "${green}Running...${plain}"
-install_base
+install_dependencies
 install_x-ui $1

sub/default.json

@@ -0,0 +1,105 @@
+{
+  "dns": {
+    "tag": "dns_out",
+    "queryStrategy": "UseIP",
+    "servers": [
+      {
+        "address": "8.8.8.8",
+        "skipFallback": false
+      }
+    ]
+  },
+  "inbounds": [
+    {
+      "port": 10808,
+      "protocol": "socks",
+      "settings": {
+        "auth": "noauth",
+        "udp": true,
+        "userLevel": 8
+      },
+      "sniffing": {
+        "destOverride": [
+          "http",
+          "tls",
+          "fakedns"
+        ],
+        "enabled": true
+      },
+      "tag": "socks"
+    },
+    {
+      "port": 10809,
+      "protocol": "http",
+      "settings": {
+        "userLevel": 8
+      },
+      "tag": "http"
+    }
+  ],
+  "log": {
+    "loglevel": "warning"
+  },
+  "outbounds": [
+    {
+      "tag": "direct",
+      "protocol": "freedom",
+      "settings": {
+        "domainStrategy": "UseIP"
+      }
+    },
+    {
+      "tag": "block",
+      "protocol": "blackhole",
+      "settings": {
+        "response": {
+          "type": "http"
+        }
+      }
+    }
+  ],
+  "policy": {
+    "levels": {
+      "8": {
+        "connIdle": 300,
+        "downlinkOnly": 1,
+        "handshake": 4,
+        "uplinkOnly": 1
+      }
+    },
+    "system": {
+      "statsOutboundUplink": true,
+      "statsOutboundDownlink": true
+    }
+  },
+  "routing": {
+    "domainStrategy": "AsIs",
+    "rules": [
+      {
+        "type": "field",
+        "network": "tcp,udp",
+        "balancerTag": "all"
+      }
+    ],
+    "balancers": [
+      {
+        "tag": "all",
+        "selector": [
+          "proxy"
+        ],
+        "strategy": {
+          "type": "leastPing"
+        }
+      }
+    ]
+  },
+  "observatory": {
+    "probeInterval": "5m",
+    "probeURL": "https://api.github.com/_private/browser/stats",
+    "subjectSelector": [
+      "proxy"
+    ],
+    "EnableConcurrency": true
+  },
+  "stats": {}
+}

sub/sub.go

@@ -47,11 +47,6 @@ func (s *Server) initRouter() (*gin.Engine, error) {
 
 	engine := gin.Default()
 
-	subPath, err := s.settingService.GetSubPath()
-	if err != nil {
-		return nil, err
-	}
-
 	subDomain, err := s.settingService.GetSubDomain()
 	if err != nil {
 		return nil, err
@@ -61,9 +56,44 @@ func (s *Server) initRouter() (*gin.Engine, error) {
 		engine.Use(middleware.DomainValidatorMiddleware(subDomain))
 	}
 
-	g := engine.Group(subPath)
+	LinksPath, err := s.settingService.GetSubPath()
+	if err != nil {
+		return nil, err
+	}
 
-	s.sub = NewSUBController(g)
+	JsonPath, err := s.settingService.GetSubJsonPath()
+	if err != nil {
+		return nil, err
+	}
+
+	Encrypt, err := s.settingService.GetSubEncrypt()
+	if err != nil {
+		return nil, err
+	}
+
+	ShowInfo, err := s.settingService.GetSubShowInfo()
+	if err != nil {
+		return nil, err
+	}
+
+	RemarkModel, err := s.settingService.GetRemarkModel()
+	if err != nil {
+		RemarkModel = "-ieo"
+	}
+
+	SubUpdates, err := s.settingService.GetSubUpdates()
+	if err != nil {
+		SubUpdates = "10"
+	}
+
+	SubJsonFragment, err := s.settingService.GetSubJsonFragment()
+	if err != nil {
+		SubJsonFragment = ""
+	}
+
+	g := engine.Group("/")
+
+	s.sub = NewSUBController(g, LinksPath, JsonPath, Encrypt, ShowInfo, RemarkModel, SubUpdates, SubJsonFragment)
 
 	return engine, nil
 }

sub/subController.go

@@ -3,34 +3,57 @@ package sub
 import (
 	"encoding/base64"
 	"strings"
-	"x-ui/web/service"
 
 	"github.com/gin-gonic/gin"
 )
 
 type SUBController struct {
-	subService     SubService
+	subPath        string
-	settingService service.SettingService
+	subJsonPath    string
+	subEncrypt     bool
+	updateInterval string
+
+	subService     *SubService
+	subJsonService *SubJsonService
 }
 
-func NewSUBController(g *gin.RouterGroup) *SUBController {
+func NewSUBController(
-	a := &SUBController{}
+	g *gin.RouterGroup,
+	subPath string,
+	jsonPath string,
+	encrypt bool,
+	showInfo bool,
+	rModel string,
+	update string,
+	jsonFragment string) *SUBController {
+
+	a := &SUBController{
+		subPath:        subPath,
+		subJsonPath:    jsonPath,
+		subEncrypt:     encrypt,
+		updateInterval: update,
+
+		subService:     NewSubService(showInfo, rModel),
+		subJsonService: NewSubJsonService(jsonFragment),
+	}
 	a.initRouter(g)
 	return a
 }
 
 func (a *SUBController) initRouter(g *gin.RouterGroup) {
-	g = g.Group("/")
+	gLink := g.Group(a.subPath)
+	gJson := g.Group(a.subJsonPath)
 
-	g.GET("/:subid", a.subs)
+	gLink.GET(":subid", a.subs)
+
+	gJson.GET(":subid", a.subJsons)
 }
 
 func (a *SUBController) subs(c *gin.Context) {
-	subEncrypt, _ := a.settingService.GetSubEncrypt()
+	println(c.Request.Header["User-Agent"][0])
-	subShowInfo, _ := a.settingService.GetSubShowInfo()
 	subId := c.Param("subid")
 	host := strings.Split(c.Request.Host, ":")[0]
-	subs, headers, err := a.subService.GetSubs(subId, host, subShowInfo)
+	subs, header, err := a.subService.GetSubs(subId, host)
 	if err != nil || len(subs) == 0 {
 		c.String(400, "Error!")
 	} else {
@@ -40,14 +63,32 @@ func (a *SUBController) subs(c *gin.Context) {
 		}
 
 		// Add headers
-		c.Writer.Header().Set("Subscription-Userinfo", headers[0])
+		c.Writer.Header().Set("Subscription-Userinfo", header)
-		c.Writer.Header().Set("Profile-Update-Interval", headers[1])
+		c.Writer.Header().Set("Profile-Update-Interval", a.updateInterval)
-		c.Writer.Header().Set("Profile-Title", headers[2])
+		c.Writer.Header().Set("Profile-Title", subId)
 
-		if subEncrypt {
+		if a.subEncrypt {
 			c.String(200, base64.StdEncoding.EncodeToString([]byte(result)))
 		} else {
 			c.String(200, result)
 		}
 	}
 }
+
+func (a *SUBController) subJsons(c *gin.Context) {
+	println(c.Request.Header["User-Agent"][0])
+	subId := c.Param("subid")
+	host := strings.Split(c.Request.Host, ":")[0]
+	jsonSub, header, err := a.subJsonService.GetJson(subId, host)
+	if err != nil || len(jsonSub) == 0 {
+		c.String(400, "Error!")
+	} else {
+
+		// Add headers
+		c.Writer.Header().Set("Subscription-Userinfo", header)
+		c.Writer.Header().Set("Profile-Update-Interval", a.updateInterval)
+		c.Writer.Header().Set("Profile-Title", subId)
+
+		c.String(200, jsonSub)
+	}
+}

sub/subJsonService.go

@@ -0,0 +1,359 @@
+package sub
+
+import (
+	_ "embed"
+	"encoding/json"
+	"fmt"
+	"strings"
+	"x-ui/database/model"
+	"x-ui/logger"
+	"x-ui/util/json_util"
+	"x-ui/util/random"
+	"x-ui/web/service"
+	"x-ui/xray"
+)
+
+//go:embed default.json
+var defaultJson string
+
+type SubJsonService struct {
+	fragmanet string
+
+	inboundService service.InboundService
+	SubService
+}
+
+func NewSubJsonService(fragment string) *SubJsonService {
+	return &SubJsonService{
+		fragmanet: fragment,
+	}
+}
+
+func (s *SubJsonService) GetJson(subId string, host string) (string, string, error) {
+	inbounds, err := s.SubService.getInboundsBySubId(subId)
+	if err != nil || len(inbounds) == 0 {
+		return "", "", err
+	}
+
+	var header string
+	var traffic xray.ClientTraffic
+	var clientTraffics []xray.ClientTraffic
+	var configJson map[string]interface{}
+	var defaultOutbounds []json_util.RawMessage
+
+	json.Unmarshal([]byte(defaultJson), &configJson)
+	if outboundSlices, ok := configJson["outbounds"].([]interface{}); ok {
+		for _, defaultOutbound := range outboundSlices {
+			jsonBytes, _ := json.Marshal(defaultOutbound)
+			defaultOutbounds = append(defaultOutbounds, jsonBytes)
+		}
+	}
+
+	outbounds := []json_util.RawMessage{}
+	startIndex := 0
+	// Prepare Inbounds
+	for _, inbound := range inbounds {
+		clients, err := s.inboundService.GetClients(inbound)
+		if err != nil {
+			logger.Error("SubJsonService - GetClients: Unable to get clients from inbound")
+		}
+		if clients == nil {
+			continue
+		}
+		if len(inbound.Listen) > 0 && inbound.Listen[0] == '@' {
+			listen, port, streamSettings, err := s.getFallbackMaster(inbound.Listen, inbound.StreamSettings)
+			if err == nil {
+				inbound.Listen = listen
+				inbound.Port = port
+				inbound.StreamSettings = streamSettings
+			}
+		}
+
+		var subClients []model.Client
+		for _, client := range clients {
+			if client.Enable && client.SubID == subId {
+				subClients = append(subClients, client)
+				clientTraffics = append(clientTraffics, s.SubService.getClientTraffics(inbound.ClientStats, client.Email))
+			}
+		}
+
+		outbound := s.getOutbound(inbound, subClients, host, startIndex)
+		if outbound != nil {
+			outbounds = append(outbounds, outbound...)
+			startIndex += len(outbound)
+		}
+	}
+
+	if len(outbounds) == 0 {
+		return "", "", nil
+	}
+
+	// Prepare statistics
+	for index, clientTraffic := range clientTraffics {
+		if index == 0 {
+			traffic.Up = clientTraffic.Up
+			traffic.Down = clientTraffic.Down
+			traffic.Total = clientTraffic.Total
+			if clientTraffic.ExpiryTime > 0 {
+				traffic.ExpiryTime = clientTraffic.ExpiryTime
+			}
+		} else {
+			traffic.Up += clientTraffic.Up
+			traffic.Down += clientTraffic.Down
+			if traffic.Total == 0 || clientTraffic.Total == 0 {
+				traffic.Total = 0
+			} else {
+				traffic.Total += clientTraffic.Total
+			}
+			if clientTraffic.ExpiryTime != traffic.ExpiryTime {
+				traffic.ExpiryTime = 0
+			}
+		}
+	}
+
+	if s.fragmanet != "" {
+		outbounds = append(outbounds, json_util.RawMessage(s.fragmanet))
+	}
+
+	// Combile outbounds
+	outbounds = append(outbounds, defaultOutbounds...)
+	var outboundStrings []json_util.RawMessage
+	for _, outbound := range outbounds {
+		outboundStrings = append(outboundStrings, outbound)
+	}
+	configJson["outbounds"] = outboundStrings
+	finalJson, _ := json.MarshalIndent(configJson, "", "  ")
+
+	header = fmt.Sprintf("upload=%d; download=%d; total=%d; expire=%d", traffic.Up, traffic.Down, traffic.Total, traffic.ExpiryTime/1000)
+	return string(finalJson), header, nil
+}
+
+func (s *SubJsonService) getOutbound(inbound *model.Inbound, clients []model.Client, host string, startIndex int) []json_util.RawMessage {
+	var newOutbounds []json_util.RawMessage
+	stream := s.streamData(inbound.StreamSettings)
+
+	externalProxies, ok := stream["externalProxy"].([]interface{})
+	if !ok || len(externalProxies) == 0 {
+		externalProxies = []interface{}{
+			map[string]interface{}{
+				"forceTls": "same",
+				"dest":     host,
+				"port":     float64(inbound.Port),
+			},
+		}
+	}
+
+	delete(stream, "externalProxy")
+
+	config_index := startIndex
+	for _, ep := range externalProxies {
+		extPrxy := ep.(map[string]interface{})
+		inbound.Listen = extPrxy["dest"].(string)
+		inbound.Port = int(extPrxy["port"].(float64))
+		newStream := stream
+		switch extPrxy["forceTls"].(string) {
+		case "tls":
+			if newStream["security"] != "tls" {
+				newStream["security"] = "tls"
+				newStream["tslSettings"] = map[string]interface{}{}
+			}
+		case "none":
+			if newStream["security"] != "none" {
+				newStream["security"] = "none"
+				delete(newStream, "tslSettings")
+			}
+		}
+		streamSettings, _ := json.MarshalIndent(newStream, "", "  ")
+		inbound.StreamSettings = string(streamSettings)
+
+		for _, client := range clients {
+			inbound.Tag = fmt.Sprintf("proxy_%d", config_index)
+			switch inbound.Protocol {
+			case "vmess", "vless":
+				newOutbounds = append(newOutbounds, s.genVnext(inbound, client))
+			case "trojan", "shadowsocks":
+				newOutbounds = append(newOutbounds, s.genServer(inbound, client))
+			}
+			config_index += 1
+		}
+	}
+
+	return newOutbounds
+}
+
+func (s *SubJsonService) streamData(stream string) map[string]interface{} {
+	var streamSettings map[string]interface{}
+	json.Unmarshal([]byte(stream), &streamSettings)
+	security, _ := streamSettings["security"].(string)
+	if security == "tls" {
+		streamSettings["tlsSettings"] = s.tlsData(streamSettings["tlsSettings"].(map[string]interface{}))
+	} else if security == "reality" {
+		streamSettings["realitySettings"] = s.realityData(streamSettings["realitySettings"].(map[string]interface{}))
+	}
+	delete(streamSettings, "sockopt")
+
+	if s.fragmanet != "" {
+		streamSettings["sockopt"] = json_util.RawMessage(`{"dialerProxy": "fragment", "tcpKeepAliveIdle": 100, "TcpNoDelay": true}`)
+	}
+
+	// remove proxy protocol
+	network, _ := streamSettings["network"].(string)
+	switch network {
+	case "tcp":
+		streamSettings["tcpSettings"] = s.removeAcceptProxy(streamSettings["tcpSettings"])
+	case "ws":
+		streamSettings["wsSettings"] = s.removeAcceptProxy(streamSettings["wsSettings"])
+	}
+
+	return streamSettings
+}
+
+func (s *SubJsonService) removeAcceptProxy(setting interface{}) map[string]interface{} {
+	netSettings, ok := setting.(map[string]interface{})
+	if ok {
+		delete(netSettings, "acceptProxyProtocol")
+	}
+	return netSettings
+}
+
+func (s *SubJsonService) tlsData(tData map[string]interface{}) map[string]interface{} {
+	tlsData := make(map[string]interface{}, 1)
+	tlsClientSettings := tData["settings"].(map[string]interface{})
+
+	tlsData["serverName"] = tData["serverName"]
+	tlsData["alpn"] = tData["alpn"]
+	if allowInsecure, ok := tlsClientSettings["allowInsecure"].(string); ok {
+		tlsData["allowInsecure"] = allowInsecure
+	}
+	if fingerprint, ok := tlsClientSettings["fingerprint"].(string); ok {
+		tlsData["fingerprint"] = fingerprint
+	}
+	return tlsData
+}
+
+func (s *SubJsonService) realityData(rData map[string]interface{}) map[string]interface{} {
+	rltyData := make(map[string]interface{}, 1)
+	rltyClientSettings := rData["settings"].(map[string]interface{})
+
+	rltyData["show"] = false
+	rltyData["publicKey"] = rltyClientSettings["publicKey"]
+	rltyData["fingerprint"] = rltyClientSettings["fingerprint"]
+
+	// Set random data
+	rltyData["spiderX"] = "/" + random.Seq(15)
+	shortIds, ok := rData["shortIds"].([]interface{})
+	if ok && len(shortIds) > 0 {
+		rltyData["shortId"] = shortIds[random.Num(len(shortIds))].(string)
+	} else {
+		rltyData["shortId"] = ""
+	}
+	serverNames, ok := rData["serverNames"].([]interface{})
+	if ok && len(serverNames) > 0 {
+		rltyData["serverName"] = serverNames[random.Num(len(serverNames))].(string)
+	} else {
+		rltyData["serverName"] = ""
+	}
+
+	return rltyData
+}
+
+func (s *SubJsonService) genVnext(inbound *model.Inbound, client model.Client) json_util.RawMessage {
+	outbound := Outbound{}
+	usersData := make([]UserVnext, 1)
+
+	usersData[0].ID = client.ID
+	usersData[0].Level = 8
+	if inbound.Protocol == model.VLESS {
+		usersData[0].Flow = client.Flow
+		usersData[0].Encryption = "none"
+	}
+
+	vnextData := make([]VnextSetting, 1)
+	vnextData[0] = VnextSetting{
+		Address: inbound.Listen,
+		Port:    inbound.Port,
+		Users:   usersData,
+	}
+
+	outbound.Protocol = string(inbound.Protocol)
+	outbound.Tag = inbound.Tag
+	outbound.StreamSettings = json_util.RawMessage(inbound.StreamSettings)
+	outbound.Settings = OutboundSettings{
+		Vnext: vnextData,
+	}
+
+	result, _ := json.MarshalIndent(outbound, "", "  ")
+	return result
+}
+
+func (s *SubJsonService) genServer(inbound *model.Inbound, client model.Client) json_util.RawMessage {
+	outbound := Outbound{}
+
+	serverData := make([]ServerSetting, 1)
+	serverData[0] = ServerSetting{
+		Address:  inbound.Listen,
+		Port:     inbound.Port,
+		Level:    8,
+		Password: client.Password,
+	}
+
+	if inbound.Protocol == model.Shadowsocks {
+		var inboundSettings map[string]interface{}
+		json.Unmarshal([]byte(inbound.Settings), &inboundSettings)
+		method, _ := inboundSettings["method"].(string)
+		serverData[0].Method = method
+
+		// server password in multi-user 2022 protocols
+		if strings.HasPrefix(method, "2022") {
+			if serverPassword, ok := inboundSettings["password"].(string); ok {
+				serverData[0].Password = fmt.Sprintf("%s:%s", serverPassword, client.Password)
+			}
+		}
+	}
+
+	outbound.Protocol = string(inbound.Protocol)
+	outbound.Tag = inbound.Tag
+	outbound.StreamSettings = json_util.RawMessage(inbound.StreamSettings)
+	outbound.Settings = OutboundSettings{
+		Servers: serverData,
+	}
+
+	result, _ := json.MarshalIndent(outbound, "", "  ")
+	return result
+}
+
+type Outbound struct {
+	Protocol       string                 `json:"protocol"`
+	Tag            string                 `json:"tag"`
+	StreamSettings json_util.RawMessage   `json:"streamSettings"`
+	Mux            map[string]interface{} `json:"mux,omitempty"`
+	ProxySettings  map[string]interface{} `json:"proxySettings,omitempty"`
+	Settings       OutboundSettings       `json:"settings,omitempty"`
+}
+
+type OutboundSettings struct {
+	Vnext   []VnextSetting  `json:"vnext,omitempty"`
+	Servers []ServerSetting `json:"servers,omitempty"`
+}
+
+type VnextSetting struct {
+	Address string      `json:"address"`
+	Port    int         `json:"port"`
+	Users   []UserVnext `json:"users"`
+}
+
+type UserVnext struct {
+	Encryption string `json:"encryption,omitempty"`
+	Flow       string `json:"flow,omitempty"`
+	ID         string `json:"id"`
+	Level      int    `json:"level"`
+}
+
+type ServerSetting struct {
+	Password string `json:"password"`
+	Level    int    `json:"level"`
+	Address  string `json:"address"`
+	Port     int    `json:"port"`
+	Flow     string `json:"flow,omitempty"`
+	Method   string `json:"method,omitempty"`
+}

sub/subService.go

@@ -10,6 +10,7 @@ import (
 	"x-ui/database/model"
 	"x-ui/logger"
 	"x-ui/util/common"
+	"x-ui/util/random"
 	"x-ui/web/service"
 	"x-ui/xray"
 
@@ -17,50 +18,46 @@ import (
 )
 
 type SubService struct {
-	address        string
+	address     string
-	showInfo       bool
+	showInfo    bool
-	remarkModel    string
+	remarkModel string
+
 	inboundService service.InboundService
-	settingService service.SettingService
 }
 
-func (s *SubService) GetSubs(subId string, host string, showInfo bool) ([]string, []string, error) {
+func NewSubService(showInfo bool, remarkModel string) *SubService {
+	return &SubService{
+		showInfo:    showInfo,
+		remarkModel: remarkModel,
+	}
+}
+
+func (s *SubService) GetSubs(subId string, host string) ([]string, string, error) {
 	s.address = host
-	s.showInfo = showInfo
 	var result []string
-	var headers []string
+	var header string
 	var traffic xray.ClientTraffic
 	var clientTraffics []xray.ClientTraffic
 	inbounds, err := s.getInboundsBySubId(subId)
 	if err != nil {
-		return nil, nil, err
+		return nil, "", err
-	}
-	s.remarkModel, err = s.settingService.GetRemarkModel()
-	if err != nil {
-		s.remarkModel = "-ieo"
 	}
+
+	// Prepare Inbounds
 	for _, inbound := range inbounds {
 		clients, err := s.inboundService.GetClients(inbound)
 		if err != nil {
-			logger.Error("SubService - GetSub: Unable to get clients from inbound")
+			logger.Error("SubService - GetClients: Unable to get clients from inbound")
 		}
 		if clients == nil {
 			continue
 		}
 		if len(inbound.Listen) > 0 && inbound.Listen[0] == '@' {
-			fallbackMaster, err := s.getFallbackMaster(inbound.Listen)
+			listen, port, streamSettings, err := s.getFallbackMaster(inbound.Listen, inbound.StreamSettings)
 			if err == nil {
-				inbound.Listen = fallbackMaster.Listen
+				inbound.Listen = listen
-				inbound.Port = fallbackMaster.Port
+				inbound.Port = port
-				var stream map[string]interface{}
+				inbound.StreamSettings = streamSettings
-				json.Unmarshal([]byte(inbound.StreamSettings), &stream)
-				var masterStream map[string]interface{}
-				json.Unmarshal([]byte(fallbackMaster.StreamSettings), &masterStream)
-				stream["security"] = masterStream["security"]
-				stream["tlsSettings"] = masterStream["tlsSettings"]
-				stream["externalProxy"] = masterStream["externalProxy"]
-				modifiedStream, _ := json.MarshalIndent(stream, "", "  ")
-				inbound.StreamSettings = string(modifiedStream)
 			}
 		}
 		for _, client := range clients {
@@ -71,6 +68,8 @@ func (s *SubService) GetSubs(subId string, host string, showInfo bool) ([]string
 			}
 		}
 	}
+
+	// Prepare statistics
 	for index, clientTraffic := range clientTraffics {
 		if index == 0 {
 			traffic.Up = clientTraffic.Up
@@ -92,11 +91,8 @@ func (s *SubService) GetSubs(subId string, host string, showInfo bool) ([]string
 			}
 		}
 	}
-	headers = append(headers, fmt.Sprintf("upload=%d; download=%d; total=%d; expire=%d", traffic.Up, traffic.Down, traffic.Total, traffic.ExpiryTime/1000))
+	header = fmt.Sprintf("upload=%d; download=%d; total=%d; expire=%d", traffic.Up, traffic.Down, traffic.Total, traffic.ExpiryTime/1000)
-	updateInterval, _ := s.settingService.GetSubUpdates()
+	return result, header, nil
-	headers = append(headers, fmt.Sprintf("%d", updateInterval))
-	headers = append(headers, subId)
-	return result, headers, nil
 }
 
 func (s *SubService) getInboundsBySubId(subId string) ([]*model.Inbound, error) {
@@ -125,7 +121,7 @@ func (s *SubService) getClientTraffics(traffics []xray.ClientTraffic, email stri
 	return xray.ClientTraffic{}
 }
 
-func (s *SubService) getFallbackMaster(dest string) (*model.Inbound, error) {
+func (s *SubService) getFallbackMaster(dest string, streamSettings string) (string, int, string, error) {
 	db := database.GetDB()
 	var inbound *model.Inbound
 	err := db.Model(model.Inbound{}).
@@ -133,9 +129,19 @@ func (s *SubService) getFallbackMaster(dest string) (*model.Inbound, error) {
 		Where("EXISTS (SELECT * FROM json_each(settings, '$.fallbacks') WHERE json_extract(value, '$.dest') = ?)", dest).
 		Find(&inbound).Error
 	if err != nil {
-		return nil, err
+		return "", 0, "", err
 	}
-	return inbound, nil
+
+	var stream map[string]interface{}
+	json.Unmarshal([]byte(streamSettings), &stream)
+	var masterStream map[string]interface{}
+	json.Unmarshal([]byte(inbound.StreamSettings), &masterStream)
+	stream["security"] = masterStream["security"]
+	stream["tlsSettings"] = masterStream["tlsSettings"]
+	stream["externalProxy"] = masterStream["externalProxy"]
+	modifiedStream, _ := json.MarshalIndent(stream, "", "  ")
+
+	return inbound.Listen, inbound.Port, string(modifiedStream), nil
 }
 
 func (s *SubService) getLink(inbound *model.Inbound, email string) string {
@@ -382,25 +388,21 @@ func (s *SubService) genVlessLink(inbound *model.Inbound, email string) string {
 		if realitySetting != nil {
 			if sniValue, ok := searchKey(realitySetting, "serverNames"); ok {
 				sNames, _ := sniValue.([]interface{})
-				params["sni"], _ = sNames[0].(string)
+				params["sni"] = sNames[random.Num(len(sNames))].(string)
 			}
 			if pbkValue, ok := searchKey(realitySettings, "publicKey"); ok {
 				params["pbk"], _ = pbkValue.(string)
 			}
 			if sidValue, ok := searchKey(realitySetting, "shortIds"); ok {
 				shortIds, _ := sidValue.([]interface{})
-				params["sid"], _ = shortIds[0].(string)
+				params["sid"] = shortIds[random.Num(len(shortIds))].(string)
 			}
 			if fpValue, ok := searchKey(realitySettings, "fingerprint"); ok {
 				if fp, ok := fpValue.(string); ok && len(fp) > 0 {
 					params["fp"] = fp
 				}
 			}
-			if spxValue, ok := searchKey(realitySettings, "spiderX"); ok {
+			params["spx"] = "/" + random.Seq(15)
-				if spx, ok := spxValue.(string); ok && len(spx) > 0 {
-					params["spx"] = spx
-				}
-			}
 		}
 
 		if streamNetwork == "tcp" && len(clients[clientIndex].Flow) > 0 {
@@ -408,6 +410,10 @@ func (s *SubService) genVlessLink(inbound *model.Inbound, email string) string {
 		}
 	}
 
+	if security != "tls" && security != "reality" {
+		params["security"] = "none"
+	}
+
 	externalProxies, _ := stream["externalProxy"].([]interface{})
 
 	if len(externalProxies) > 0 {
@@ -559,28 +565,28 @@ func (s *SubService) genTrojanLink(inbound *model.Inbound, email string) string
 		if realitySetting != nil {
 			if sniValue, ok := searchKey(realitySetting, "serverNames"); ok {
 				sNames, _ := sniValue.([]interface{})
-				params["sni"], _ = sNames[0].(string)
+				params["sni"] = sNames[random.Num(len(sNames))].(string)
 			}
 			if pbkValue, ok := searchKey(realitySettings, "publicKey"); ok {
 				params["pbk"], _ = pbkValue.(string)
 			}
 			if sidValue, ok := searchKey(realitySetting, "shortIds"); ok {
 				shortIds, _ := sidValue.([]interface{})
-				params["sid"], _ = shortIds[0].(string)
+				params["sid"] = shortIds[random.Num(len(shortIds))].(string)
 			}
 			if fpValue, ok := searchKey(realitySettings, "fingerprint"); ok {
 				if fp, ok := fpValue.(string); ok && len(fp) > 0 {
 					params["fp"] = fp
 				}
 			}
-			if spxValue, ok := searchKey(realitySettings, "spiderX"); ok {
+			params["spx"] = "/" + random.Seq(15)
-				if spx, ok := spxValue.(string); ok && len(spx) > 0 {
-					params["spx"] = spx
-				}
-			}
 		}
 	}
 
+	if security != "tls" && security != "reality" {
+		params["security"] = "none"
+	}
+
 	externalProxies, _ := stream["externalProxy"].([]interface{})
 
 	if len(externalProxies) > 0 {
@@ -802,7 +808,7 @@ func (s *SubService) genRemark(inbound *model.Inbound, email string, extra strin
 		orders['i'] = inbound.Remark
 	}
 	if len(extra) > 0 {
-		orders['e'] = extra
+		orders['o'] = extra
 	}
 
 	var remark []string

util/random/random.go

@@ -41,3 +41,7 @@ func Seq(n int) string {
 	}
 	return string(runes)
 }
+
+func Num(n int) int {
+	return rand.Intn(n)
+}

web/assets/css/custom.css

@@ -55,7 +55,7 @@ style attribute {
 }
 .ant-table-tbody > tr > td,
 .ant-table-thead > tr > th {
-    padding: 16px;
+    padding: 12px 8px;
     overflow-wrap: break-word;
 }
 .ant-table-thead > tr > th {
@@ -132,6 +132,13 @@ style attribute {
         margin: 0.5rem;
         padding: 0.5rem;
     }
+    .ant-modal-body {
+        padding: 10px;
+    }
+    .ant-form-item-label {
+        line-height: 1.5;
+        padding: 8px 0 0;
+    }
 }
 
 .ant-layout-content {
@@ -399,11 +406,6 @@ style attribute {
     background-color: rgb(255, 127, 127);
 }
 
-.ant-table-tbody > tr > td,
-.ant-table-thead > tr > th {
-    padding: 16px 5px;
-}
-
 .ant-table-expand-icon-th,
 .ant-table-row-expand-icon-cell {
     width: 30px;
@@ -414,6 +416,10 @@ style attribute {
     background-color: white;
 }
 
+.ant-form-item {
+    margin-bottom: 0;
+}
+
 .ant-setting-textarea {
     margin-top: 1.5rem;
 }
@@ -1032,6 +1038,12 @@ li.ant-select-dropdown-menu-item:empty:after {
     color: rgba(255, 255, 255, 0.25);
 }
 
+.dark .ant-message-notice-content {
+    background-color: #222d42;
+    border: 1px solid #2c3950; 
+    color: rgba(255, 255, 255, 0.65);
+}
+
 .ant-input-number-handler-wrap {
     border-radius: 0;
 }
@@ -1043,3 +1055,29 @@ li.ant-select-dropdown-menu-item:empty:after {
 .ant-input-number {
     overflow: clip;
 }
+
+.ant-modal-body,
+.ant-collapse-content>.ant-collapse-content-box {
+    overflow-x: auto;
+}
+
+.dark .ant-dropdown-menu-item:hover,
+.dark .ant-dropdown-menu-submenu-title:hover,
+.dark .ant-select-dropdown-menu-item-active:not(.ant-select-dropdown-menu-item-disabled),
+.dark .ant-select-dropdown-menu-item:hover:not(.ant-select-dropdown-menu-item-disabled) {
+    background-color: #313f5a;
+}
+
+.ant-select-dropdown,
+.ant-popover-inner {
+    overflow-x: hidden;
+}
+
+.ant-popover-inner-content {
+    max-height: 400px;
+    overflow-y: auto;
+}
+
+.ant-input-group-addon:not(:first-child):not(:last-child), .ant-input-group-wrap:not(:first-child):not(:last-child), .ant-input-group>.ant-input:not(:first-child):not(:last-child) {
+    border-radius: 0rem 1rem 1rem 0rem;
+}

web/assets/js/model/dbinbound.js

@@ -56,6 +56,10 @@ class DBInbound {
         return this.protocol === Protocols.HTTP;
     }
 
+    get isWireguard() {
+        return this.protocol === Protocols.WIREGUARD;
+    }
+
     get address() {
         let address = location.hostname;
         if (!ObjectUtil.isEmpty(this.listen) && this.listen !== "0.0.0.0") {

web/assets/js/model/outbound.js

@@ -8,6 +8,7 @@ const Protocols = {
     Shadowsocks: "shadowsocks",
     Socks: "socks",
     HTTP: "http",
+    Wireguard: "wireguard"
 };
 
 const SSMethods = {
@@ -46,18 +47,27 @@ const ALPN_OPTION = {
     HTTP1: "http/1.1",
 };
 
-const outboundDomainStrategies = [
+const OutboundDomainStrategies = [
     "AsIs",
     "UseIP",
     "UseIPv4",
     "UseIPv6"
-]
+];
+
+const WireguardDomainStrategy = [
+    "ForceIP",
+    "ForceIPv4",
+    "ForceIPv4v6",
+    "ForceIPv6",
+    "ForceIPv6v4"
+];
 
 Object.freeze(Protocols);
 Object.freeze(SSMethods);
 Object.freeze(TLS_FLOW_CONTROL);
 Object.freeze(ALPN_OPTION);
-Object.freeze(outboundDomainStrategies);
+Object.freeze(OutboundDomainStrategies);
+Object.freeze(WireguardDomainStrategy);
 
 class CommonClass {
 
@@ -408,7 +418,7 @@ class Outbound extends CommonClass {
     }
 
     canEnableTls() {
-        if (![Protocols.VMess, Protocols.VLESS, Protocols.Trojan].includes(this.protocol)) return false;
+        if (![Protocols.VMess, Protocols.VLESS, Protocols.Trojan, Protocols.Shadowsocks].includes(this.protocol)) return false;
         return ["tcp", "ws", "http", "quic", "grpc"].includes(this.stream.network);
     }
 
@@ -476,7 +486,7 @@ class Outbound extends CommonClass {
         if(data.length !=2) return null;
         switch(data[0].toLowerCase()){
             case Protocols.VMess:
-                return this.fromVmessLink(JSON.parse(atob(data[1])));
+                return this.fromVmessLink(JSON.parse(Base64.decode(data[1])));
             case Protocols.VLESS:
             case Protocols.Trojan:
             case 'ss':
@@ -493,8 +503,8 @@ class Outbound extends CommonClass {
         if (network === 'tcp') {
             stream.tcp = new TcpStreamSettings(
                 json.type,
-                json.host ? json.host.split(','): [],
+                json.host ?? '',
-                json.path ? json.path.split(','): []);
+                json.path ?? '');
         } else if (network === 'kcp') {
             stream.kcp = new KcpStreamSettings();
             stream.type = json.type;
@@ -505,7 +515,7 @@ class Outbound extends CommonClass {
             stream.network = 'http'
             stream.http = new HttpStreamSettings(
                 json.path,
-                json.host ? json.host.split(',') : []);
+                json.host);
         } else if (network === 'quic') {
             stream.quic = new QuicStreamSettings(
                 json.host ? json.host : 'none',
@@ -570,7 +580,7 @@ class Outbound extends CommonClass {
             let sni=url.searchParams.get('sni') ?? '';
             let sid=url.searchParams.get('sid') ?? '';
             let spx=url.searchParams.get('spx') ?? '';
-            stream.tls = new RealityStreamSettings(pbk, fp, sni, sid, spx);
+            stream.reality = new RealityStreamSettings(pbk, fp, sni, sid, spx);
         }
 
         let data = link.split('?');
@@ -625,6 +635,7 @@ Outbound.Settings = class extends CommonClass {
             case Protocols.Shadowsocks: return new Outbound.ShadowsocksSettings();
             case Protocols.Socks: return new Outbound.SocksSettings();
             case Protocols.HTTP: return new Outbound.HttpSettings();
+            case Protocols.Wireguard: return new Outbound.WireguardSettings();
             default: return null;
         }
     }
@@ -640,6 +651,7 @@ Outbound.Settings = class extends CommonClass {
             case Protocols.Shadowsocks: return Outbound.ShadowsocksSettings.fromJson(json);
             case Protocols.Socks: return Outbound.SocksSettings.fromJson(json);
             case Protocols.HTTP: return Outbound.HttpSettings.fromJson(json);
+            case Protocols.Wireguard: return Outbound.WireguardSettings.fromJson(json);
             default: return null;
         }
     }
@@ -839,22 +851,22 @@ Outbound.ShadowsocksSettings = class extends CommonClass {
     }
 };
 Outbound.SocksSettings = class extends CommonClass {
-    constructor(address, port, user, password) {
+    constructor(address, port, user, pass) {
         super();
         this.address = address;
         this.port = port;
         this.user = user;
-        this.password = password;
+        this.pass = pass;
     }
 
     static fromJson(json={}) {
-        servers = json.servers;
+        let servers = json.servers;
         if(ObjectUtil.isArrEmpty(servers)) servers=[{users: [{}]}];
         return new Outbound.SocksSettings(
             servers[0].address,
             servers[0].port,
             ObjectUtil.isArrEmpty(servers[0].users) ? '' : servers[0].users[0].user,
-            ObjectUtil.isArrEmpty(servers[0].password) ? '' : servers[0].users[0].password,
+            ObjectUtil.isArrEmpty(servers[0].users) ? '' : servers[0].users[0].pass,
         );
     }
 
@@ -863,28 +875,28 @@ Outbound.SocksSettings = class extends CommonClass {
             servers: [{
                 address: this.address,
                 port: this.port,
-                users: ObjectUtil.isEmpty(this.user) ? [] : [{user: this.user, password: this.password}],
+                users: ObjectUtil.isEmpty(this.user) ? [] : [{user: this.user, pass: this.pass}],
             }],
         };
     }
 };
 Outbound.HttpSettings = class extends CommonClass {
-    constructor(address, port, user, password) {
+    constructor(address, port, user, pass) {
         super();
         this.address = address;
         this.port = port;
         this.user = user;
-        this.password = password;
+        this.pass = pass;
     }
 
     static fromJson(json={}) {
-        servers = json.servers;
+        let servers = json.servers;
         if(ObjectUtil.isArrEmpty(servers)) servers=[{users: [{}]}];
         return new Outbound.HttpSettings(
             servers[0].address,
             servers[0].port,
             ObjectUtil.isArrEmpty(servers[0].users) ? '' : servers[0].users[0].user,
-            ObjectUtil.isArrEmpty(servers[0].password) ? '' : servers[0].users[0].password,
+            ObjectUtil.isArrEmpty(servers[0].users) ? '' : servers[0].users[0].pass,
         );
     }
 
@@ -893,8 +905,89 @@ Outbound.HttpSettings = class extends CommonClass {
             servers: [{
                 address: this.address,
                 port: this.port,
-                users: ObjectUtil.isEmpty(this.user) ? [] : [{user: this.user, password: this.password}],
+                users: ObjectUtil.isEmpty(this.user) ? [] : [{user: this.user, pass: this.pass}],
             }],
         };
     }
 };
+Outbound.WireguardSettings = class extends CommonClass {
+    constructor(
+            mtu=1420, secretKey='',
+            address='', workers=2, domainStrategy='', reserved='',
+            peers=[new Outbound.WireguardSettings.Peer()], kernelMode=false) {
+        super();
+        this.mtu = mtu;
+        this.secretKey = secretKey;
+        this.pubKey = secretKey.length>0 ? Wireguard.generateKeypair(secretKey).publicKey : '';
+        this.address = address instanceof Array ? address.join(',') : address;
+        this.workers = workers;
+        this.domainStrategy = domainStrategy;
+        this.reserved = reserved instanceof Array ? reserved.join(',') : reserved;
+        this.peers = peers;
+        this.kernelMode = kernelMode;
+    }
+
+    addPeer() {
+        this.peers.push(new Outbound.WireguardSettings.Peer());
+    }
+
+    delPeer(index) {
+        this.peers.splice(index, 1);
+    }
+
+    static fromJson(json={}){
+        return new Outbound.WireguardSettings(
+            json.mtu,
+            json.secretKey,
+            json.address,
+            json.workers,
+            json.domainStrategy,
+            json.reserved,
+            json.peers.map(peer => Outbound.WireguardSettings.Peer.fromJson(peer)),
+            json.kernelMode,
+        );
+    }
+
+    toJson() {
+        return {
+            mtu: this.mtu?? undefined,
+            secretKey: this.secretKey,
+            address: this.address ? this.address.split(",") : [],
+            workers: this.workers?? undefined,
+            domainStrategy: WireguardDomainStrategy.includes(this.domainStrategy) ? this.domainStrategy : undefined,
+            reserved: this.reserved ? this.reserved.split(",") : undefined,
+            peers: Outbound.WireguardSettings.Peer.toJsonArray(this.peers),
+            kernelMode: this.kernelMode,
+        };
+    }
+};
+Outbound.WireguardSettings.Peer = class extends CommonClass {
+    constructor(publicKey='', psk='', allowedIPs=['0.0.0.0/0','::/0'], endpoint='', keepAlive=0) {
+        super();
+        this.publicKey = publicKey;
+        this.psk = psk;
+        this.allowedIPs = allowedIPs;
+        this.endpoint = endpoint;
+        this.keepAlive = keepAlive;
+    }
+
+    static fromJson(json={}){
+        return new Outbound.WireguardSettings.Peer(
+            json.publicKey,
+            json.preSharedKey,
+            json.allowedIPs,
+            json.endpoint,
+            json.keepAlive
+        );
+    }
+
+    toJson() {
+        return {
+            publicKey: this.publicKey,
+            preSharedKey: this.psk.length>0 ? this.psk : undefined,
+            allowedIPs: this.allowedIPs ? this.allowedIPs : undefined,
+            endpoint: this.endpoint,
+            keepAlive: this.keepAlive?? undefined,
+        };
+    }
+};

web/assets/js/model/setting.js

@@ -24,6 +24,7 @@ class AllSetting {
         this.subListen = "";
         this.subPort = "2096";
         this.subPath = "/sub/";
+        this.subJsonPath = "/json/";
         this.subDomain = "";
         this.subCertFile = "";
         this.subKeyFile = "";
@@ -31,6 +32,8 @@ class AllSetting {
         this.subEncrypt = true;
         this.subShowInfo = false;
         this.subURI = '';
+        this.subJsonURI = '';
+        this.subJsonFragment = '';
 
         this.timeLocation = "Asia/Tehran";
 

web/assets/js/model/xray.js

@@ -6,6 +6,7 @@ const Protocols = {
     DOKODEMO: 'dokodemo-door',
     SOCKS: 'socks',
     HTTP: 'http',
+    WIREGUARD: 'wireguard',
 };
 
 const SSMethods = {
@@ -229,6 +230,7 @@ TcpStreamSettings.TcpRequest = class extends XrayCommonClass {
 
     toJson() {
         return {
+            version: this.version,
             method: this.method,
             path: ObjectUtil.clone(this.path),
             headers: XrayCommonClass.toV2Headers(this.headers),
@@ -406,7 +408,7 @@ class HttpStreamSettings extends XrayCommonClass {
 
 class QuicStreamSettings extends XrayCommonClass {
     constructor(security='none',
-                key='', type='none') {
+                key=RandomUtil.randomSeq(10), type='none') {
         super();
         this.security = security;
         this.key = key;
@@ -458,7 +460,7 @@ class TlsStreamSettings extends XrayCommonClass {
                 cipherSuites = '',
                 rejectUnknownSni = false,
                 certificates=[new TlsStreamSettings.Cert()],
-                alpn=[],
+                alpn=[ALPN_OPTION.H2,ALPN_OPTION.HTTP1],
                 settings=new TlsStreamSettings.Settings()) {
         super();
         this.sni = serverName;
@@ -812,7 +814,7 @@ class Sniffing extends XrayCommonClass {
 class Inbound extends XrayCommonClass {
     constructor(port=RandomUtil.randomIntRange(10000, 60000),
                 listen='',
-                protocol=Protocols.VMESS,
+                protocol=Protocols.VLESS,
                 settings=null,
                 streamSettings=new StreamSettings(),
                 tag='',
@@ -982,10 +984,6 @@ class Inbound extends XrayCommonClass {
         return [Protocols.VMESS, Protocols.VLESS, Protocols.TROJAN, Protocols.SHADOWSOCKS].includes(this.protocol);
     }
 
-    canSniffing() {
-        return [Protocols.VMESS, Protocols.VLESS, Protocols.TROJAN, Protocols.SHADOWSOCKS].includes(this.protocol);
-    }
-
     reset() {
         this.port = RandomUtil.randomIntRange(10000, 60000);
         this.listen = '';
@@ -1138,7 +1136,7 @@ class Inbound extends XrayCommonClass {
             }
         }
 
-        if (security === 'reality') {
+        else if (security === 'reality') {
             params.set("security", "reality");
             params.set("pbk", this.stream.reality.settings.publicKey);
             params.set("fp", this.stream.reality.settings.fingerprint);
@@ -1156,6 +1154,10 @@ class Inbound extends XrayCommonClass {
             }
         }
 
+        else {
+            params.set("security", "none");
+        }
+
         const link = `vless://${uuid}@${address}:${port}`;
         const url = new URL(link);
         for (const [key, value] of params) {
@@ -1314,7 +1316,7 @@ class Inbound extends XrayCommonClass {
             }
         }
 
-        if (security === 'reality') {
+        else if (security === 'reality') {
             params.set("security", "reality");
             params.set("pbk", this.stream.reality.settings.publicKey);
             params.set("fp", this.stream.reality.settings.fingerprint);
@@ -1328,6 +1330,9 @@ class Inbound extends XrayCommonClass {
                 params.set("spx", this.stream.reality.settings.spiderX);
             }
         }
+        else {
+            params.set("security", "none");
+        }
 
         const link = `trojan://${clientPassword}@${address}:${port}`;
         const url = new URL(link);
@@ -1338,6 +1343,28 @@ class Inbound extends XrayCommonClass {
         return url.toString();
     }
 
+    getWireguardLink(address, port, remark, peerId) {
+        let txt = `[Interface]\n`
+        txt += `PrivateKey = ${this.settings.peers[peerId].privateKey}\n`
+        txt += `Address = ${this.settings.peers[peerId].allowedIPs[0]}\n`
+        txt += `DNS = 1.1.1.1, 9.9.9.9\n`
+        if (this.settings.mtu) {
+            txt += `MTU = ${this.settings.mtu}\n`
+        }
+        txt += `\n# ${remark}\n`
+        txt += `[Peer]\n`
+        txt += `PublicKey = ${this.settings.pubKey}\n`
+        txt += `AllowedIPs = 0.0.0.0/0, ::/0\n`
+        txt += `Endpoint = ${address}:${port}`
+        if (this.settings.peers[peerId].psk) {
+            txt += `\nPresharedKey = ${this.settings.peers[peerId].psk}`
+        }
+        if (this.settings.peers[peerId].keepAlive) {
+            txt += `\nPersistentKeepalive = ${this.settings.peers[peerId].keepAlive}\n`
+        }
+        return txt;
+    }
+
     genLink(address='', port=this.port, forceTls='same', remark='', client) {
         switch (this.protocol) {
             case Protocols.VMESS:
@@ -1361,7 +1388,7 @@ class Inbound extends XrayCommonClass {
         const orderChars = remarkModel.slice(1);
         let orders = {
             'i': remark,
-            'e': client ? client.email : '',
+            'e': email,
             'o': '',
           };
         if(ObjectUtil.isArrEmpty(this.stream.externalProxy)){
@@ -1384,6 +1411,7 @@ class Inbound extends XrayCommonClass {
     }
 
     genInboundLinks(remark = '', remarkModel = '-ieo') {
+        let addr = !ObjectUtil.isEmpty(this.listen) && this.listen !== "0.0.0.0" ? this.listen : location.hostname;
         if(this.clients){
            let links = [];
            this.clients.forEach((client) => {
@@ -1393,7 +1421,14 @@ class Inbound extends XrayCommonClass {
             });
             return links.join('\r\n');
         } else {
-            if(this.protocol == Protocols.SHADOWSOCKS && !this.isSSMultiUser) return this.genSSLink(this.listen, this.port, 'same', remark);
+            if(this.protocol == Protocols.SHADOWSOCKS && !this.isSSMultiUser) return this.genSSLink(addr, this.port, 'same', remark);
+            if(this.protocol == Protocols.WIREGUARD) {
+                let links = [];
+                this.settings.peers.forEach((p,index) => {
+                    links.push(this.getWireguardLink(addr,this.port,remark + remarkModel.charAt(0) + (index+1),index));
+                });
+                return links.join('\r\n');
+            }
             return '';
         }
     }
@@ -1444,6 +1479,7 @@ Inbound.Settings = class extends XrayCommonClass {
             case Protocols.DOKODEMO: return new Inbound.DokodemoSettings(protocol);
             case Protocols.SOCKS: return new Inbound.SocksSettings(protocol);
             case Protocols.HTTP: return new Inbound.HttpSettings(protocol);
+            case Protocols.WIREGUARD: return new Inbound.WireguardSettings(protocol);
             default: return null;
         }
     }
@@ -1457,6 +1493,7 @@ Inbound.Settings = class extends XrayCommonClass {
             case Protocols.DOKODEMO: return Inbound.DokodemoSettings.fromJson(json);
             case Protocols.SOCKS: return Inbound.SocksSettings.fromJson(json);
             case Protocols.HTTP: return Inbound.HttpSettings.fromJson(json);
+            case Protocols.WIREGUARD: return Inbound.WireguardSettings.fromJson(json);
             default: return null;
         }
     }
@@ -2047,3 +2084,81 @@ Inbound.HttpSettings.HttpAccount = class extends XrayCommonClass {
         return new Inbound.HttpSettings.HttpAccount(json.user, json.pass);
     }
 };
+
+Inbound.WireguardSettings = class extends XrayCommonClass {
+    constructor(protocol, mtu=1420, secretKey=Wireguard.generateKeypair().privateKey, peers=[new Inbound.WireguardSettings.Peer()], kernelMode=false) {
+        super(protocol);
+        this.mtu = mtu;
+        this.secretKey = secretKey;
+        this.pubKey = secretKey.length>0 ? Wireguard.generateKeypair(secretKey).publicKey : '';
+        this.peers = peers;
+        this.kernelMode = kernelMode;
+    }
+
+    addPeer() {
+        this.peers.push(new Inbound.WireguardSettings.Peer(null,null,'',['10.0.0.' + (this.peers.length+2)]));
+    }
+
+    delPeer(index) {
+        this.peers.splice(index, 1);
+    }
+
+    static fromJson(json={}){
+        return new Inbound.WireguardSettings(
+            Protocols.WIREGUARD,
+            json.mtu,
+            json.secretKey,
+            json.peers.map(peer => Inbound.WireguardSettings.Peer.fromJson(peer)),
+            json.kernelMode,
+        );
+    }
+
+    toJson() {
+        return {
+            mtu: this.mtu?? undefined,
+            secretKey: this.secretKey,
+            peers: Inbound.WireguardSettings.Peer.toJsonArray(this.peers),
+            kernelMode: this.kernelMode,
+        };
+    }
+};
+
+Inbound.WireguardSettings.Peer = class extends XrayCommonClass {
+    constructor(privateKey, publicKey, psk='', allowedIPs=['10.0.0.2/32'], keepAlive=0) {
+        super();
+        this.privateKey = privateKey
+        this.publicKey = publicKey;
+        if (!this.publicKey){
+            [this.publicKey, this.privateKey] = Object.values(Wireguard.generateKeypair())
+        }
+        this.psk = psk;
+        allowedIPs.forEach((a,index) => {
+            if (a.length>0 && !a.includes('/')) allowedIPs[index] += '/32';
+        })
+        this.allowedIPs = allowedIPs;
+        this.keepAlive = keepAlive;
+    }
+
+    static fromJson(json={}){
+        return new Inbound.WireguardSettings.Peer(
+            json.privateKey,
+            json.publicKey,
+            json.preSharedKey,
+            json.allowedIPs,
+            json.keepAlive
+        );
+    }
+
+    toJson() {
+        this.allowedIPs.forEach((a,index) => {
+            if (a.length>0 && !a.includes('/')) this.allowedIPs[index] += '/32';
+        });
+        return {
+            privateKey: this.privateKey,
+            publicKey: this.publicKey,
+            preSharedKey: this.psk.length>0 ? this.psk : undefined,
+            allowedIPs: this.allowedIPs,
+            keepAlive: this.keepAlive?? undefined,
+        };
+    }
+};

web/assets/js/util/common.js

@@ -20,6 +20,14 @@ function sizeFormat(size) {
     }
 }
 
+function cpuCoreFormat(cores) {
+    if (cores === 1) {
+        return "1 Core";
+    } else {
+        return cores + " Cores";
+    }
+}
+
 function base64(str) {
     return Base64.encode(str);
 }

web/assets/js/util/utils.js

@@ -136,9 +136,9 @@ class RandomUtil {
     }
 
     static randomShortId() {
-        let shortIds = ['','','',''];
+        let shortIds = new Array(24).fill('');
-        for (var ii = 0; ii < 4; ii++) {
+        for (var ii = 0; ii < 24; ii++) {
-            for (var jj = 0; jj < this.randomInt(8); jj++){
+            for (var jj = 0; jj < this.randomInt(16); jj++){
                 let randomNum = this.randomInt(256);
                 shortIds[ii] += ('0' + randomNum.toString(16)).slice(-2)
             }
@@ -296,3 +296,190 @@ class ObjectUtil {
         return true;
     }
 }
+
+class Wireguard {
+	static gf(init) {
+		var r = new Float64Array(16);
+		if (init) {
+			for (var i = 0; i < init.length; ++i)
+				r[i] = init[i];
+		}
+		return r;
+	}
+
+	static pack(o, n) {
+		var b, m = this.gf(), t = this.gf();
+		for (var i = 0; i < 16; ++i)
+			t[i] = n[i];
+		this.carry(t);
+		this.carry(t);
+		this.carry(t);
+		for (var j = 0; j < 2; ++j) {
+			m[0] = t[0] - 0xffed;
+			for (var i = 1; i < 15; ++i) {
+				m[i] = t[i] - 0xffff - ((m[i - 1] >> 16) & 1);
+				m[i - 1] &= 0xffff;
+			}
+			m[15] = t[15] - 0x7fff - ((m[14] >> 16) & 1);
+			b = (m[15] >> 16) & 1;
+			m[14] &= 0xffff;
+			this.cswap(t, m, 1 - b);
+		}
+		for (var i = 0; i < 16; ++i) {
+			o[2 * i] = t[i] & 0xff;
+			o[2 * i + 1] = t[i] >> 8;
+		}
+	}
+
+	static carry(o) {
+		var c;
+		for (var i = 0; i < 16; ++i) {
+			o[(i + 1) % 16] += (i < 15 ? 1 : 38) * Math.floor(o[i] / 65536);
+			o[i] &= 0xffff;
+		}
+	}
+
+	static cswap(p, q, b) {
+		var t, c = ~(b - 1);
+		for (var i = 0; i < 16; ++i) {
+			t = c & (p[i] ^ q[i]);
+			p[i] ^= t;
+			q[i] ^= t;
+		}
+	}
+
+	static add(o, a, b) {
+		for (var i = 0; i < 16; ++i)
+			o[i] = (a[i] + b[i]) | 0;
+	}
+
+	static subtract(o, a, b) {
+		for (var i = 0; i < 16; ++i)
+			o[i] = (a[i] - b[i]) | 0;
+	}
+
+	static multmod(o, a, b) {
+		var t = new Float64Array(31);
+		for (var i = 0; i < 16; ++i) {
+			for (var j = 0; j < 16; ++j)
+				t[i + j] += a[i] * b[j];
+		}
+		for (var i = 0; i < 15; ++i)
+			t[i] += 38 * t[i + 16];
+		for (var i = 0; i < 16; ++i)
+			o[i] = t[i];
+		this.carry(o);
+		this.carry(o);
+	}
+
+	static invert(o, i) {
+		var c = this.gf();
+		for (var a = 0; a < 16; ++a)
+			c[a] = i[a];
+		for (var a = 253; a >= 0; --a) {
+			this.multmod(c, c, c);
+			if (a !== 2 && a !== 4)
+                this.multmod(c, c, i);
+		}
+		for (var a = 0; a < 16; ++a)
+			o[a] = c[a];
+	}
+
+	static clamp(z) {
+		z[31] = (z[31] & 127) | 64;
+		z[0] &= 248;
+	}
+
+	static generatePublicKey(privateKey) {
+		var r, z = new Uint8Array(32);
+		var a = this.gf([1]),
+			b = this.gf([9]),
+			c = this.gf(),
+			d = this.gf([1]),
+			e = this.gf(),
+			f = this.gf(),
+			_121665 = this.gf([0xdb41, 1]),
+			_9 = this.gf([9]);
+		for (var i = 0; i < 32; ++i)
+			z[i] = privateKey[i];
+		this.clamp(z);
+		for (var i = 254; i >= 0; --i) {
+			r = (z[i >>> 3] >>> (i & 7)) & 1;
+			this.cswap(a, b, r);
+			this.cswap(c, d, r);
+			this.add(e, a, c);
+			this.subtract(a, a, c);
+			this.add(c, b, d);
+			this.subtract(b, b, d);
+			this.multmod(d, e, e);
+			this.multmod(f, a, a);
+			this.multmod(a, c, a);
+			this.multmod(c, b, e);
+			this.add(e, a, c);
+			this.subtract(a, a, c);
+			this.multmod(b, a, a);
+			this.subtract(c, d, f);
+			this.multmod(a, c, _121665);
+			this.add(a, a, d);
+			this.multmod(c, c, a);
+			this.multmod(a, d, f);
+			this.multmod(d, b, _9);
+			this.multmod(b, e, e);
+			this.cswap(a, b, r);
+			this.cswap(c, d, r);
+		}
+		this.invert(c, c);
+		this.multmod(a, a, c);
+		this.pack(z, a);
+		return z;
+	}
+
+	static generatePresharedKey() {
+		var privateKey = new Uint8Array(32);
+		window.crypto.getRandomValues(privateKey);
+		return privateKey;
+	}
+
+	static generatePrivateKey() {
+		var privateKey = this.generatePresharedKey();
+		this.clamp(privateKey);
+		return privateKey;
+	}
+
+	static encodeBase64(dest, src) {
+		var input = Uint8Array.from([(src[0] >> 2) & 63, ((src[0] << 4) | (src[1] >> 4)) & 63, ((src[1] << 2) | (src[2] >> 6)) & 63, src[2] & 63]);
+		for (var i = 0; i < 4; ++i)
+			dest[i] = input[i] + 65 +
+			(((25 - input[i]) >> 8) & 6) -
+			(((51 - input[i]) >> 8) & 75) -
+			(((61 - input[i]) >> 8) & 15) +
+			(((62 - input[i]) >> 8) & 3);
+	}
+
+	static keyToBase64(key) {
+		var i, base64 = new Uint8Array(44);
+		for (i = 0; i < 32 / 3; ++i)
+            this.encodeBase64(base64.subarray(i * 4), key.subarray(i * 3));
+        this.encodeBase64(base64.subarray(i * 4), Uint8Array.from([key[i * 3 + 0], key[i * 3 + 1], 0]));
+		base64[43] = 61;
+		return String.fromCharCode.apply(null, base64);
+	}
+
+    static keyFromBase64(encoded) {
+        const binaryStr = atob(encoded);
+        const bytes = new Uint8Array(binaryStr.length);
+        for (let i = 0; i < binaryStr.length; i++) {
+            bytes[i] = binaryStr.charCodeAt(i);
+        }
+        return bytes;
+    }
+
+	static generateKeypair(secretKey='') {
+        var privateKey = secretKey.length>0 ? this.keyFromBase64(secretKey) : this.generatePrivateKey();
+        var publicKey = this.generatePublicKey(privateKey);
+        return {
+            publicKey: this.keyToBase64(publicKey),
+            privateKey: secretKey.length>0 ? secretKey : this.keyToBase64(privateKey)
+        };
+    }
+}

web/controller/xray_setting.go

@@ -26,6 +26,7 @@ func (a *XraySettingController) initRouter(g *gin.RouterGroup) {
 	g.POST("/update", a.updateSetting)
 	g.GET("/getXrayResult", a.getXrayResult)
 	g.GET("/getDefaultJsonConfig", a.getDefaultXrayConfig)
+	g.POST("/warp/:action", a.warp)
 }
 
 func (a *XraySettingController) getXraySetting(c *gin.Context) {
@@ -61,3 +62,24 @@ func (a *XraySettingController) getDefaultXrayConfig(c *gin.Context) {
 func (a *XraySettingController) getXrayResult(c *gin.Context) {
 	jsonObj(c, a.XrayService.GetXrayResult(), nil)
 }
+
+func (a *XraySettingController) warp(c *gin.Context) {
+	action := c.Param("action")
+	var resp string
+	var err error
+	switch action {
+	case "data":
+		resp, err = a.XraySettingService.GetWarp()
+	case "config":
+		resp, err = a.XraySettingService.GetWarpConfig()
+	case "reg":
+		skey := c.PostForm("privateKey")
+		pkey := c.PostForm("publicKey")
+		resp, err = a.XraySettingService.RegWarp(skey, pkey)
+	case "license":
+		license := c.PostForm("license")
+		resp, err = a.XraySettingService.SetWarpLicence(license)
+	}
+
+	jsonObj(c, resp, err)
+}

web/entity/entity.go

@@ -46,6 +46,9 @@ type AllSetting struct {
 	SubEncrypt       bool   `json:"subEncrypt" form:"subEncrypt"`
 	SubShowInfo      bool   `json:"subShowInfo" form:"subShowInfo"`
 	SubURI           string `json:"subURI" form:"subURI"`
+	SubJsonPath      string `json:"subJsonPath" form:"subJsonPath"`
+	SubJsonURI       string `json:"subJsonURI" form:"subJsonURI"`
+	SubJsonFragment  string `json:"subJsonFragment" form:"subJsonFragment"`
 }
 
 func (s *AllSetting) CheckValid() error {
@@ -103,6 +106,13 @@ func (s *AllSetting) CheckValid() error {
 		s.SubPath += "/"
 	}
 
+	if !strings.HasPrefix(s.SubJsonPath, "/") {
+		s.SubJsonPath = "/" + s.SubJsonPath
+	}
+	if !strings.HasSuffix(s.SubJsonPath, "/") {
+		s.SubJsonPath += "/"
+	}
+
 	_, err := time.LoadLocation(s.TimeLocation)
 	if err != nil {
 		return common.NewError("time location not exist:", s.TimeLocation)

web/html/common/head.html

@@ -7,8 +7,6 @@
     <link rel="stylesheet" href="{{ .base_path }}assets/ant-design-vue@1.7.8/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/css/custom.css?{{ .cur_ver }}">
-    <link rel=”icon” type=”image/x-icon” href="{{ .base_path }}assets/favicon.ico">
-    <link rel="shortcut icon" type="image/x-icon" href="{{ .base_path }}assets/favicon.ico">
     <style>
         [v-cloak] {
             display: none;
@@ -30,4 +28,5 @@
     </style>
     <title>{{ .host }}-{{ i18n .title}}</title>
 </head>
+<div id="message"></div>
 {{end}}

web/html/common/qrcode_modal.html

@@ -5,13 +5,23 @@
          width="300px" :class="themeSwitcher.currentTheme">
     <a-tag color="green" style="margin-bottom: 10px;display: block;text-align: center;" >{{ i18n "pages.inbounds.clickOnQRcode" }}</a-tag>
     <template v-if="app.subSettings.enable && qrModal.subId">
-        <a-divider>Subscription</a-divider>
+        <a-divider>{{ i18n "pages.settings.subSettings"}}</a-divider>
-        <canvas @click="copyToClipboard('qrCode-sub',genSubLink(qrModal.client.subId))" id="qrCode-sub" style="width: 100%; height: 100%;"></canvas>
+        <canvas @click="copyToClipboard('qrCode-sub',genSubLink(qrModal.client.subId))"
+            id="qrCode-sub"
+            style="width: 100%; height: 100%; display: flex; border-radius: 1rem;">
+        </canvas>
+        <a-divider>{{ i18n "pages.settings.subSettings"}} Json</a-divider>
+        <canvas @click="copyToClipboard('qrCode-subJson',genSubJsonLink(qrModal.client.subId))"
+            id="qrCode-subJson"
+            style="width: 100%; height: 100%; display: flex; border-radius: 1rem;">
+        </canvas>
     </template>
     <a-divider>{{ i18n "pages.inbounds.client" }}</a-divider>
     <template v-for="(row, index) in qrModal.qrcodes">
         <a-tag color="blue" style="margin: 10px 0; display: block; text-align: center;">[[ row.remark ]]</a-tag>
-        <canvas @click="copyToClipboard('qrCode-'+index, row.link)" :id="'qrCode-'+index" style="width: 100%; height: 100%;"></canvas>
+        <canvas @click="copyToClipboard('qrCode-'+index, row.link)"
+            :id="'qrCode-'+index"
+            style="width: 100%; height: 100%; display: flex; border-radius: 1rem;"></canvas>
     </template>
 </a-modal>
 
@@ -32,12 +42,21 @@
             this.client = client;
             this.subId = '';
             this.qrcodes = [];
-            this.inbound.genAllLinks(this.dbInbound.remark, app.remarkModel, client).forEach(l => {
+            if (this.inbound.protocol == Protocols.WIREGUARD){
-                this.qrcodes.push({
+                this.inbound.genInboundLinks(dbInbound.remark).split('\r\n').forEach((l,index) =>{
-                    remark: l.remark,
+                    this.qrcodes.push({
-                    link: l.link
+                        remark: "Peer " + (index+1),
+                        link: l
+                    });
                 });
-            });
+            } else {
+                this.inbound.genAllLinks(this.dbInbound.remark, app.remarkModel, client).forEach(l => {
+                    this.qrcodes.push({
+                        remark: l.remark,
+                        link: l.link
+                    });
+                });
+            }
             this.visible = true;
         },
         close: function () {
@@ -70,12 +89,16 @@
             },
             genSubLink(subID) {
                 return app.subSettings.subURI+subID+'?name='+subID;
+            },
+            genSubJsonLink(subID) {
+                return app.subSettings.subJsonURI+subID;
             }
         },
         updated() {
             if (qrModal.client && qrModal.client.subId) {
                 qrModal.subId = qrModal.client.subId;
                 this.setQrCode("qrCode-sub", this.genSubLink(qrModal.subId));
+                this.setQrCode("qrCode-subJson", this.genSubJsonLink(qrModal.subId));
             }
             qrModal.qrcodes.forEach((element, index) => {
                 this.setQrCode("qrCode-" + index, element.link);

web/html/common/text_modal.html

@@ -1,14 +1,16 @@
 {{define "textModal"}}
 <a-modal id="text-modal" v-model="txtModal.visible" :title="txtModal.title"
-         :closable="true" ok-text='{{ i18n "copy" }}' cancel-text='{{ i18n "close" }}'
+         :closable="true"
-         :ok-button-props="{attrs:{id:'txt-modal-ok-btn'}}" :class="themeSwitcher.currentTheme">
+         :class="themeSwitcher.currentTheme">
-    <a-button v-if="!ObjectUtil.isEmpty(txtModal.fileName)" type="primary" style="margin-bottom: 10px;"
+    <template slot="footer">
-              :href="'data:application/text;charset=utf-8,' + encodeURIComponent(txtModal.content)"
+        <a-button v-if="!ObjectUtil.isEmpty(txtModal.fileName)" icon="download"
-              :download="txtModal.fileName">
+            :href="'data:application/text;charset=utf-8,' + encodeURIComponent(txtModal.content)"
-        {{ i18n "download" }} [[ txtModal.fileName ]]
+            :download="txtModal.fileName">[[ txtModal.fileName ]]
-    </a-button>
+        </a-button>
+            <a-button type="primary" id="copy-btn">{{ i18n "copy" }}</a-button>
+    </template>
     <a-input type="textarea" v-model="txtModal.content"
-             :autosize="{ minRows: 10, maxRows: 20}"></a-input>
+        :autosize="{ minRows: 10, maxRows: 20}"></a-input>
 </a-modal>
 
 <script>
@@ -27,7 +29,7 @@
             this.visible = true;
             textModalApp.$nextTick(() => {
                 if (this.clipboard === null) {
-                    this.clipboard = new ClipboardJS('#txt-modal-ok-btn', {
+                    this.clipboard = new ClipboardJS('#copy-btn', {
                         text: () => this.content,
                     });
                     this.clipboard.on('success', () => {

web/html/login.html

@@ -27,6 +27,7 @@
     text-align: center;
     align-items: center;
     justify-content: center;
+    width: 100%;
   }
   .title {
     font-size: 32px;
@@ -36,7 +37,6 @@
     overflow: hidden;
   }
   #login {
-    animation: charge 0.5s both;
     background-color: #fff;
     border-radius: 2rem;
     padding: 3rem;
@@ -45,24 +45,6 @@
   #login:hover {
     box-shadow: 0 2px 8px rgba(0, 0, 0, 0.09);
   }
-  @keyframes charge {
-    from {
-      transform: translateY(5rem);
-      opacity: 0;
-    }
-    to {
-      transform: translateY(0);
-      opacity: 1;
-    }
-  }
-  @keyframes wave {
-    from {
-      transform: rotate(0deg);
-    }
-    to {
-      transform: rotate(360deg);
-    }
-  }
   .wave {
     opacity: 0.6;
     position: absolute;
@@ -70,20 +52,20 @@
     left: 50%;
     width: 6000px;
     height: 6000px;
-    background-color: rgba(14, 73, 181, 0.08);
+    background-color: rgba(0, 135, 113, 0.08);
     margin-left: -3000px;
     transform-origin: 50% 48%;
     border-radius: 46%;
-    animation: wave 72s infinite linear;
     pointer-events: none;
+    rotate: 125deg;
   }
   .wave2 {
-    animation: wave 88s infinite linear;
+    opacity: 0.4;
-    opacity: 0.3;
+    rotate: 70deg;
   }
   .wave3 {
-    animation: wave 80s infinite linear;
+    opacity: 0.2;
-    opacity: 0.1;
+    rotate: 90deg;
   }
   .under {
     background-color: #dce9f5;
@@ -100,120 +82,8 @@
   .dark h1 {
     color: rgba(255, 255, 255, 0.85);
   }
-  .ant-btn-primary-login {
+  .ant-form-item {
-    color: #0e49b5;
+    margin-bottom: 16px;
-    background-color: #edf4fa;
-    border-color: #a9c5e7;
-    text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.12);
-    box-shadow: none;
-    width: 100%;
-  }
-  .ant-btn-primary-login:focus,
-  .ant-btn-primary-login:hover {
-    color: #fff;
-    background-color: #0c3f9d;
-    border-color: #0e49b5;
-    background-image: linear-gradient(
-      270deg,
-      rgba(123, 199, 77, 0) 30%,
-      #2f67c2,
-      rgba(123, 199, 77, 0) 100%
-    );
-    background-repeat: no-repeat;
-    animation: ma-bg-move ease-in-out 5s infinite;
-    background-position-x: -500px;
-    width: 95%;
-    animation-delay: -0.5s;
-    box-shadow: 0 2px 0 rgba(0, 0, 0, 0.045);
-  }
-  .ant-btn-primary-login.active,
-  .ant-btn-primary-login:active {
-    color: #fff;
-    background-color: #04308f;
-    border-color: #04308f;
-  }
-  @keyframes ma-bg-move {
-    0% {
-      background-position: -500px 0;
-    }
-    50% {
-      background-position: 1000px 0;
-    }
-    100% {
-      background-position: 1000px 0;
-    }
-  }
-  .wave-btn-bg {
-    position: relative;
-    border-radius: 25px;
-    width: 100%;
-  }
-  .dark .wave-btn-bg {
-    color: #fff;
-    position: relative;
-    background-color: #0e49b5;
-    border: 2px double transparent;
-    background-origin: border-box;
-    background-clip: padding-box, border-box;
-    background-size: 300%;
-    animation: wave-btn-tara 4s ease infinite;
-    transition: all 0.5s ease;
-    width: 100%;
-  }
-  .dark .wave-btn-bg-cl {
-    background-image: linear-gradient(rgba(13, 14, 33, 0), rgba(13, 14, 33, 0)),
-      radial-gradient(circle at left top, #0e49b5, #387eff, #0e49b5) !important;
-    border-radius: 3em;
-  }
-  .dark .wave-btn-bg-cl:hover {
-    width: 95%;
-  }
-  .dark .wave-btn-bg-cl:before {
-    position: absolute;
-    content: "";
-    top: -5px;
-    left: -5px;
-    bottom: -5px;
-    right: -5px;
-    z-index: -1;
-    background: inherit;
-    background-size: inherit;
-    border-radius: 4em;
-    opacity: 0;
-    transition: 0.5s;
-  }
-  .dark .wave-btn-bg-cl:hover::before {
-    opacity: 1;
-    filter: blur(20px);
-    animation: wave-btn-tara 8s linear infinite;
-  }
-  @keyframes wave-btn-tara {
-    to {
-      background-position: 300%;
-    }
-  }
-  .dark .ant-btn-primary-login {
-    font-size: 14px;
-    color: #fff;
-    text-align: center;
-    background-image: linear-gradient(
-      rgba(13, 14, 33, 0.45),
-      rgba(13, 14, 33, 0.35)
-    );
-    border-radius: 2rem;
-    border: none;
-    outline: none;
-    background-color: transparent;
-    height: 46px;
-    position: relative;
-    white-space: nowrap;
-    cursor: pointer;
-    touch-action: manipulation;
-    padding: 0 15px;
-    width: 100%;
-    animation: none;
-    background-position-x: 0;
-    box-shadow: none;
   }
 </style>
 <body>
@@ -227,7 +97,8 @@
             <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>
-                    <h1 class="title">{{ i18n "pages.login.title" }}</h1>
+                    <h1 class="title" style="margin-bottom: 5px; font-size: 24px;">X-UI</h1>
+                    <h2 class="title" style="text-align: center;">{{ i18n "pages.login.title" }}</h2>
                 </a-col>
             </a-row>
             <a-row type="flex" justify="center">
@@ -246,12 +117,10 @@
                         </a-form-item>
                         <a-form-item>
                             <a-row justify="center" class="centered">
-                                <div class="wave-btn-bg wave-btn-bg-cl">
+                                <a-button type="primary" :loading="loading" @click="login" :icon="loading ? 'poweroff' : undefined"
-                                    <a-button class="ant-btn-primary-login" type="primary" :loading="loading" @click="login" :icon="loading ? 'poweroff' : undefined"
+                            :style="{ fontWeight: 'bold', width: loading ? '50px' : '100%', display: 'inline-block' }">
-                                              :style="loading ? { width: '50px' } : { display: 'inline-block' }">
+                            [[ loading ? '' : '{{ i18n "login" }}' ]]
-                                        [[ loading ? '' : '{{ i18n "login" }}' ]]
+                                </a-button>
-                                    </a-button>
-                                </div>
                             </a-row>
                         </a-form-item>
                         <a-form-item>

web/html/xui/client_bulk_modal.html

@@ -2,170 +2,105 @@
 <a-modal id="client-bulk-modal" v-model="clientsBulkModal.visible" :title="clientsBulkModal.title" @ok="clientsBulkModal.ok"
          :confirm-loading="clientsBulkModal.confirmLoading" :closable="true" :mask-closable="false"
          :ok-text="clientsBulkModal.okText" cancel-text='{{ i18n "close" }}' :class="themeSwitcher.currentTheme">
-    <a-form layout="inline">
+    <a-form :colon="false" :label-col="{ md: {span:8} }" :wrapper-col="{ md: {span:14} }">
-        <table width="100%" class="ant-table-tbody">
+        <a-form-item label='{{ i18n "pages.client.method" }}'>
-            <tr>
+            <a-select v-model="clientsBulkModal.emailMethod" buttonStyle="solid" :dropdown-class-name="themeSwitcher.currentTheme">
-                <td>{{ i18n "pages.client.method" }}</td>
+                <a-select-option :value="0">Random</a-select-option>
-                <td>
+                <a-select-option :value="1">Random+Prefix</a-select-option>
-                    <a-form-item>
+                <a-select-option :value="2">Random+Prefix+Num</a-select-option>
-                        <a-select v-model="clientsBulkModal.emailMethod" buttonStyle="solid" style="width: 250px" :dropdown-class-name="themeSwitcher.currentTheme">
+                <a-select-option :value="3">Random+Prefix+Num+Postfix</a-select-option>
-                            <a-select-option :value="0">Random</a-select-option>
+                <a-select-option :value="4">Prefix+Num+Postfix</a-select-option>
-                            <a-select-option :value="1">Random+Prefix</a-select-option>
+            </a-select>
-                            <a-select-option :value="2">Random+Prefix+Num</a-select-option>
+        </a-form-item>
-                            <a-select-option :value="3">Random+Prefix+Num+Postfix</a-select-option>
+        <a-form-item label='{{ i18n "pages.client.first" }}' v-if="clientsBulkModal.emailMethod>1">
-                            <a-select-option :value="4">Prefix+Num+Postfix</a-select-option>
+            <a-input-number v-model="clientsBulkModal.firstNum" :min="1"></a-input-number>
-                        </a-select>
+        </a-form-item>
-                    </a-form-item>
+        <a-form-item label='{{ i18n "pages.client.last" }}' v-if="clientsBulkModal.emailMethod>1">
-                </td>
+            <a-input-number v-model="clientsBulkModal.lastNum" :min="clientsBulkModal.firstNum"></a-input-number>
-            </tr>
+        </a-form-item>
-            <tr v-if="clientsBulkModal.emailMethod>1">
+        <a-form-item label='{{ i18n "pages.client.prefix" }}' v-if="clientsBulkModal.emailMethod>0">
-                <td>{{ i18n "pages.client.first" }}</td>
+            <a-input v-model="clientsBulkModal.emailPrefix"></a-input>
-                <td>
+        </a-form-item>
-                    <a-form-item>
+        <a-form-item label='{{ i18n "pages.client.postfix" }}' v-if="clientsBulkModal.emailMethod>2">
-                        <a-input-number v-model="clientsBulkModal.firstNum" :min="1"></a-input-number>
+            <a-input v-model="clientsBulkModal.emailPostfix"></a-input>
-                    </a-form-item>
+        </a-form-item>
-                </td>
+        <a-form-item label='{{ i18n "pages.client.clientCount" }}' v-if="clientsBulkModal.emailMethod < 2">
-            </tr>
+            <a-input-number v-model="clientsBulkModal.quantity" :min="1" :max="100"></a-input-number>
-            <tr v-if="clientsBulkModal.emailMethod>1">
+        </a-form-item>
-                <td>{{ i18n "pages.client.last" }}</td>
+        <a-form-item label='Flow' v-if="clientsBulkModal.inbound.canEnableTlsFlow()">
-                <td>
+            <a-select v-model="clientsBulkModal.flow" :dropdown-class-name="themeSwitcher.currentTheme">
-                    <a-form-item>
+                <a-select-option value="" selected>{{ i18n "none" }}</a-select-option>
-                        <a-input-number v-model="clientsBulkModal.lastNum" :min="clientsBulkModal.firstNum"></a-input-number>
+                <a-select-option v-for="key in TLS_FLOW_CONTROL" :value="key">[[ key ]]</a-select-option>
-                    </a-form-item>
+            </a-select>
-                </td>
+        </a-form-item>
-            </tr>
+        <a-form-item v-if="app.subSettings.enable">
-            <tr v-if="clientsBulkModal.emailMethod>0">
+            <template slot="label">
-                <td>{{ i18n "pages.client.prefix" }}</td>
+                <a-tooltip>
-                <td>
+                    <template slot="title">
-                    <a-form-item>
+                        <span>{{ i18n "pages.inbounds.subscriptionDesc" }}</span>
-                        <a-input v-model="clientsBulkModal.emailPrefix" style="width: 250px"></a-input>
+                    </template>
-                    </a-form-item>
+                    Subscription
-                </td>
+                    <a-icon @click="clientsBulkModal.subId = RandomUtil.randomLowerAndNum(16)" type="sync"></a-icon>
-            </tr>
+                </a-tooltip>
-            <tr v-if="clientsBulkModal.emailMethod>2">
+            </template>
-                <td>{{ i18n "pages.client.postfix" }}</td>
+            <a-input v-model.trim="clientsBulkModal.subId"></a-input>
-                <td>
+        </a-form-item>
-                    <a-form-item>
+        <a-form-item v-if="app.tgBotEnable">
-                        <a-input v-model="clientsBulkModal.emailPostfix" style="width: 250px"></a-input>
+            <template slot="label">
-                    </a-form-item>
+                <a-tooltip>
-                </td>
+                    <template slot="title">
-            </tr>
+                        <span>{{ i18n "pages.inbounds.telegramDesc" }}</span>
-            <tr v-if="clientsBulkModal.emailMethod < 2">
+                    </template>
-                <td>{{ i18n "pages.client.clientCount" }}</td>
+                    Telegram ID
-                <td>
+                    <a-icon type="question-circle"></a-icon>
-                    <a-form-item>
+                </a-tooltip>
-                        <a-input-number v-model="clientsBulkModal.quantity" :min="1" :max="100"></a-input-number>
+            </template>
-                    </a-form-item>
+            <a-input v-model.trim="clientsBulkModal.tgId"></a-input>
-                </td>
+        </a-form-item>
-            </tr>
+        <a-form-item>
-            <tr v-if="clientsBulkModal.inbound.canEnableTlsFlow()">
+            <template slot="label">
-                <td>Flow</td>
+                <a-tooltip>
-                <td>
+                    <template slot="title">
-                    <a-form-item>
+                        <span>{{ i18n "pages.inbounds.meansNoLimit" }}</span>
-                        <a-select v-model="clientsBulkModal.flow" style="width: 250px" :dropdown-class-name="themeSwitcher.currentTheme">
+                    </template>
-                            <a-select-option value="" selected>{{ i18n "none" }}</a-select-option>
+                    {{ i18n "pages.inbounds.totalFlow" }}
-                            <a-select-option v-for="key in TLS_FLOW_CONTROL" :value="key">[[ key ]]</a-select-option>
+                    <a-icon type="question-circle"></a-icon>
-                        </a-select>
+                </a-tooltip>
-                    </a-form-item>
+            </template>
-                </td>
+            <a-input-number v-model="clientsBulkModal.totalGB" :min="0"></a-input-number> GB
-            </tr>
+        </a-form-item>
-            <tr v-if="app.subSettings.enable">
+        <a-form-item label='{{ i18n "pages.client.delayedStart" }}'>
-                <td>Subscription
+            <a-switch v-model="clientsBulkModal.delayedStart" @click="clientsBulkModal.expiryTime=0"></a-switch>
-                    <a-tooltip>
+        </a-form-item>
-                        <template slot="title">
+        <a-form-item label='{{ i18n "pages.client.expireDays" }}' v-if="clientsBulkModal.delayedStart">
-                            <span>{{ i18n "pages.inbounds.subscriptionDesc" }}</span>
+            <a-input-number v-model.number="delayedExpireDays" :min="0"></a-input-number>
-                        </template>
+        </a-form-item>
-                        <a-icon @click="client.subId = RandomUtil.randomLowerAndNum(16)" type="sync"></a-icon>
+        <a-form-item v-else>
-                    </a-tooltip>
+            <template slot="label">
-                </td>
+                <a-tooltip>
-                <td>
+                    <template slot="title">
-                    <a-form-item>
+                        <span>{{ i18n "pages.inbounds.leaveBlankToNeverExpire" }}</span>
-                        <a-input v-model.trim="clientsBulkModal.subId" style="width: 250px"></a-input>
+                    </template>
-                    </a-form-item>
+                    {{ i18n "pages.inbounds.expireDate" }}
-                </td>
+                    <a-icon type="question-circle"></a-icon>
-            </tr>
+                </a-tooltip>
-            <tr v-if="app.tgBotEnable">
+            </template>
-                <td>Telegram ID
+            <a-date-picker :show-time="{ format: 'HH:mm:ss' }" format="YYYY-MM-DD HH:mm:ss"
-                    <a-tooltip>
+                :dropdown-class-name="themeSwitcher.currentTheme"
-                        <template slot="title">
+                v-model="clientsBulkModal.expiryTime"></a-date-picker>
-                            <span>{{ i18n "pages.inbounds.telegramDesc" }}</span>
+        </a-form-item>
-                        </template>
+        <a-form-item v-if="clientsBulkModal.expiryTime != 0">
-                        <a-icon type="question-circle" theme="filled"></a-icon>
+            <template slot="label">
-                    </a-tooltip>
+                <span>{{ i18n "pages.client.renew" }}</span>
-                </td>
+                <a-tooltip>
-                <td>
+                    <template slot="title">
-                    <a-form-item>
+                        <span>{{ i18n "pages.client.renewDesc" }}</span>
-                        <a-input v-model.trim="clientsBulkModal.tgId" style="width: 250px"></a-input>
+                    </template>
-                    </a-form-item>
+                    <a-icon type="question-circle"></a-icon>
-                </td>
+                </a-tooltip>
-            </tr>
+            </template>
-            <tr>
+            <a-input-number v-model.number="clientsBulkModal.reset" :min="0"></a-input-number>
-                <td>
+        </a-form-item>
-                    <span>{{ i18n "pages.inbounds.totalFlow" }}</span>(GB)
-                    <a-tooltip>
-                        <template slot="title">
-                            0 <span>{{ i18n "pages.inbounds.meansNoLimit" }}</span>
-                        </template>
-                        <a-icon type="question-circle" theme="filled"></a-icon>
-                    </a-tooltip>
-                </td>
-                <td>
-                    <a-form-item>
-                    <a-input-number v-model="clientsBulkModal.totalGB" :min="0"></a-input-number>
-                    </a-form-item>
-                </td>
-            </tr>
-            <tr>
-                <td>{{ i18n "pages.client.delayedStart" }}</td>
-                <td>
-                    <a-form-item>
-                        <a-switch v-model="clientsBulkModal.delayedStart" @click="clientsBulkModal.expiryTime=0"></a-switch>
-                    </a-form-item>
-                </td>
-            </tr>
-            <tr v-if="clientsBulkModal.delayedStart">
-                <td>{{ i18n "pages.client.expireDays" }}</td>
-                <td>
-                    <a-form-item>
-                        <a-input-number v-model.number="delayedExpireDays" :min="0"></a-input-number>
-                    </a-form-item>
-                </td>
-            </tr>
-            <tr v-else>
-                <td>
-                    <span>{{ i18n "pages.inbounds.expireDate" }}</span>
-                    <a-tooltip>
-                        <template slot="title">
-                            <span>{{ i18n "pages.inbounds.leaveBlankToNeverExpire" }}</span>
-                        </template>
-                        <a-icon type="question-circle" theme="filled"></a-icon>
-                    </a-tooltip>
-                </td>
-                <td>
-                    <a-form-item>
-                        <a-date-picker :show-time="{ format: 'HH:mm:ss' }" format="YYYY-MM-DD HH:mm:ss"
-                                       :dropdown-class-name="themeSwitcher.currentTheme"
-                                       v-model="clientsBulkModal.expiryTime" style="width: 250px;"></a-date-picker>
-                    </a-form-item>
-                </td>
-            </tr>
-            <tr v-if="clientsBulkModal.expiryTime != 0">
-                <td>
-                    <span>{{ i18n "pages.client.renew" }}</span>
-                    <a-tooltip>
-                        <template slot="title">
-                            <span>{{ i18n "pages.client.renewDesc" }}</span>
-                        </template>
-                        <a-icon type="question-circle" theme="filled"></a-icon>
-                    </a-tooltip>
-                </td>
-                <td>
-                    <a-form-item>
-                        <a-input-number v-model.number="clientsBulkModal.reset" :min="0"></a-input-number>
-                    </a-form-item>
-                </td>
-            </tr>
-        </table>
     </a-form>
 </a-modal>
 <script>
@@ -220,7 +155,7 @@
             }
             ObjectUtil.execute(clientsBulkModal.confirm, clients, clientsBulkModal.dbInbound.id);
         },
-        show({ title='', okText='{{ i18n "sure" }}', dbInbound=null, confirm=(inbound, dbInbound)=>{} }) {
+        show({ title='', okText='{{ i18n "confirm" }}', dbInbound=null, confirm=(inbound, dbInbound)=>{} }) {
             this.visible = true;
             this.title = title;
             this.okText = okText;
@@ -254,7 +189,7 @@
             clientsBulkModal.visible = false;
             clientsBulkModal.loading(false);
         },
-        loading(loading) {
+        loading(loading=true) {
             clientsBulkModal.confirmLoading = loading;
         },
     };

web/html/xui/client_modal.html

@@ -29,7 +29,7 @@
                 ObjectUtil.execute(clientModal.confirm, clientModalApp.client, clientModal.dbInbound.id);
             }
         },
-        show({ title='', okText='{{ i18n "sure" }}', index=null, dbInbound=null, confirm=()=>{}, isEdit=false  }) {
+        show({ title='', okText='{{ i18n "confirm" }}', index=null, dbInbound=null, confirm=()=>{}, isEdit=false  }) {
             this.visible = true;
             this.title = title;
             this.okText = okText;
@@ -70,7 +70,7 @@
             clientModal.visible = false;
             clientModal.loading(false);
         },
-        loading(loading) {
+        loading(loading=true) {
             clientModal.confirmLoading = loading;
         },
     };

web/html/xui/common_sider.html

@@ -1,23 +1,23 @@
 {{define "menuItems"}}
 <a-menu-item key="{{ .base_path }}xui/">
     <a-icon type="dashboard"></a-icon>
-    <span>{{ i18n "menu.dashboard"}}</span>
+    <span><strong>{{ i18n "menu.dashboard"}}</strong></span>
 </a-menu-item>
 <a-menu-item key="{{ .base_path }}xui/inbounds">
     <a-icon type="user"></a-icon>
-    <span>{{ i18n "menu.inbounds"}}</span>
+    <span><strong>{{ i18n "menu.inbounds"}}</strong></span>
 </a-menu-item>
 <a-menu-item key="{{ .base_path }}xui/settings">
     <a-icon type="setting"></a-icon>
-    <span>{{ i18n "menu.settings"}}</span>
+    <span><strong>{{ i18n "menu.settings"}}</strong></span>
 </a-menu-item>
 <a-menu-item key="{{ .base_path }}xui/xray">
     <a-icon type="tool"></a-icon>
-    <span>{{ i18n "menu.xray"}}</span>
+    <span><strong>{{ i18n "menu.xray"}}</strong></span>
 </a-menu-item>
 <a-menu-item key="{{ .base_path }}logout">
     <a-icon type="logout"></a-icon>
-    <span>{{ i18n "menu.logout"}}</span>
+    <span><strong>{{ i18n "menu.logout"}}</strong></span>
 </a-menu-item>
 {{end}}
 

web/html/xui/component/themeSwitch.html

@@ -19,6 +19,7 @@
       toggleTheme() {
         this.isDarkTheme = !this.isDarkTheme;
         localStorage.setItem('dark-mode', this.isDarkTheme);
+        document.getElementById('message').className = themeSwitcher.currentTheme;
       },
     };
   }
@@ -29,6 +30,10 @@
     props: [],
     template: `{{template "component/themeSwitchTemplate"}}`,
     data: () => ({ themeSwitcher }),
+    mounted() {
+      this.$message.config({getContainer: () => document.getElementById('message')});
+      document.getElementById('message').className = themeSwitcher.currentTheme;
+    }
   });
 </script>
 {{end}}

web/html/xui/dns_modal.html

@@ -0,0 +1,86 @@
+{{define "dnsModal"}}
+<a-modal id="dns-modal" v-model="dnsModal.visible" :title="dnsModal.title" @ok="dnsModal.ok"
+         :closable="true" :mask-closable="false"
+         :ok-text="dnsModal.okText" cancel-text='{{ i18n "close" }}' :class="themeSwitcher.currentTheme">
+    <a-form :colon="false" :label-col="{ md: {span:6} }" :wrapper-col="{ md: {span:14} }">
+        <a-form-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>
+            <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-input>
+          </template>
+        </a-form-item>
+        <a-form-item label='{{ i18n "pages.xray.dns.strategy" }}' v-if="isAdvanced">
+          <a-select
+            v-model="dnsModal.dnsServer.queryStrategy"
+            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>
+</a-modal>
+<script>
+    const dnsModal = {
+        title: '',
+        visible: false,
+        okText: '{{ i18n "confirm" }}',
+        isEdit: false,
+        confirm: null,
+        dnsServer: {
+          address: "localhost",
+          domains: [],
+          queryStrategy: 'UseIP',
+        },
+        ok() {
+          domains = dnsModal.dnsServer.domains.filter(d => d.length>0);
+          dnsModal.dnsServer.domains = domains;
+          newDnsServer = domains.length > 0 ? dnsModal.dnsServer : dnsModal.dnsServer.address;
+          ObjectUtil.execute(dnsModal.confirm, newDnsServer);
+        },
+        show({ title='', okText='{{ i18n "confirm" }}', dnsServer, confirm=(dnsServer)=>{}, isEdit=false  }) {
+            this.title = title;
+            this.okText = okText;
+            this.confirm = confirm;
+            this.visible = true;
+            if(isEdit) {
+              if (typeof dnsServer == 'object'){
+                this.dnsServer = dnsServer;
+              } else {
+                this.dnsServer.address = dnsServer?? '';
+              }
+            } else {
+              this.dnsServer = {
+                address: "localhost",
+                domains: [],
+                queryStrategy: 'UseIP',
+              }
+            }
+            this.isEdit = isEdit;
+        },
+        close() {
+            dnsModal.visible = false;
+        },
+    };
+
+    new Vue({
+        delimiters: ['[[', ']]'],
+        el: '#dns-modal',
+        data: {
+            dnsModal: dnsModal,
+        },
+        computed: {
+          isAdvanced: {
+            get: function () { return dnsModal.dnsServer.domains.length>0 }
+          }
+        }
+    });
+
+</script>
+{{end}}

web/html/xui/fakedns_modal.html

@@ -0,0 +1,57 @@
+{{define "fakednsModal"}}
+<a-modal id="fakedns-modal" v-model="fakednsModal.visible" :title="fakednsModal.title" @ok="fakednsModal.ok"
+         :closable="true" :mask-closable="false"
+         :ok-text="fakednsModal.okText" cancel-text='{{ i18n "close" }}' :class="themeSwitcher.currentTheme">
+    <a-form :colon="false" :label-col="{ md: {span:6} }" :wrapper-col="{ md: {span:14} }">
+        <a-form-item label='{{ i18n "pages.xray.fakedns.ipPool" }}'>
+            <a-input v-model.trim="fakednsModal.fakeDns.ipPool"></a-input>
+        </a-form-item>
+        <a-form-item label='{{ i18n "pages.xray.fakedns.poolSize" }}'>
+          <a-input type="number" min="1" v-model.trim="fakednsModal.fakeDns.poolSize"></a-input>
+        </a-form-item>
+    </a-form>
+</a-modal>
+<script>
+    const fakednsModal = {
+        title: '',
+        visible: false,
+        okText: '{{ i18n "confirm" }}',
+        isEdit: false,
+        confirm: null,
+        fakeDns: {
+          ipPool: "198.18.0.0/16",
+          poolSize: 65535,
+        },
+        ok() {
+          ObjectUtil.execute(fakednsModal.confirm, fakednsModal.fakeDns);
+        },
+        show({ title='', okText='{{ i18n "confirm" }}', fakeDns, confirm=(fakeDns)=>{}, isEdit=false  }) {
+            this.title = title;
+            this.okText = okText;
+            this.confirm = confirm;
+            this.visible = true;
+            if(isEdit) {
+                this.fakeDns = fakeDns;
+            } else {
+              this.fakeDns = {
+                ipPool: "198.18.0.0/16",
+                poolSize: 65535,
+              }
+            }
+            this.isEdit = isEdit;
+        },
+        close() {
+            fakednsModal.visible = false;
+        },
+    };
+
+    new Vue({
+        delimiters: ['[[', ']]'],
+        el: '#fakedns-modal',
+        data: {
+            fakednsModal: fakednsModal,
+        }
+    });
+
+</script>
+{{end}}

web/html/xui/form/client.html

@@ -1,170 +1,125 @@
 {{define "form/client"}}
-<a-form layout="inline" v-if="client">
+<a-form layout="horizontal" v-if="client" :colon="false" :label-col="{ md: {span:8} }" :wrapper-col="{ md: {span:14} }">
-    <table width="100%" class="ant-table-tbody">
+    <a-form-item label='{{ i18n "pages.inbounds.enable" }}'>
-        <tr>
+        <a-switch v-model="client.enable"></a-switch>
-            <td>{{ i18n "pages.inbounds.enable" }}</td>
+    </a-form-item>
-            <td>
+    <a-form-item>
-                <a-form-item>
+        <template slot="label">
-                    <a-switch v-model="client.enable"></a-switch>
+            <a-tooltip>
-                </a-form-item>
+                <template slot="title">
-            </td>
+                    <span>{{ i18n "pages.inbounds.emailDesc" }}</span>
-        </tr>
+                </template>
-        <tr>
+                {{ i18n "pages.inbounds.email" }}
-            <td>
+                <a-icon type="sync" @click="client.email = RandomUtil.randomLowerAndNum(9)"></a-icon>
-                <span>{{ i18n "pages.inbounds.email" }}</span>
+            </a-tooltip>
-                <a-tooltip>
+        </template>
-                    <template slot="title">
+        <a-input v-model.trim="client.email"></a-input>
-                        <span>{{ i18n "pages.inbounds.emailDesc" }}</span>
+    </a-form-item>
-                    </template>
+    <a-form-item v-if="inbound.protocol === Protocols.TROJAN || inbound.protocol === Protocols.SHADOWSOCKS">
-                    <a-icon type="sync" @click="client.email = RandomUtil.randomLowerAndNum(9)"></a-icon>
+        <template slot="label">
-                </a-tooltip>
+            <a-tooltip>
-            </td>
+                <template slot="title">
-            <td>
+                    <span>{{ i18n "reset" }}</span>
-                <a-form-item>
+                </template>
-                    <a-input v-model.trim="client.email" style="width: 250px"></a-input>
+                {{ i18n "password" }}
-                </a-form-item>
+                <a-icon v-if="inbound.protocol === Protocols.SHADOWSOCKS" @click="client.password = RandomUtil.randomShadowsocksPassword()" type="sync"></a-icon>
-            </td>
+                <a-icon v-if="inbound.protocol === Protocols.TROJAN" @click="client.password = RandomUtil.randomSeq(10)" type="sync"></a-icon>
-        </tr>
+            </a-tooltip>
-        <tr v-if="inbound.protocol === Protocols.TROJAN || inbound.protocol === Protocols.SHADOWSOCKS">
+        </template>
-            <td>password
+        <a-input v-model.trim="client.password"></a-input>
-                <a-icon v-if="inbound.protocol === Protocols.SHADOWSOCKS" @click="client.password = RandomUtil.randomShadowsocksPassword()" type="sync"> </a-icon>
+    </a-form-item>
-            </td>
+    <a-form-item v-if="inbound.protocol === Protocols.VMESS || inbound.protocol === Protocols.VLESS">
-            <td>
+        <template slot="label">
-                <a-form-item>
+            <a-tooltip>
-                    <a-input v-model.trim="client.password" style="width: 250px"></a-input>
+                <template slot="title">
-                </a-form-item>
+                    <span>{{ i18n "reset" }}</span>
-            </td>
+                </template>
-        </tr>
+                ID <a-icon @click="client.id = RandomUtil.randomUUID()" type="sync"></a-icon>
-        <tr v-if="inbound.protocol === Protocols.VMESS || inbound.protocol === Protocols.VLESS">
+            </a-tooltip>
-            <td>ID <a-icon @click="client.id = RandomUtil.randomUUID()" type="sync"></a-icon></td>
+        </template>
-            <td>
+        <a-input v-model.trim="client.id"></a-input>
-                <a-form-item>
+    </a-form-item>
-                    <a-input v-model.trim="client.id" style="width: 250px"></a-input>
+    <a-form-item v-if="client.email && app.subSettings.enable">
-                </a-form-item>
+        <template slot="label">
-            </td>
+            <a-tooltip>
-        </tr>
+                <template slot="title">
-        <tr v-if="client.email && app.subSettings.enable">
+                    <span>{{ i18n "pages.inbounds.subscriptionDesc" }}</span>
-            <td>Subscription
+                </template>
-                <a-tooltip>
+                Subscription
-                    <template slot="title">
+                <a-icon @click="client.subId = RandomUtil.randomLowerAndNum(16)" type="sync"></a-icon>
-                        <span>{{ i18n "pages.inbounds.subscriptionDesc" }}</span>
+            </a-tooltip>
-                    </template>
+        </template>
-                    <a-icon @click="client.subId = RandomUtil.randomLowerAndNum(16)" type="sync"></a-icon>
+        <a-input v-model.trim="client.subId"></a-input>
-                </a-tooltip>
+    </a-form-item>
-            </td>
+    <a-form-item v-if="client.email && app.tgBotEnable">
-            <td>
+        <template slot="label">
-                <a-form-item>
+            <a-tooltip>
-                    <a-input v-model.trim="client.subId" style="width: 250px"></a-input>
+                <template slot="title">
-                </a-form-item>
+                    <span>{{ i18n "pages.inbounds.telegramDesc" }}</span>
-            </td>
+                </template>
-        </tr>
+                Telegram ID
-        <tr v-if="client.email && app.tgBotEnable">
+                <a-icon type="question-circle"></a-icon>
-            <td>Telegram ID
+            </a-tooltip>
-                <a-tooltip>
+        </template>
-                    <template slot="title">
+        <a-input v-model.trim="client.tgId"></a-input>
-                        <span>{{ i18n "pages.inbounds.telegramDesc" }}</span>
+    </a-form-item>
-                    </template>
+    <a-form-item v-if="inbound.canEnableTlsFlow()" label='Flow'>
-                    <a-icon type="question-circle" theme="filled"></a-icon>
+        <a-select v-model="client.flow" :dropdown-class-name="themeSwitcher.currentTheme">
-                </a-tooltip>
+            <a-select-option value="" selected>{{ i18n "none" }}</a-select-option>
-            </td>
+            <a-select-option v-for="key in TLS_FLOW_CONTROL" :value="key">[[ key ]]</a-select-option>
-            <td>
+        </a-select>
-                <a-form-item>
+    </a-form-item>
-                    <a-input v-model.trim="client.tgId" style="width: 250px"></a-input>
+    <a-form-item>
-                </a-form-item>
+        <template slot="label">
-            </td>
+            <a-tooltip>
-        </tr>
+                <template slot="title">
-        <tr v-if="inbound.canEnableTlsFlow()">
+                    <span>{{ i18n "pages.inbounds.meansNoLimit" }}</span>
-            <td>Flow</td>
+                </template>
-            <td>
+                {{ i18n "pages.inbounds.totalFlow" }}
-                <a-form-item>
+                <a-icon type="question-circle"></a-icon>
-                    <a-select v-model="client.flow" style="width: 250px" :dropdown-class-name="themeSwitcher.currentTheme">
+            </a-tooltip>
-                        <a-select-option value="" selected>{{ i18n "none" }}</a-select-option>
+        </template>
-                        <a-select-option v-for="key in TLS_FLOW_CONTROL" :value="key">[[ key ]]</a-select-option>
+        <a-input-number v-model="client._totalGB" :min="0"></a-input-number> GB
-                    </a-select>
+    </a-form-item>
-                </a-form-item>
+    <a-form-item v-if="isEdit && clientStats" label='{{ i18n "usage" }}'>
-            </td>
+        <a-tag :color="clientUsageColor(clientStats, app.trafficDiff)">
-        </tr>
+            [[ sizeFormat(clientStats.up) ]] / 
-        <tr>
+            [[ sizeFormat(clientStats.down) ]]
-            <td>
+            ([[ sizeFormat(clientStats.up + clientStats.down) ]])
-                <span>{{ i18n "pages.inbounds.totalFlow" }}</span>(GB)
+        </a-tag>
-                <a-tooltip>
+        <a-tooltip>
-                    <template slot="title">
+            <template slot="title">{{ i18n "pages.inbounds.resetTraffic" }}</template>
-                        0 <span>{{ i18n "pages.inbounds.meansNoLimit" }}</span>
+            <a-icon type="retweet" @click="resetClientTraffic(client.email,clientStats.inboundId,$event.target)" v-if="client.email.length > 0"></a-icon>
-                    </template>
+        </a-tooltip>
-                    <a-icon type="question-circle" theme="filled"></a-icon>
+    </a-form-item>
-                </a-tooltip>
+    <a-form-item label='{{ i18n "pages.client.delayedStart" }}'>
-            </td>
+        <a-switch v-model="delayedStart" @click="client._expiryTime=0"></a-switch>
-            <td>
+    </a-form-item>
-                <a-form-item>
+    <a-form-item v-if="delayedStart" label='{{ i18n "pages.client.expireDays" }}'>
-                    <a-input-number v-model="client._totalGB" :min="0"></a-input-number>
+        <a-input-number v-model.number="delayedExpireDays" :min="0"></a-input-number>
-                </a-form-item>
+    </a-form-item>
-            </td>
+    <a-form-item v-else>
-        </tr>
+        <template slot="label">
-        <tr v-if="isEdit && clientStats">
+            <a-tooltip>
-            <td>{{ i18n "usage" }}</td>
+                <template slot="title">{{ i18n "pages.inbounds.leaveBlankToNeverExpire" }}</template>
-            <td>
+                {{ i18n "pages.inbounds.expireDate" }}
-                <a-tag :color="clientUsageColor(clientStats, app.trafficDiff)">
+                <a-icon type="question-circle"></a-icon>
-                    [[ sizeFormat(clientStats.up) ]] / 
+            </a-tooltip>
-                    [[ sizeFormat(clientStats.down) ]]
+        </template>
-                    ([[ sizeFormat(clientStats.up + clientStats.down) ]])
+        <a-date-picker :show-time="{ format: 'HH:mm:ss' }" format="YYYY-MM-DD HH:mm:ss"
-                </a-tag>
+                        :dropdown-class-name="themeSwitcher.currentTheme"
-                <a-tooltip>
+                        v-model="client._expiryTime"></a-date-picker>
-                    <template slot="title">{{ i18n "pages.inbounds.resetTraffic" }}</template>
+        <a-tag color="red" v-if="isEdit && isExpiry">Expired</a-tag>
-                    <a-icon type="retweet" @click="resetClientTraffic(client.email,clientStats.inboundId,$event.target)" v-if="client.email.length > 0"></a-icon>
+    </a-form-item>
-                </a-tooltip>
+    <a-form-item v-if="client.expiryTime != 0">
-            </td>
+        <template slot="label">
-        </tr>
+            <a-tooltip>
-        <tr>
+                <template slot="title">{{ i18n "pages.client.renewDesc" }}</template>
-            <td>{{ i18n "pages.client.delayedStart" }}</td>
+                {{ i18n "pages.client.renew" }}
-            <td>
+                <a-icon type="question-circle"></a-icon>
-                <a-form-item>
+            </a-tooltip>
-                    <a-switch v-model="delayedStart" @click="client._expiryTime=0"></a-switch>
+        </template>
-                </a-form-item>
+        <a-input-number v-model.number="client.reset" :min="0"></a-input-number>
-            </td>
+</a-form-item>
-        </tr>
-        <tr v-if="delayedStart">
-            <td>{{ i18n "pages.client.expireDays" }}</td>
-            <td>
-                <a-form-item>
-                    <a-input-number v-model.number="delayedExpireDays" :min="0"></a-input-number>
-                </a-form-item>
-            </td>
-        </tr>
-        <tr v-else>
-            <td>
-                <span>{{ i18n "pages.inbounds.expireDate" }}</span>
-                <a-tooltip>
-                    <template slot="title">
-                        <span>{{ i18n "pages.inbounds.leaveBlankToNeverExpire" }}</span>
-                    </template>
-                    <a-icon type="question-circle" theme="filled"></a-icon>
-                </a-tooltip>
-            </td>
-            <td>
-                <a-form-item>
-                    <a-date-picker :show-time="{ format: 'HH:mm:ss' }" format="YYYY-MM-DD HH:mm:ss"
-                                   :dropdown-class-name="themeSwitcher.currentTheme"
-                                   v-model="client._expiryTime" style="width: 250px;"></a-date-picker>
-                    <a-tag color="red" v-if="isEdit && isExpiry">Expired</a-tag>
-                </a-form-item>
-            </td>
-        </tr>
-        <tr v-if="client.expiryTime != 0">
-            <td>
-                <span>{{ i18n "pages.client.renew" }}</span>
-                <a-tooltip>
-                    <template slot="title">
-                        <span>{{ i18n "pages.client.renewDesc" }}</span>
-                    </template>
-                    <a-icon type="question-circle" theme="filled"></a-icon>
-                </a-tooltip>
-            </td>
-            <td>
-                <a-form-item>
-                    <a-input-number v-model.number="client.reset" :min="0"></a-input-number>
-                </a-form-item>
-            </td>
-        </tr>
-    </table>
 </a-form>
 {{end}}

web/html/xui/form/inbound.html

@@ -1,91 +1,63 @@
 {{define "form/inbound"}}
 <!-- base -->
-<a-form layout="inline">
+<a-form :colon="false" :label-col="{ md: {span:6} }" :wrapper-col="{ md: {span:14} }">
-    <table width="100%" class="ant-table-tbody">
+    <a-form-item label='{{ i18n "enable" }}'>
-        <tr>
+        <a-switch v-model="dbInbound.enable"></a-switch>
-            <td>{{ i18n "enable" }}</td>
+    </a-form-item>
-            <td>
+    <a-form-item label='{{ i18n "remark" }}'>
-                <a-form-item>
+        <a-input v-model.trim="dbInbound.remark"></a-input>
-                    <a-switch v-model="dbInbound.enable"></a-switch>
+    </a-form-item>
-                </a-form-item>
+
-            </td>
+    <a-form-item label='{{ i18n "protocol" }}'>
-        </tr>
+        <a-select v-model="inbound.protocol" :disabled="isEdit" :dropdown-class-name="themeSwitcher.currentTheme">
-        <tr>
+            <a-select-option v-for="p in Protocols" :key="p" :value="p">[[ p ]]</a-select-option>
-            <td>{{ i18n "remark" }}</td>
+        </a-select>
-            <td>
+    </a-form-item>
-                <a-form-item>
+
-                    <a-input v-model.trim="dbInbound.remark" style="width: 250px;"></a-input>
+    <a-form-item>
-                </a-form-item>
+        <template slot="label">
-            </td>
+            <a-tooltip>
-        </tr>
-        <tr>
-            <td>{{ i18n "protocol" }}</td>
-            <td>
-                <a-form-item>
-                    <a-select v-model="inbound.protocol" style="width: 250px;" :disabled="isEdit" :dropdown-class-name="themeSwitcher.currentTheme">
-                        <a-select-option v-for="p in Protocols" :key="p" :value="p">[[ p ]]</a-select-option>
-                    </a-select>
-                </a-form-item>
-            </td>
-        </tr>
-        <tr>
-            <td>{{ i18n "monitor" }}
-                <a-tooltip>
                 <template slot="title">
                     <span>{{ i18n "pages.inbounds.monitorDesc" }}</span>
                 </template>
-                <a-icon type="question-circle" theme="filled"></a-icon>
+                {{ i18n "monitor" }}
-                </a-tooltip>
+                <a-icon type="question-circle"></a-icon>
-            </td>
+            </a-tooltip>
-            <td>
+        </template>
-                <a-form-item>
+        <a-input v-model.trim="inbound.listen"></a-input>
-                    <a-input v-model.trim="inbound.listen" style="width: 250px;"></a-input>
+    </a-form-item>
-                </a-form-item>
+
-            </td>
+    <a-form-item label='{{ i18n "pages.inbounds.port" }}'>
-        </tr>
+        <a-input-number v-model.number="inbound.port"></a-input-number>
-        <tr>
+    </a-form-item>
-            <td>{{ i18n "pages.inbounds.port" }}</td>
+
-            <td>
+    <a-form-item>
-                <a-form-item>
+        <template slot="label">
-                    <a-input-number v-model.number="inbound.port"></a-input-number>
+            <a-tooltip>
-                </a-form-item>
+                <template slot="title">
-            </td>
+                    <span>{{ i18n "pages.inbounds.meansNoLimit" }}</span>
-        </tr>
+                </template>
-        <tr>
+                {{ i18n "pages.inbounds.totalFlow" }}
-            <td>
+                <a-icon type="question-circle"></a-icon>
-                <span>{{ i18n "pages.inbounds.totalFlow" }}</span>(GB)
+            </a-tooltip>
-                <a-tooltip>
+        </template>
-                    <template slot="title">
+        <a-input-number v-model="dbInbound.totalGB" :min="0"></a-input-number> GB
-                        0 <span>{{ i18n "pages.inbounds.meansNoLimit" }}</span>
+    </a-form-item>
-                    </template>
+
-                    <a-icon type="question-circle" theme="filled"></a-icon>
+    <a-form-item>
-                </a-tooltip>
+        <template slot="label">
-            </td>
+            <a-tooltip>
-            <td>
+                <template slot="title">
-                <a-form-item>
+                    <span>{{ i18n "pages.inbounds.leaveBlankToNeverExpire" }}</span>
-                    <a-input-number v-model="dbInbound.totalGB" :min="0"></a-input-number>
+                </template>
-                </a-form-item>
+                {{ i18n "pages.inbounds.expireDate" }}
-            </td>
+                <a-icon type="question-circle"></a-icon>
-        </tr>
+            </a-tooltip>
-        <tr>
+        </template>
-            <td>
+            <a-date-picker :show-time="{ format: 'HH:mm:ss' }" format="YYYY-MM-DD HH:mm:ss"
-                <span>{{ i18n "pages.inbounds.expireDate" }}</span>
+                :dropdown-class-name="themeSwitcher.currentTheme"
-                <a-tooltip>
+                v-model="dbInbound._expiryTime"></a-date-picker>
-                    <template slot="title">
+        </a-form-item>
-                        <span>{{ i18n "pages.inbounds.leaveBlankToNeverExpire" }}</span>
-                    </template>
-                    <a-icon type="question-circle" theme="filled"></a-icon>
-                </a-tooltip>
-            </td>
-            <td>
-                <a-form-item>
-                    <a-date-picker :show-time="{ format: 'HH:mm:ss' }" format="YYYY-MM-DD HH:mm:ss"
-                                   :dropdown-class-name="themeSwitcher.currentTheme"
-                                   v-model="dbInbound._expiryTime" style="width: 250px;"></a-date-picker>
-                </a-form-item>
-            </td>
-        </tr>
-    </table>
 </a-form>
 
 <!-- vmess settings -->
@@ -123,6 +95,11 @@
     {{template "form/http"}}
 </template>
 
+<!-- wireguard -->
+<template v-if="inbound.protocol === Protocols.WIREGUARD">
+    {{template "form/wireguard"}}
+</template>
+
 <!-- stream settings -->
 <template v-if="inbound.canEnableStream()">
     {{template "form/streamSettings"}}
@@ -135,7 +112,7 @@
 </template>
 
 <!-- sniffing -->
-<template v-if="inbound.canSniffing()">
+<template>
     {{template "form/sniffing"}}
 </template>
 {{end}}

web/html/xui/form/outbound.html

@@ -2,535 +2,395 @@
 <!-- base -->
 <a-tabs :active-key="outModal.activeKey"  style="padding: 0; background-color: transparent;" @change="(activeKey) => {outModal.toggleJson(activeKey == '2'); }">
 <a-tab-pane key="1" tab="Form">
-<a-form layout="inline">
+<a-form :colon="false" :label-col="{ md: {span:8} }" :wrapper-col="{ md: {span:14} }">
-    <table width="100%" class="ant-table-tbody">
+        <a-form-item label='{{ i18n "protocol" }}'>
-        <tr>
+            <a-select v-model="outbound.protocol" :dropdown-class-name="themeSwitcher.currentTheme">
-            <td>{{ i18n "protocol" }}</td>
+                <a-select-option v-for="x,y in Protocols" :value="x">[[ y ]]</a-select-option>
-            <td>
+            </a-select>
-                <a-form-item>
+        </a-form-item>
-                    <a-select v-model="outbound.protocol" style="width: 250px;" :dropdown-class-name="themeSwitcher.currentTheme">
+        <a-form-item label='{{ i18n "pages.xray.outbound.tag" }}' has-feedback :validate-status="outModal.duplicateTag? 'warning' : 'success'">
-                        <a-select-option v-for="x,y in Protocols" :value="x">[[ y ]]</a-select-option>
+            <a-input v-model.trim="outbound.tag" @change="outModal.check()" placeholder='{{ i18n "pages.xray.outbound.tagDesc" }}'></a-input>
-                    </a-select>
+        </a-form-item>
-                </a-form-item>
-            </td>
-        </tr>
-        <tr>
-            <td>{{ i18n "pages.xray.outbound.tag" }}</td>
-            <td>
-                <a-form-item has-feedback :validate-status="outModal.duplicateTag? 'warning' : 'success'">
-                    <a-input v-model.trim="outbound.tag" style="width: 250px" @change="outModal.check()" placeholder='{{ i18n "pages.xray.outbound.tagDesc" }}'></a-input>
-                </a-form-item>
-            </td>
-        </tr>
 
 <!-- freedom settings-->
 <template v-if="outbound.protocol === Protocols.Freedom">
-        <tr>
+        <a-form-item label='Strategy'>
-            <td>Strategy</td>
+            <a-select
-            <td>
+            v-model="outbound.settings.domainStrategy"
-                <a-form-item>
+            :dropdown-class-name="themeSwitcher.currentTheme">
-                    <a-select
+                <a-select-option v-for="s in OutboundDomainStrategies" :value="s">[[ s ]]</a-select-option>
-                    v-model="outbound.settings.domainStrategy"
+            </a-select>
-                    style="width: 250px;" :dropdown-class-name="themeSwitcher.currentTheme">
+        </a-form-item>
-                        <a-select-option v-for="s in outboundDomainStrategies" :value="s">[[ s ]]</a-select-option>
+        <a-form-item label='Fragment'>
-                    </a-select>
+            <a-switch
-                </a-form-item>
+                :checked="Object.keys(outbound.settings.fragment).length >0"
-            </td>
+                @change="checked => outbound.settings.fragment = checked ? new Outbound.FreedomSettings.Fragment() : {}">
-        </tr>
+            </a-switch>
-        <tr>
+        </a-form-item>
-            <td>Fragment</td>
-            <td>
-                <a-form-item>
-                    <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>
-            </td>
-        </tr>
     <template v-if="Object.keys(outbound.settings.fragment).length >0">
-        <tr>
+        <a-form-item label='Packets'>
-            <td>Packets</td>
+            <a-select
-            <td>
+            v-model="outbound.settings.fragment.packets"
-                <a-form-item>
+            :dropdown-class-name="themeSwitcher.currentTheme">
-                    <a-select
+                <a-select-option v-for="s in ['1-3','tlshello']" :value="s">[[ s ]]</a-select-option>
-                    v-model="outbound.settings.fragment.packets"
+            </a-select>
-                    style="width: 250px;" :dropdown-class-name="themeSwitcher.currentTheme">
+        </a-form-item>
-                        <a-select-option v-for="s in ['1-3','tlshello']" :value="s">[[ s ]]</a-select-option>
+        <a-form-item label='Length'>
-                    </a-select>
+            <a-input v-model.trim="outbound.settings.fragment.length"></a-input>
-                </a-form-item>
+        </a-form-item>
-            </td>
+        <a-form-item label='Interval'>
-        </tr>
+            <a-input v-model.trim="outbound.settings.fragment.interval"></a-input>
-        <tr>
+        </a-form-item>
-            <td>Length</td>
-            <td>
-                <a-form-item>
-                    <a-input v-model.trim="outbound.settings.fragment.length" style="width: 250px"></a-input>
-                </a-form-item>
-            </td>
-        </tr>
-        <tr>
-            <td>Interval</td>
-            <td>
-                <a-form-item>
-                    <a-input v-model.trim="outbound.settings.fragment.interval" style="width: 250px"></a-input>
-                </a-form-item>
-            </td>
-        </tr>
     </template>
 </template>
 
 <!-- blackhole settings -->
 <template v-if="outbound.protocol === Protocols.Blackhole">
-        <tr>
+        <a-form-item label='Response Type'>
-            <td>Response Type</td>
+            <a-select
-            <td>
+            v-model="outbound.settings.type"
-                <a-form-item>
+            :dropdown-class-name="themeSwitcher.currentTheme">
-                    <a-select
+                <a-select-option v-for="s in ['', 'none','http']" :value="s">[[ s ]]</a-select-option>
-                    v-model="outbound.settings.type"
+            </a-select>
-                    style="width: 250px;" :dropdown-class-name="themeSwitcher.currentTheme">
+        </a-form-item>
-                        <a-select-option v-for="s in ['', 'none','http']" :value="s">[[ s ]]</a-select-option>
-                    </a-select>
-                </a-form-item>
-            </td>
-        </tr>
 </template>
 
 <!-- dns settings -->
 <template v-if="outbound.protocol === Protocols.DNS">
-        <tr>
+        <a-form-item label='{{ i18n "pages.inbounds.network" }}'>
-            <td>{{ i18n "pages.inbounds.network" }}</td>
+            <a-select
-            <td>
+            v-model="outbound.settings.network"
-                <a-form-item>
+            :dropdown-class-name="themeSwitcher.currentTheme">
-                    <a-select
+                <a-select-option v-for="s in ['udp','tcp']" :value="s">[[ s ]]</a-select-option>
-                    v-model="outbound.settings.network"
+            </a-select>
-                    style="width: 250px;" :dropdown-class-name="themeSwitcher.currentTheme">
+        </a-form-item>
-                        <a-select-option v-for="s in ['udp','tcp']" :value="s">[[ s ]]</a-select-option>
+</template>
-                    </a-select>
+
-                </a-form-item>
+<!-- wireguard settings -->
-            </td>
+<template v-if="outbound.protocol === Protocols.Wireguard">
-        </tr>
+    <a-form-item>
+        <template slot="label">
+            <a-tooltip>
+                <template slot="title">
+                    <span>{{ i18n "pages.xray.rules.useComma" }}</span>
+                </template>
+                {{ 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>
+    </a-form-item>
+    <a-form-item>
+        <template slot="label">
+            <a-tooltip>
+                <template slot="title">
+                    <span>{{ i18n "reset" }}</span>
+                </template>
+                {{ i18n "pages.xray.wireguard.secretKey" }}
+                <a-icon type="sync"
+                    @click="[outbound.settings.pubKey, outbound.settings.secretKey] = Object.values(Wireguard.generateKeypair())">
+                </a-icon>
+            </a-tooltip>
+        </template>
+        <a-input v-model.trim="outbound.settings.secretKey"></a-input>
+    </a-form-item>
+    <a-form-item label='{{ i18n "pages.xray.wireguard.publicKey" }}'>
+        <a-input disabled v-model="outbound.settings.pubKey"></a-input>
+    </a-form-item>
+    <a-form-item label='{{ i18n "pages.xray.wireguard.domainStrategy" }}'>
+        <a-select v-model="outbound.settings.domainStrategy" :dropdown-class-name="themeSwitcher.currentTheme">
+            <a-select-option v-for="wds in ['', ...WireguardDomainStrategy]" :value="wds">[[ wds ]]</a-select-option>
+        </a-select>
+    </a-form-item>
+    <a-form-item label='MTU'>
+        <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-form-item>
+    <a-form-item label='Kernel Mode'>
+        <a-switch v-model="outbound.settings.kernelMode"></a-switch>
+    </a-form-item>
+    <a-form-item>
+        <template slot="label">
+            <a-tooltip>
+                <template slot="title">
+                    <span>{{ i18n "pages.xray.rules.useComma" }}</span>
+                </template>
+                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-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;">
+            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>
+        <a-form-item label='{{ i18n "pages.xray.wireguard.publicKey" }}'>
+            <a-input v-model.trim="peer.publicKey"></a-input>
+        </a-form-item>
+        <a-form-item label='{{ i18n "pages.xray.wireguard.psk" }}'>
+            <a-input v-model.trim="peer.psk"></a-input>
+        </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>
+            </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-input>
+            </template>
+        </a-form-item>
+        <a-form-item label='Keep Alive'>
+            <a-input-number v-model.number="peer.keepAlive" :min="0"></a-input>
+        </a-form-item>    
+    </a-form>
 </template>
 
 <!-- Address + Port -->
 <template v-if="outbound.hasAddressPort()">
-        <tr>
+        <a-form-item label='{{ i18n "pages.inbounds.address" }}'>
-            <td>{{ i18n "pages.inbounds.address" }}</td>
+            <a-input v-model.trim="outbound.settings.address"></a-input>
-            <td>
+        </a-form-item>
-                <a-form-item>
+        <a-form-item label='{{ i18n "pages.inbounds.port" }}'>
-                    <a-input v-model.trim="outbound.settings.address" style="width: 250px"></a-input>
+            <a-input-number v-model.number="outbound.settings.port" :min="1" :max="65532"></a-input-number>
-                </a-form-item>
+        </a-form-item>
-            </td>
-        </tr>
-        <tr>
-            <td>{{ i18n "pages.inbounds.port" }}</td>
-            <td>
-                <a-form-item>
-                    <a-input-number v-model.number="outbound.settings.port" :min="1" :max="65532"></a-input-number>
-                </a-form-item>
-            </td>
-        </tr>
 </template>
 
 <!-- Vnext (vless/vmess) settings -->
 <template v-if="[Protocols.VMess, Protocols.VLESS].includes(outbound.protocol)">
-        <tr>
+        <a-form-item label='ID'>
-            <td>ID</td>
+            <a-input v-model.trim="outbound.settings.id"></a-input>
-            <td>
+        </a-form-item>
-                <a-form-item>
-                    <a-input v-model.trim="outbound.settings.id" style="width: 250px"></a-input>
-                </a-form-item>
-            </td>
-        </tr>
     <!-- vless settings -->
     <template v-if="outbound.canEnableTlsFlow()">
-        <tr>
+        <a-form-item label='Flow'>
-            <td>Flow</td>
+            <a-select v-model="outbound.settings.flow" :dropdown-class-name="themeSwitcher.currentTheme">
-            <td>
+                <a-select-option value="" selected>{{ i18n "none" }}</a-select-option>
-                <a-form-item>
+                <a-select-option v-for="key in TLS_FLOW_CONTROL" :value="key">[[ key ]]</a-select-option>
-                    <a-select v-model="outbound.settings.flow" style="width: 250px" :dropdown-class-name="themeSwitcher.currentTheme">
+            </a-select>
-                        <a-select-option value="" selected>{{ i18n "none" }}</a-select-option>
+        </a-form-item>
-                        <a-select-option v-for="key in TLS_FLOW_CONTROL" :value="key">[[ key ]]</a-select-option>
-                    </a-select>
-                </a-form-item>
-            </td>
-        </tr>
     </template>
 </template>
 
 <!-- Servers (trojan/shadowsocks/socks/http) settings -->
 <template v-if="outbound.hasServers()">
-        <tr v-if="outbound.hasUsername()">
+    <!-- http / socks -->
-            <td>{{ i18n "username" }}</td>
+    <template v-if="outbound.hasUsername()">
-            <td>
+        <a-form-item label='{{ i18n "username" }}'>
-                <a-form-item>
+            <a-input v-model.trim="outbound.settings.user"></a-input>
-                    <a-input v-model.trim="outbound.settings.user" style="width: 250px"></a-input>
+        </a-form-item>
-                </a-form-item>
+        <a-form-item label='{{ i18n "password" }}'>
-            </td>
+            <a-input v-model.trim="outbound.settings.pass"></a-input>
-        </tr>
+        </a-form-item>
-        <tr>
+    </template>
-            <td>{{ i18n "password" }}</td>
+    <!-- trojan/shadowsocks -->
-            <td>
+    <template v-if="[Protocols.Trojan, Protocols.Shadowsocks].includes(outbound.protocol)">
-                <a-form-item>
+        <a-form-item label='{{ i18n "password" }}'>
-                    <a-input v-model.trim="outbound.settings.password" style="width: 250px"></a-input>
+        <a-input v-model.trim="outbound.settings.password"></a-input>
-                </a-form-item>
+        </a-form-item>
-            </td>
+    </template>
-        </tr>
     <!-- shadowsocks -->
     <template v-if="outbound.protocol === Protocols.Shadowsocks">
-        <tr>
+        <a-form-item label='{{ i18n "encryption" }}'>
-            <td>{{ i18n "encryption" }}</td>
+            <a-select v-model="outbound.settings.method" :dropdown-class-name="themeSwitcher.currentTheme">
-            <td>
+                <a-select-option v-for="(method, method_name) in SSMethods" :value="method">[[ method_name ]]</a-select-option>
-                <a-form-item>
+            </a-select>
-                    <a-select v-model="outbound.settings.method" style="width: 250px;" :dropdown-class-name="themeSwitcher.currentTheme">
+        </a-form-item>
-                        <a-select-option v-for="method in SSMethods" :value="method">[[ method ]]</a-select-option>
+        <a-form-item label='UDP over TCP'>
-                    </a-select>
+            <a-switch v-model="outbound.settings.uot"></a-switch>
-                </a-form-item>
+        </a-form-item>
-            </td>
+  </template>
-        </tr>
-        <tr>
-            <td>UDP over TCP</td>
-            <td>
-                <a-form-item>
-                    <a-switch v-model="outbound.settings.uot"></a-switch>
-                </a-form-item>
-            </td>
-        </tr>
-    </template>
 </template>
 
 <!-- stream settings -->
 <template v-if="outbound.canEnableStream()">
-        <tr>
+        <a-form-item label='{{ i18n "transmission" }}'>
-            <td>{{ i18n "transmission" }}</td>
+            <a-select v-model="outbound.stream.network" @change="streamNetworkChange"
-            <td>
+                    :dropdown-class-name="themeSwitcher.currentTheme">
-                <a-form-item>
+                <a-select-option value="tcp">TCP</a-select-option>
-                    <a-select v-model="outbound.stream.network" @change="streamNetworkChange"
+                <a-select-option value="kcp">mKCP</a-select-option>
-                    style="width: 250px;" :dropdown-class-name="themeSwitcher.currentTheme">
+                <a-select-option value="ws">WebSocket</a-select-option>
-                        <a-select-option value="tcp">TCP</a-select-option>
+                <a-select-option value="http">HTTP/2</a-select-option>
-                        <a-select-option value="kcp">KCP</a-select-option>
+                <a-select-option value="quic">QUIC</a-select-option>
-                        <a-select-option value="ws">WebSocket</a-select-option>
+                <a-select-option value="grpc">gRPC</a-select-option>
-                        <a-select-option value="http">HTTP2</a-select-option>
+            </a-select>
-                        <a-select-option value="quic">QUIC</a-select-option>
+        </a-form-item>
-                        <a-select-option value="grpc">gRPC</a-select-option>
-                    </a-select>
-                </a-form-item>
-            </td>
-        </tr>
     <template v-if="outbound.stream.network === 'tcp'">
-        <tr>
+        <a-form-item label='HTTP {{ i18n "camouflage" }}'>
-            <td>http {{ i18n "camouflage" }}</td>
+            <a-switch
-            <td>
+                :checked="outbound.stream.tcp.type === 'http'"
-                <a-form-item>
+                @change="checked => outbound.stream.tcp.type = checked ? 'http' : 'none'">
-                    <a-switch
+            </a-switch>
-                            :checked="outbound.stream.tcp.type === 'http'"
+        </a-form-item>
-                            @change="checked => outbound.stream.tcp.type = checked ? 'http' : 'none'">
-                    </a-switch>
-                </a-form-item>
-            </td>
-        </tr>
         <template v-if="outbound.stream.tcp.type == 'http'">
-        <tr>
+        <a-form-item label='{{ i18n "host" }}'>
-            <td>{{ i18n "host" }}</td>
+            <a-input v-model.trim="outbound.stream.tcp.host"></a-input>
-            <td>
+        </a-form-item> 
-                <a-form-item>
+        <a-form-item label='{{ i18n "path" }}'>
-                    <a-input style="width: 250px;" v-model.trim="outbound.stream.tcp.host"></a-input>
+            <a-input v-model.trim="outbound.stream.tcp.path"></a-input>
-                </a-form-item> 
+        </a-form-item> 
-            </td>
-        </tr>
-        <tr>
-            <td>{{ i18n "path" }}</td>
-            <td>
-                <a-form-item>
-                    <a-input style="width: 250px;" v-model.trim="outbound.stream.tcp.path"></a-input>
-                </a-form-item> 
-            </td>
-        </tr>
         </template>
     </template>
     
     <!-- kcp -->
     <template v-if="outbound.stream.network === 'kcp'">
-        <tr>
+        <a-form-item label='{{ i18n "camouflage" }}'>
-            <td>{{ i18n "camouflage" }}</td>
+            <a-select v-model="outbound.stream.kcp.type" :dropdown-class-name="themeSwitcher.currentTheme">
-            <td>
+                <a-select-option value="none">None</a-select-option>
-                <a-form-item>
+                <a-select-option value="srtp">SRTP</a-select-option>
-                    <a-select v-model="outbound.stream.kcp.type" style="width: 250px;" :dropdown-class-name="themeSwitcher.currentTheme">
+                <a-select-option value="utp">uTP</a-select-option>
-                        <a-select-option value="none">none (not camouflage)</a-select-option>
+                <a-select-option value="wechat-video">WeChat</a-select-option>
-                        <a-select-option value="srtp">srtp (video call)</a-select-option>
+                <a-select-option value="dtls">DTLS 1.2</a-select-option>
-                        <a-select-option value="utp">utp (BT download)</a-select-option>
+                <a-select-option value="wireguard">WireGuard</a-select-option>
-                        <a-select-option value="wechat-video">wechat-video (WeChat video)</a-select-option>
+            </a-select>
-                        <a-select-option value="dtls">dtls (DTLS 1.2 packages)</a-select-option>
+        </a-form-item>
-                        <a-select-option value="wireguard">wireguard (wireguard packages)</a-select-option>
+        <a-form-item label='{{ i18n "password" }}'>
-                    </a-select>
+            <a-input v-model="outbound.stream.kcp.seed"></a-input>
-                </a-form-item>
+        </a-form-item>
-            </td>
+        <a-form-item label='MTU'>
-        </tr>
+            <a-input-number v-model.number="outbound.stream.kcp.mtu"></a-input-number>
-        <tr>
+        </a-form-item>
-            <td>{{ i18n "password" }}</td>
+        <a-form-item label='TTI (ms)'>
-            <td>
+            <a-input-number v-model.number="outbound.stream.kcp.tti"></a-input-number>
-                <a-form-item>
+        </a-form-item>
-                    <a-input v-model="outbound.stream.kcp.seed" style="width: 250px;"></a-input>
+        <a-form-item label='Uplink (MB/s)'>
-                </a-form-item>
+            <a-input-number v-model.number="outbound.stream.kcp.upCap"></a-input-number>
-            </td>
+        </a-form-item> 
-        </tr>
+        <a-form-item label='Downlink (MB/s)'>
-        <tr>
+            <a-input-number v-model.number="outbound.stream.kcp.downCap"></a-input-number>
-            <td>mtu</td>
+        </a-form-item>
-            <td>
+        <a-form-item label='Congestion'>
-                <a-form-item>
+            <a-switch v-model="outbound.stream.kcp.congestion"></a-switch>
-                    <a-input-number v-model.number="outbound.stream.kcp.mtu"></a-input-number>
+        </a-form-item>
-                </a-form-item>
+        <a-form-item label='Read Buffer (MB)'>
-            </td>
+            <a-input-number v-model.number="outbound.stream.kcp.readBuffer"></a-input-number>
-        </tr>
+        </a-form-item>
-        <tr>
+        <a-form-item label='Write Buffer (MB)'>
-            <td>tti (ms)</td>
+            <a-input-number v-model.number="outbound.stream.kcp.writeBuffer"></a-input-number>
-            <td>
+        </a-form-item>
-                <a-form-item>
-                    <a-input-number v-model.number="outbound.stream.kcp.tti"></a-input-number>
-                </a-form-item>
-            </td>
-        </tr>
-        <tr>
-            <td>uplink capacity (MB/S)</td>
-            <td>
-                <a-form-item>
-                    <a-input-number v-model.number="outbound.stream.kcp.upCap"></a-input-number>
-                </a-form-item> 
-            </td>
-        </tr>
-        <tr>
-            <td>downlink capacity (MB/S)</td>
-            <td>
-                <a-form-item>
-                    <a-input-number v-model.number="outbound.stream.kcp.downCap"></a-input-number>
-                </a-form-item>
-            </td>
-        </tr>
-        <tr>
-            <td>congestion</td>
-            <td>
-                <a-form-item>
-                    <a-switch v-model="outbound.stream.kcp.congestion"></a-switch>
-                </a-form-item>
-            </td>
-        </tr>
-        <tr>
-            <td>read buffer size (MB)</td>
-            <td>
-                <a-form-item>
-                    <a-input-number v-model.number="outbound.stream.kcp.readBuffer"></a-input-number>
-                </a-form-item>
-            </td>
-        </tr>
-        <tr>
-            <td>write buffer size (MB)</td>
-            <td>
-                <a-form-item>
-                    <a-input-number v-model.number="outbound.stream.kcp.writeBuffer"></a-input-number>
-                </a-form-item>
-            </td>
-        </tr>
     </template>
     
     <!-- ws -->
     <template v-if="outbound.stream.network === 'ws'">
-        <tr>
+        <a-form-item label='{{ i18n "host" }}'>
-            <td>{{ i18n "host" }}</td>
+            <a-input v-model="outbound.stream.ws.host"></a-input>
-            <td><a-form-item><a-input style="width: 250px" v-model="outbound.stream.ws.host"></a-input></a-form-item></td>
+        </a-form-item>
-        </tr>
+        <a-form-item label='{{ i18n "path" }}'>
-        <tr>
+            <a-form-item><a-input v-model.trim="outbound.stream.ws.path"></a-input>
-            <td>{{ i18n "path" }}</td>
+        </a-form-item>
-            <td><a-form-item><a-input style="width: 250px;" v-model.trim="outbound.stream.ws.path"></a-input></a-form-item></td>
-        </tr>
     </template>
     
     <!-- http -->
     <template v-if="outbound.stream.network === 'http'">
-        <tr>
+        <a-form-item label='{{ i18n "host" }}'>
-            <td>{{ i18n "host" }}</td>
+            <a-input v-model.trim="outbound.stream.http.host"></a-input>
-            <td>
+        </a-form-item>
-                <a-form-item>
+        <a-form-item label='{{ i18n "path" }}'>
-                    <a-input v-model.trim="outbound.stream.http.host" style="width: 250px;"></a-input>
+            <a-input v-model.trim="outbound.stream.http.path"></a-input>
-                </a-form-item>
+        </a-form-item>
-            </td>
-        </tr>
-        <tr>
-            <td>{{ i18n "path" }}</td>
-            <td>
-                <a-form-item>
-                    <a-input v-model.trim="outbound.stream.http.path" style="width: 250px;"></a-input>
-                </a-form-item>
-            </td>
-        </tr>
     </template>
     
     <!-- quic -->
     <template v-if="outbound.stream.network === 'quic'">
-        <tr>
+        <a-form-item label='{{ i18n "pages.inbounds.stream.quic.encryption" }}'>
-            <td>{{ i18n "pages.inbounds.stream.quic.encryption" }}</td>
+            <a-select v-model="outbound.stream.quic.security" :dropdown-class-name="themeSwitcher.currentTheme">
-            <td>
+                <a-select-option value="none">None</a-select-option>
-                <a-form-item>
+                <a-select-option value="aes-128-gcm">AES-128-GCM</a-select-option>
-                    <a-select v-model="outbound.stream.quic.security" style="width: 250px;" :dropdown-class-name="themeSwitcher.currentTheme">
+                <a-select-option value="chacha20-poly1305">CHACHA20-POLY1305</a-select-option>
-                        <a-select-option value="none">none</a-select-option>
+            </a-select>
-                        <a-select-option value="aes-128-gcm">aes-128-gcm</a-select-option>
+        </a-form-item>
-                        <a-select-option value="chacha20-poly1305">chacha20-poly1305</a-select-option>
+        <a-form-item label='{{ i18n "password" }}'>
-                    </a-select>
+            <a-input v-model.trim="outbound.stream.quic.key"></a-input>
-                </a-form-item>
+        </a-form-item> 
-            </td>
+        <a-form-item label='{{ i18n "camouflage" }}'>
-        </tr>
+            <a-select v-model="outbound.stream.quic.type" :dropdown-class-name="themeSwitcher.currentTheme">
-        <tr>
+                <a-select-option value="none">None</a-select-option>
-            <td>{{ i18n "password" }}</td>
+                <a-select-option value="srtp">SRTP</a-select-option>
-            <td>
+                <a-select-option value="utp">uTP</a-select-option>
-                <a-form-item>
+                <a-select-option value="wechat-video">WeChat</a-select-option>
-                    <a-input v-model.trim="outbound.stream.quic.key" style="width: 250px;"></a-input>
+                <a-select-option value="dtls">DTLS 1.2</a-select-option>
-                </a-form-item> 
+                <a-select-option value="wireguard">WireGuard</a-select-option>
-            </td>
+            </a-select>
-        </tr>
+        </a-form-item>
-        <tr>
-            <td>{{ i18n "camouflage" }}</td>
-            <td>
-                <a-form-item>
-                    <a-select v-model="outbound.stream.quic.type" style="width: 250px;" :dropdown-class-name="themeSwitcher.currentTheme">
-                        <a-select-option value="none">none (not camouflage)</a-select-option>
-                        <a-select-option value="srtp">srtp (video call)</a-select-option>
-                        <a-select-option value="utp">utp (BT download)</a-select-option>
-                        <a-select-option value="wechat-video">wechat-video (WeChat video)</a-select-option>
-                        <a-select-option value="dtls">dtls (DTLS 1.2 packages)</a-select-option>
-                        <a-select-option value="wireguard">wireguard (wireguard packages)</a-select-option>
-                    </a-select>
-                </a-form-item>
-            </td>
-        </tr>
     </template>
     
     <!-- grpc -->
     <template v-if="outbound.stream.network === 'grpc'">
-        <tr>
+        <a-form-item label='Service Name'>
-            <td>serviceName</td>
+            <a-input v-model.trim="outbound.stream.grpc.serviceName"></a-input>
-            <td>
+        </a-form-item>
-                <a-form-item>
+        <a-form-item label='Multi Mode'>
-                    <a-input v-model.trim="outbound.stream.grpc.serviceName" style="width: 250px;"></a-input>
+            <a-switch v-model="outbound.stream.grpc.multiMode"></a-switch>
-                </a-form-item>
+        </a-form-item>
-            </td>
-        </tr>
-        <tr>
-            <td>MultiMode</td>
-            <td>
-                <a-form-item>
-                    <a-switch v-model="outbound.stream.grpc.multiMode"></a-switch>
-                </a-form-item>
-            </td>
-        </tr>
     </template>
 </template>
 
 <!-- tls settings -->
 <template v-if="outbound.canEnableTls()">
-        <tr>
+        <a-form-item label='{{ i18n "security" }}'>
-            <td>{{ i18n "security" }}</td>
+            <a-radio-group v-model="outbound.stream.security" button-style="solid">
-            <td>
+                <a-radio-button value="none">{{ i18n "none" }}</a-radio-button>
-                <a-form-item>
+                <a-radio-button value="tls">TLS</a-radio-button>
-                    <a-radio-group v-model="outbound.stream.security" button-style="solid">
+                <a-radio-button v-if="outbound.canEnableReality()" value="reality">Reality</a-radio-button>
-                        <a-radio-button value="none">{{ i18n "none" }}</a-radio-button>
+            </a-radio-group>
-                        <a-radio-button value="tls">TLS</a-radio-button>
+        </a-form-item>
-                        <a-radio-button v-if="outbound.canEnableReality()" value="reality">Reality</a-radio-button>
-                    </a-radio-group>
-                </a-form-item>
-            </td>
-        </tr>
         <template v-if="outbound.stream.isTls">
-            <tr>
+            <a-form-item label="SNI" placeholder="Server Name Indication">
-                <td>SNI</td>
+                <a-input v-model.trim="outbound.stream.tls.serverName"></a-input>
-                <td>
+            </a-form-item>
-                    <a-form-item placeholder="Server Name Indication">
+            <a-form-item label="uTLS">
-                        <a-input v-model.trim="outbound.stream.tls.serverName" style="width: 250px"></a-input>
+                <a-select v-model="outbound.stream.tls.fingerprint"
-                    </a-form-item>                
+                            :dropdown-class-name="themeSwitcher.currentTheme">
-                </td>
+                    <a-select-option value=''>None</a-select-option>
-            </tr>
+                    <a-select-option v-for="key in UTLS_FINGERPRINT" :value="key">[[ key ]]</a-select-option>
-            <tr>
+                </a-select>
-                <td>uTLS</td>
+            </a-form-item>
-                <td>
+            <a-form-item label="ALPN">
-                    <a-form-item>
+                <a-select
-                        <a-select v-model="outbound.stream.tls.fingerprint"
+                    mode="multiple"
-                                    style="width: 250px" :dropdown-class-name="themeSwitcher.currentTheme">
+                   
-                            <a-select-option value=''>None</a-select-option>
+                    :dropdown-class-name="themeSwitcher.currentTheme"
-                            <a-select-option v-for="key in UTLS_FINGERPRINT" :value="key">[[ key ]]</a-select-option>
+                    v-model="outbound.stream.tls.alpn">
-                        </a-select>
+                    <a-select-option v-for="alpn in ALPN_OPTION" :value="alpn">[[ alpn ]]</a-select-option>
-                    </a-form-item>
+                </a-select>
-                </td>
+            </a-form-item>
-            </tr>
+            <a-form-item label="Allow Insecure">
-            <tr>
+                <a-switch v-model="outbound.stream.tls.allowInsecure"></a-switch>
-                <td>ALPN</td>
+            </a-form-item>
-                <td>
-                    <a-form-item>
-                        <a-select
-                            mode="multiple"
-                            style="width: 250px"
-                            :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>
-                </td>
-            </tr>
-            <tr>
-                <td>Allow insecure</td>
-                <td>
-                    <a-form-item>
-                        <a-switch v-model="outbound.stream.tls.allowInsecure"></a-switch>
-                    </a-form-item>
-                </td>
-            </tr>
         </template>
         
         <!-- reality settings -->
         <template v-if="outbound.stream.isReality">
-                <tr>
+                <a-form-item label="SNI">
-                    <td>{{ i18n "domainName" }}</td>
+                    <a-input v-model.trim="outbound.stream.reality.serverName"></a-input>
-                    <td>
+                </a-form-item>
-                        <a-form-item>
+                <a-form-item label="uTLS">
-                            <a-input v-model.trim="outbound.stream.reality.serverName" style="width: 250px"></a-input>
+                    <a-select v-model="outbound.stream.reality.fingerprint"
-                        </a-form-item>
+                                :dropdown-class-name="themeSwitcher.currentTheme">
-                    </td>
+                        <a-select-option v-for="key in UTLS_FINGERPRINT" :value="key">[[ key ]]</a-select-option>
-                </tr>
+                    </a-select>
-                <tr>
+                </a-form-item>
-                    <td>uTLS</td>
+                <a-form-item label="Short ID">
-                    <td>
+                    <a-input v-model.trim="outbound.stream.reality.shortId" style="width:250px"></a-input>
-                        <a-form-item>
+                </a-form-item>
-                            <a-select v-model="outbound.stream.reality.fingerprint"
+                <a-form-item label="SpiderX">
-                                      style="width: 250px" :dropdown-class-name="themeSwitcher.currentTheme">
+                    <a-input v-model.trim="outbound.stream.reality.spiderX" style="width:250px"></a-input>
-                                <a-select-option v-for="key in UTLS_FINGERPRINT" :value="key">[[ key ]]</a-select-option>
+                </a-form-item>
-                            </a-select>
+                <a-form-item label="Public Key">
-                        </a-form-item>
+                            <a-input v-model.trim="outbound.stream.reality.publicKey"></a-input>
-                    </td>
+                </a-form-item>
-                </tr>
-                <tr>
-                    <td>Short Id</td>
-                    <td>
-                        <a-form-item>
-                            <a-input v-model.trim="outbound.stream.reality.shortId" style="width:250px"></a-input>
-                        </a-form-item>
-                    </td>
-                </tr>
-                <tr>
-                    <td>SpiderX</td>
-                    <td>
-                        <a-form-item>
-                            <a-input v-model.trim="outbound.stream.reality.spiderX" style="width:250px"></a-input>
-                        </a-form-item>
-                    </td>
-                </tr>
-                <tr>
-                    <td>Public Key</td>
-                    <td>
-                        <a-form-item>
-                            <a-input v-model.trim="outbound.stream.reality.publicKey" style="width: 250px"></a-input>
-                        </a-form-item>
-                    </td>
-                </tr>
         </template>
 </template>
-    </table>
 </a-form>
 </a-tab-pane>
 <a-tab-pane key="2" tab="JSON" force-render="true">

web/html/xui/form/protocol/dokodemo.html

@@ -1,42 +1,20 @@
 {{define "form/dokodemo"}}
-<a-form layout="inline">
+<a-form :colon="false" :label-col="{ md: {span:6} }" :wrapper-col="{ md: {span:14} }">
-    <table width="100%" class="ant-table-tbody">
+    <a-form-item label='{{ i18n "pages.inbounds.targetAddress"}}'>
-        <tr>
+        <a-input v-model.trim="inbound.settings.address"></a-input>
-            <td>{{ i18n "pages.inbounds.targetAddress"}}</td>
+    </a-form-item>
-            <td>
+    <a-form-item label='{{ i18n "pages.inbounds.destinationPort"}}'>
-                <a-form-item>
+        <a-input-number v-model.number="inbound.settings.port"></a-input-number>
-                    <a-input v-model.trim="inbound.settings.address"></a-input>
+    </a-form-item>
-                </a-form-item>
+    <a-form-item label='{{ i18n "pages.inbounds.network"}}'>
-            </td>
+        <a-select v-model="inbound.settings.network" :dropdown-class-name="themeSwitcher.currentTheme">
-        </tr>
+            <a-select-option value="tcp,udp">TCP+UDP</a-select-option>
-        <tr>
+            <a-select-option value="tcp">TCP</a-select-option>
-            <td>{{ i18n "pages.inbounds.destinationPort"}}</td>
+            <a-select-option value="udp">UDP</a-select-option>
-            <td>
+        </a-select>
-                <a-form-item>
+    </a-form-item>           
-                    <a-input-number v-model.number="inbound.settings.port"></a-input-number>
+    <a-form-item label='Follow Redirect'>
-                </a-form-item>
+        <a-switch v-model="inbound.settings.followRedirect"></a-switch>
-            </td>
+    </a-form-item>
-        </tr>
-        <tr>
-            <td>{{ i18n "pages.inbounds.network"}}</td>
-            <td>
-                <a-form-item>
-                    <a-select v-model="inbound.settings.network" style="width: 100px;" :dropdown-class-name="themeSwitcher.currentTheme">
-                        <a-select-option value="tcp,udp">tcp+udp</a-select-option>
-                        <a-select-option value="tcp">tcp</a-select-option>
-                        <a-select-option value="udp">udp</a-select-option>
-                    </a-select>
-                </a-form-item>           
-            </td>
-        </tr>
-        <tr>
-            <td>FollowRedirect</td>
-            <td>
-                <a-form-item>
-                    <a-switch v-model="inbound.settings.followRedirect"></a-switch>
-                </a-form-item>
-            </td>
-        </tr>
-    </table>
 </a-form>
 {{end}}

web/html/xui/form/protocol/http.html

@@ -1,5 +1,5 @@
 {{define "form/http"}}
-<a-form layout="inline">
+<a-form>
         <table style="width: 100%; text-align: center; margin-bottom: 10px;">
             <tr>
                 <td width="45%">{{ i18n "username" }}</td>

web/html/xui/form/protocol/shadowsocks.html

@@ -1,6 +1,5 @@
 {{define "form/shadowsocks"}}
-<a-form layout="inline">
+<template v-if="inbound.isSSMultiUser">
-    <template v-if="inbound.isSSMultiUser">
     <a-collapse activeKey="0" v-for="(client, index) in inbound.settings.shadowsockses.slice(0,1)" v-if="!isEdit">  
         <a-collapse-panel header='{{ i18n "pages.inbounds.client" }}'>
             {{template "form/client"}}
@@ -20,40 +19,32 @@
             </table>
         </a-collapse-panel>
     </a-collapse>
-    </template>
+</template>
-    <table width="100%" class="ant-table-tbody">
+<a-form :colon="false" :label-col="{ md: {span:6} }" :wrapper-col="{ md: {span:14} }">
-        <tr>
+    <a-form-item label='{{ i18n "encryption" }}'>
-            <td>{{ i18n "encryption" }}</td>
+        <a-select v-model="inbound.settings.method" @change="SSMethodChange" :dropdown-class-name="themeSwitcher.currentTheme">
-            <td>
+            <a-select-option v-for="(method,method_name) in SSMethods" :value="method">[[ method_name ]]</a-select-option>
-                <a-form-item>
+        </a-select>
-                    <a-select v-model="inbound.settings.method" style="width: 250px;" @change="SSMethodChange" :dropdown-class-name="themeSwitcher.currentTheme">
+    </a-form-item>
-                        <a-select-option v-for="method in SSMethods" :value="method">[[ method ]]</a-select-option>
+    <a-form-item v-if="inbound.isSS2022">
-                    </a-select>
+        <template slot="label">
-                </a-form-item>
+            <a-tooltip>
-            </td>
+                <template slot="title">
-        </tr>
+                    <span>{{ i18n "reset" }}</span>
-        <tr v-if="inbound.isSS2022">
+                </template>
-            <td>{{ i18n "password" }}
+                {{ i18n "password" }}
-                <a-icon @click="inbound.settings.password = RandomUtil.randomShadowsocksPassword()" type="sync"> </a-icon>
+                <a-icon @click="inbound.settings.password = RandomUtil.randomShadowsocksPassword()" type="sync"></a-icon>
-            </td>
+            </a-tooltip>
-            <td>
+        </template>
-                <a-form-item>
+        <a-input v-model.trim="inbound.settings.password"></a-input>
-                    <a-input v-model.trim="inbound.settings.password" style="width: 250px"></a-input>
+    </a-form-item>
-                </a-form-item>
+    <a-form-item label='{{ i18n "pages.inbounds.network" }}'>
-            </td>
+        <a-select v-model="inbound.settings.network" :dropdown-class-name="themeSwitcher.currentTheme">
-        </tr>
+            <a-select-option value="tcp,udp">TCP+UDP</a-select-option>
-        <tr>
+            <a-select-option value="tcp">TCP</a-select-option>
-            <td>{{ i18n "pages.inbounds.network" }}</td>
+            <a-select-option value="udp">UDP</a-select-option>
-            <td>
+        </a-select>
-                <a-form-item>
+    </a-form-item>
-                    <a-select v-model="inbound.settings.network" style="width: 100px;" :dropdown-class-name="themeSwitcher.currentTheme">
-                        <a-select-option value="tcp,udp">tcp+udp</a-select-option>
-                        <a-select-option value="tcp">tcp</a-select-option>
-                        <a-select-option value="udp">udp</a-select-option>
-                    </a-select>
-                </a-form-item>
-            </td>
-        </tr>
-    </table>
 </a-form>
+<a-divider style="margin:0;"></a-divider>
 {{end}}

web/html/xui/form/protocol/socks.html

@@ -1,52 +1,33 @@
 {{define "form/socks"}}
-<a-form layout="inline">
+<a-form :colon="false" :label-col="{ md: {span:6} }" :wrapper-col="{ md: {span:14} }">
-    <table width="100%" class="ant-table-tbody">
+    <a-form-item label='{{ i18n "pages.inbounds.enable" }} UDP'>
-        <tr>
+        <a-switch v-model="inbound.settings.udp"></a-switch>
-            <td style="width: 30%;">{{ i18n "password" }}</td>
+    </a-form-item>
-            <td>
+    <a-form-item label="IP" v-if="inbound.settings.udp">
-                <a-form-item>
+        <a-input v-model.trim="inbound.settings.ip"></a-input>
-                    <a-switch :checked="inbound.settings.auth === 'password'"
+    </a-form-item>
-                              @change="checked => inbound.settings.auth = checked ? 'password' : 'noauth'"></a-switch>
+    <a-form-item label='{{ i18n "password" }}'>
-                </a-form-item>
+        <a-switch :checked="inbound.settings.auth === 'password'"
-            </td>
+        @change="checked => inbound.settings.auth = checked ? 'password' : 'noauth'"></a-switch>
-        </tr>
+    </a-form-item>
-        <tr v-if="inbound.settings.auth === 'password'">
+    <template v-if="inbound.settings.auth === 'password'">
-            <td colspan="2">
+        <table style="width: 100%; text-align: center; margin-bottom: 10px;">
-                <table style="width: 100%; text-align: center; margin-bottom: 10px;">
+            <tr>
-                    <tr>
+                <td width="45%">{{ i18n "username" }}</td>
-                        <td width="45%">{{ i18n "username" }}</td>
+                <td width="45%">{{ i18n "password" }}</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 size="small" @click="inbound.settings.addAccount(new Inbound.SocksSettings.SocksAccount())">+</a-button></td>
+            </tr>
-                    </tr>
+        </table>
-                </table>
+        <a-input-group compact v-for="(account, index) in inbound.settings.accounts" style="margin-bottom: 10px;">
-                <a-input-group compact v-for="(account, index) in inbound.settings.accounts" style="margin-bottom: 10px;">
+            <a-input style="width: 50%" v-model.trim="account.user" placeholder='{{ i18n "username" }}'>
-                    <a-input style="width: 50%" v-model.trim="account.user" placeholder='{{ i18n "username" }}'>
+                <template slot="addonBefore" style="margin: 0;">[[ index+1 ]]</template>
-                        <template slot="addonBefore" style="margin: 0;">[[ index+1 ]]</template>
+            </a-input>
-                    </a-input>
+            <a-input style="width: 50%" v-model.trim="account.pass" placeholder='{{ i18n "password" }}'>
-                    <a-input style="width: 50%" v-model.trim="account.pass" placeholder='{{ i18n "password" }}'>
+                <template slot="addonAfter">
-                        <template slot="addonAfter">
+                    <a-button size="small" @click="inbound.settings.delAccount(index)">-</a-button>
-                            <a-button size="small" @click="inbound.settings.delAccount(index)">-</a-button>
+                </template>
-                        </template>
+            </a-input>
-                    </a-input>
+        </a-input-group>
-                </a-input-group>
+    </template>
-            </td>
-        </tr>
-        <tr>
-            <td>{{ i18n "pages.inbounds.enable" }} udp</td>
-            <td>
-                <a-form-item>
-                    <a-switch v-model="inbound.settings.udp"></a-switch>
-                </a-form-item>
-            </td>
-        </tr>
-        <tr v-if="inbound.settings.udp">
-            <td>IP</td>
-            <td>
-                <a-form-item>
-                    <a-input v-model.trim="inbound.settings.ip"></a-input>
-                </a-form-item>
-            </td>
-        </tr>
-    </table>
 </a-form>
 {{end}}

web/html/xui/form/protocol/trojan.html

@@ -1,5 +1,4 @@
 {{define "form/trojan"}}
-<a-form layout="inline">
 <a-collapse activeKey="0" v-for="(client, index) in inbound.settings.trojans.slice(0,1)" v-if="!isEdit">  
     <a-collapse-panel header='{{ i18n "pages.inbounds.client" }}'>
         {{template "form/client"}}
@@ -32,54 +31,27 @@
     </a-form>
 
     <!-- trojan fallbacks -->
-    <a-form v-for="(fallback, index) in inbound.settings.fallbacks" layout="inline">
+    <a-form v-for="(fallback, index) in inbound.settings.fallbacks" :colon="false" :label-col="{ md: {span:6} }" :wrapper-col="{ md: {span:14} }">
         <a-divider style="margin:0;">
-            fallback[[ index + 1 ]]
+            Fallback [[ index + 1 ]]
             <a-icon type="delete" @click="() => inbound.settings.delFallback(index)"
                     style="color: rgb(255, 77, 79);cursor: pointer;"/>
         </a-divider>
-        <table width="100%">
+        <a-form-item label='SNI'>
-            <tr>
+            <a-input v-model="fallback.name"></a-input>
-                <td style="width: 20%;">Name</td>
+        </a-form-item>            
-                <td>
+        <a-form-item label='ALPN'>
-                    <a-form-item>
+            <a-input v-model="fallback.alpn"></a-input>
-                        <a-input v-model="fallback.name" style="width: 250px"></a-input>
+        </a-form-item>
-                    </a-form-item>            
+        <a-form-item label='Path'>
-                </td>
+            <a-input v-model="fallback.path"></a-input>
-            </tr>
+        </a-form-item>
-            <tr>
+        <a-form-item label='Dest'>
-                <td>Alpn</td>
+            <a-input v-model="fallback.dest"></a-input>
-                <td>
+        </a-form-item>
-                    <a-form-item>
+        <a-form-item label='xVer'>
-                        <a-input v-model="fallback.alpn" style="width: 250px"></a-input>
+            <a-input-number v-model="fallback.xver" :min="0" :max="2"></a-input-number>
-                    </a-form-item>
+        </a-form-item>
-                </td>
-            </tr>
-            <tr>
-                <td>Path</td>
-                <td>
-                    <a-form-item>
-                        <a-input v-model="fallback.path" style="width: 250px"></a-input>
-                    </a-form-item>
-                </td>
-            </tr>
-            <tr>
-                <td>Dest</td>
-                <td>
-                    <a-form-item>
-                        <a-input v-model="fallback.dest" style="width: 250px"></a-input>
-                    </a-form-item>
-                </td>
-            </tr>
-            <tr>
-                <td>xVer</td>
-                <td>
-                    <a-form-item>
-                        <a-input-number v-model="fallback.xver" :min="0" :max="2"></a-input-number>
-                    </a-form-item>
-                </td>
-            </tr>
-    </table>
     </a-form>
     <a-divider style="margin:0;"></a-divider>
 </template>

web/html/xui/form/protocol/vless.html

@@ -1,5 +1,4 @@
 {{define "form/vless"}}
-<a-form layout="inline">
 <a-collapse activeKey="0" v-for="(client, index) in inbound.settings.vlesses.slice(0,1)" v-if="!isEdit">    
     <a-collapse-panel header='{{ i18n "pages.inbounds.client" }}'>
         {{template "form/client"}}
@@ -34,54 +33,27 @@
     </a-form>
 
     <!-- vless fallbacks -->
-    <a-form v-for="(fallback, index) in inbound.settings.fallbacks" layout="inline">
+    <a-form v-for="(fallback, index) in inbound.settings.fallbacks" :colon="false" :label-col="{ md: {span:6} }" :wrapper-col="{ md: {span:14} }">
         <a-divider style="margin:0;">
-            fallback[[ index + 1 ]]
+            Fallback [[ index + 1 ]]
             <a-icon type="delete" @click="() => inbound.settings.delFallback(index)"
                     style="color: rgb(255, 77, 79);cursor: pointer;"/>
         </a-divider>
-        <table width="100%">
+        <a-form-item label='SNI'>
-            <tr>
+            <a-input v-model="fallback.name"></a-input>
-                <td style="width: 20%;">Name</td>
+        </a-form-item>            
-                <td>
+        <a-form-item label='ALPN'>
-                    <a-form-item>
+            <a-input v-model="fallback.alpn"></a-input>
-                        <a-input v-model="fallback.name" style="width: 250px"></a-input>
+        </a-form-item>
-                    </a-form-item>            
+        <a-form-item label='Path'>
-                </td>
+            <a-input v-model="fallback.path"></a-input>
-            </tr>
+        </a-form-item>
-            <tr>
+        <a-form-item label='Dest'>
-                <td>Alpn</td>
+            <a-input v-model="fallback.dest"></a-input>
-                <td>
+        </a-form-item>
-                    <a-form-item>
+        <a-form-item label='xVer'>
-                        <a-input v-model="fallback.alpn" style="width: 250px"></a-input>
+            <a-input-number v-model="fallback.xver" :min="0" :max="2"></a-input-number>
-                    </a-form-item>
+        </a-form-item>
-                </td>
-            </tr>
-            <tr>
-                <td>Path</td>
-                <td>
-                    <a-form-item>
-                        <a-input v-model="fallback.path" style="width: 250px"></a-input>
-                    </a-form-item>
-                </td>
-            </tr>
-            <tr>
-                <td>Dest</td>
-                <td>
-                    <a-form-item>
-                        <a-input v-model="fallback.dest" style="width: 250px"></a-input>
-                    </a-form-item>
-                </td>
-            </tr>
-            <tr>
-                <td>xVer</td>
-                <td>
-                    <a-form-item>
-                        <a-input-number v-model="fallback.xver" :min="0" :max="2"></a-input-number>
-                    </a-form-item>
-                </td>
-            </tr>
-    </table>
     </a-form>
     <a-divider style="margin:0;"></a-divider>
 </template>

web/html/xui/form/protocol/vmess.html

@@ -1,5 +1,4 @@
 {{define "form/vmess"}}
-<a-form layout="inline">
 <a-collapse activeKey="0" v-for="(client, index) in inbound.settings.vmesses.slice(0,1)" v-if="!isEdit">    
     <a-collapse-panel header='{{ i18n "pages.inbounds.client" }}'>
         {{template "form/client"}}

web/html/xui/form/protocol/wireguard.html

@@ -0,0 +1,80 @@
+{{define "form/wireguard"}}
+<a-form :colon="false" :label-col="{ md: {span:6} }" :wrapper-col="{ md: {span:14} }">
+    <a-form-item>
+        <template slot="label">
+            <a-tooltip>
+                <template slot="title">
+                    <span>{{ i18n "reset" }}</span>
+                </template>
+                {{ i18n "pages.xray.wireguard.secretKey" }}
+                <a-icon type="sync"
+                    @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>
+    </a-form-item>
+    <a-form-item label='{{ i18n "pages.xray.wireguard.publicKey" }}'>
+        <a-input disabled v-model="inbound.settings.pubKey"></a-input>
+    </a-form-item>
+    <a-form-item label='MTU'>
+        <a-input-number v-model.number="inbound.settings.mtu"></a-input-number>
+    </a-form-item>
+    <a-form-item label='Kernel Mode'>
+        <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-form-item>
+    <a-form v-for="(peer, index) in inbound.settings.peers" :colon="false" :label-col="{ md: {span:6} }" :wrapper-col="{ md: {span:14} }">
+        <a-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-divider>
+        <a-form-item>
+            <template slot="label">
+                <a-tooltip>
+                    <template slot="title">
+                        <span>{{ i18n "reset" }}</span>
+                    </template>
+                    {{ i18n "pages.xray.wireguard.secretKey" }}
+                    <a-icon @click="[peer.publicKey, peer.privateKey] = Object.values(Wireguard.generateKeypair())"type="sync"> </a-icon>
+                </a-tooltip>
+            </template>
+            <a-input v-model.trim="peer.privateKey"></a-input>
+        </a-form-item>
+        <a-form-item>
+            <template slot="label">
+                {{ i18n "pages.xray.wireguard.publicKey" }}
+            </template>
+            <a-input v-model.trim="peer.publicKey"></a-input>
+        </a-form-item>
+        <a-form-item>
+            <template slot="label">
+                <a-tooltip>
+                    <template slot="title">
+                        <span>{{ i18n "reset" }}</span>
+                    </template>
+                    {{ i18n "pages.xray.wireguard.psk" }}
+                    <a-icon @click="peer.psk = Wireguard.keyToBase64(Wireguard.generatePresharedKey())"type="sync"> </a-icon>
+                </a-tooltip>
+            </template>
+            <a-input v-model.trim="peer.psk"></a-input>
+        </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>
+            </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-input>
+            </template>
+        </a-form-item>
+        <a-form-item label='Keep Alive'>
+            <a-input-number v-model.number="peer.keepAlive" :min="0"></a-input>
+        </a-form-item>    
+    </a-form>
+</a-form>
+{{end}}

web/html/xui/form/sniffing.html

@@ -1,19 +1,19 @@
 {{define "form/sniffing"}}
 <a-divider style="margin:0;"></a-divider>
-<a-form layout="inline">
+<a-form :colon="false" :label-col="{ md: {span:6} }" :wrapper-col="{ md: {span:14} }">
   <a-form-item>
     <span slot="label">
-        sniffing
+        Sniffing
         <a-tooltip>
             <template slot="title">
                 <span>{{ i18n "pages.inbounds.noRecommendKeepDefault" }}</span>
             </template>
-            <a-icon type="question-circle" theme="filled"></a-icon>
+            <a-icon type="question-circle"></a-icon>
         </a-tooltip>
     </span>
     <a-switch v-model="inbound.sniffing.enabled"></a-switch>
   </a-form-item>
-  <a-form-item>
+  <a-form-item :wrapper-col="{span:24}">
     <a-checkbox-group v-model="inbound.sniffing.destOverride" v-if="inbound.sniffing.enabled">
       <a-checkbox v-for="key,value in SNIFFING_OPTION" :value="key">[[ value ]]</a-checkbox>
     </a-checkbox-group>

web/html/xui/form/stream/external_proxy.html

@@ -1,32 +1,26 @@
 {{define "form/externalProxy"}}
-<a-form layout="inline">
+<a-form :colon="false" :label-col="{ md: {span:8} }" :wrapper-col="{ md: {span:14} }">
     <a-divider style="margin:0;"></a-divider>
     <a-form-item label="External Proxy">
-    <a-switch v-model="externalProxy"></a-switch>
+        <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 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>
-    <table width="100%" class="ant-table-tbody" v-if="externalProxy" style="margin-bottom:5px">
+    <a-input-group style="margin: 5px 0;" compact v-for="(row, index) in inbound.stream.externalProxy">
-        <tr style="line-height: 40px;">
+        <template>
-            <td width="100%">
+            <a-tooltip title="Force TLS">
-                <a-input-group style="margin: 0 5px;" compact v-for="(row, index) in inbound.stream.externalProxy">
+                <a-select v-model="row.forceTls" style="width:20%; margin: 0px" :dropdown-class-name="themeSwitcher.currentTheme">
-                    <template>
+                    <a-select-option value="same">{{ i18n "pages.inbounds.same" }}</a-select-option>
-                        <a-tooltip title="Force TLS">
+                    <a-select-option value="none">{{ i18n "none" }}</a-select-option>
-                            <a-select v-model="row.forceTls" style="width:20%; margin: 0px" :dropdown-class-name="themeSwitcher.currentTheme">
+                    <a-select-option value="tls">TLS</a-select-option>
-                                <a-select-option value="same">{{ i18n "pages.inbounds.same" }}</a-select-option>
+                </a-select>
-                                <a-select-option value="none">{{ i18n "none" }}</a-select-option>
+            </a-tooltip>
-                                <a-select-option value="tls">TLS</a-select-option>
+        </template>
-                            </a-select>
+        <a-input style="width: 35%" v-model.trim="row.dest" placeholder='{{ i18n "host" }}'></a-input>
-                        </a-tooltip>
+        <a-tooltip title='{{ i18n "pages.inbounds.port" }}'>
-                    </template>
+            <a-input-number style="width: 15%;" v-model.number="row.port" min="1" max="65531"></a-input-number>
-                    <a-input style="width: 35%" v-model.trim="row.dest" placeholder='{{ i18n "host" }}'></a-input>
+        </a-tooltip>
-                    <a-tooltip title='{{ i18n "pages.inbounds.port" }}'>
+        <a-input style="width: 20%" v-model.trim="row.remark" placeholder='{{ i18n "remark" }}'></a-input>
-                        <a-input-number style="width: 15%;" v-model.number="row.port" min="1" max="65531"></a-input-number>
+        <a-button style="width: 10%; margin: 0px" @click="inbound.stream.externalProxy.splice(index, 1)">-</a-button>
-                    </a-tooltip>
+    </a-input-group>
-                    <a-input style="width: 20%" v-model.trim="row.remark" placeholder='{{ i18n "remark" }}'></a-input>
-                    <a-button style="width: 10%; margin: 0px" @click="inbound.stream.externalProxy.splice(index, 1)">-</a-button>
-                </a-input-group>
-            </td>
-        </tr>
-    </table>
 </a-form>
 {{end}}

web/html/xui/form/stream/stream_grpc.html

@@ -1,22 +1,10 @@
 {{define "form/streamGRPC"}}
-<a-form layout="inline">
+<a-form :colon="false" :label-col="{ md: {span:6} }" :wrapper-col="{ md: {span:14} }">
-    <table width="100%" class="ant-table-tbody">
+    <a-form-item label="Service Name">
-        <tr>
+        <a-input v-model.trim="inbound.stream.grpc.serviceName" style="width: 250px;"></a-input>
-            <td>serviceName</td>
+    </a-form-item>
-            <td>
+    <a-form-item label="Multi Mode">
-                <a-form-item>
+        <a-switch v-model="inbound.stream.grpc.multiMode"></a-switch>
-                    <a-input v-model.trim="inbound.stream.grpc.serviceName" style="width: 250px;"></a-input>
+    </a-form-item>
-                </a-form-item>
-            </td>
-        </tr>
-        <tr>
-            <td>MultiMode</td>
-            <td>
-                <a-form-item>
-                    <a-switch v-model="inbound.stream.grpc.multiMode"></a-switch>
-                </a-form-item>
-            </td>
-        </tr>
-    </table>
 </a-form>
 {{end}}

web/html/xui/form/stream/stream_http.html

@@ -1,24 +1,19 @@
 {{define "form/streamHTTP"}}
-<a-form layout="inline">
+<a-form :colon="false" :label-col="{ md: {span:6} }" :wrapper-col="{ md: {span:14} }">
-    <table width="100%" class="ant-table-tbody">
+    <a-form-item label='{{ i18n "path" }}'>
-        <tr>
+        <a-input v-model.trim="inbound.stream.http.path"></a-input>
-            <td>{{ i18n "path" }}</td>
+    </a-form-item>
-            <td>
+    <a-form-item>
-                <a-form-item>
+        <template slot="label">{{ i18n "host" }}
-                    <a-input v-model.trim="inbound.stream.http.path" style="width: 250px;"></a-input>
+            <a-button size="small" @click="inbound.stream.http.addHost()">+</a-button>
-                </a-form-item>
+        </template>
-            </td>
+        <template v-for="(host, index) in inbound.stream.http.host">
-        </tr>
+            <a-input v-model.trim="inbound.stream.http.host[index]">
-        <tr>
+                <a-button size="small" slot="addonAfter"
-            <td>host</td>
+                @click="inbound.stream.http.removeHost(index)"
-            <td>
+                v-if="inbound.stream.http.host.length>1">-</a-button>
-                <a-form-item>
+            </a-input>
-                    <a-row v-for="(host, index) in inbound.stream.http.host">
+        </template>
-                        <a-input v-model.trim="inbound.stream.http.host[index]" style="width: 250px;"></a-input>
+    </a-form-item>
-                    </a-row>
-                </a-form-item>
-            </td>
-        </tr>
-    </table>
 </a-form>
 {{end}}

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

@@ -1,85 +1,47 @@
 {{define "form/streamKCP"}}
-<a-form layout="inline">
+<a-form :colon="false" :label-col="{ md: {span:6} }" :wrapper-col="{ md: {span:14} }">
-    <table width="100%" class="ant-table-tbody">
+    <a-form-item label='{{ i18n "camouflage" }}'>
-        <tr>
+        <a-select v-model="inbound.stream.kcp.type" :dropdown-class-name="themeSwitcher.currentTheme">
-            <td>{{ i18n "camouflage" }}</td>
+            <a-select-option value="none">None</a-select-option>
-            <td>
+            <a-select-option value="srtp">SRTP</a-select-option>
-                <a-form-item>
+            <a-select-option value="utp">uTP</a-select-option>
-                    <a-select v-model="inbound.stream.kcp.type" style="width: 250px;" :dropdown-class-name="themeSwitcher.currentTheme">
+            <a-select-option value="wechat-video">WeChat</a-select-option>
-                        <a-select-option value="none">none (not camouflage)</a-select-option>
+            <a-select-option value="dtls">DTLS 1.2</a-select-option>
-                        <a-select-option value="srtp">srtp (video call)</a-select-option>
+            <a-select-option value="wireguard">WireGuard</a-select-option>
-                        <a-select-option value="utp">utp (BT download)</a-select-option>
+        </a-select>
-                        <a-select-option value="wechat-video">wechat-video (WeChat video)</a-select-option>
+    </a-form-item>
-                        <a-select-option value="dtls">dtls (DTLS 1.2 packages)</a-select-option>
+    <a-form-item>
-                        <a-select-option value="wireguard">wireguard (wireguard packages)</a-select-option>
+        <template slot="label">
-                    </a-select>
+            <a-tooltip>
-                </a-form-item>
+                <template slot="title">
-            </td>
+                    <span>{{ i18n "reset" }}</span>
-        </tr>
+                </template>
-        <tr>
+                {{ i18n "password" }}
-            <td>{{ i18n "password" }}</td>
+                <a-icon @click="inbound.stream.kcp.seed = RandomUtil.randomSeq(10)"type="sync"> </a-icon>
-            <td>
+            </a-tooltip>
-                <a-form-item>
+        </template>
-                    <a-input v-model="inbound.stream.kcp.seed" style="width: 250px;"></a-input>
+        <a-input v-model.trim="inbound.stream.kcp.seed"></a-input>
-                </a-form-item>
+    </a-form-item>
-            </td>
+    <a-form-item label='MTU'>
-        </tr>
+        <a-input-number v-model.number="inbound.stream.kcp.mtu"></a-input-number>
-        <tr>
+    </a-form-item>
-            <td>mtu</td>
+    <a-form-item label='TTI (ms)'>
-            <td>
+        <a-input-number v-model.number="inbound.stream.kcp.tti"></a-input-number>
-                <a-form-item>
+    </a-form-item>
-                    <a-input-number v-model.number="inbound.stream.kcp.mtu"></a-input-number>
+    <a-form-item label='Uplink (MB/s)'>
-                </a-form-item>
+        <a-input-number v-model.number="inbound.stream.kcp.upCap"></a-input-number>
-            </td>
+    </a-form-item> 
-        </tr>
+    <a-form-item label='Downlink (MB/s)'>
-        <tr>
+        <a-input-number v-model.number="inbound.stream.kcp.downCap"></a-input-number>
-            <td>tti (ms)</td>
+    </a-form-item>
-            <td>
+    <a-form-item label='Congestion'>
-                <a-form-item>
+        <a-switch v-model="inbound.stream.kcp.congestion"></a-switch>
-                    <a-input-number v-model.number="inbound.stream.kcp.tti"></a-input-number>
+    </a-form-item>
-                </a-form-item>
+    <a-form-item label='Read Buffer (MB)'>
-            </td>
+        <a-input-number v-model.number="inbound.stream.kcp.readBuffer"></a-input-number>
-        </tr>
+    </a-form-item>
-        <tr>
+    <a-form-item label='Write Buffer (MB)'>
-            <td>uplink capacity (MB/S)</td>
+        <a-input-number v-model.number="inbound.stream.kcp.writeBuffer"></a-input-number>
-            <td>
+    </a-form-item>
-                <a-form-item>
-                    <a-input-number v-model.number="inbound.stream.kcp.upCap"></a-input-number>
-                </a-form-item> 
-            </td>
-        </tr>
-        <tr>
-            <td>downlink capacity (MB/S)</td>
-            <td>
-                <a-form-item>
-                    <a-input-number v-model.number="inbound.stream.kcp.downCap"></a-input-number>
-                </a-form-item>
-            </td>
-        </tr>
-        <tr>
-            <td>congestion</td>
-            <td>
-                <a-form-item>
-                    <a-switch v-model="inbound.stream.kcp.congestion"></a-switch>
-                </a-form-item>
-            </td>
-        </tr>
-        <tr>
-            <td>read buffer size (MB)</td>
-            <td>
-                <a-form-item>
-                    <a-input-number v-model.number="inbound.stream.kcp.readBuffer"></a-input-number>
-                </a-form-item>
-            </td>
-        </tr>
-        <tr>
-            <td>write buffer size (MB)</td>
-            <td>
-                <a-form-item>
-                    <a-input-number v-model.number="inbound.stream.kcp.writeBuffer"></a-input-number>
-                </a-form-item>
-            </td>
-        </tr>
-    </table>
 </a-form>
 {{end}}

web/html/xui/form/stream/stream_quic.html

@@ -1,41 +1,33 @@
 {{define "form/streamQUIC"}}
-<a-form layout="inline">
+<a-form :colon="false" :label-col="{ md: {span:6} }" :wrapper-col="{ md: {span:14} }">
-    <table width="100%" class="ant-table-tbody">
+    <a-form-item label='{{ i18n "pages.inbounds.stream.quic.encryption" }}'>
-        <tr>
+        <a-select v-model="inbound.stream.quic.security" :dropdown-class-name="themeSwitcher.currentTheme">
-            <td>{{ i18n "pages.inbounds.stream.quic.encryption" }}</td>
+            <a-select-option value="none">None</a-select-option>
-            <td>
+            <a-select-option value="aes-128-gcm">AES-128-GCM</a-select-option>
-                <a-form-item>
+            <a-select-option value="chacha20-poly1305">CHACHA20-POLY1305</a-select-option>
-                    <a-select v-model="inbound.stream.quic.security" style="width: 250px;" :dropdown-class-name="themeSwitcher.currentTheme">
+        </a-select>
-                        <a-select-option value="none">none</a-select-option>
+    </a-form-item> 
-                        <a-select-option value="aes-128-gcm">aes-128-gcm</a-select-option>
+    <a-form-item>
-                        <a-select-option value="chacha20-poly1305">chacha20-poly1305</a-select-option>
+        <template slot="label">
-                    </a-select>
+            <a-tooltip>
-                </a-form-item>
+                <template slot="title">
-            </td>
+                    <span>{{ i18n "reset" }}</span>
-        </tr>
+                </template>
-        <tr>
+                {{ i18n "password" }}
-            <td>{{ i18n "password" }}</td>
+                <a-icon @click="inbound.stream.quic.key = RandomUtil.randomSeq(10)"type="sync"> </a-icon>
-            <td>
+            </a-tooltip>
-                <a-form-item>
+        </template>
-                    <a-input v-model.trim="inbound.stream.quic.key" style="width: 250px;"></a-input>
+        <a-input v-model.trim="inbound.stream.quic.key"></a-input>
-                </a-form-item> 
+    </a-form-item>
-            </td>
+    <a-form-item label='{{ i18n "camouflage" }}'>
-        </tr>
+        <a-select v-model="inbound.stream.quic.type" :dropdown-class-name="themeSwitcher.currentTheme">
-        <tr>
+            <a-select-option value="none">None</a-select-option>
-            <td>{{ i18n "camouflage" }}</td>
+            <a-select-option value="srtp">SRTP</a-select-option>
-            <td>
+            <a-select-option value="utp">uTP</a-select-option>
-                <a-form-item>
+            <a-select-option value="wechat-video">WeChat</a-select-option>
-                    <a-select v-model="inbound.stream.quic.type" style="width: 250px;" :dropdown-class-name="themeSwitcher.currentTheme">
+            <a-select-option value="dtls">DTLS 1.2</a-select-option>
-                        <a-select-option value="none">none (not camouflage)</a-select-option>
+            <a-select-option value="wireguard">WireGuard</a-select-option>
-                        <a-select-option value="srtp">srtp (video call)</a-select-option>
+        </a-select>
-                        <a-select-option value="utp">utp (BT download)</a-select-option>
+    </a-form-item>
-                        <a-select-option value="wechat-video">wechat-video (WeChat video)</a-select-option>
-                        <a-select-option value="dtls">dtls (DTLS 1.2 packages)</a-select-option>
-                        <a-select-option value="wireguard">wireguard (wireguard packages)</a-select-option>
-                    </a-select>
-                </a-form-item>
-            </td>
-        </tr>
-    </table>
 </a-form>
 {{end}}

web/html/xui/form/stream/stream_settings.html

@@ -1,13 +1,13 @@
 {{define "form/streamSettings"}}
 <!-- select stream network -->
-<a-form layout="inline">
+<a-form :colon="false" :label-col="{ md: {span:6} }" :wrapper-col="{ md: {span:14} }">
     <a-form-item label="{{ i18n "transmission" }}">
         <a-select v-model="inbound.stream.network" @change="streamNetworkChange"
-            style="width: 150px;" :dropdown-class-name="themeSwitcher.currentTheme">
+            :dropdown-class-name="themeSwitcher.currentTheme">
             <a-select-option value="tcp">TCP</a-select-option>
-            <a-select-option value="kcp">KCP</a-select-option>
+            <a-select-option value="kcp">mKCP</a-select-option>
             <a-select-option value="ws">WebSocket</a-select-option>
-            <a-select-option value="http">HTTP2</a-select-option>
+            <a-select-option value="http">HTTP/2</a-select-option>
             <a-select-option value="quic">QUIC</a-select-option>
             <a-select-option value="grpc">gRPC</a-select-option>
         </a-select>

web/html/xui/form/stream/stream_sockopt.html

@@ -1,46 +1,26 @@
 {{define "form/streamSockopt"}}
 <a-divider style="margin:0;"></a-divider>
-<a-form layout="inline">
+<a-form :colon="false" :label-col="{ md: {span:8} }" :wrapper-col="{ md: {span:14} }">
-    <a-form-item label="Transparent Proxy">
+    <a-form-item label="TPROXY">
         <a-switch v-model="inbound.stream.sockoptSwitch"></a-switch>
     </a-form-item>
-    <table width="100%" class="ant-table-tbody" v-if="inbound.stream.sockoptSwitch">
+    <template v-if="inbound.stream.sockoptSwitch">
-        <tr>
+        <a-form-item label="PROXY Protocol">
-            <td>Accept Proxy Protocol</td>
+            <a-switch v-model="inbound.stream.sockopt.acceptProxyProtocol"></a-switch>
-            <td>
+        </a-form-item>
-                <a-form-item>
+        <a-form-item label="TCP Fast Open">
-                    <a-switch v-model="inbound.stream.sockopt.acceptProxyProtocol"></a-switch>
+            <a-switch v-model.trim="inbound.stream.sockopt.tcpFastOpen"></a-switch>
-                </a-form-item>
+        </a-form-item>
-            </td>
+        <a-form-item label="Route Mark">
-        </tr>
+            <a-input-number v-model="inbound.stream.sockopt.mark" :min="0"></a-input-number>
-        <tr>
+        </a-form-item>
-            <td>TCP FastOpen</td>
+        <a-form-item label="TPROXY">
-            <td>
+            <a-select v-model="inbound.stream.sockopt.tproxy" :dropdown-class-name="themeSwitcher.currentTheme">
-                <a-form-item>
+                <a-select-option value="off">Off</a-select-option>
-                    <a-switch v-model.trim="inbound.stream.sockopt.tcpFastOpen"></a-switch>
+                <a-select-option value="redirect">Redirect</a-select-option>
-                </a-form-item>
+                <a-select-option value="tproxy">TPROXY</a-select-option>
-            </td>
+            </a-select>
-        </tr>
+        </a-form-item>
-        <tr>
+    </template>
-            <td>Route Mark</td>
-            <td>
-                <a-form-item>
-                    <a-input-number v-model="inbound.stream.sockopt.mark" :min="0"></a-input-number>
-                </a-form-item>
-            </td>
-        </tr>
-        <tr>
-            <td>T-Proxy</td>
-            <td>
-                <a-form-item>
-                    <a-select v-model="inbound.stream.sockopt.tproxy" style="width: 250px;" :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">T-Proxy</a-select-option>
-                    </a-select>
-                </a-form-item>
-            </td>
-        </tr>
-    </table>
 </a-form>
 {{end}}

web/html/xui/form/stream/stream_tcp.html

@@ -1,113 +1,82 @@
 {{define "form/streamTCP"}}
 <!-- tcp type -->
-<a-form layout="inline">
+<a-form :colon="false" :label-col="{ md: {span:8} }" :wrapper-col="{ md: {span:14} }">
-    <a-form-item label="Accept 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-form-item label='HTTP {{ i18n "camouflage" }}'>
-        <a-switch
+        <a-switch :checked="inbound.stream.tcp.type === 'http'"
-                :checked="inbound.stream.tcp.type === 'http'"
+            @change="checked => inbound.stream.tcp.type = checked ? 'http' : 'none'">
-                @change="checked => inbound.stream.tcp.type = checked ? 'http' : 'none'">
         </a-switch>
     </a-form-item>
 </a-form>
 
-<!-- tcp request -->
+<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'" layout="inline">
+    :wrapper-col="{ md: {span:14} }">
-    <table width="100%" class="ant-table-tbody">
+    <!-- tcp request -->
-        <tr>
+    <a-divider style="margin:0;">{{ i18n "pages.inbounds.stream.general.request" }}</a-divider>
-            <td>{{ i18n "pages.inbounds.stream.tcp.requestVersion" }}</td>
+    <a-form-item label='{{ i18n "pages.inbounds.stream.tcp.version" }}'>
-            <td>
+        <a-input v-model.trim="inbound.stream.tcp.request.version"></a-input>
-                <a-form-item>
+    </a-form-item>
-                    <a-input v-model.trim="inbound.stream.tcp.request.version" style="width: 200px;"></a-input>
+    <a-form-item label='{{ i18n "pages.inbounds.stream.tcp.method" }}'>
-                </a-form-item>
+        <a-input v-model.trim="inbound.stream.tcp.request.method"></a-input>
-            </td>
+    </a-form-item>
-        </tr>
+    <a-form-item>
-        <tr>
+        <template slot="label">{{ i18n "pages.inbounds.stream.tcp.path" }}
-            <td>{{ i18n "pages.inbounds.stream.tcp.requestMethod" }}</td>
+            <a-button size="small" @click="inbound.stream.tcp.request.addPath('/')">+</a-button>
-            <td>
+        </template>
-                <a-form-item>
+        <template v-for="(path, index) in inbound.stream.tcp.request.path">
-                    <a-input v-model.trim="inbound.stream.tcp.request.method" style="width: 200px;"></a-input>
+            <a-input v-model.trim="inbound.stream.tcp.request.path[index]">
-                </a-form-item>
+                <a-button size="small" slot="addonAfter" @click="inbound.stream.tcp.request.removePath(index)"
-            </td>
+                    v-if="inbound.stream.tcp.request.path.length>1">-</a-button>
-        </tr>
+            </a-input>
-        <tr>
+        </template>
-            <td style="vertical-align: top; padding-top: 10px;">{{ i18n "pages.inbounds.stream.tcp.requestPath" }}
+    </a-form-item>
-                <a-button size="small" @click="inbound.stream.tcp.request.addPath('/')">+</a-button>
+    <a-form-item label='{{ i18n "pages.inbounds.stream.tcp.requestHeader" }}'>
-            </td>
+        <a-button size="small" @click="inbound.stream.tcp.request.addHeader('', '')">+</a-button>
-            <td>
+    </a-form-item>
-                <a-form-item>
+    <a-form-item :wrapper-col="{span:24}">
-                    <a-row v-for="(path, index) in inbound.stream.tcp.request.path">
+        <a-input-group compact v-for="(header, index) in inbound.stream.tcp.request.headers">
-                        <a-input v-model.trim="inbound.stream.tcp.request.path[index]" style="width: 200px;">
+            <a-input style="width: 50%" v-model.trim="header.name"
-                            <a-button size="small" slot="addonAfter"
+                placeholder='{{ i18n "pages.inbounds.stream.general.name" }}'>
-                            @click="inbound.stream.tcp.request.removePath(index)"
+                <template slot="addonBefore" style="margin: 0;">[[ index+1 ]]</template>
-                            v-if="inbound.stream.tcp.request.path.length>1">-</a-button>
+            </a-input>
-                        </a-input>
+            <a-input style="width: 50%" v-model.trim="header.value"
-                    </a-row>
+                placeholder='{{ i18n "pages.inbounds.stream.general.value" }}'>
-                </a-form-item> 
+                <a-button slot="addonAfter" size="small"
-            </td>
+                    @click="inbound.stream.tcp.request.removeHeader(index)">-</a-button>
-        </tr>
+            </a-input>
-        <tr>
+        </a-input-group>
-            <td colspan="2" width="100%">
+    </a-form-item>
-                <a-form-item>
+
-                    <span>{{ i18n "pages.inbounds.stream.general.requestHeader" }}:</span>
+    <!-- tcp response -->
-                    <a-button size="small" style="margin-left: 10px" @click="inbound.stream.tcp.request.addHeader('', '')">+</a-button>
+    <a-divider style="margin:0;">{{ i18n "pages.inbounds.stream.general.response" }}</a-divider>
-                    <a-input-group compact v-for="(header, index) in inbound.stream.tcp.request.headers">
+    <a-form-item label='{{ i18n "pages.inbounds.stream.tcp.version" }}'>
-                        <a-input style="width: 50%" v-model.trim="header.name" placeholder='{{ i18n "pages.inbounds.stream.general.name" }}'>
+        <a-input v-model.trim="inbound.stream.tcp.response.version"></a-input>
-                            <template slot="addonBefore" style="margin: 0;">[[ index+1 ]]</template>
+    </a-form-item>
-                        </a-input>
+    <a-form-item label='{{ i18n "pages.inbounds.stream.tcp.status" }}'>
-                        <a-input style="width: 50%" v-model.trim="header.value" placeholder='{{ i18n "pages.inbounds.stream.general.value" }}'>
+        <a-input v-model.trim="inbound.stream.tcp.response.status"></a-input>
-                            <a-button slot="addonAfter" size="small" @click="inbound.stream.tcp.request.removeHeader(index)">-</a-button>
+    </a-form-item>
-                        </a-input>
+    <a-form-item label='{{ i18n "pages.inbounds.stream.tcp.statusDescription" }}'>
-                    </a-input-group>
+        <a-input v-model.trim="inbound.stream.tcp.response.reason"></a-input>
-                </a-form-item>
+    </a-form-item>
-            </td>
+    <a-form-item label='{{ i18n "pages.inbounds.stream.tcp.responseHeader" }}'>
-        </tr>
+        <a-button size="small"
-        <!-- tcp response -->
+            @click="inbound.stream.tcp.response.addHeader('Content-Type', 'application/octet-stream')">+</a-button>
-        <tr>
+    </a-form-item>
-            <td>{{ i18n "pages.inbounds.stream.tcp.responseVersion" }}</td>
+    <a-form-item :wrapper-col="{span:24}">
-            <td>
+        <a-input-group compact v-for="(header, index) in inbound.stream.tcp.response.headers">
-                <a-form-item>
+            <a-input style="width: 50%" v-model.trim="header.name"
-                    <a-input v-model.trim="inbound.stream.tcp.response.version" style="width: 200px;"></a-input>
+                placeholder='{{ i18n "pages.inbounds.stream.general.name" }}'>
-                </a-form-item>
+                <template slot="addonBefore" style="margin: 0;">[[ index+1 ]]</template>
-            </td>
+            </a-input>
-        </tr>
+            <a-input style="width: 50%" v-model.trim="header.value"
-        <tr>
+                placeholder='{{ i18n "pages.inbounds.stream.general.value" }}'>
-            <td>{{ i18n "pages.inbounds.stream.tcp.responseStatus" }}</td>
+                <template slot="addonAfter">
-            <td>
+                    <a-button size="small" @click="inbound.stream.tcp.response.removeHeader(index)">-</a-button>
-                <a-form-item>
+                </template>
-                    <a-input v-model.trim="inbound.stream.tcp.response.status" style="width: 200px;"></a-input>
+            </a-input>
-                </a-form-item>
+        </a-input-group>
-            </td>
+    </a-form-item>
-        </tr>
-        <tr>
-            <td>{{ i18n "pages.inbounds.stream.tcp.responseStatusDescription" }}</td>
-            <td>
-                <a-form-item>
-                    <a-input v-model.trim="inbound.stream.tcp.response.reason" style="width: 200px;"></a-input>
-                </a-form-item>
-            </td>
-        </tr>
-        <tr>
-            <td colspan="2" width="100%">
-                <a-form-item>
-                    <span>{{ i18n "pages.inbounds.stream.tcp.responseHeader" }}:</span>
-                    <a-button size="small" style="margin-left: 10px"
-                        @click="inbound.stream.tcp.response.addHeader('Content-Type', 'application/octet-stream')">+</a-button>
-                    <a-input-group compact v-for="(header, index) in inbound.stream.tcp.response.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" }}'>
-                            <template slot="addonAfter">
-                                <a-button size="small" @click="inbound.stream.tcp.response.removeHeader(index)">-</a-button>
-                            </template>
-                        </a-input>
-                    </a-input-group>
-                </a-form-item>
-            </td>
-        </tr>
-    </table>
 </a-form>
 {{end}}

web/html/xui/form/stream/stream_ws.html

@@ -1,16 +1,15 @@
 {{define "form/streamWS"}}
-<a-form layout="inline">
+<a-form :colon="false" :label-col="{ md: {span:8} }" :wrapper-col="{ md: {span:14} }">
-    <a-form-item label="AcceptProxyProtocol">
+    <a-form-item label="PROXY Protocol">
         <a-switch v-model="inbound.stream.ws.acceptProxyProtocol"></a-switch>
     </a-form-item>
-    <br>
     <a-form-item label='{{ i18n "path" }}'>
         <a-input v-model.trim="inbound.stream.ws.path"></a-input>
     </a-form-item>
-    <br>
+    <a-form-item label='{{ i18n "pages.inbounds.stream.tcp.requestHeader" }}'>
-    <a-form-item style="width: 100%;">
+        <a-button size="small" @click="inbound.stream.ws.addHeader()">+</a-button>
-        <span>{{ i18n "pages.inbounds.stream.general.requestHeader" }}:</span>
+    </a-form-item>
-        <a-button size="small" style="margin-left: 10px" @click="inbound.stream.ws.addHeader()">+</a-button>
+    <a-form-item :wrapper-col="{span:24}">
         <a-input-group compact v-for="(header, index) in inbound.stream.ws.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>

web/html/xui/form/tls_settings.html

@@ -1,251 +1,135 @@
 {{define "form/tlsSettings"}}
 <!-- tls enable -->
-<a-form v-if="inbound.canEnableTls()" layout="inline">
+<a-form v-if="inbound.canEnableTls()" :colon="false" :label-col="{ md: {span:8} }" :wrapper-col="{ md: {span:14} }">
     <a-divider style="margin:0;"></a-divider>
-    <table width="100%" class="ant-table-tbody">
+    <a-form-item label='{{ i18n "security" }}'>
-        <tr>
+        <a-radio-group v-model="inbound.stream.security" button-style="solid">
-            <td colspan="2">
+            <a-radio-button value="none">{{ i18n "none" }}</a-radio-button>
-                <a-form-item label='{{ i18n "security" }}'>
+            <a-radio-button value="tls">TLS</a-radio-button>
-                    <a-radio-group v-model="inbound.stream.security" button-style="solid">
+            <a-radio-button v-if="inbound.canEnableReality()" value="reality">Reality</a-radio-button>
-                        <a-radio-button value="none">{{ i18n "none" }}</a-radio-button>
+        </a-radio-group>
-                        <a-radio-button value="tls">TLS</a-radio-button>
+    </a-form-item>
-                        <a-radio-button v-if="inbound.canEnableReality()" value="reality">Reality</a-radio-button>
-                    </a-radio-group>
-                </a-form-item>
-            </td>
-        </tr>
 
 <!-- tls settings -->
 <template v-if="inbound.stream.isTls">
-    <tr>
+    <a-form-item label="SNI" placeholder="Server Name Indication">
-        <td>SNI</td>
+        <a-input v-model.trim="inbound.stream.tls.sni"></a-input>
-        <td>
+    </a-form-item>                
-            <a-form-item placeholder="Server Name Indication">
+    <a-form-item label="Cipher Suites">
-                <a-input v-model.trim="inbound.stream.tls.sni" style="width: 250px"></a-input>
+        <a-select v-model="inbound.stream.tls.cipherSuites" :dropdown-class-name="themeSwitcher.currentTheme">
-            </a-form-item>                
+            <a-select-option value="">Auto</a-select-option>
-        </td>
+            <a-select-option v-for="key,value in TLS_CIPHER_OPTION" :value="key">[[ value ]]</a-select-option>
-    </tr>
+        </a-select>
-    <tr>
+    </a-form-item>
-        <td>CipherSuites</td>
+    <a-form-item label="Min/Max Version">
-        <td>
+        <a-input-group compact>
-            <a-form-item>
+            <a-select v-model="inbound.stream.tls.minVersion" style="width:100px;" :dropdown-class-name="themeSwitcher.currentTheme">
-                <a-select v-model="inbound.stream.tls.cipherSuites" style="width: 250px" :dropdown-class-name="themeSwitcher.currentTheme">
+                <a-select-option v-for="key in TLS_VERSION_OPTION" :value="key">[[ key ]]</a-select-option>
-                    <a-select-option value="">auto</a-select-option>
+            </a-select>
-                    <a-select-option v-for="key,value in TLS_CIPHER_OPTION" :value="key">[[ value ]]</a-select-option>
+            <a-select v-model="inbound.stream.tls.maxVersion" style="width:100px;" :dropdown-class-name="themeSwitcher.currentTheme">
-                </a-select>
+                <a-select-option v-for="key in TLS_VERSION_OPTION" :value="key">[[ key ]]</a-select-option>
-            </a-form-item>
+            </a-select>
-        </td>
+        </a-input-group>
-    </tr>
+    </a-form-item>
-    <tr>
+    <a-form-item label="uTLS">
-        <td>Min/Max Version</td>
+        <a-select v-model="inbound.stream.tls.settings.fingerprint"
-        <td>
+                    :dropdown-class-name="themeSwitcher.currentTheme">
-            <a-form-item>
+            <a-select-option value=''>None</a-select-option>
-                <a-input-group compact>
+            <a-select-option v-for="key in UTLS_FINGERPRINT" :value="key">[[ key ]]</a-select-option>
-                    <a-select style="width: 125px" v-model="inbound.stream.tls.minVersion" :dropdown-class-name="themeSwitcher.currentTheme">
+        </a-select>
-                        <a-select-option v-for="key in TLS_VERSION_OPTION" :value="key">[[ key ]]</a-select-option>
+    </a-form-item>
-                    </a-select>
+    <a-form-item label="ALPN">
-                    <a-select style="width: 125px" v-model="inbound.stream.tls.maxVersion" :dropdown-class-name="themeSwitcher.currentTheme">
+        <a-select
-                        <a-select-option v-for="key in TLS_VERSION_OPTION" :value="key">[[ key ]]</a-select-option>
+            mode="multiple"
-                    </a-select>
+            :dropdown-class-name="themeSwitcher.currentTheme"
-                </a-input-group>
+            v-model="inbound.stream.tls.alpn">
-            </a-form-item>
+            <a-select-option v-for="alpn in ALPN_OPTION" :value="alpn">[[ alpn ]]</a-select-option>
-        </td>
+        </a-select>
-    </tr>
+    </a-form-item>
-    <tr>
+    <a-form-item label="Allow Insecure">
-        <td>uTLS</td>
+        <a-switch v-model="inbound.stream.tls.settings.allowInsecure"></a-switch>
-        <td>
+    </a-form-item>
-            <a-form-item>
+    <a-form-item label="Reject Unknown SNI">
-                <a-select v-model="inbound.stream.tls.settings.fingerprint"
+        <a-switch v-model="inbound.stream.tls.rejectUnknownSni"></a-switch>
-                            style="width: 250px" :dropdown-class-name="themeSwitcher.currentTheme">
+    </a-form-item>
-                    <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>
-        </td>
-    </tr>
-    <tr>
-        <td>ALPN</td>
-        <td>
-            <a-form-item>
-                <a-select
-                    mode="multiple"
-                    style="width: 250px"
-                    :dropdown-class-name="themeSwitcher.currentTheme"
-                    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>
-        </td>
-    </tr>
-    <tr>
-        <td>Allow insecure</td>
-        <td>
-            <a-form-item>
-                <a-switch v-model="inbound.stream.tls.settings.allowInsecure"></a-switch>
-            </a-form-item>
-        </td>
-    </tr>
-    <tr>
-        <td>Reject Unknown SNI</td>
-        <td>
-            <a-form-item>
-                <a-switch v-model="inbound.stream.tls.rejectUnknownSni"></a-switch>
-            </a-form-item>
-        </td>
-    </tr>
     <template v-for="cert,index in inbound.stream.tls.certs">
-        <tr>
+        <a-form-item label='{{ i18n "certificate" }}'>
-            <td>{{ i18n "certificate" }}</td>
+            <a-radio-group v-model="cert.useFile" button-style="solid">
-            <td>
+                <a-radio-button :value="true">{{ i18n "pages.inbounds.certificatePath" }}</a-radio-button>
-                <a-form-item>
+                <a-radio-button :value="false">{{ i18n "pages.inbounds.certificateContent" }}</a-radio-button>
-                    <a-radio-group v-model="cert.useFile" button-style="solid">
+            </a-radio-group>
-                        <a-radio-button :value="true">{{ i18n "pages.inbounds.certificatePath" }}</a-radio-button>
+            <a-button v-if="index === 0" type="primary" size="small" @click="inbound.stream.tls.addCert()" style="margin-left: 10px">+</a-button>
-                        <a-radio-button :value="false">{{ i18n "pages.inbounds.certificateContent" }}</a-radio-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-radio-group>
+        </a-form-item>
-                    <a-button v-if="index === 0" type="primary" size="small" @click="inbound.stream.tls.addCert()" style="margin-left: 10px">+</a-button>
+    <template v-if="cert.useFile">
-                    <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 label='{{ i18n "pages.inbounds.publicKeyPath" }}'>
-                </a-form-item>
+            <a-input v-model.trim="cert.certFile" style="width:250px;"></a-input>
-            </td>
+        </a-form-item>
-        </tr>
+        <a-form-item label='{{ i18n "pages.inbounds.keyPath" }}'>
-        <template v-if="cert.useFile">
+            <a-input v-model.trim="cert.keyFile" style="width:250px;"></a-input>
-        <tr>
+        </a-form-item>
-            <td>{{ i18n "pages.inbounds.publicKeyPath" }}</td>
+        <a-form-item label=" ">
-            <td>
+            <a-button type="primary" icon="import" @click="setDefaultCertData(index)">{{ i18n "pages.inbounds.setDefaultCert" }}</a-button>
-                <a-form-item>
+        </a-form-item>
-                    <a-input v-model.trim="cert.certFile" style="width:250px;"></a-input>
-                </a-form-item>
-            </td>
-        </tr>
-        <tr>
-            <td>{{ i18n "pages.inbounds.keyPath" }}</td>
-            <td>
-                <a-form-item>
-                    <a-input v-model.trim="cert.keyFile" style="width:250px;"></a-input>
-                </a-form-item>
-            </td>
-        </tr>
-        <tr>
-            <td></td>
-            <td>
-                <a-button type="primary" icon="import" @click="setDefaultCertData(index)">{{ i18n "pages.inbounds.setDefaultCert" }}</a-button>
-            </td>
-        </tr>
     </template>
     <template v-else>
-        <tr>
+        <a-form-item label='{{ i18n "pages.inbounds.publicKeyContent" }}'>
-            <td>{{ i18n "pages.inbounds.publicKeyContent" }}</td>
+            <a-input type="textarea" :rows="3" style="width:250px;" v-model="cert.cert"></a-input>
-            <td>
+        </a-form-item>
-                <a-form-item>
+        <a-form-item label='{{ i18n "pages.inbounds.keyContent" }}'>
-                    <a-input type="textarea" :rows="3" style="width:250px;" v-model="cert.cert"></a-input>
+            <a-input type="textarea" :rows="3" style="width:250px;" v-model="cert.key"></a-input>
-                </a-form-item>
+        </a-form-item>
-            </td>
-        </tr>
-        <tr>
-            <td>{{ i18n "pages.inbounds.keyContent" }}</td>
-            <td>
-                <a-form-item>
-                    <a-input type="textarea" :rows="3" style="width:250px;" v-model="cert.key"></a-input>
-                </a-form-item>
-            </td>
-        </tr>
     </template>
-        <tr>
+        <a-form-item label='OCSP stapling'>
-            <td>ocspStapling</td>
+            <a-input-number v-model.number="cert.ocspStapling" :min="0"></a-input-number>
-            <td>
+        </a-form-item>
-                <a-form-item>
-                    <a-input-number v-model.number="cert.ocspStapling" :min="0"></a-input-number>
-                </a-form-item>
-            </td>
-        </tr>
     </template>
 </template>
 
 <!-- reality settings -->
 <template v-if="inbound.stream.isReality">
-        <tr>
+    <a-form-item label='Show'>
-            <td>Show</td>
+        <a-switch v-model="inbound.stream.reality.show"></a-switch>
-            <td>
+    </a-form-item>                
-                <a-form-item>
+    <a-form-item label='Xver'>
-                    <a-switch v-model="inbound.stream.reality.show"></a-switch>
+        <a-input-number v-model.number="inbound.stream.reality.xver" :min="0"></a-input-number>
-                </a-form-item>                
+    </a-form-item>
-            </td>
+    <a-form-item label='uTLS'>
-        </tr>
+        <a-select v-model="inbound.stream.reality.settings.fingerprint"
-        <tr>
+                    :dropdown-class-name="themeSwitcher.currentTheme">
-            <td>Xver</td>
+            <a-select-option v-for="key in UTLS_FINGERPRINT" :value="key">[[ key ]]</a-select-option>
-            <td>
+        </a-select>
-                <a-form-item>
+    </a-form-item>
-                    <a-input-number v-model.number="inbound.stream.reality.xver" :min="0"></a-input-number>
+    <a-form-item label='Dest'>
-                </a-form-item>
+        <a-input v-model.trim="inbound.stream.reality.dest"></a-input>
-            </td>
+    </a-form-item>
-        </tr>
+    <a-form-item label='SNI'>
-        <tr>
+        <a-input v-model.trim="inbound.stream.reality.serverNames"></a-input>
-            <td>uTLS</td>
+    </a-form-item>
-            <td>
+    <a-form-item>
-                <a-form-item>
+        <template slot="label">
-                    <a-select v-model="inbound.stream.reality.settings.fingerprint"
+            <a-tooltip>
-                              style="width: 250px" :dropdown-class-name="themeSwitcher.currentTheme">
+                <template slot="title">
-                        <a-select-option v-for="key in UTLS_FINGERPRINT" :value="key">[[ key ]]</a-select-option>
+                    <span>{{ i18n "reset" }}</span>
-                    </a-select>
+                </template>
-                </a-form-item>
+                Short IDs
-            </td>
-        </tr>
-        <tr>
-            <td>Dest</td>
-            <td>
-                <a-form-item>
-                    <a-input v-model.trim="inbound.stream.reality.dest" style="width: 250px"></a-input>
-                </a-form-item>
-            </td>
-        </tr>
-        <tr>
-            <td>Server Names</td>
-            <td>
-                <a-form-item>
-                    <a-input v-model.trim="inbound.stream.reality.serverNames" style="width: 250px"></a-input>
-                </a-form-item>
-            </td>
-        </tr>
-        <tr>
-            <td>Short Ids
                 <a-icon @click="inbound.stream.reality.shortIds = RandomUtil.randomShortId().join(',')" type="sync">
-            </td>
+            </a-icon>
-            <td>
+        </template>
-                <a-form-item>
+        <a-input v-model.trim="inbound.stream.reality.shortIds" style="width:250px"></a-input>
-                    <a-input v-model.trim="inbound.stream.reality.shortIds" style="width:250px"></a-input>
+    </a-form-item>
-                </a-form-item>
+    <a-form-item label='SpiderX'>
-            </td>
+        <a-input v-model.trim="inbound.stream.reality.settings.spiderX" style="width:250px"></a-input>
-        </tr>
+    </a-form-item>
-        <tr>
+    <a-form-item label='Private Key'>
-            <td>SpiderX</td>
+        <a-input v-model.trim="inbound.stream.reality.privateKey"></a-input>
-            <td>
+    </a-form-item>
-                <a-form-item>
+    <a-form-item label='Public Key'>
-                    <a-input v-model.trim="inbound.stream.reality.settings.spiderX" style="width:250px"></a-input>
+        <a-input v-model.trim="inbound.stream.reality.settings.publicKey"></a-input>
-                </a-form-item>
+    </a-form-item>
-            </td>
+    <a-form-item label=" ">
-        </tr>
+        <a-button type="primary" icon="import" @click="getNewX25519Cert">Get New Cert</a-button>
-        <tr>
+    </a-form-item>
-            <td>Private Key</td>
-            <td>
-                <a-form-item>
-                    <a-input v-model.trim="inbound.stream.reality.privateKey" style="width: 250px"></a-input>
-                </a-form-item>
-            </td>
-        </tr>
-        <tr>
-            <td>Public Key</td>
-            <td>
-                <a-form-item>
-                    <a-input v-model.trim="inbound.stream.reality.settings.publicKey" style="width: 250px"></a-input>
-                </a-form-item>
-            </td>
-        </tr>
-        <tr>
-            <td></td>
-            <td>
-                <a-button type="primary" icon="import" @click="getNewX25519Cert">Get new cert</a-button>
-            </td>
-        </tr>
 </template>
-    </table>
 </a-form>
 {{end}}

web/html/xui/inbound_info_modal.html

@@ -7,15 +7,20 @@
     width="600px"
     :class="themeSwitcher.currentTheme"
     >
-    <table style="margin-bottom: 10px; width: 100%;">
+    <a-row>
-        <tr><td>
+        <a-col :xs="24" :md="12">
             <table>
                 <tr><td>{{ i18n "protocol" }}</td><td><a-tag color="purple">[[ dbInbound.protocol ]]</a-tag></td></tr>
-                <tr><td>{{ i18n "pages.inbounds.address" }}</td><td><a-tag>[[ dbInbound.address ]]</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>
                 <tr><td>{{ i18n "pages.inbounds.port" }}</td><td><a-tag>[[ dbInbound.port ]]</a-tag></td></tr>
             </table>
-        </td>
+        </a-col>
-        <td v-if="dbInbound.isVMess || dbInbound.isVLess || dbInbound.isTrojan || dbInbound.isSS">
+        <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="blue">[[ inbound.network ]]</a-tag></td>
@@ -23,12 +28,19 @@
             <template v-if="inbound.isTcp || inbound.isWs || inbound.isH2">
                 <tr>
                     <td>{{ i18n "host" }}</td>
-                    <td v-if="inbound.host"><a-tag>[[ inbound.host ]]</a-tag></td>
+                    <td v-if="inbound.host">
+                        <a-tooltip :title="[[ inbound.host ]]">
+                            <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>
                 </tr>
                 <tr>
                     <td>{{ i18n "path" }}</td>
-                    <td v-if="inbound.path"><a-tag>[[ inbound.path ]]</a-tag></td>
+                    <td v-if="inbound.path">
+                        <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>
                 </tr>
             </template>
@@ -45,30 +57,35 @@
             </template>
             
             <template v-if="inbound.isGrpc">
-                <tr><td>grpc serviceName</td><td><a-tag>[[ inbound.serviceName ]]</a-tag></td></tr>
+                <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>
             </template>
             </table>
-        </td></tr>
+        </template>
-        <tr colspan="2" v-if="dbInbound.hasLink()">
+        </a-col>
-            <td>
+        <template v-if="dbInbound.hasLink()">
-                {{ i18n "security" }}
+            {{ i18n "security" }}
-                <a-tag :color="inbound.stream.security == 'none' ? 'red' : 'green'">[[ inbound.stream.security ]]</a-tag>
+            <a-tag :color="inbound.stream.security == 'none' ? 'red' : 'green'">[[ inbound.stream.security ]]</a-tag>
-                <br />
+            <br />
-                <template v-if="inbound.stream.security != 'none'">
+            <template v-if="inbound.stream.security != 'none'">
-                {{ i18n "domainName" }}
+            {{ i18n "domainName" }}
-                <a-tag :color="inbound.serverName ? 'green' : 'orange'">[[ inbound.serverName ? inbound.serverName : '' ]]</a-tag>
+            <a-tag :color="inbound.serverName ? 'green' : 'orange'">[[ inbound.serverName ? inbound.serverName : '' ]]</a-tag>
-                </template>
+            </template>
-            </td>
+        </template>
-        </tr>
-    </table>
     <table v-if="dbInbound.isSS" style="margin-bottom: 10px; width: 100%;">
         <tr>
             <td>{{ i18n "encryption" }}</td>
             <td><a-tag color="blue">[[ inbound.settings.method ]]</a-tag></td>
         </tr><tr v-if="inbound.isSS2022">
             <td>{{ i18n "password" }}</td>
-            <td><a-tag>[[ inbound.settings.password ]]</a-tag></td>
+            <td>
+                <a-tooltip :title="[[ inbound.settings.password  ]]">
+                    <a-tag class="info-large-tag">[[ inbound.settings.password  ]]</a-tag>
+                </a-tooltip>
+            </td>
         </tr><tr>
             <td>{{ i18n "pages.inbounds.network" }}</td>
             <td><a-tag color="blue">[[ inbound.settings.network ]]</a-tag></td>
@@ -90,8 +107,12 @@
                 <td><a-tag>[[ infoModal.clientSettings.flow ]]</a-tag></td>
             </tr>
             <tr v-if="infoModal.clientSettings.password">
-                <td>Password</td>
+                <td>{{ i18n "password" }}</td>
-                <td><a-tag>[[ infoModal.clientSettings.password ]]</a-tag></td>
+                <td>
+                    <a-tooltip :title="[[ infoModal.clientSettings.password  ]]">
+                        <a-tag class="info-large-tag">[[ infoModal.clientSettings.password  ]]</a-tag>
+                    </a-tooltip>
+                </td>
             </tr>
             <tr>
                 <td>{{ i18n "status" }}</td>
@@ -139,10 +160,10 @@
             </tr>
         </table>
         <template v-if="app.subSettings.enable && infoModal.clientSettings.subId">
-            <a-divider>Subscription link</a-divider>
+            <a-divider>Subscription URL</a-divider>
             <a-row>
-                <a-col :span="22"><a :href="[[ infoModal.subLink ]]" target="_blank">[[ infoModal.subLink ]]</a></a-col>
+                <a-col :sx="24" :md="22">SUB: <a :href="[[ infoModal.subLink ]]" target="_blank">[[ infoModal.subLink ]]</a></a-col>
-                <a-col :span="2">
+                <a-col :sx="24" :md="2" style="text-align: right;">
                     <a-tooltip title='{{ i18n "copy" }}'>
                         <button class="ant-btn ant-btn-primary" id="copy-sub-link" @click="copyToClipboard('copy-sub-link', infoModal.subLink)">
                             <a-icon type="snippets"></a-icon>
@@ -150,12 +171,22 @@
                     </a-tooltip>
                 </a-col>
             </a-row>
+            <a-row>
+                <a-col :sx="24" :md="22">JSON: <a :href="[[ infoModal.subJsonLink ]]" target="_blank">[[ infoModal.subJsonLink ]]</a></a-col>
+                <a-col :sx="24" :md="2" style="text-align: right;">
+                    <a-tooltip title='{{ i18n "copy" }}'>
+                        <button class="ant-btn ant-btn-primary" id="copy-subJson-link" @click="copyToClipboard('copy-subJson-link', infoModal.subJsonLink)">
+                            <a-icon type="snippets"></a-icon>
+                        </button>
+                    </a-tooltip>
+                </a-col>
+            </a-row>
         </template>
         <template v-if="app.tgBotEnable && infoModal.clientSettings.tgId">
             <a-divider>Telegram ID</a-divider>
             <a-row>
-                <a-col :span="22"><a :href="[[ infoModal.tgLink ]]" target="_blank">@[[ infoModal.clientSettings.tgId ]]</a></a-col>
+                <a-col :sx="24" :md="22"><a :href="[[ infoModal.tgLink ]]" target="_blank">@[[ infoModal.clientSettings.tgId ]]</a></a-col>
-                <a-col :span="2">
+                <a-col :sx="24" :md="2" style="text-align: right;">
                     <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-icon type="snippets"></a-icon>
@@ -167,8 +198,8 @@
         <template v-if="dbInbound.hasLink()">
             <a-divider>URL</a-divider>
             <a-row v-for="(link,index) in infoModal.links">
-                <a-col :span="22"><a-tag color="blue">[[ link.remark ]]</a-tag><br />[[ link.link ]]</a-col>
+                <a-col :sx="24" :md="22"><a-tag color="blue">[[ link.remark ]]</a-tag><br />[[ link.link ]]</a-col>
-                <a-col :span="2" style="text-align: right;">
+                <a-col :sx="24" :md="2" style="text-align: right;">
                     <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-icon type="snippets"></a-icon>
@@ -239,6 +270,71 @@
                 <td><a-tag color="blue">[[ account.pass ]]</a-tag></td>
             </tr>
         </table>
+        <table v-if="dbInbound.isWireguard" style="margin-bottom: 10px; width: 100%;">
+            <tr class="client-table-odd-row">
+                <td>{{ i18n "pages.xray.wireguard.secretKey" }}</td>
+                <td>[[ inbound.settings.secretKey ]]</td>
+            </tr>
+            <tr>
+                <td>{{ i18n "pages.xray.wireguard.publicKey" }}</td>
+                <td>[[ inbound.settings.pubKey ]]</td>
+            </tr>
+            <tr class="client-table-odd-row">
+                <td>MTU</td>
+                <td>[[ inbound.settings.mtu ]]</td>
+            </tr>
+            <tr>
+                <td>Kernel Mode</td>
+                <td>[[ inbound.settings.kernelMode ]]</td>
+            </tr>
+        <template v-for="(peer, index) in inbound.settings.peers">
+            <tr>
+                <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>
+                <td>[[ peer.privateKey ]]</td>
+            </tr>
+            <tr>
+                <td>{{ i18n "pages.xray.wireguard.publicKey" }}</td>
+                <td>[[ peer.publicKey ]]</td>
+            </tr>
+            <tr class="client-table-odd-row">
+                <td>{{ i18n "pages.xray.wireguard.psk" }}</td>
+                <td>[[ peer.psk ]]</td>
+            </tr>
+            <tr>
+                <td>{{ i18n "pages.xray.wireguard.allowedIPs" }}</td>
+                <td>[[ peer.allowedIPs.join(",") ]]</td>
+            </tr>
+            <tr class="client-table-odd-row">
+                <td>Keep Alive</td>
+                <td>[[ peer.keepAlive ]]</td>
+            </tr>
+            <tr>
+                <td colspan="2">
+                    <a-row>
+                        <a-col :span="22" style="overflow-wrap: anywhere;">
+                            <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"
+                                    :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>
+                    </a-row>
+                </td>
+            </tr>
+        </table>
+        </template>
     </template>
 </a-modal>
 <script>
@@ -255,6 +351,7 @@
         index: null,
         isExpired: false,
         subLink: '',
+        subJsonLink: '',
         tgLink: '',
         show(dbInbound, index) {
             this.index = index;
@@ -263,10 +360,15 @@
             this.clientSettings = this.inbound.clients ? this.inbound.clients[index] : null;
             this.isExpired = this.inbound.clients ? this.inbound.isExpiry(index): this.dbInbound.isExpiry;
             this.clientStats = this.inbound.clients ? this.dbInbound.clientStats.find(row => row.email === this.clientSettings.email) : [];
-            this.links = this.inbound.genAllLinks(this.dbInbound.remark, app.remarkModel, this.clientSettings);
+            if (this.inbound.protocol == Protocols.WIREGUARD){
+                this.links = this.inbound.genInboundLinks(dbInbound.remark).split('\r\n')
+            } else {
+                this.links = this.inbound.genAllLinks(this.dbInbound.remark, app.remarkModel, this.clientSettings);
+            }
             if (this.clientSettings) {
                 if (this.clientSettings.subId) {
                     this.subLink = this.genSubLink(this.clientSettings.subId);
+                    this.subJsonLink = this.genSubJsonLink(this.clientSettings.subId);
                 }
                 if (this.clientSettings.tgId) {
                     this.tgLink = "https://t.me/" + this.clientSettings.tgId;
@@ -279,6 +381,9 @@
         },
         genSubLink(subID) {
             return app.subSettings.subURI+subID+'?name='+subID;
+        },
+        genSubJsonLink(subID) {
+            return app.subSettings.subJsonURI+subID+'?name='+subID;;
         }
     };
 

web/html/xui/inbound_modal.html

@@ -10,7 +10,7 @@
         title: '',
         visible: false,
         confirmLoading: false,
-        okText: '{{ i18n "sure" }}',
+        okText: '{{ i18n "confirm" }}',
         isEdit: false,
         confirm: null,
         inbound: new Inbound(),
@@ -18,7 +18,7 @@
         ok() {
             ObjectUtil.execute(inModal.confirm, inModal.inbound, inModal.dbInbound);
         },
-        show({ title='', okText='{{ i18n "sure" }}', inbound=null, dbInbound=null, confirm=(inbound, dbInbound)=>{}, isEdit=false  }) {
+        show({ title='', okText='{{ i18n "confirm" }}', inbound=null, dbInbound=null, confirm=(inbound, dbInbound)=>{}, isEdit=false  }) {
             this.title = title;
             this.okText = okText;
             if (inbound) {
@@ -39,7 +39,7 @@
             inModal.visible = false;
             inModal.loading(false);
         },
-        loading(loading) {
+        loading(loading=true) {
             inModal.confirmLoading = loading;
         },
     };

web/html/xui/inbounds.html

@@ -43,6 +43,10 @@
         0%, 50%, 100%   { transform: scale(1);  opacity:  1; }
         10%             { transform: scale(1.5); opacity: .2; }
     }
+    .info-large-tag {
+        max-width: 200px;
+        overflow: hidden;
+    }
 </style>
 
 <body>
@@ -64,15 +68,15 @@
                     <a-card hoverable>
                         <a-row>
                             <a-col :xs="24" :sm="24" :lg="12">
-                                {{ i18n "pages.inbounds.totalDownUp" }}:
+                                <strong>{{ i18n "pages.inbounds.totalDownUp" }}:</strong>
                                 <a-tag color="blue">[[ sizeFormat(total.up) ]] / [[ sizeFormat(total.down) ]]</a-tag>
                             </a-col>
                             <a-col :xs="24" :sm="24" :lg="12">
-                                {{ i18n "pages.inbounds.totalUsage" }}:
+                                <strong>{{ i18n "pages.inbounds.totalUsage" }}:</strong>
                                 <a-tag color="blue">[[ sizeFormat(total.up + total.down) ]]</a-tag>
                             </a-col>
                             <a-col :xs="24" :sm="24" :lg="12">
-                                {{ i18n "pages.inbounds.inboundCount" }}:
+                                <strong>{{ i18n "pages.inbounds.inboundCount" }}:</strong>
                                 <a-tag color="blue">[[ dbInbounds.length ]]</a-tag>
                             </a-col>
                             <a-col :xs="24" :sm="24" :lg="12">
@@ -80,7 +84,7 @@
                                     <div>
                                         <a-back-top :target="() => document.getElementById('content-layout')" visibility-height="200">
                                         </a-back-top>
-                                {{ i18n "clients" }}:
+                                <strong>{{ i18n "clients" }}:</strong>
                                 <a-tag color="blue">[[ total.clients ]]</a-tag>
                                 <a-popover title='{{ i18n "disabled" }}' :overlay-class-name="themeSwitcher.currentTheme">
                                     <template slot="content">
@@ -133,6 +137,10 @@
                                                 <a-icon type="export"></a-icon>
                                                 {{ i18n "pages.inbounds.export" }}
                                             </a-menu-item>
+                                            <a-menu-item key="subs" v-if="subSettings.enable">
+                                                <a-icon type="export"></a-icon>
+                                                {{ i18n "pages.inbounds.export" }} - {{ i18n "pages.settings.subSettings" }}
+                                            </a-menu-item>
                                             <a-menu-item key="resetInbounds">
                                                 <a-icon type="reload"></a-icon>
                                                 {{ i18n "pages.inbounds.resetAllTraffic" }}
@@ -141,7 +149,7 @@
                                                 <a-icon type="file-done"></a-icon>
                                                 {{ i18n "pages.inbounds.resetAllClientTraffics" }}
                                             </a-menu-item>
-                                            <a-menu-item key="delDepletedClients">
+                                            <a-menu-item key="delDepletedClients" style="color: #FF4D4F;">
                                                 <a-icon type="rest"></a-icon>
                                                 {{ i18n "pages.inbounds.delDepletedClients" }}
                                             </a-menu-item>
@@ -160,9 +168,9 @@
                                 </a-col>
                             </a-row>
                         </div>
-                        <div style="display: flex; align-items: center; justify-content: flex-start;">
+                        <div :style="isMobile ? '' : 'display: flex; align-items: center; justify-content: flex-start;'">
                             <a-switch v-model="enableFilter"
-                                style="margin-right: .5rem;"
+                                :style="isMobile ? 'margin-bottom: .5rem; display: flex;' : 'margin-right: .5rem;'"
                                 @change="toggleFilter">
                                 <a-icon slot="checkedChildren" type="search"></a-icon>
                                 <a-icon slot="unCheckedChildren" type="filter"></a-icon>
@@ -195,7 +203,7 @@
                                             <a-icon type="edit"></a-icon>
                                             {{ i18n "edit" }}
                                         </a-menu-item>
-                                        <a-menu-item key="qrcode" v-if="dbInbound.isSS && !dbInbound.toInbound().isSSMultiUser">
+                                        <a-menu-item key="qrcode" v-if="(dbInbound.isSS && !dbInbound.toInbound().isSSMultiUser) || dbInbound.isWireguard">
                                             <a-icon type="qrcode"></a-icon>
                                             {{ i18n "qrCode" }}
                                         </a-menu-item>
@@ -216,7 +224,11 @@
                                                 <a-icon type="export"></a-icon>
                                                 {{ i18n "pages.inbounds.export"}}
                                             </a-menu-item>
-                                            <a-menu-item key="delDepletedClients">
+                                            <a-menu-item key="subs" v-if="subSettings.enable">
+                                                <a-icon type="export"></a-icon>
+                                                {{ i18n "pages.inbounds.export"}} - {{ i18n "pages.settings.subSettings" }}
+                                            </a-menu-item>
+                                            <a-menu-item key="delDepletedClients" style="color: #FF4D4F;">
                                                 <a-icon type="rest"></a-icon>
                                                 {{ i18n "pages.inbounds.delDepletedClients" }}
                                             </a-menu-item>
@@ -232,7 +244,7 @@
                                         </a-menu-item>
                                         <a-menu-item key="clipboard">
                                             <a-icon type="copy"></a-icon>
-                                            {{ i18n "pages.inbounds.copyToClipboard" }}
+                                            {{ i18n "pages.inbounds.exportInbound" }}
                                         </a-menu-item>
                                         <a-menu-item key="clone">
                                             <a-icon type="block"></a-icon> {{ i18n "pages.inbounds.clone"}}
@@ -243,7 +255,7 @@
                                             </span>
                                         </a-menu-item>
                                         <a-menu-item v-if="isMobile">
-                                            <a-switch size="small" v-model="dbInbound.enable" @change="switchEnable(dbInbound.id)"></a-switch>
+                                            <a-switch size="small" v-model="dbInbound.enable" @change="switchEnable(dbInbound.id,dbInbound.enable)"></a-switch>
                                             {{ i18n "pages.inbounds.enable" }}
                                         </a-menu-item>
                                     </a-menu>
@@ -310,7 +322,7 @@
                                 </a-popover>
                             </template>
                             <template slot="enable" slot-scope="text, dbInbound">
-                                <a-switch v-model="dbInbound.enable" @change="switchEnable(dbInbound.id)"></a-switch>
+                                <a-switch v-model="dbInbound.enable" @change="switchEnable(dbInbound.id,dbInbound.enable)"></a-switch>
                             </template>
                             <template slot="expiryTime" slot-scope="text, dbInbound">
                                 <a-popover v-if="dbInbound.expiryTime > 0" :overlay-class-name="themeSwitcher.currentTheme">
@@ -423,7 +435,7 @@
                                     :columns="isMobile ? innerMobileColumns : innerColumns"
                                     :data-source="getInboundClients(record)"
                                     :pagination=pagination(getInboundClients(record))
-                                    :style="isMobile ? 'margin: -16px -5px -17px;' : 'margin-left: 10px;'">
+                                    style="margin: -12px -6px -13px;">
                                     {{template "client_table"}}
                                 </a-table>
                             </template>
@@ -517,9 +529,9 @@
         { title: '{{ i18n "pages.inbounds.operate" }}', width: 50, scopedSlots: { customRender: 'actions' } },
         { title: '{{ i18n "pages.inbounds.enable" }}', width: 20, scopedSlots: { customRender: 'enable' } },
         { title: '{{ i18n "online" }}', width: 20, scopedSlots: { customRender: 'online' } },
-        { title: '{{ i18n "pages.inbounds.client" }}', width: 80, scopedSlots: { customRender: 'client' } },
+        { title: '{{ i18n "pages.inbounds.client" }}', width: 70, scopedSlots: { customRender: 'client' } },
         { title: '{{ i18n "pages.inbounds.traffic" }}', width: 80, align: 'center', scopedSlots: { customRender: 'traffic' } },
-        { title: '{{ i18n "pages.inbounds.expireDate" }}', width: 80, align: 'center', scopedSlots: { customRender: 'expiryTime' } },
+        { title: '{{ i18n "pages.inbounds.expireDate" }}', width: 70, align: 'center', scopedSlots: { customRender: 'expiryTime' } },
     ];
 
     const innerMobileColumns = [
@@ -552,7 +564,8 @@
             refreshInterval: Number(localStorage.getItem("refreshInterval")) || 5000,
             subSettings: {
                 enable : false,
-                subURI : ''
+                subURI : '',
+                subJsonURI : '',
             },
             remarkModel: '-ieo',
             tgBotEnable: false,
@@ -597,7 +610,8 @@
                     this.tgBotEnable = tgBotEnable;
                     this.subSettings = {
                         enable : subEnable,
-                        subURI: subURI
+                        subURI: subURI,
+                        subJsonURI: subJsonURI
                     };
                     this.pageSize = pageSize;
                     this.remarkModel = remarkModel;
@@ -634,8 +648,12 @@
                     clientCount = clients.length;
                     if (dbInbound.enable) {
                         clients.forEach(client => {
-                            client.enable ? active.push(client.email) : deactive.push(client.email);
+                            if (client.enable) {
-                            if(this.isClientOnline(client.email)) online.push(client.email);
+                                active.push(client.email);
+                                if(this.isClientOnline(client.email)) online.push(client.email);
+                            } else {
+                                deactive.push(client.email);
+                            }
                         });
                         clientStats.forEach(client => {
                             if (!client.enable) {
@@ -723,6 +741,9 @@
                     case "export":
                         this.exportAllLinks();
                         break;
+                    case "subs":
+                        this.exportAllSubs();
+                        break;
                     case "resetInbounds":
                         this.resetAllTraffic();
                         break;
@@ -754,6 +775,9 @@
                     case "export":
                         this.inboundLinks(dbInbound.id);
                         break;
+                    case "subs":
+                        this.exportSubs(dbInbound.id);
+                        break;
                     case "clipboard":
                         this.copyToClipboard(dbInbound.id);
                         break;
@@ -832,8 +856,8 @@
                     port: RandomUtil.randomIntRange(10000, 60000),
                     protocol: baseInbound.protocol,
                     settings: Inbound.Settings.getSettings(baseInbound.protocol).toString(),
-		    streamSettings: baseInbound.stream.toString(),
+                    streamSettings: baseInbound.stream.toString(),
-                    sniffing: baseInbound.canSniffing() ? baseInbound.sniffing.toString() : '{}',
+                    sniffing: baseInbound.sniffing.toString(),
                 };
                 await this.submit('/xui/inbound/add', data, inModal);
             },
@@ -852,7 +876,7 @@
                     settings: inbound.settings.toString(),
                 };
                 if (inbound.canEnableStream()) data.streamSettings = inbound.stream.toString();
-                if (inbound.canSniffing()) data.sniffing = inbound.sniffing.toString();
+                data.sniffing = inbound.sniffing.toString();
 
                 await this.submit('/xui/inbound/add', data, inModal);
             },
@@ -871,7 +895,7 @@
                     settings: inbound.settings.toString(),
                 };
                 if (inbound.canEnableStream()) data.streamSettings = inbound.stream.toString();
-                if (inbound.canSniffing()) data.sniffing = inbound.sniffing.toString();
+                data.sniffing = inbound.sniffing.toString();
 
                 await this.submit(`/xui/inbound/update/${dbInbound.id}`, data, inModal);
             },
@@ -1026,8 +1050,9 @@
                 newDbInbound = this.checkFallback(dbInbound);
                 infoModal.show(newDbInbound, index);
             },
-            switchEnable(dbInboundId) {
+            switchEnable(dbInboundId,state) {
                 dbInbound = this.dbInbounds.find(row => row.id === dbInboundId);
+                dbInbound.enable = state;
                 this.submit(`/xui/inbound/update/${dbInboundId}`, dbInbound);
             },
             async switchEnableClient(dbInboundId, client) {
@@ -1089,7 +1114,7 @@
                     title: '{{ i18n "pages.inbounds.delDepletedClientsTitle"}}',
                     content: '{{ i18n "pages.inbounds.delDepletedClientsContent"}}',
                     class: themeSwitcher.currentTheme,
-                    okText: '{{ i18n "reset"}}',
+                    okText: '{{ i18n "delete"}}',
                     cancelText: '{{ i18n "cancel"}}',
                     onOk: () => this.submit('/xui/inbound/delDepletedClients/' + dbInboundId),
                 })
@@ -1177,6 +1202,22 @@
                 newDbInbound = this.checkFallback(dbInbound);
                 txtModal.show('{{ i18n "pages.inbounds.export"}}', newDbInbound.genInboundLinks(this.remarkModel), newDbInbound.remark);
             },
+            exportSubs(dbInboundId) {
+                const dbInbound = this.dbInbounds.find(row => row.id === dbInboundId);
+                const clients = this.getInboundClients(dbInbound);
+                let subLinks = []
+                if (clients != null){
+                    clients.forEach(c => {
+                        if (c.subId && c.subId.length>0){
+                            subLinks.push(this.subSettings.subURI + c.subId + "?name=" + c.subId)
+                        }
+                    })
+                }
+                txtModal.show(
+                    '{{ i18n "pages.inbounds.export"}} - {{ i18n "pages.settings.subSettings" }}',
+                    [...new Set(subLinks)].join('\n'),
+                    dbInbound.remark + "-Subs");
+            },
             importInbound() {
                 promptModal.open({
                     title: '{{ i18n "pages.inbounds.importInbound" }}',
@@ -1189,7 +1230,24 @@
                     },
                 });
             },
-			exportAllLinks() {
+			exportAllSubs() {
+                let subLinks = []
+                for (const dbInbound of this.dbInbounds) {
+                    const clients = this.getInboundClients(dbInbound);
+                    if (clients != null){
+                        clients.forEach(c => {
+                            if (c.subId && c.subId.length>0){
+                                subLinks.push(this.subSettings.subURI + c.subId + "?name=" + c.subId)
+                            }
+                        })
+                    }
+                }
+                txtModal.show(
+                    '{{ i18n "pages.inbounds.export"}} - {{ i18n "pages.settings.subSettings" }}',
+                    [...new Set(subLinks)].join('\r\n'),
+                    'All-Inbounds-Subs');
+            },
+            exportAllLinks() {
                 let copyText = [];
                 for (const dbInbound of this.dbInbounds) {
                     copyText.push(dbInbound.genInboundLinks(this.remarkModel));

web/html/xui/index.html

@@ -44,14 +44,14 @@
                                         <a-progress type="dashboard" status="normal"
                                                     :stroke-color="status.cpu.color"
                                                     :percent="status.cpu.percent"></a-progress>
-                                        <div>CPU: ([[ status.cpuCount ]]core)</div>
+                                            <div><strong>CPU:</strong>  [[ cpuCoreFormat(status.cpuCount) ]]</div>
                                     </a-col>
                                     <a-col :span="12" style="text-align: center">
                                         <a-progress type="dashboard" status="normal"
                                                     :stroke-color="status.mem.color"
                                                     :percent="status.mem.percent"></a-progress>
                                         <div>
-                                            {{ i18n "pages.index.memory"}}: [[ sizeFormat(status.mem.current) ]] / [[ sizeFormat(status.mem.total) ]]
+                                            <strong>{{ i18n "pages.index.memory"}}:</strong> [[ sizeFormat(status.mem.current) ]] / [[ sizeFormat(status.mem.total) ]]
                                         </div>
                                     </a-col>
                                 </a-row>
@@ -63,7 +63,7 @@
                                                     :stroke-color="status.swap.color"
                                                     :percent="status.swap.percent"></a-progress>
                                         <div>
-                                            Swap: [[ sizeFormat(status.swap.current) ]] / [[ sizeFormat(status.swap.total) ]]
+                                            <strong>Swap:</strong> [[ sizeFormat(status.swap.current) ]] / [[ sizeFormat(status.swap.total) ]]
                                         </div>
                                     </a-col>
                                     <a-col :span="12" style="text-align: center">
@@ -71,7 +71,7 @@
                                                     :stroke-color="status.disk.color"
                                                     :percent="status.disk.percent"></a-progress>
                                         <div>
-                                            {{ i18n "pages.index.hard"}}: [[ sizeFormat(status.disk.current) ]] / [[ sizeFormat(status.disk.total) ]]
+                                            <strong>{{ i18n "pages.index.hard"}}:</strong> [[ sizeFormat(status.disk.current) ]] / [[ sizeFormat(status.disk.total) ]]
                                         </div>
                                     </a-col>
                                 </a-row>
@@ -84,85 +84,100 @@
                 <a-row>
                     <a-col :sm="24" :md="12">
                         <a-card hoverable>
-                            X-UI: <a href="https://github.com/alireza0/x-ui/releases" target="_blank"><a-tag color="blue">{{ .cur_ver }}</a-tag></a>
+                            <strong>{{ i18n "pages.inbounds.stream.tcp.version" }}:</strong>
-                            Xray:
+                            <a href="https://github.com/alireza0/x-ui/releases" target="_blank">
+                                <a-tag color="purple" style="cursor: pointer;">X-UI {{ .cur_ver }}</a-tag>
+                            </a>
                             <a-tooltip title='{{ i18n "pages.index.xraySwitch" }}'>
-                                <a-tag color="blue" style="cursor: pointer;" @click="openSelectV2rayVersion">[[ status.xray.version ]]</a-tag>
+                                <a-tag color="purple" style="cursor: pointer;" @click="openSelectV2rayVersion">Xray [[ status.xray.version ]]</a-tag>
                             </a-tooltip>
                         </a-card>
                     </a-col>
                     <a-col :sm="24" :md="12">
                         <a-card hoverable>
-                            {{ i18n "pages.index.operationHours" }}:
+                            <strong>{{ i18n "pages.index.operationHours" }}:</strong> 
-                            Xray
+                            <a-tooltip>
-                            <a-tag color="blue">[[ formatSecond(status.appStats.uptime) ]]</a-tag>
+                                 <template slot="title">
-                            OS
+                                     {{ i18n "pages.index.xrayoperationHoursDesc" }}
+                                 </template>
+                                <a-tag color="blue" style="margin-right: 3px;">Xray [[ formatSecond(status.appStats.uptime) ]]</a-tag>
+                            </a-tooltip>      
                             <a-tooltip>
                                 <template slot="title">
                                     {{ i18n "pages.index.operationHoursDesc" }}
                                 </template>
-                                <a-icon type="question-circle" theme="filled"></a-icon>
+                                 <a-tag color="blue">OS [[ formatSecond(status.uptime) ]]</a-tag>
                             </a-tooltip>
-                            <a-tag color="blue">[[ formatSecond(status.uptime) ]]</a-tag>
                         </a-card>
                     </a-col>
                     <a-col :sm="24" :md="12">
                         <a-card hoverable>
-                            {{ i18n "pages.index.xrayStatus" }}:
+                            <strong>{{ i18n "pages.index.xrayStatus" }}:</strong>
-                            <a-tag :color="status.xray.color">[[ status.xray.state ]]</a-tag>
+                            <a-tag :color="status.xray.color" style="margin-right: 3px;"><strong>[[ status.xray.state ]]</strong></a-tag>
                             <a-popover v-if="status.xray.state === State.Error"
                                 :overlay-class-name="themeSwitcher.currentTheme">
-                                <span slot="title" style="font-size: 12pt">Error in running xray-core
+                                <span slot="title" style="font-size: 12pt">An error occurred while running Xray
                                     <a-tag color="purple" style="cursor: pointer; float: right;" @click="openLogs()">{{ i18n "pages.index.logs" }}</a-tag>
                                 </span>
                                 <template slot="content">
                                     <p style="max-width: 400px" v-for="line in status.xray.errorMsg.split('\n')">[[ line ]]</p>
                                 </template>
-                                <a-icon type="question-circle" theme="filled"></a-icon>
+                                <a-icon type="exclamation-circle"></a-icon>
                             </a-popover>
-                            <a-tag color="purple" style="cursor: pointer;" @click="stopXrayService">{{ i18n "pages.index.stopXray" }}</a-tag>
+                            <a-tag color="purple" style="cursor: pointer; margin-right: 3px;" @click="stopXrayService">{{ i18n "pages.index.stopXray" }}</a-tag>
-                            <a-tag color="purple" style="cursor: pointer;" @click="restartXrayService">{{ i18n "pages.index.restartXray" }}</a-tag>                    
+                            <a-tag color="purple" style="cursor: pointer; margin-right: 3px;" @click="restartXrayService">{{ i18n "pages.index.restartXray" }}</a-tag>             
                         </a-card>
                     </a-col>
                     <a-col :sm="24" :md="12">
                         <a-card hoverable>
-                            {{ i18n "menu.link" }}:
+                            <strong>{{ i18n "menu.link" }}:</strong>
-                            <a-tag color="purple" style="cursor: pointer;" @click="openLogs()">{{ i18n "pages.index.logs" }}</a-tag>
+                            <a-tag color="purple" style="cursor: pointer; margin-right: 3px;" @click="openLogs()">{{ i18n "pages.index.logs" }}</a-tag>
-                            <a-tag color="purple" style="cursor: pointer;" @click="openConfig">{{ i18n "pages.index.config" }}</a-tag>
+                            <a-tag color="purple" style="cursor: pointer; margin-right: 3px;" @click="openConfig">{{ i18n "pages.index.config" }}</a-tag>
                             <a-tag color="purple" style="cursor: pointer;" @click="openBackup">{{ i18n "pages.index.backup" }}</a-tag>
                         </a-card>
                     </a-col>
                     <a-col :sm="24" :md="12">
                         <a-card hoverable>
-                            {{ i18n "pages.index.systemLoad" }}: [[ status.loads[0] ]] | [[ status.loads[1] ]] | [[ status.loads[2] ]]
+                            <strong>{{ i18n "pages.index.systemLoad" }}:</strong> 
-                        </a-card>
-                    </a-col>
-                    <a-col :sm="24" :md="12">
-                        <a-card hoverable>
-                            {{ i18n "usage"}}:
-                            Memory: [[ sizeFormat(status.appStats.mem) ]] -
-                            Threads: [[ status.appStats.threads ]]
-                            </a-tooltip>
-                        </a-card>
-                    </a-col>
-                    <a-col :sm="24" :md="12">
-                        <a-card hoverable>
-                            Host: [[ status.hostInfo.hostname ]] -
-                            <template v-if="status.hostInfo.ipv4">IPv4:
                             <a-tooltip>
                                 <template slot="title">
-                                    [[ status.hostInfo.ipv4 ]]
+                                    {{ i18n "pages.index.systemLoadDesc" }}
                                 </template>
-                                <a-icon type="question-circle" theme="filled"></a-icon>
+                                <a-tag color="blue">[[ status.loads[0] ]] | [[ status.loads[1] ]] | [[ status.loads[2] ]]</a-tag>
                             </a-tooltip>
+                        </a-card>
+                    </a-col>
+                    <a-col :sm="24" :md="12">
+                        <a-card hoverable>
+                            <strong>{{ i18n "usage" }}:</strong>
+                            <a-tag color="blue" style="margin-right: 3px;">RAM [[ sizeFormat(status.appStats.mem) ]]</a-tag>
+                            <a-tag color="blue">Threads [[ status.appStats.threads ]]</a-tag>
+                        </a-card>
+                    </a-col>
+                    <a-col :sm="24" :md="12">
+                        <a-card hoverable>
+                            <strong>{{ i18n "pages.index.serverInfo" }}:</strong>
+                            <a-tooltip>
+                                <template slot="title">
+                                    {{ i18n "pages.index.hostname" }}
+                                </template>
+                                <a-tag color="blue" style="margin-right: 3px;">[[ status.hostInfo.hostname ]]</a-tag>
+                            </a-tooltip>
+                            <template v-if="status.hostInfo.ipv4">    
+                                <a-tooltip>
+                                    <template slot="title">
+                                        [[ status.hostInfo.ipv4 ]]
+                                    </template>
+                                    <a-tag color="blue" style="margin-right: 3px;">IPv4</a-tag>
+                                </a-tooltip>
                             </template>
-                            <template v-if="status.hostInfo.ipv6">IPv6:
+                            <template v-if="status.hostInfo.ipv6">
-                            <a-tooltip>
+                                <a-tooltip>
-                                <template slot="title">
+                                    <template slot="title">
-                                    [[ status.hostInfo.ipv6 ]]
+                                        [[ status.hostInfo.ipv6 ]]
-                                </template>
+                                    </template>
-                                <a-icon type="question-circle" theme="filled"></a-icon>
+                                    <a-tag color="blue" style="margin-right: 3px;">IPv6</a-tag>
-                            </a-tooltip>
+                                </a-tooltip>
                             </template>
                         </a-card>
                     </a-col>
@@ -170,21 +185,21 @@
                         <a-card hoverable>
                             <a-row>
                                 <a-col :span="12">
-                                    TCP:  [[ status.tcpCount ]]
+                                    <a-icon type="swap"></a-icon>    
                                     <a-tooltip>
                                         <template slot="title">
                                             {{ i18n "pages.index.connectionTcpCountDesc" }}
                                         </template>
-                                        <a-icon type="question-circle" theme="filled"></a-icon>
+                                        <strong>TCP:</Strong> <a-tag>[[ status.tcpCount ]]</a-tag>
                                     </a-tooltip>
                                 </a-col>
                                 <a-col :span="12">
-                                    UDP:  [[ status.udpCount ]]
+                                    <a-icon type="swap"></a-icon>
                                     <a-tooltip>
                                         <template slot="title">
                                             {{ i18n "pages.index.connectionUdpCountDesc" }}
                                         </template>
-                                        <a-icon type="question-circle" theme="filled"></a-icon>
+                                        <strong>UDP:</strong> <a-tag>[[ status.udpCount ]]</a-tag>
                                     </a-tooltip>
                                 </a-col>
                             </a-row>
@@ -195,22 +210,20 @@
                             <a-row>
                                 <a-col :span="12">
                                     <a-icon type="arrow-up"></a-icon>
-                                    [[ sizeFormat(status.netIO.up) ]] / S
                                     <a-tooltip>
                                         <template slot="title">
                                             {{ i18n "pages.index.upSpeed" }}
                                         </template>
-                                        <a-icon type="question-circle" theme="filled"></a-icon>
+                                        <strong>Up:</strong> [[ sizeFormat(status.netIO.up) ]]/s
                                     </a-tooltip>
                                 </a-col>
                                 <a-col :span="12">
                                     <a-icon type="arrow-down"></a-icon>
-                                    [[ sizeFormat(status.netIO.down) ]] / S
                                     <a-tooltip>
                                         <template slot="title">
                                             {{ i18n "pages.index.downSpeed" }}
                                         </template>
-                                        <a-icon type="question-circle" theme="filled"></a-icon>
+                                        <strong>Down:</strong> [[ sizeFormat(status.netIO.down) ]]/s
                                     </a-tooltip>
                                 </a-col>
                             </a-row>
@@ -221,22 +234,20 @@
                             <a-row>
                                 <a-col :span="12">
                                     <a-icon type="cloud-upload"></a-icon>
-                                    [[ sizeFormat(status.netTraffic.sent) ]]
                                     <a-tooltip>
                                         <template slot="title">
                                             {{ i18n "pages.index.totalSent" }}
                                         </template>
-                                        <a-icon type="question-circle" theme="filled"></a-icon>
+                                        <strong>Out:</strong> [[ sizeFormat(status.netTraffic.sent) ]]
                                     </a-tooltip>
                                 </a-col>
                                 <a-col :span="12">
                                     <a-icon type="cloud-download"></a-icon>
-                                    [[ sizeFormat(status.netTraffic.recv) ]]
                                     <a-tooltip>
                                         <template slot="title">
                                             {{ i18n "pages.index.totalReceive" }}
                                         </template>
-                                        <a-icon type="question-circle" theme="filled"></a-icon>
+                                       <strong>In:</strong> [[ sizeFormat(status.netTraffic.recv) ]]
                                     </a-tooltip>
                                 </a-col>
                             </a-row>
@@ -251,8 +262,10 @@
              :closable="true" @ok="() => versionModal.visible = false"
              :class="themeSwitcher.currentTheme"
              footer="">
-        <h2>{{ i18n "pages.index.xraySwitchClick"}}</h2>
+        <a-alert type="warning" style="margin-bottom: 12px; width: fit-content"
-        <h2>{{ i18n "pages.index.xraySwitchClickDesk"}}</h2>
+        message='{{ i18n "pages.index.xraySwitchClickDesk" }}'
+        show-icon
+        ></a-alert>
         <template v-for="version, index in versionModal.versions">
             <a-tag :color="index % 2 == 0 ? 'purple' : 'blue'"
                    style="margin: 10px" @click="switchV2rayVersion(version)">
@@ -261,52 +274,53 @@
         </template>
     </a-modal>
 
-    <a-modal id="log-modal" v-model="logModal.visible" title="Logs"
+    <a-modal id="log-modal" v-model="logModal.visible"
-             :closable="true" @ok="() => logModal.visible = false" @cancel="() => logModal.visible = false"
+             :closable="true" @cancel="() => logModal.visible = false"
              :class="themeSwitcher.currentTheme"
-             width="800px"
+             width="800px" footer="">
-             footer="">
+        <template slot="title">
+            {{ i18n "pages.index.logs" }}
+            <a-icon :spin="logModal.loading"
+                    type="sync"
+                    style="vertical-align: middle; margin-left: 10px;"
+                    :disabled="logModal.loading"
+                    @click="openLogs()">
+            </a-icon>
+        </template>
         <a-form layout="inline">
-            <a-form-item label="Count">
+            <a-form-item>
-                <a-select v-model="logModal.rows"
+                <a-input-group compact>
-                style="width: 80px"
+                    <a-select v-model="logModal.rows" style="width:70px;"
-                @change="openLogs()" :dropdown-class-name="themeSwitcher.currentTheme">
+                    @change="openLogs()" :dropdown-class-name="themeSwitcher.currentTheme">
-                    <a-select-option value="10">10</a-select-option>
+                        <a-select-option value="10">10</a-select-option>
-                    <a-select-option value="20">20</a-select-option>
+                        <a-select-option value="20">20</a-select-option>
-                    <a-select-option value="50">50</a-select-option>
+                        <a-select-option value="50">50</a-select-option>
-                    <a-select-option value="100">100</a-select-option>
+                        <a-select-option value="100">100</a-select-option>
-                </a-select>
+                    </a-select>
-            </a-form-item>
+                    <a-select v-model="logModal.level" style="width:100px;"
-            <a-form-item label="Log Level">
+                    @change="openLogs()" :dropdown-class-name="themeSwitcher.currentTheme">
-                <a-select v-model="logModal.level"
+                        <a-select-option value="debug">Debug</a-select-option>
-                style="width: 120px"
+                        <a-select-option value="info">Info</a-select-option>
-                @change="openLogs()" :dropdown-class-name="themeSwitcher.currentTheme">
+                        <a-select-option value="warning">Warning</a-select-option>
-                    <a-select-option value="debug">Debug</a-select-option>
+                        <a-select-option value="err">Error</a-select-option>
-                    <a-select-option value="info">Info</a-select-option>
+                    </a-select>
-                    <a-select-option value="warning">Warning</a-select-option>
+                </a-input-group>
-                    <a-select-option value="err">Error</a-select-option>
-                </a-select>
-            </a-form-item>
-            <a-form-item label="SysLog">
-                <a-checkbox v-model="logModal.syslog" @change="openLogs()"></a-checkbox>
             </a-form-item>
             <a-form-item>
-                <a-button class="ant-btn ant-btn-primary" :loading="logModal.loading" @click="openLogs()"><a-icon :spin="logModal.loading" type="sync"></a-icon> Reload</a-button>
+                <a-checkbox v-model="logModal.syslog" @change="openLogs()">SysLog</a-checkbox>
             </a-form-item>
-            <a-form-item>
+            <a-form-item style="float: right;">
-                <a-button type="primary" style="margin-bottom: 10px;"
+                <a-button type="primary" icon="download"
                 :href="'data:application/text;charset=utf-8,' + encodeURIComponent(logModal.logs)" download="x-ui.log">
-                    {{ i18n "download" }} x-ui.log
                 </a-button>
             </a-form-item>
-       </a-form>
+        </a-form>
-        <div class="ant-input" style="height: auto; max-height: 500px; overflow: auto;" v-html="logModal.logs"></div>
+        <div class="ant-input" style="height: auto; max-height: 500px; overflow: auto;" v-html="logModal.formattedLogs"></div>
     </a-modal>
 
     <a-modal id="backup-modal" v-model="backupModal.visible" :title="backupModal.title"
-            :closable="true"
+            :closable="true" footer=""
-            :class="themeSwitcher.currentTheme"
+            :class="themeSwitcher.currentTheme">
-            @ok="() => backupModal.hide()" @cancel="() => backupModal.hide()">
             <a-alert type="warning" style="margin-bottom: 10px; width: fit-content"
             :message="backupModal.description"
             show-icon
@@ -328,9 +342,9 @@
 {{template "textModal"}}
 <script>
     const State = {
-        Running: "running",
+        Running: "Running",
-        Stop: "stop",
+        Stop: "Stop",
-        Error: "error",
+        Error: "Error",
     }
     Object.freeze(State);
 
@@ -398,7 +412,7 @@
             this.xray = data.xray;
             switch (this.xray.state) {
                 case State.Running:
-                    this.xray.color = "blue";
+                    this.xray.color = 'blue';
                     break;
                 case State.Stop:
                     this.xray.color = "orange";
@@ -433,7 +447,8 @@
         loading: false,
         show(logs) {
             this.visible = true;
-            this.logs = logs? this.formatLogs(logs) : "No Record...";
+            this.logs = logs; 
+            this.formattedLogs = this.logs?.length > 0 ? this.formatLogs(this.logs) : "No Record...";
         },
         formatLogs(logs) {
             let formattedLogs = '';

web/html/xui/settings.html

@@ -16,6 +16,7 @@
     }
 
     .ant-tabs-bar {
+        font-weight: bold;
         margin: 0;
     }
 
@@ -50,6 +51,16 @@
                     show-icon closable
                     >
                     </a-alert>
+                    <a-alert type="error" v-if="confAlerts.length>0" style="margin-bottom: 10px"
+                    message='{{ i18n "secAlertTitle" }}'
+                    color="red"
+                    show-icon closable
+                    >
+                    <template slot="description">
+                        {{ i18n "secAlertConf" }}
+                        <li v-for="a in confAlerts">- [[ a ]]</li>
+                    </template>
+                    </a-alert>
                 </transition>
                 <a-space direction="vertical">
                     <a-card hoverable style="margin-bottom: .5rem;">
@@ -134,42 +145,22 @@
                             </a-list>
                         </a-tab-pane>
                         <a-tab-pane key="2" tab='{{ i18n "pages.settings.userSettings"}}'>
-                            <a-form style="padding: 20px;" layout="inline">
+                            <a-form  layout="horizontal" :colon="false" style="float: left; margin: 10px 0;" :label-col="{ md: {span:10} }" :wrapper-col="{ md: {span:14} }">
-                                <table cellpadding="2">
+                                <a-form-item label='{{ i18n "pages.settings.oldUsername"}}'>
-                                    <tr>
+                                    <a-input v-model="user.oldUsername"></a-input>
-                                        <td>{{ i18n "pages.settings.oldUsername"}}:</td>
+                                </a-form-item>
-                                        <td>
+                                <a-form-item label='{{ i18n "pages.settings.currentPassword"}}'>
-                                            <a-form-item>
+                                    <password-input v-model="user.oldPassword"></password-input>
-                                                <a-input v-model="user.oldUsername" style="width: 200px"></a-input>
+                                </a-form-item>
-                                            </a-form-item>
+                                <a-form-item label='{{ i18n "pages.settings.newUsername"}}'>
-                                        </td>
+                                    <a-input v-model="user.newUsername"></a-input>
-                                    </tr>
+                                </a-form-item>
-                                    <tr>
+                                <a-form-item label='{{ i18n "pages.settings.newPassword"}}'>
-                                        <td>{{ i18n "pages.settings.currentPassword"}}:</td>
+                                    <password-input v-model="user.newPassword"></password-input>
-                                        <td>
+                                </a-form-item>
-                                            <a-form-item>
+                                <a-form-item label=" ">
-                                                <password-input v-model="user.oldPassword" style="width: 200px"></password-input>
+                                    <a-button type="primary" @click="updateUser">{{ i18n "confirm" }}</a-button>
-                                            </a-form-item>
+                                </a-form-item>
-                                        </td>
-                                    </tr>
-                                    <tr>
-                                        <td>{{ i18n "pages.settings.newUsername"}}:</td>
-                                        <td>
-                                            <a-form-item>
-                                                <a-input v-model="user.newUsername" style="width: 200px"></a-input>
-                                            </a-form-item>
-                                        </td>
-                                    </tr>
-                                    <tr>
-                                        <td>{{ i18n "pages.settings.newPassword"}}:</td>
-                                        <td>
-                                            <a-form-item>
-                                                <password-input v-model="user.newPassword" style="width: 200px"></password-input>
-                                            </a-form-item>            
-                                        </td>
-                                    </tr>
-                                </table>
-                                <a-button type="primary" @click="updateUser">{{ i18n "confirm" }}</a-button>
                             </a-form>
                         </a-tab-pane>
                         <a-tab-pane key="3" tab='{{ i18n "pages.settings.TGBotSettings"}}'>
@@ -220,6 +211,17 @@
                                 <setting-list-item type="number" title='{{ i18n "pages.settings.subUpdates"}}' desc='{{ i18n "pages.settings.subUpdatesDesc"}}' v-model="allSetting.subUpdates"></setting-list-item>
                             </a-list>
                         </a-tab-pane>
+                        <a-tab-pane key="5" tab='{{ i18n "pages.settings.subSettings" }} Json' v-if="allSetting.subEnable">
+                            <a-list item-layout="horizontal">
+                                <setting-list-item type="text" title='{{ i18n "pages.settings.subPath"}}' desc='{{ i18n "pages.settings.subPathDesc"}}' v-model="allSetting.subJsonPath"></setting-list-item>
+                                <setting-list-item type="text" title='{{ i18n "pages.settings.subURI"}}' desc='{{ i18n "pages.settings.subURIDesc"}}' v-model="allSetting.subJsonURI" placeholder="(http|https)://domain[:port]/path/"></setting-list-item>
+                                <setting-list-item type="switch" title='{{ i18n "pages.settings.fragment"}}' desc='{{ i18n "pages.settings.fragmentDesc"}}' v-model="fragment"></setting-list-item>
+                                <template v-if="fragment">
+                                    <setting-list-item type="text" title='length' v-model="fragmentLength" placeholder="100-200"></setting-list-item>
+                                    <setting-list-item type="text" title='Interval' v-model="fragmentInterval" placeholder="10-20"></setting-list-item>
+                                </template>
+                            </a-list>
+                        </a-tab-pane>
                     </a-tabs>
                 </a-space>
             </a-spin>
@@ -249,6 +251,24 @@
             remarkModels: {i:'Inbound',e:'Email',o:'Other'},
             remarkSeparators: [' ','-','_','@',':','~','|',',','.','/'],
             remarkSample: '',
+            defaultFragment: {
+                tag: "fragment",
+                protocol: "freedom",
+                settings: {
+                    domainStrategy: "AsIs",
+                    fragment: {
+                        packets: "tlshello",
+                        length: "100-200",
+                        interval: "10-20"
+                    }
+                },
+                streamSettings: {
+                    sockopt: {
+                        tcpKeepAliveIdle: 100,
+                        TcpNoDelay: true
+                    }
+                }
+            },
             get remarkModel() {
                 rm = this.allSetting.remarkModel;
                 return rm.length>1 ? rm.substring(1).split('') : [];
@@ -309,7 +329,7 @@
                         title: '{{ i18n "pages.settings.restartPanel" }}',
                         content: '{{ i18n "pages.settings.restartPanelDesc" }}',
                         class: themeSwitcher.currentTheme,
-                        okText: '{{ i18n "sure" }}',
+                        okText: '{{ i18n "confirm" }}',
                         cancelText: '{{ i18n "cancel" }}',
                         onOk: () => resolve(),
                     });
@@ -329,6 +349,50 @@
                 }
             }
         },
+        computed: {
+            fragment: {
+                get: function() { return this.allSetting?.subJsonFragment != ""; },
+                set: function (v) {
+                    this.allSetting.subJsonFragment = v ? JSON.stringify(this.defaultFragment) : "";
+                }
+            },
+            fragmentLength: {
+                get: function() { return this.fragment ? JSON.parse(this.allSetting.subJsonFragment).settings.fragment.length : ""; },
+                set: function(v) {
+                    if (v != ""){
+                        newFragment = JSON.parse(this.allSetting.subJsonFragment);
+                        newFragment.settings.fragment.length = v;
+                        this.allSetting.subJsonFragment = JSON.stringify(newFragment);
+                    }
+                }
+            },
+            fragmentInterval: {
+                get: function() { return this.fragment ? JSON.parse(this.allSetting.subJsonFragment).settings.fragment.interval : ""; },
+                set: function(v) {
+                    if (v != ""){
+                        newFragment = JSON.parse(this.allSetting.subJsonFragment);
+                        newFragment.settings.fragment.interval = v;
+                        this.allSetting.subJsonFragment = JSON.stringify(newFragment);
+                    }
+                }
+            },
+            confAlerts: {
+                get: function() {
+                    if (!this.allSetting) return [];
+                    var alerts = []
+                    if (this.allSetting.port == 54321) alerts.push('{{ i18n "pages.settings.panelPort"}}');
+                    panelPath = window.location.pathname.split('/').length<4
+                    if (panelPath && this.allSetting.webBasePath == '/') alerts.push('{{ i18n "pages.settings.panelConfig"}} {{ i18n "pages.settings.panelUrlPath"}}');
+                    if (this.allSetting.subEnable) {
+                        subPath = this.allSetting.subURI.length >0 ? new URL(this.allSetting.subURI).pathname : this.allSetting.subPath;
+                        if (subPath == '/sub/') alerts.push('{{ i18n "pages.settings.subSettings"}} {{ i18n "pages.settings.subPath"}}');
+                        subJsonPath = this.allSetting.subJsonURI.length >0 ? new URL(this.allSetting.subJsonURI).pathname : this.allSetting.subJsonPath;
+                        if (subJsonPath == '/json/') alerts.push('JSON {{ i18n "pages.settings.subPath"}}');
+                    }
+                    return alerts
+                }
+            }
+        },
         async mounted() {
             if (window.location.protocol !== "https:") {
                 this.showAlert = true;

web/html/xui/warp_modal.html

@@ -0,0 +1,204 @@
+{{define "warpModal"}}
+<a-modal id="warp-modal" v-model="warpModal.visible" title="Cloudflare WARP"
+         :confirm-loading="warpModal.confirmLoading" :closable="true" :mask-closable="true"
+         :footer="null" :class="themeSwitcher.currentTheme">
+    <template v-if="ObjectUtil.isEmpty(warpModal.warpData)">
+        <a-button icon="api" @click="register" :loading="warpModal.confirmLoading">{{ i18n "pages.inbounds.create" }}</a-button>
+    </template>
+    <template v-else>
+        <table style="margin: 5px 0; width: 100%;">
+            <tr class="client-table-odd-row">
+                <td>Access Token</td>
+                <td>[[ warpModal.warpData.access_token ]]</td>
+            </tr>
+            <tr>
+                <td>Device ID</td>
+                <td>[[ warpModal.warpData.device_id ]]</td>
+            </tr>
+            <tr class="client-table-odd-row">
+                <td>License Key</td>
+                <td>[[ warpModal.warpData.license_key ]]</td>
+            </tr>
+            <tr>
+                <td>Private Key</td>
+                <td>[[ warpModal.warpData.private_key ]]</td>
+            </tr>
+        </table>
+        <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-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>
+        <template v-if="!ObjectUtil.isEmpty(warpModal.warpConfig)">
+            <table style="width: 100%">
+                <tr class="client-table-odd-row">
+                    <td>Device Name</td>
+                    <td>[[ warpModal.warpConfig.name ]]</td>
+                </tr>
+                <tr>
+                    <td>Device Model</td>
+                    <td>[[ warpModal.warpConfig.model ]]</td>
+                </tr>
+                <tr class="client-table-odd-row">
+                    <td>Device Enabled</td>
+                    <td>[[ warpModal.warpConfig.enabled ]]</td>
+                </tr>
+            <template v-if="!ObjectUtil.isEmpty(warpModal.warpConfig.account)">
+                <tr>
+                    <td>Account Type</td>
+                    <td>[[ warpModal.warpConfig.account.account_type ]]</td>
+                </tr>
+                <tr class="client-table-odd-row">
+                    <td>Role</td>
+                    <td>[[ warpModal.warpConfig.account.role ]]</td>
+                </tr>
+                <tr>
+                    <td>WARP+ Data</td>
+                    <td>[[ sizeFormat(warpModal.warpConfig.account.premium_data) ]]</td>
+                </tr>
+                <tr class="client-table-odd-row">
+                    <td>Quota</td>
+                    <td>[[ sizeFormat(warpModal.warpConfig.account.quota) ]]</td>
+                </tr>
+                <tr v-if="!ObjectUtil.isEmpty(warpModal.warpConfig.account.usage)">
+                    <td>Usage</td>
+                    <td>[[ sizeFormat(warpModal.warpConfig.account.usage) ]]</td>
+                </tr>
+            </template>
+            </table>
+            <a-divider style="margin: 10px 0;">{{ i18n "pages.xray.outbound.outboundStatus" }}</a-divider>
+            <a-form :label-col="{ md: {span:8} }" :wrapper-col="{ md: {span:14} }">
+                    <template v-if="warpOutboundIndex>=0">
+                        <a-tag color="green" style="line-height: 31px;">{{ i18n "enabled" }}</a-tag>
+                        <a-button @click="resetOutbound" :loading="warpModal.confirmLoading" type="danger">{{ i18n "reset" }}</a-button>
+                    </template>
+                    <template v-else>
+                        <a-tag color="orange" style="line-height: 31px;">{{ i18n "disabled" }}</a-tag>
+                        <a-button @click="addOutbound" :loading="warpModal.confirmLoading" type="primary">{{ i18n "pages.xray.outbound.addOutbound" }}</a-button>
+                    </template>
+                </a-form-item>
+            </a-form>
+        </template>
+    </template>
+</a-modal>
+<script>
+
+    const warpModal = {
+        visible: false,
+        confirmLoading: false,
+        warpData: null,
+        warpConfig: null,
+        warpOutbound: null,
+        show() {
+            this.visible = true;
+            this.warpConfig = null;
+            this.getData();
+
+        },
+        close() {
+            this.visible = false;
+            this.loading(false);
+        },
+        loading(loading=true) {
+            this.confirmLoading = loading;
+        },
+        async getData(){
+            this.loading(true);
+            const msg = await HttpUtil.post('/xui/xray/warp/data');
+            this.loading(false);
+            if (msg.success) {
+                this.warpData = msg.obj.length>0 ? JSON.parse(msg.obj): null;
+            }
+        },
+    };
+
+    new Vue({
+        delimiters: ['[[', ']]'],
+        el: '#warp-modal',
+        data: {
+            warpModal: warpModal,
+            warpPlus: '',
+        },
+        methods: {
+            collectConfig() {
+                config = warpModal.warpConfig.config;
+                peer = config.peers[0];
+                if(config){
+                    warpModal.warpOutbound = Outbound.fromJson({
+                        tag: 'warp',
+                        protocol: Protocols.Wireguard,
+                        settings: {
+                            mtu: 1420,
+                            secretKey: warpModal.warpData.private_key,
+                            address: Object.values(config.interface.addresses),
+                            domainStrategy: 'ForceIP',
+                            peers: [{
+                                publicKey: peer.public_key,
+                                endpoint: peer.endpoint.host,
+                            }],
+                            kernelMode: false
+                        }
+                    });
+                }
+            },
+            async register(){
+                warpModal.loading(true);
+                keys = Wireguard.generateKeypair();
+                const msg = await HttpUtil.post('/xui/xray/warp/reg',keys);
+                if (msg.success) {
+                    resp = JSON.parse(msg.obj);
+                    warpModal.warpData = resp.data;
+                    warpModal.warpConfig = resp.config;
+                    this.collectConfig();
+                }
+                warpModal.loading(false);
+            },
+            async updateLicense(l){
+                warpModal.loading(true);
+                const msg = await HttpUtil.post('/xui/xray/warp/license',{license: l});
+                if (msg.success) {
+                    warpModal.warpData = JSON.parse(msg.obj);
+                    warpModal.warpConfig = null;
+                    this.warpPlus = '';
+                }
+                warpModal.loading(false);
+            },
+            async getConfig(){
+                warpModal.loading(true);
+                const msg = await HttpUtil.post('/xui/xray/warp/config');
+                warpModal.loading(false);
+                if (msg.success) {
+                    warpModal.warpConfig = JSON.parse(msg.obj);
+                    this.collectConfig();
+                }
+            },
+            addOutbound(){
+                app.templateSettings.outbounds.push(warpModal.warpOutbound.toJson());
+                app.outboundSettings = JSON.stringify(app.templateSettings.outbounds);
+                warpModal.close();
+            },
+            resetOutbound(){
+                app.templateSettings.outbounds[this.warpOutboundIndex] = warpModal.warpOutbound.toJson();
+                app.outboundSettings = JSON.stringify(app.templateSettings.outbounds);
+                warpModal.close();
+            }
+        },
+        computed: {
+            warpOutboundIndex: {
+                get: function() {
+                    return app.templateSettings ? app.templateSettings.outbounds.findIndex((o) => o.tag == 'warp') : -1;
+                }
+            }
+        }
+    });
+
+</script>
+{{end}}

web/html/xui/xray.html

@@ -3,10 +3,11 @@
 {{template "head" .}}
 <link rel="stylesheet" href="{{ .base_path }}assets/codemirror/codemirror.css">
 <link rel="stylesheet" href="{{ .base_path }}assets/codemirror/fold/foldgutter.css">
-<link rel="stylesheet" href="{{ .base_path }}assets/codemirror/xq.css">
+<link rel="stylesheet" href="{{ .base_path }}assets/codemirror/xq.css?{{ .cur_ver }}">
 <link rel="stylesheet" href="{{ .base_path }}assets/codemirror/lint/lint.css">
 
-<script src="{{ .base_path }}assets/js/model/outbound.js"></script>
+<script src="{{ .base_path }}assets/base64/base64.min.js"></script>
+<script src="{{ .base_path }}assets/js/model/outbound.js?{{ .cur_ver }}"></script>
 <script src="{{ .base_path }}assets/codemirror/codemirror.js"></script>
 <script src="{{ .base_path }}assets/codemirror/javascript.js"></script>
 <script src="{{ .base_path }}assets/codemirror/jshint.js"></script>
@@ -29,9 +30,14 @@
             margin: 0;
             padding: 12px .5rem;
         }
+        .ant-table-thead > tr > th,
+        .ant-table-tbody > tr > td {
+            padding: 10px 0px;
+        }
     }
 
     .ant-tabs-bar {
+        font-weight: bold;
         margin: 0;
     }
 
@@ -80,7 +86,7 @@
                                         <template slot="content">
                                             <p style="max-width: 400px" v-for="line in restartResult.split('\n')">[[ line ]]</p>
                                         </template>
-                                        <a-icon type="question-circle" theme="filled"></a-icon>
+                                        <a-icon type="question-circle"></a-icon>
                                     </a-popover>
                                 </a-space>
                             </a-col>
@@ -98,7 +104,7 @@
                             </a-col>
                         </a-row>
                     </a-card>
-                    <a-tabs default-active-key="1" @change="(activeKey) => { if(activeKey == 'tpl-4') this.changeCode(); }">
+                    <a-tabs default-active-key="1" @change="(activeKey) => { if(activeKey == 'tpl-advanced') this.changeCode(); }">
                         <a-tab-pane key="tpl-1" tab='{{ i18n "pages.xray.basicTemplate"}}' style="padding-top: 20px;">
                             <a-collapse>
                                 <a-collapse-panel header='{{ i18n "pages.xray.generalConfigs"}}'>
@@ -122,7 +128,7 @@
                                                     <a-select
                                                         v-model="freedomStrategy"
                                                         style="width: 100%" :dropdown-class-name="themeSwitcher.currentTheme">
-                                                        <a-select-option v-for="s in outboundDomainStrategies" :value="s">[[ s ]]</a-select-option>
+                                                        <a-select-option v-for="s in OutboundDomainStrategies" :value="s">[[ s ]]</a-select-option>
                                                     </a-select>
                                                 </template>
                                             </a-col>
@@ -135,13 +141,54 @@
                                                 description='{{ i18n "pages.xray.RoutingStrategyDesc" }}'/>
                                         </a-col>
                                         <a-col :lg="24" :xl="12">
-                                            <template>
+                                            <a-select
-                                                <a-select
+                                                v-model="routingStrategy"
-                                                    v-model="routingStrategy"
+                                                style="width: 100%" :dropdown-class-name="themeSwitcher.currentTheme">
-                                                    style="width: 100%" :dropdown-class-name="themeSwitcher.currentTheme">
+                                                <a-select-option v-for="s in routingDomainStrategies" :value="s">[[ s ]]</a-select-option>
-                                                    <a-select-option v-for="s in routingDomainStrategies" :value="s">[[ s ]]</a-select-option>
+                                            </a-select>
-                                                </a-select>
+                                        </a-col>
+                                    </a-row>
+                                </a-list-item>
+                                </a-collapse-panel>
+                                <a-collapse-panel header='{{ i18n "pages.xray.logConfigs" }}'>
+                                    <a-row :xs="24" :sm="24" :lg="12">
+                                        <a-alert type="warning" style="text-align: center;">
+                                            <template slot="message">
+                                                <a-icon type="exclamation-circle" theme="filled" style="color: #FFA031"></a-icon>
+                                                {{ i18n "pages.xray.logConfigsDesc" }}
                                             </template>
+                                        </a-alert>
+                                    </a-row>
+                                    <a-list-item>
+                                        <a-row style="padding: 20px">
+                                            <a-col :lg="24" :xl="12">
+                                                <a-list-item-meta title='Level'/>
+                                            </a-col>
+                                            <a-col :lg="24" :xl="12">
+                                                <template>
+                                                    <a-select
+                                                        v-model="logLevel"
+                                                        style="width: 100%" :dropdown-class-name="themeSwitcher.currentTheme">
+                                                        <a-select-option v-for="level in ['none', 'debug', 'info', 'warning', 'error']" :value="level">[[ level ]]</a-select-option>
+                                                    </a-select>
+                                                </template>
+                                            </a-col>
+                                        </a-row>
+                                    </a-list-item>
+                                    <a-row style="padding: 20px">
+                                        <a-col :lg="24" :xl="12">
+                                            <a-list-item-meta title='Access Logs' />
+                                        </a-col>
+                                        <a-col :lg="24" :xl="12">
+                                            <a-input v-model="logAccess"></a-input>
+                                        </a-col>
+                                    </a-row>
+                                    <a-row style="padding: 20px">
+                                        <a-col :lg="24" :xl="12">
+                                            <a-list-item-meta title='Error Logs' />
+                                        </a-col>
+                                        <a-col :lg="24" :xl="12">
+                                            <a-input v-model="logError"></a-input>
                                         </a-col>
                                     </a-row>
                                 </a-list-item>
@@ -204,6 +251,24 @@
                                     <setting-list-item type="switch" title='{{ i18n "pages.xray.GoogleIPv4"}}' desc='{{ i18n "pages.xray.GoogleIPv4Desc"}}' v-model="GoogleIPv4Settings"></setting-list-item>
                                     <setting-list-item type="switch" title='{{ i18n "pages.xray.NetflixIPv4"}}' desc='{{ i18n "pages.xray.NetflixIPv4Desc"}}' v-model="NetflixIPv4Settings"></setting-list-item>
                                 </a-collapse-panel>
+                                <a-collapse-panel header='{{ i18n "pages.xray.warpConfigs"}}'>
+                                    <a-row :xs="24" :sm="24" :lg="12">
+                                        <a-alert type="warning" style="text-align: center;">
+                                            <template slot="message">
+                                                <a-icon type="exclamation-circle" theme="filled" style="color: #FFA031"></a-icon>
+                                                {{ i18n "pages.xray.warpConfigsDesc" }}
+                                            </template>
+                                        </a-alert>
+                                    </a-row>
+                                    <template v-if="WarpExist">
+                                        <setting-list-item type="switch" title='{{ i18n "pages.xray.GoogleWARP"}}' desc='{{ i18n "pages.xray.GoogleWARPDesc"}}' v-model="GoogleWARPSettings"></setting-list-item>
+                                        <setting-list-item type="switch" title='{{ i18n "pages.xray.OpenAIWARP"}}' desc='{{ i18n "pages.xray.OpenAIWARPDesc"}}' v-model="OpenAIWARPSettings"></setting-list-item>
+                                        <setting-list-item type="switch" title='{{ i18n "pages.xray.NetflixWARP"}}' desc='{{ i18n "pages.xray.NetflixWARPDesc"}}' v-model="NetflixWARPSettings"></setting-list-item>
+                                        <setting-list-item type="switch" title='{{ i18n "pages.xray.SpotifyWARP"}}' desc='{{ i18n "pages.xray.SpotifyWARPDesc"}}' v-model="SpotifyWARPSettings"></setting-list-item>
+                                        <setting-list-item type="switch" title='{{ i18n "pages.xray.MetaWARP"}}' desc='{{ i18n "pages.xray.MetaWARPDesc"}}' v-model="MetaWARPSettings"></setting-list-item>
+                                    </template>
+                                    <a-button v-else style="margin: 10px 0;" @click="showWarp">WARP {{ i18n "pages.xray.rules.outbound" }}</a-button>
+                                </a-collapse-panel>
                                 <a-collapse-panel header='{{ i18n "pages.settings.resetDefaultConfig"}}'>
                                     <a-space direction="horizontal" style="padding: 0 20px">
                                         <a-button type="primary" @click="resetXrayConfigToDefault">{{ i18n "pages.settings.resetDefaultConfig" }}</a-button>
@@ -272,6 +337,14 @@
                                         [[ rule.outboundTag ]]
                                     </a-popover>
                                 </template>
+                                <template slot="balancer" slot-scope="text, rule, index">
+                                    <a-popover :overlay-class-name="themeSwitcher.currentTheme">
+                                        <template slot="content">
+                                            <p v-if="rule.balancerTag">Balancer Tag: [[ rule.balancerTag ]]</p>
+                                        </template>
+                                        [[ rule.balancerTag ]]
+                                    </a-popover>
+                                </template>
                                 <template slot="info" slot-scope="text, rule, index">
                                     <a-popover placement="bottomRight"
                                         v-if="(rule.source+rule.sourcePort+rule.network+rule.protocol+rule.attrs+rule.ip+rule.domain+rule.port).length>0"
@@ -310,6 +383,10 @@
                                                     <td>Port</td>
                                                     <td><a-tag color="green" v-for="r in rule.port.split(',')">[[ r ]]</a-tag></td>
                                                 </tr>
+                                                <tr v-if="rule.balancerTag">
+                                                    <td>Balancer Tag</td>
+                                                    <td><a-tag color="blue">[[ rule.balancerTag ]]</a-tag></td>
+                                                </tr>
                                             </table>
                                         </template>
                                         <a-button shape="round" size="small" style="font-size: 14px; padding: 0 10px;">
@@ -320,79 +397,196 @@
                             </a-table>
                         </a-tab-pane>
                         <a-tab-pane key="tpl-3" tab='{{ i18n "pages.xray.Outbounds"}}' style="padding-top: 20px;" force-render="true">
-                            <a-button type="primary" icon="plus" @click="addOutbound()">{{ i18n "pages.xray.outbound.addOutbound" }}</a-button>
+                            <a-button type="primary" icon="plus" @click="addOutbound()" style="margin-bottom: 10px;">{{ i18n "pages.xray.outbound.addOutbound" }}</a-button>
-                            <a-button type="primary" icon="plus" @click="addReverse()">{{ i18n "pages.xray.outbound.addReverse" }}</a-button>
+                            <a-button type="primary" @click="showWarp()" style="margin-bottom: 10px;">WARP</a-button>
-                            <a-row>
+                            <a-table :columns="outboundColumns" bordered
-                                <a-col :sm="24" :md="12">
+                            :row-key="r => r.key"
-                                    <p style="margin: 10px;">{{ i18n "pages.xray.Outbounds"}}</p>
+                            :data-source="outboundData"
-                                    <a-table :columns="outboundColumns" bordered
+                            :scroll="isMobile ? {} : { x: 200 }"
-                                    :row-key="r => r.key"
+                            :pagination="false"
-                                    :data-source="outboundData"
+                            :indent-size="0"
-                                    :scroll="isMobile ? {} : { x: 200 }"
+                            :style="isMobile ? 'padding: 5px 5px' : 'margin-right: 1px;'">
-                                    :pagination="false"
+                                <template slot="action" slot-scope="text, outbound, index">
-                                    :indent-size="0"
+                                    [[ index+1 ]]
-                                    :style="isMobile ? 'padding: 5px 5px' : 'margin-right: 1px;'">
+                                    <a-dropdown :trigger="['click']">
-                                        <template slot="action" slot-scope="text, outbound, index">
+                                        <a-icon @click="e => e.preventDefault()" type="more" style="font-size: 16px; text-decoration: bold;"></a-icon>
-                                            [[ index+1 ]]
+                                        <a-menu slot="overlay" :theme="themeSwitcher.currentTheme">
-                                            <a-dropdown :trigger="['click']">
+                                            <a-menu-item v-if="index>0" @click="setFirstOutbound(index)">
-                                                <a-icon @click="e => e.preventDefault()" type="more" style="font-size: 16px; text-decoration: bold;"></a-icon>
+                                                <a-icon type="vertical-align-top"></a-icon>
-                                                <a-menu slot="overlay" :theme="themeSwitcher.currentTheme">
+                                                {{ i18n "pages.xray.rules.first"}}
-                                                    <a-menu-item @click="editOutbound(index)">
+                                            </a-menu-item>
-                                                        <a-icon type="edit"></a-icon>
+                                            <a-menu-item @click="editOutbound(index)">
-                                                        {{ i18n "edit" }}
+                                                <a-icon type="edit"></a-icon>
-                                                    </a-menu-item>
+                                                {{ i18n "edit" }}
-                                                    <a-menu-item @click="deleteOutbound(index)">
+                                            </a-menu-item>
-                                                        <span style="color: #FF4D4F">
+                                            <a-menu-item @click="deleteOutbound(index)">
-                                                            <a-icon type="delete"></a-icon> {{ i18n "delete"}}
+                                                <span style="color: #FF4D4F">
-                                                        </span>
+                                                    <a-icon type="delete"></a-icon> {{ i18n "delete"}}
-                                                    </a-menu-item>
+                                                </span>
-                                                </a-menu>
+                                            </a-menu-item>
-                                            </a-dropdown>
+                                        </a-menu>
-                                        </template>
+                                    </a-dropdown>
-                                        <template slot="address" slot-scope="text, outbound, index">
+                                </template>
-                                            <p style="margin: 0 5px;" v-for="addr in findOutboundAddress(outbound)">[[ addr ]]</p>
+                                <template slot="address" slot-scope="text, outbound, index">
-                                        </template>
+                                    <p style="margin: 0 5px;" v-for="addr in findOutboundAddress(outbound)">[[ addr ]]</p>
-                                        <template slot="protocol" slot-scope="text, outbound, index">
+                                </template>
-                                            <a-tag style="margin:0;" color="purple">[[ outbound.protocol ]]</a-tag>
+                                <template slot="protocol" slot-scope="text, outbound, index">
-                                            <template v-if="[Protocols.VMess, Protocols.VLESS, Protocols.Trojan, Protocols.Shadowsocks].includes(outbound.protocol)">
+                                    <a-tag style="margin:0;" color="purple">[[ outbound.protocol ]]</a-tag>
-                                                <a-tag style="margin:0;" color="blue">[[ outbound.streamSettings.network ]]</a-tag>
+                                    <template v-if="[Protocols.VMess, Protocols.VLESS, Protocols.Trojan, Protocols.Shadowsocks].includes(outbound.protocol)">
-                                                <a-tag style="margin:0;" v-if="outbound.streamSettings.security=='tls'" color="green">tls</a-tag>
+                                        <a-tag style="margin:0;" color="blue">[[ outbound.streamSettings.network ]]</a-tag>
-                                                <a-tag style="margin:0;" v-if="outbound.streamSettings.security=='reality'" color="green">reality</a-tag>
+                                        <a-tag style="margin:0;" v-if="outbound.streamSettings.security=='tls'" color="green">tls</a-tag>
-                                            </template>
+                                        <a-tag style="margin:0;" v-if="outbound.streamSettings.security=='reality'" color="green">reality</a-tag>
-                                        </template>
+                                    </template>
-                                    </a-table>
+                                </template>
-                                </a-col>
+                            </a-table>
-                                <a-col :sm="24" :md="12" v-if="reverseData.length>0">
-                                    <p style="margin: 10px;">{{ i18n "pages.xray.outbound.reverse"}}</p>
-                                    <a-table :columns="reverseColumns" bordered
-                                    :row-key="r => r.key"
-                                    :data-source="reverseData"
-                                    :scroll="isMobile ? {} : { x: 200 }"
-                                    :pagination="false"
-                                    :indent-size="0"
-                                    :style="isMobile ? 'padding: 5px 0' : 'margin-left: 1px;'">
-                                        <template slot="action" slot-scope="text, reverse, index">
-                                            [[ index+1 ]]
-                                            <a-dropdown :trigger="['click']">
-                                                <a-icon @click="e => e.preventDefault()" type="more" style="font-size: 16px; text-decoration: bold;"></a-icon>
-                                                <a-menu slot="overlay" :theme="themeSwitcher.currentTheme">
-                                                    <a-menu-item @click="editReverse(index)">
-                                                        <a-icon type="edit"></a-icon>
-                                                        {{ i18n "edit" }}
-                                                    </a-menu-item>
-                                                    <a-menu-item @click="deleteReverse(index)">
-                                                        <span style="color: #FF4D4F">
-                                                            <a-icon type="delete"></a-icon> {{ i18n "delete"}}
-                                                        </span>
-                                                    </a-menu-item>
-                                                </a-menu>
-                                            </a-dropdown>
-                                        </template>
-                                    </a-table>
-                                </a-col>
-                            </a-row>
                         </a-tab-pane>
-                        <a-tab-pane key="tpl-4" tab='{{ i18n "pages.xray.advancedTemplate"}}' style="padding-top: 20px;" force-render="true">
+                        <a-tab-pane key="tpl-4" tab='{{ i18n "pages.xray.outbound.reverse"}}' style="padding-top: 20px;" force-render="true">
+                            <a-button type="primary" icon="plus" @click="addReverse()" style="margin-bottom: 10px;">{{ i18n "pages.xray.outbound.addReverse" }}</a-button>
+                            <a-table :columns="reverseColumns" bordered
+                            :row-key="r => r.key"
+                            :data-source="reverseData"
+                            :scroll="isMobile ? {} : { x: 200 }"
+                            :pagination="false"
+                            :indent-size="0"
+                            :style="isMobile ? 'padding: 5px 0' : 'margin-left: 1px;'">
+                                <template slot="action" slot-scope="text, reverse, index">
+                                    [[ index+1 ]]
+                                    <a-dropdown :trigger="['click']">
+                                        <a-icon @click="e => e.preventDefault()" type="more" style="font-size: 16px; text-decoration: bold;"></a-icon>
+                                        <a-menu slot="overlay" :theme="themeSwitcher.currentTheme">
+                                            <a-menu-item @click="editReverse(index)">
+                                                <a-icon type="edit"></a-icon>
+                                                {{ i18n "edit" }}
+                                            </a-menu-item>
+                                            <a-menu-item @click="deleteReverse(index)">
+                                                <span style="color: #FF4D4F">
+                                                    <a-icon type="delete"></a-icon> {{ i18n "delete"}}
+                                                </span>
+                                            </a-menu-item>
+                                        </a-menu>
+                                    </a-dropdown>
+                                </template>
+                            </a-table>
+                        </a-tab-pane>
+                        <a-tab-pane key="tpl-5" tab='{{ i18n "pages.xray.Balancers"}}' style="padding-top: 20px;" force-render="true">
+                            <a-button type="primary" icon="plus" @click="addBalancer()" style="margin-bottom: 10px;">{{ i18n "pages.xray.balancer.addBalancer"}}</a-button>
+                            <a-table :columns="balancerColumns" bordered v-if="balancersData.length>0"
+                            :row-key="r => r.key"
+                            :data-source="balancersData"
+                            :scroll="isMobile ? {} : { x: 200 }"
+                            :pagination="false"
+                            :indent-size="0"
+                            :style="isMobile ? 'padding: 5px 0' : 'margin-left: 1px;'">
+                                <template slot="action" slot-scope="text, balancer, index">
+                                    [[ index+1 ]]
+                                    <a-dropdown :trigger="['click']">
+                                        <a-icon @click="e => e.preventDefault()" type="more" style="font-size: 16px; text-decoration: bold;"></a-icon>
+                                        <a-menu slot="overlay" :theme="themeSwitcher.currentTheme">
+                                            <a-menu-item @click="editBalancer(index)">
+                                                <a-icon type="edit"></a-icon>
+                                                {{ i18n "edit" }}
+                                            </a-menu-item>
+                                            <a-menu-item @click="deleteBalancer(index)">
+                                                <span style="color: #FF4D4F">
+                                                    <a-icon type="delete"></a-icon> {{ i18n "delete"}}
+                                                </span>
+                                            </a-menu-item>
+                                        </a-menu>
+                                    </a-dropdown>
+                                </template>
+                                <template slot="strategy" slot-scope="text, balancer, index">
+                                    <a-tag style="margin:0;" v-if="balancer.strategy=='random'" color="purple">Random</a-tag>
+                                    <a-tag style="margin:0;" v-if="balancer.strategy=='roundRobin'" color="green">Round Robin</a-tag>
+                                </template>
+                                <template slot="selector" slot-scope="text, balancer, index">
+                                    <a-tag class="info-large-tag" style="margin:1;" v-for="sel in balancer.selector">[[ sel ]]</a-tag>
+                                </template>
+                            </a-table>                            
+                        </a-tab-pane>
+                        <a-tab-pane key="tpl-6" tab='DNS' style="padding-top: 20px;" force-render="true">
+                            <setting-list-item type="switch" title='{{ i18n "pages.xray.dns.enable" }}' desc='{{ i18n "pages.xray.dns.enableDesc" }}' v-model="enableDNS"></setting-list-item>
+                            <template v-if="enableDNS">
+                                <a-list-item>
+                                    <a-row style="padding: 20px">
+                                        <a-col :lg="24" :xl="12">
+                                            <a-list-item-meta title='{{ i18n "pages.xray.dns.strategy" }}' description='{{ i18n "pages.xray.dns.strategyDesc" }}' />
+                                        </a-col>
+                                        <a-col :lg="24" :xl="12">
+                                            <a-select
+                                                v-model="dnsStrategy"
+                                                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-col>
+                                    </a-row>
+                                </a-list-item>
+                                <a-divider>DNS</a-divider>
+                                <a-button type="primary" icon="plus" @click="addDNSServer()" style="margin-bottom: 10px;">{{ i18n "pages.xray.dns.add" }}</a-button>
+                                <a-table :columns="dnsColumns" bordered v-if="dnsServers.length>0"
+                                :row-key="r => r.key"
+                                :data-source="dnsServers"
+                                :scroll="isMobile ? {} : { x: 200 }"
+                                :pagination="false"
+                                :indent-size="0"
+                                :style="isMobile ? 'padding: 5px 0' : 'margin-left: 1px;'">
+                                    <template slot="action" slot-scope="text,dns,index">
+                                        [[ index+1 ]]
+                                        <a-dropdown :trigger="['click']">
+                                            <a-icon @click="e => e.preventDefault()" type="more" style="font-size: 16px; text-decoration: bold;"></a-icon>
+                                            <a-menu slot="overlay" :theme="themeSwitcher.currentTheme">
+                                                <a-menu-item @click="editDNSServer(index)">
+                                                    <a-icon type="edit"></a-icon>
+                                                    {{ i18n "edit" }}
+                                                </a-menu-item>
+                                                <a-menu-item @click="deleteDNSServer(index)">
+                                                    <span style="color: #FF4D4F">
+                                                        <a-icon type="delete"></a-icon> {{ i18n "delete"}}
+                                                    </span>
+                                                </a-menu-item>
+                                            </a-menu>
+                                        </a-dropdown>
+                                    </template>
+                                    <template slot="address" slot-scope="dns,index">
+                                        <span v-if="typeof dns == 'object'">[[ dns.address ]]</span>
+                                        <span v-else>[[ dns ]]</span>
+                                    </template>
+                                    <template slot="domain" slot-scope="dns,index">
+                                        <span v-if="typeof dns == 'object'">[[ dns.domains.join(",") ]]</span>
+                                    </template>
+                                </a-table>
+                                <a-divider>Fake DNS</a-divider>
+                                <a-button type="primary" icon="plus" @click="addFakedns()" style="margin-bottom: 10px;">{{ i18n "pages.xray.fakedns.add" }}</a-button>
+                                <a-table :columns="fakednsColumns" bordered v-if="fakeDns && fakeDns.length>0"
+                                :row-key="r => r.key"
+                                :data-source="fakeDns"
+                                :scroll="isMobile ? {} : { x: 200 }"
+                                :pagination="false"
+                                :indent-size="0"
+                                :style="isMobile ? 'padding: 5px 0' : 'margin-left: 1px;'">
+                                    <template slot="action" slot-scope="text,fakedns,index">
+                                        [[ index+1 ]]
+                                        <a-dropdown :trigger="['click']">
+                                            <a-icon @click="e => e.preventDefault()" type="more" style="font-size: 16px; text-decoration: bold;"></a-icon>
+                                            <a-menu slot="overlay" :theme="themeSwitcher.currentTheme">
+                                                <a-menu-item @click="editFakedns(index)">
+                                                    <a-icon type="edit"></a-icon>
+                                                    {{ i18n "edit" }}
+                                                </a-menu-item>
+                                                <a-menu-item @click="deleteFakedns(index)">
+                                                    <span style="color: #FF4D4F">
+                                                        <a-icon type="delete"></a-icon> {{ i18n "delete"}}
+                                                    </span>
+                                                </a-menu-item>
+                                            </a-menu>
+                                        </a-dropdown>
+                                    </template>
+                                </a-table>
+                            </template>
+                        </a-tab-pane>
+                        <a-tab-pane key="tpl-advanced" tab='{{ i18n "pages.xray.advancedTemplate"}}' style="padding-top: 20px;" force-render="true">
                             <a-list-item-meta title='{{ i18n "pages.xray.Template"}}' description='{{ i18n "pages.xray.TemplateDesc"}}'></a-list-item-meta>
                             <a-radio-group v-model="advSettings" @change="changeCode" button-style="solid" style="margin: 10px 0;" :size="isMobile ? 'small' : ''">
                                 <a-radio-button value="xraySetting">{{ i18n "pages.xray.completeTemplate"}}</a-radio-button>
@@ -414,12 +608,16 @@
 {{template "ruleModal"}}
 {{template "outModal"}}
 {{template "reverseModal"}}
+{{template "balancerModal"}}
+{{template "dnsModal"}}
+{{template "fakednsModal"}}
+{{template "warpModal"}}
 <script>
     const rulesColumns = [
         { title: "#", align: 'center', width: 15, scopedSlots: { customRender: 'action' } },
         { title: '{{ i18n "pages.xray.rules.source"}}', children: [
             { title: 'IP', dataIndex: "source", align: 'center', width: 20, ellipsis: true },
-            { title: 'port', dataIndex: 'sourcePort', align: 'center', width: 10, ellipsis: true } ]},
+            { title: 'Port', dataIndex: 'sourcePort', align: 'center', width: 10, ellipsis: true } ]},
         { title: '{{ i18n "pages.inbounds.network"}}', children: [
             { title: 'L4', dataIndex: 'network', align: 'center', width: 10 },
             { title: 'Protocol', dataIndex: 'protocol', align: 'center', width: 10, ellipsis: true },
@@ -430,8 +628,9 @@
             { title: 'Port', dataIndex: 'port', align: 'center', width: 10, ellipsis: true }]},
         { title: '{{ i18n "pages.xray.rules.inbound"}}', children: [
             { title: 'Inbound Tag', dataIndex: 'inboundTag', align: 'center', width: 20, ellipsis: true },
-            { title: 'User email', dataIndex: 'user', align: 'center', width: 20, ellipsis: true }]},
+            { title: 'Client Email', dataIndex: 'user', align: 'center', width: 20, ellipsis: true }]},
         { title: '{{ i18n "pages.xray.rules.outbound"}}', dataIndex: 'outboundTag', align: 'center', width: 20 },
+        { title: '{{ i18n "pages.xray.rules.balancer"}}', dataIndex: 'balancerTag', align: 'center', width: 15 },
     ];
 
     const rulesMobileColumns = [
@@ -455,6 +654,25 @@
         { title: '{{ i18n "pages.xray.outbound.domain"}}', dataIndex: 'domain', align: 'center', width: 50 },
     ];
 
+    const balancerColumns = [
+        { title: "#", align: 'center', width: 20, scopedSlots: { customRender: 'action' } },
+        { title: '{{ i18n "pages.xray.balancer.tag"}}', dataIndex: 'tag', align: 'center', width: 50 },
+        { title: '{{ i18n "pages.xray.balancer.balancerStrategy"}}', align: 'center', width: 50, scopedSlots: { customRender: 'strategy' }},
+        { title: '{{ i18n "pages.xray.balancer.balancerSelectors"}}', align: 'center', width: 100, scopedSlots: { customRender: 'selector' }},
+    ];
+
+    const dnsColumns = [
+        { title: "#", align: 'center', width: 20, scopedSlots: { customRender: 'action' } },
+        { title: '{{ i18n "pages.xray.outbound.address"}}', align: 'center', width: 50, scopedSlots: { customRender: 'address' } },
+        { title: '{{ i18n "pages.xray.dns.domains"}}', align: 'center', width: 50, scopedSlots: { customRender: 'domain' } },
+    ];
+
+    const fakednsColumns = [
+        { title: "#", align: 'center', width: 20, scopedSlots: { customRender: 'action' } },
+        { title: '{{ i18n "pages.xray.fakedns.ipPool"}}', dataIndex: 'ipPool', align: 'center', width: 50 },
+        { title: '{{ i18n "pages.xray.fakedns.poolSize"}}', dataIndex: 'poolSize', align: 'center', width: 50 },
+    ];
+
     const app = new Vue({
         delimiters: ['[[', ']]'],
         el: '#app',
@@ -512,7 +730,7 @@
                 ips: {
                     local: ["geoip:private"],
                     cn: ["geoip:cn"],
-                    ir: ["ext:geoip_IR.dat:ir","ext:geoip_IR.dat:arvancloud","ext:geoip_IR.dat:derakcloud","ext:geoip_IR.dat:iranserver"],
+                    ir: ["ext:geoip_IR.dat:ir"],
                     ru: ["geoip:ru"],
                 },
                 domains: {
@@ -520,8 +738,11 @@
                         "geosite:category-ads-all",
                         "ext:geosite_IR.dat:category-ads-all"
                     ],
+                    openai: ["geosite:openai"],
                     google: ["geosite:google"],
+                    spotify: ["geosite:spotify"],
                     netflix: ["geosite:netflix"],
+                    meta: ["geosite:meta"],
                     cn: [
                         "geosite:cn",
                         "regexp:.*\\.cn$"
@@ -533,17 +754,17 @@
                     ir: [
                         "regexp:.*\\.ir$",
                         "regexp:.*\\.xn--mgba3a4f16a$",  // .ایران
-                        "ext:geosite_IR.dat:ir"  // have rules to bypass all .ir domains.
+                        "ext:geosite_IR.dat:ir"
                     ]
                 },
                 familyProtectDNS: {
                     "servers": [
-                        "1.1.1.3",
+                        "1.1.1.3",  // https://developers.cloudflare.com/1.1.1.1/setup/
                         "1.0.0.3",
-                        "94.140.14.15",
+                        "2606:4700:4700::1113",
-                        "94.140.15.16"
+                        "2606:4700:4700::1003"
                     ],
-                    "queryStrategy": "UseIPv4"
+                    "queryStrategy": "UseIP"
                 },
             }
         },
@@ -702,6 +923,8 @@
                         break;
                     case Protocols.DNS:
                         return [o.settings.address + ':' + o.settings.port];
+                    case Protocols.Wireguard:
+                        return o.settings.peers.map(peer => peer.endpoint);
                     default:
                         return null;
                 }
@@ -742,6 +965,11 @@
                 outbounds.splice(index,1);
                 this.outboundSettings = JSON.stringify(outbounds);
             },
+            setFirstOutbound(index){
+                outbounds = this.templateSettings.outbounds;
+                outbounds.splice(0, 0, outbounds.splice(index, 1)[0]);
+                this.outboundSettings = JSON.stringify(outbounds);
+            },
             addReverse(){
                 reverseModal.show({
                     title: '{{ i18n "pages.xray.outbound.addReverse"}}',
@@ -777,17 +1005,27 @@
                     confirm: (reverse, rules) => {
                         reverseModal.loading();
                         if(reverse.tag.length > 0){
-                            oldtag = this.reverseData[index].tag;
+                            oldData = this.reverseData[index];
-                            this.deleteReverse(index);
                             newTemplateSettings = this.templateSettings;
-                            if(newTemplateSettings.reverse == undefined) newTemplateSettings.reverse = {};
+                            oldReverseIndex = newTemplateSettings.reverse[oldData.type+'s'].findIndex(rs => rs.tag == oldData.tag);
-                            if(newTemplateSettings.reverse[reverse.type+'s']  == undefined) newTemplateSettings.reverse[reverse.type+'s'] = [];
+                            oldRuleIndex0 = oldRules.length>0 ? newTemplateSettings.routing.rules.findIndex(r => JSON.stringify(r) == JSON.stringify(oldRules[0])) : -1;
-                            newTemplateSettings.reverse[reverse.type+'s'].push({ tag: reverse.tag, domain: reverse.domain });
+                            oldRuleIndex1 = oldRules.length==2 ? newTemplateSettings.routing.rules.findIndex(r => JSON.stringify(r) == JSON.stringify(oldRules[1])) : -1;
+                            if(oldData.type == reverse.type){
+                                newTemplateSettings.reverse[oldData.type + 's'][oldReverseIndex] = { tag: reverse.tag, domain: reverse.domain };
+                            } else {
+                                newTemplateSettings.reverse[oldData.type+'s'].splice(oldReverseIndex,1);
+                                // delete empty object
+                                if(newTemplateSettings.reverse[oldData.type+'s'].length == 0) Reflect.deleteProperty(newTemplateSettings.reverse, oldData.type+'s');
+                                // add other type of reverse if it is not exist
+                                if(!newTemplateSettings.reverse[reverse.type+'s']) newTemplateSettings.reverse[reverse.type+'s'] = [];
+                                newTemplateSettings.reverse[reverse.type+'s'].push({ tag: reverse.tag, domain: reverse.domain });
+                            }
                             this.templateSettings = newTemplateSettings;
 
                             // Adjust Rules
-                            newRules = this.templateSettings.routing.rules.filter(r => r.outboundTag != oldtag && (r.inboundTag && !r.inboundTag.includes(oldtag)));
+                            newRules = this.templateSettings.routing.rules;
-                            newRules.push(...rules)
+                            oldRuleIndex0 != -1 ? newRules[oldRuleIndex0] = rules[0] : newRules.push(rules[0]);
+                            oldRuleIndex1 != -1 ? newRules[oldRuleIndex1] = rules[1] : newRules.push(rules[1]);
                             this.routingRuleSettings = JSON.stringify(newRules);
                         }
                         reverseModal.close();
@@ -802,14 +1040,170 @@
                 realIndex = reverseTypeObj.findIndex(r => r.tag==oldData.tag && r.domain==oldData.domain);
                 newTemplateSettings.reverse[oldData.type+'s'].splice(realIndex,1);
 
+                // delete empty objects
                 if(reverseTypeObj.length == 0) Reflect.deleteProperty(newTemplateSettings.reverse, oldData.type+'s');
                 if(Object.keys(newTemplateSettings.reverse).length === 0) Reflect.deleteProperty(newTemplateSettings, 'reverse');
 
-                newRules = newTemplateSettings.routing.rules.filter(r => r.outboundTag != oldData.tag && (r.inboundTag && !r.inboundTag.includes(oldData.tag)));
+                // delete related routing rules
+                newRules = newTemplateSettings.routing.rules;
+                if(oldData.type == "bridge"){
+                    newRules = newTemplateSettings.routing.rules.filter(r => !( r.inboundTag && r.inboundTag.length == 1 && r.inboundTag[0] == oldData.tag));
+                } else if(oldData.type == "portal"){
+                    newRules = newTemplateSettings.routing.rules.filter(r => r.outboundTag != oldData.tag);
+                }
                 newTemplateSettings.routing.rules = newRules;
                 
                 this.templateSettings = newTemplateSettings;
             },
+            addBalancer() {
+                balancerModal.show({
+                    title: '{{ i18n "pages.xray.balancer.addBalancer"}}',
+                    okText: '{{ i18n "pages.xray.balancer.addBalancer"}}',
+                    balancerTags: this.balancersData.filter((o) => !ObjectUtil.isEmpty(o.tag)).map(obj => obj.tag),
+                    balancer: {
+                        tag: '',
+                        strategy: 'random',
+                        selector: []
+                    },
+                    confirm: (balancer) => {
+                        balancerModal.loading();
+                        newTemplateSettings = this.templateSettings;
+                        if (newTemplateSettings.routing.balancers == undefined) {
+                            newTemplateSettings.routing.balancers = [];
+                        }
+                        let tmpBalancer = {
+                            'tag': balancer.tag,
+                            'selector': balancer.selector
+                        };
+                        if (balancer.strategy == 'roundRobin') {
+                            tmpBalancer.strategy = {
+                                'type': balancer.strategy
+                            };
+                        }
+                        newTemplateSettings.routing.balancers.push(tmpBalancer);
+                        this.templateSettings = newTemplateSettings;
+                        balancerModal.close();
+                    },
+                    isEdit: false
+                });
+            },
+            editBalancer(index) {
+                const oldTag = this.balancersData[index].tag;
+                balancerModal.show({
+                    title: '{{ i18n "pages.xray.balancer.editBalancer"}}',
+                    okText: '{{ i18n "sure" }}',
+                    balancerTags: this.balancersData.filter((o) => !ObjectUtil.isEmpty(o.tag)).map(obj => obj.tag),
+                    balancer: this.balancersData[index],
+                    confirm: (balancer) => {
+                        balancerModal.loading();
+                        newTemplateSettings = this.templateSettings;
+
+                        let tmpBalancer = {
+                            'tag': balancer.tag,
+                            'selector': balancer.selector
+                        };
+                        if (balancer.strategy == 'roundRobin') {
+                            tmpBalancer.strategy = {
+                                'type': balancer.strategy
+                            };
+                        }
+
+                        newTemplateSettings.routing.balancers[index] = tmpBalancer;
+                        // change edited tag if used in rule section
+                        if (oldTag != balancer.tag) {
+                            newTemplateSettings.routing.rules.forEach((rule) => {
+                                if (rule.balancerTag && rule.balancerTag == oldTag) {
+                                    rule.balancerTag = balancer.tag;
+                                }
+                            });
+                        }
+                        this.templateSettings = newTemplateSettings;
+                        balancerModal.close();
+                    },
+                    isEdit: true
+                });
+            },
+            deleteBalancer(index) {
+                newTemplateSettings = this.templateSettings;
+
+                //remove from balancers
+                const oldTag = this.balancersData[index].tag;
+                this.balancersData.splice(index, 1);
+
+                // remove from settings
+                let realIndex = newTemplateSettings.routing.balancers.findIndex((b) => b.tag == oldTag);
+                newTemplateSettings.routing.balancers.splice(realIndex, 1);
+
+                // remove related routing rules
+                let rules = [];
+                newTemplateSettings.routing.rules.forEach((r) => {
+                    if (!r.balancerTag || r.balancerTag != oldTag) {
+                        rules.push(r);
+                    }
+                });
+                newTemplateSettings.routing.rules = rules;
+                this.templateSettings = newTemplateSettings;
+            },
+            addDNSServer(){
+                dnsModal.show({
+                    title: '{{ i18n "pages.xray.dns.add" }}',
+                    confirm: (dnsServer) => {
+                        dnsServers = this.dnsServers;
+                        dnsServers.push(dnsServer);
+                        this.dnsServers = dnsServers;
+                        dnsModal.close();
+                    },
+                    isEdit: false
+                });
+            },
+            editDNSServer(index){
+                dnsModal.show({
+                    title: '{{ i18n "pages.xray.dns.edit" }} #' + (index+1),
+                    dnsServer: this.dnsServers[index],
+                    confirm: (dnsServer) => {
+                        dnsServers = this.dnsServers;
+                        dnsServers[index] = dnsServer;
+                        this.dnsServers = dnsServers;
+                        dnsModal.close();
+                    },
+                    isEdit: true
+                });
+            },
+            deleteDNSServer(index){
+                newDnsServers = this.dnsServers;
+                newDnsServers.splice(index,1);
+                this.dnsServers = newDnsServers;
+            },
+            addFakedns() {
+                fakednsModal.show({
+                    title: '{{ i18n "pages.xray.fakedns.add" }}',
+                    confirm: (item) => {
+                        fakeDns = this.fakeDns?? [];
+                        fakeDns.push(item);
+                        this.fakeDns = fakeDns;
+                        fakednsModal.close();
+                    },
+                    isEdit: false
+                });
+            },
+            editFakedns(index){
+                fakednsModal.show({
+                    title: '{{ i18n "pages.xray.fakedns.edit" }} #' + (index+1),
+                    fakeDns: this.fakeDns[index],
+                    confirm: (item) => {
+                        fakeDns = this.fakeDns;
+                        fakeDns[index] = item;
+                        this.fakeDns = fakeDns;
+                        fakednsModal.close();
+                    },
+                    isEdit: true
+                });
+            },
+            deleteFakedns(index){
+                fakeDns = this.fakeDns;
+                fakeDns.splice(index,1);
+                this.fakeDns = fakeDns;
+            },
             addRule(){
                 ruleModal.show({
                     title: '{{ i18n "pages.xray.rules.add"}}',
@@ -850,6 +1244,9 @@
                 rules = this.templateSettings.routing.rules;
                 rules.splice(index,1);
                 this.routingRuleSettings = JSON.stringify(rules);
+            },
+            showWarp(){
+                warpModal.show();
             }
         },
         async mounted() {
@@ -868,6 +1265,38 @@
                 get: function () { return this.xraySetting ? JSON.parse(this.xraySetting) : null; },
                 set: function (newValue) { this.xraySetting = JSON.stringify(newValue, null, 2); },
             },
+            logSettings: {
+                get: function () { return this.templateSettings ? this.templateSettings.log : {}; },
+                set: function (newValue) {
+                    newTemplateSettings = this.templateSettings;
+                    newTemplateSettings.log = newValue;
+                    this.templateSettings = newTemplateSettings;
+                },
+            },
+            logLevel: {
+                get: function () { return this.logSettings?.loglevel?? 'none'; },
+                set: function (newValue) {
+                    newLogSettings = this.logSettings;
+                    newLogSettings.loglevel = newValue;
+                    this.logSettings = newLogSettings;
+                 },
+            },
+            logAccess: {
+                get: function () { return this.logSettings?.access?? ''; },
+                set: function (newValue) {
+                    newLogSettings = this.logSettings;
+                    newValue == "" ? delete newLogSettings.access : newLogSettings.access = newValue;
+                    this.logSettings = newLogSettings;
+                 },
+            },
+            logError: {
+                get: function () { return this.logSettings?.error?? ''; },
+                set: function (newValue) {
+                    newLogSettings = this.logSettings;
+                    newValue == "" ? delete newLogSettings.error : newLogSettings.error = newValue;
+                    this.logSettings = newLogSettings;
+                 },
+            },
             inboundSettings: {
                 get: function () { return this.templateSettings ? JSON.stringify(this.templateSettings.inbounds, null, 2) : null; },
                 set: function (newValue) {
@@ -942,6 +1371,27 @@
                     return data;
                 }
             },
+            balancersData: {
+                get: function () {
+                    data = []
+                    if (this.templateSettings != null && this.templateSettings.routing != null && this.templateSettings.routing.balancers != null) {
+                        this.templateSettings.routing.balancers.forEach((o, index) => {
+                            let strategy = "random"
+                            if (o.strategy && o.strategy.type == "roundRobin") {
+                                strategy = o.strategy.type
+                            }
+
+                            data.push({ 
+                                'key': index,
+                                'tag': o.tag ? o.tag : "",
+                                'strategy': strategy,
+                                'selector': o.selector ? o.selector : []
+                            });
+                        });
+                    }
+                    return data;
+                }
+            },
             freedomStrategy: {
                 get: function () {
                     if (!this.templateSettings) return "AsIs";
@@ -1025,6 +1475,14 @@
                     this.syncRulesWithOutbound("IPv4", this.ipv4Settings);
                 }
             },
+            warpDomains: {
+                get: function () {
+                    return this.templateRuleGetter({ outboundTag: "warp", property: "domain" });
+                },
+                set: function (newValue) {
+                    this.templateRuleSetter({ outboundTag: "warp", property: "domain", data: newValue });
+                }
+            },
             torrentSettings: {
                 get: function () {
                     return doAllItemsExist(this.settingsData.protocols.bittorrent, this.blockedProtocols);
@@ -1064,14 +1522,14 @@
             familyProtectSettings: {
                 get: function () {
                     if (!this.templateSettings || !this.templateSettings.dns || !this.templateSettings.dns.servers) return false;
-                    return doAllItemsExist(this.templateSettings.dns.servers, this.settingsData.familyProtectDNS.servers);
+                    return doAllItemsExist(this.settingsData.familyProtectDNS.servers, this.templateSettings.dns.servers);
                 },
                 set: function (newValue) {
                     newTemplateSettings = this.templateSettings;
                     if (newValue) {
                         newTemplateSettings.dns = this.settingsData.familyProtectDNS;
                     } else {
-                        delete newTemplateSettings.dns;
+                        newTemplateSettings.dns.servers = newTemplateSettings.dns?.servers?.filter(data => !this.settingsData.familyProtectDNS.servers.includes(data))
                     }
                     this.templateSettings = newTemplateSettings;
                 },
@@ -1244,6 +1702,107 @@
                     }
                 }
             },
+            WarpExist: {
+                get: function() {
+                    return this.templateSettings ? this.templateSettings.outbounds.findIndex((o) => o.tag == "warp")>=0  : false;
+                },
+            },
+            GoogleWARPSettings: {
+                get: function () {
+                    return doAllItemsExist(this.settingsData.domains.google, this.warpDomains);
+                },
+                set: function (newValue) {
+                    if (newValue) {
+                        this.warpDomains = [...this.warpDomains, ...this.settingsData.domains.google];
+                    } else {
+                        this.warpDomains = this.warpDomains.filter(data => !this.settingsData.domains.google.includes(data));
+                    }
+                },
+            },
+            OpenAIWARPSettings: {
+                get: function () {
+                    return doAllItemsExist(this.settingsData.domains.openai, this.warpDomains);
+                },
+                set: function (newValue) {
+                    if (newValue) {
+                        this.warpDomains = [...this.warpDomains, ...this.settingsData.domains.openai];
+                    } else {
+                        this.warpDomains = this.warpDomains.filter(data => !this.settingsData.domains.openai.includes(data));
+                    }
+                },
+            },
+            NetflixWARPSettings: {
+                get: function () {
+                    return doAllItemsExist(this.settingsData.domains.netflix, this.warpDomains);
+                },
+                set: function (newValue) {
+                    if (newValue) {
+                        this.warpDomains = [...this.warpDomains, ...this.settingsData.domains.netflix];
+                    } else {
+                        this.warpDomains = this.warpDomains.filter(data => !this.settingsData.domains.netflix.includes(data));
+                    }
+                },
+            },
+            MetaWARPSettings: {
+                get: function () {
+                    return doAllItemsExist(this.settingsData.domains.meta, this.warpDomains);
+                },
+                set: function (newValue) {
+                    if (newValue) {
+                        this.warpDomains = [...this.warpDomains, ...this.settingsData.domains.meta];
+                    } else {
+                        this.warpDomains = this.warpDomains.filter(data => !this.settingsData.domains.meta.includes(data));
+                    }
+                },
+            },
+            SpotifyWARPSettings: {
+                get: function () {
+                    return doAllItemsExist(this.settingsData.domains.spotify, this.warpDomains);
+                },
+                set: function (newValue) {
+                    if (newValue) {
+                        this.warpDomains = [...this.warpDomains, ...this.settingsData.domains.spotify];
+                    } else {
+                        this.warpDomains = this.warpDomains.filter(data => !this.settingsData.domains.spotify.includes(data));
+                    }
+                },
+            },
+            enableDNS: {
+                get: function () {
+                    return this.templateSettings ? this.templateSettings.dns != null : false;
+                },
+                set: function (newValue) {
+                    newTemplateSettings = this.templateSettings;
+                    newTemplateSettings.dns =  newValue ? { servers: [], queryStrategy: "UseIP" } : null;
+                    this.templateSettings = newTemplateSettings;
+                }
+            },
+            dnsStrategy: {
+                get: function () {
+                    return this.enableDNS ? this.templateSettings.dns.queryStrategy : null;
+                },
+                set: function (newValue) {
+                    newTemplateSettings = this.templateSettings;
+                    newTemplateSettings.dns.queryStrategy =  newValue;
+                    this.templateSettings = newTemplateSettings;
+                }
+            },
+            dnsServers: {
+                get: function () { return this.enableDNS ? this.templateSettings.dns.servers : []; },
+                set: function (newValue) {
+                    newTemplateSettings = this.templateSettings;
+                    newTemplateSettings.dns.servers =  newValue;
+                    this.templateSettings = newTemplateSettings;
+                }
+            },
+            fakeDns: {
+                get: function () { return this.templateSettings && this.templateSettings.fakedns ? this.templateSettings.fakedns : []; },
+                set: function (newValue) {
+                    newTemplateSettings = this.templateSettings;
+                    newTemplateSettings.fakedns = newValue.length >0 ? newValue : null;
+                    this.templateSettings = newTemplateSettings;
+                }
+            }
         },
 });
 </script>

web/html/xui/xray_balancer_modal.html

@@ -0,0 +1,111 @@
+{{define "balancerModal"}}
+<a-modal 
+    id="balancer-modal"
+    v-model="balancerModal.visible"
+    :title="balancerModal.title"
+    @ok="balancerModal.ok"
+    :confirm-loading="balancerModal.confirmLoading"
+    :ok-button-props="{ props: { disabled: !balancerModal.isValid } }"
+    :closable="true"
+    :mask-closable="false"
+    :ok-text="balancerModal.okText"
+    cancel-text='{{ i18n "close" }}'
+    :class="themeSwitcher.currentTheme">
+    <a-form :colon="false" :label-col="{ md: {span:6} }" :wrapper-col="{ md: {span:14} }">
+        <a-form-item label='{{ i18n "pages.xray.balancer.tag" }}' has-feedback
+            :validate-status="balancerModal.duplicateTag? 'warning' : 'success'">
+            <a-input v-model.trim="balancerModal.balancer.tag" @change="balancerModal.check()"
+                placeholder='{{ i18n "pages.xray.balancer.tagDesc" }}'></a-input>
+        </a-form-item>
+        <a-form-item label='{{ i18n "pages.xray.balancer.balancerStrategy" }}'>
+            <a-select v-model="balancerModal.balancer.strategy" :dropdown-class-name="themeSwitcher.currentTheme">
+                <a-select-option value="random">Random</a-select-option>
+                <a-select-option value="roundRobin">Round Robin</a-select-option>
+            </a-select>
+        </a-form-item>
+        <a-form-item label='{{ i18n "pages.xray.balancer.balancerSelectors" }}' has-feedback :validate-status="balancerModal.emptySelector? 'warning' : 'success'">
+            <a-select v-model="balancerModal.balancer.selector" mode="tags" @change="balancerModal.checkSelector()"
+                :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>
+<script>
+    const balancerModal = {
+        title: '',
+        visible: false,
+        confirmLoading: false,
+        okText: '{{ i18n "sure" }}',
+        isEdit: false,
+        confirm: null,
+        duplicateTag: false,
+        emptySelector: false,
+        balancer: {
+            tag: '',
+            strategy: 'random',
+            selector: []
+        },
+        outboundTags: [],
+        balancerTags:[],
+        ok() {
+            if (balancerModal.balancer.selector.length == 0) {
+                balancerModal.emptySelector = true;
+                return;
+            }
+            balancerModal.emptySelector = false;
+            ObjectUtil.execute(balancerModal.confirm, balancerModal.balancer);
+        },
+        show({ title = '', okText = '{{ i18n "sure" }}', balancerTags = [], balancer, confirm = (balancer) => { }, isEdit = false }) {
+            this.title = title;
+            this.okText = okText;
+            this.confirm = confirm;
+            this.visible = true;
+            if (isEdit) {
+                balancerModal.balancer = balancer;
+            } else {
+                balancerModal.balancer = {
+                    tag: '',
+                    strategy: 'random',
+                    selector: []
+                };
+            }
+            this.balancerTags = balancerTags.filter((tag) => tag != balancer.tag);
+            this.outboundTags = app.templateSettings.outbounds.filter((o) => !ObjectUtil.isEmpty(o.tag)).map(obj => obj.tag);
+            this.isEdit = isEdit;
+            this.check()
+        },
+        close() {
+            balancerModal.visible = false;
+            balancerModal.loading(false);
+        },
+        loading(loading=true) {
+            balancerModal.confirmLoading = loading;
+        },
+        check() {
+            if (balancerModal.balancer.tag == '' || balancerModal.balancerTags.includes(balancerModal.balancer.tag)) {
+                this.duplicateTag = true;
+                this.isValid = false;
+            } else {
+                this.duplicateTag = false;
+                this.isValid = true;
+            }
+        },
+        checkSelector() {
+            balancerModal.emptySelector = balancerModal.balancer.selector.length == 0;
+        }
+    };
+
+    new Vue({
+        delimiters: ['[[', ']]'],
+        el: '#balancer-modal',
+        data: {
+            balancerModal: balancerModal
+        },
+        methods: {
+        }
+    });
+
+</script>
+{{end}}

web/html/xui/xray_outbound_modal.html

@@ -11,7 +11,7 @@
         title: '',
         visible: false,
         confirmLoading: false,
-        okText: '{{ i18n "sure" }}',
+        okText: '{{ i18n "confirm" }}',
         isEdit: false,
         confirm: null,
         outbound: new Outbound(),
@@ -25,7 +25,7 @@
         ok() {
             ObjectUtil.execute(outModal.confirm, outModal.outbound.toJson());
         },
-        show({ title='', okText='{{ i18n "sure" }}', outbound, confirm=(outbound)=>{}, isEdit=false, tags=[]  }) {
+        show({ title='', okText='{{ i18n "confirm" }}', outbound, confirm=(outbound)=>{}, isEdit=false, tags=[]  }) {
             this.title = title;
             this.okText = okText;
             this.confirm = confirm;
@@ -42,7 +42,7 @@
             outModal.visible = false;
             outModal.loading(false);
         },
-        loading(loading) {
+        loading(loading=true) {
             outModal.confirmLoading = loading;
         },
         check(){

web/html/xui/xray_reverse_modal.html

@@ -2,79 +2,42 @@
 <a-modal id="reverse-modal" v-model="reverseModal.visible" :title="reverseModal.title" @ok="reverseModal.ok"
          :confirm-loading="reverseModal.confirmLoading" :closable="true" :mask-closable="false"
          :ok-text="reverseModal.okText" cancel-text='{{ i18n "close" }}' :class="themeSwitcher.currentTheme">
-    <a-form layout="inline">
+    <a-form :colon="false" :label-col="{ md: {span:6} }" :wrapper-col="{ md: {span:14} }">
-    <table width="100%" class="ant-table-tbody">
+        <a-form-item label='{{ i18n "pages.xray.outbound.type" }}'>
-        <tr>
+            <a-select v-model="reverseModal.reverse.type" :dropdown-class-name="themeSwitcher.currentTheme">
-            <td>{{ i18n "pages.xray.outbound.type" }}</td>
+                <a-select-option v-for="x,y in reverseTypes" :value="y">[[ x ]]</a-select-option>
-            <td>
+            </a-select>
-                <a-form-item>
+        </a-form-item>
-                    <a-select v-model="reverseModal.reverse.type" style="width: 250px;" :dropdown-class-name="themeSwitcher.currentTheme">
+        <a-form-item label='{{ i18n "pages.xray.outbound.tag" }}'>
-                        <a-select-option v-for="x,y in reverseTypes" :value="y">[[ x ]]</a-select-option>
+            <a-input v-model.trim="reverseModal.reverse.tag"></a-input>
-                    </a-select>
+        </a-form-item>
-                </a-form-item>
+        <a-form-item label='{{ i18n "pages.xray.outbound.domain" }}'>
-            </td>
+            <a-input v-model.trim="reverseModal.reverse.domain"></a-input>
-        </tr>
+        </a-form-item>
-        <tr>
-            <td>{{ i18n "pages.xray.outbound.tag" }}</td>
-            <td>
-                <a-form-item>
-                    <a-input v-model.trim="reverseModal.reverse.tag" style="width: 250px"></a-input>
-                </a-form-item>
-            </td>
-        </tr>
-        <tr>
-            <td>{{ i18n "pages.xray.outbound.domain" }}</td>
-            <td>
-                <a-form-item>
-                    <a-input v-model.trim="reverseModal.reverse.domain" style="width: 250px"></a-input>
-                </a-form-item>
-            </td>
-        </tr>
         <template v-if="reverseModal.reverse.type=='bridge'">
-        <tr>
+        <a-form-item label='{{ i18n "pages.xray.outbound.intercon" }}'>
-            <td>{{ i18n "pages.xray.outbound.intercon" }}</td>
+            <a-select v-model="reverseModal.rules[0].outboundTag" :dropdown-class-name="themeSwitcher.currentTheme">
-            <td>
+                <a-select-option v-for="x in reverseModal.outboundTags" :value="x">[[ x ]]</a-select-option>
-                <a-form-item>
+            </a-select>
-                    <a-select v-model="reverseModal.rules[0].outboundTag" style="width: 250px;" :dropdown-class-name="themeSwitcher.currentTheme">
+        </a-form-item>
-                        <a-select-option v-for="x in reverseModal.outboundTags" :value="x">[[ x ]]</a-select-option>
+        <a-form-item label='{{ i18n "pages.xray.rules.outbound" }}'>
-                    </a-select>
+            <a-select v-model="reverseModal.rules[1].outboundTag" :dropdown-class-name="themeSwitcher.currentTheme">
-                </a-form-item>
+                <a-select-option v-for="x in reverseModal.outboundTags" :value="x">[[ x ]]</a-select-option>
-            </td>
+            </a-select>
-        </tr>
+        </a-form-item>
-        <tr>
-            <td>{{ i18n "pages.xray.rules.outbound" }}</td>
-            <td>
-                <a-form-item>
-                    <a-select v-model="reverseModal.rules[1].outboundTag" style="width: 250px;" :dropdown-class-name="themeSwitcher.currentTheme">
-                        <a-select-option v-for="x in reverseModal.outboundTags" :value="x">[[ x ]]</a-select-option>
-                    </a-select>
-                </a-form-item>
-            </td>
-        </tr>
         </template>
         <template v-else>
-            <tr>
+            <a-form-item label='{{ i18n "pages.xray.outbound.intercon" }}'>
-                <td>{{ i18n "pages.xray.outbound.intercon" }}</td>
+                <a-checkbox-group
-                <td>
+                    v-model="reverseModal.rules[0].inboundTag"
-                    <a-form-item>
+                    :options="reverseModal.inboundTags"></a-checkbox-group>
-                        <a-checkbox-group
+            </a-form-item>
-                            v-model="reverseModal.rules[0].inboundTag"
+            <a-form-item label='{{ i18n "pages.xray.rules.inbound" }}'>
-                            :options="reverseModal.inboundTags"></a-checkbox-group>
+                <a-checkbox-group
-                    </a-form-item>
+                    v-model="reverseModal.rules[1].inboundTag"
-                </td>
+                    :options="reverseModal.inboundTags"></a-checkbox-group>
-            </tr>
+            </a-form-item>
-            <tr>
-                <td>{{ i18n "pages.xray.rules.inbound" }}</td>
-                <td>
-                    <a-form-item>
-                        <a-checkbox-group
-                            v-model="reverseModal.rules[1].inboundTag"
-                            :options="reverseModal.inboundTags"></a-checkbox-group>
-                    </a-form-item>
-                </td>
-            </tr>
         </template>
-    </table>
     </a-form>
 </a-modal>
 <script>
@@ -82,7 +45,7 @@
         title: '',
         visible: false,
         confirmLoading: false,
-        okText: '{{ i18n "sure" }}',
+        okText: '{{ i18n "confirm" }}',
         isEdit: false,
         confirm: null,
         reverse: {
@@ -110,7 +73,7 @@
             }
             ObjectUtil.execute(reverseModal.confirm, reverseModal.reverse, reverseModal.rules);
         },
-        show({ title='', okText='{{ i18n "sure" }}', reverse, rules, confirm=(reverse, rules)=>{}, isEdit=false  }) {
+        show({ title='', okText='{{ i18n "confirm" }}', reverse, rules, confirm=(reverse, rules)=>{}, isEdit=false  }) {
             this.title = title;
             this.okText = okText;
             this.confirm = confirm;
@@ -156,7 +119,7 @@
             reverseModal.visible = false;
             reverseModal.loading(false);
         },
-        loading(loading) {
+        loading(loading=true) {
             reverseModal.confirmLoading = loading;
         },
     };
@@ -167,8 +130,6 @@
         data: {
             reverseModal: reverseModal,
             reverseTypes: { bridge: '{{ i18n "pages.xray.outbound.bridge" }}', portal:'{{ i18n "pages.xray.outbound.portal" }}'},
-        },
-        methods: {
         }
     });
 

web/html/xui/xray_rule_modal.html

@@ -2,149 +2,124 @@
 <a-modal id="rule-modal" v-model="ruleModal.visible" :title="ruleModal.title" @ok="ruleModal.ok"
          :confirm-loading="ruleModal.confirmLoading" :closable="true" :mask-closable="false"
          :ok-text="ruleModal.okText" cancel-text='{{ i18n "close" }}' :class="themeSwitcher.currentTheme">
-    <a-form layout="inline">
+    <a-form :colon="false" :label-col="{ md: {span:6} }" :wrapper-col="{ md: {span:14} }">
-        <table width="100%" class="ant-table-tbody">
+        <a-form-item label='Domain Matcher'>
-            <tr>
+                    <a-select v-model="ruleModal.rule.domainMatcher" :dropdown-class-name="themeSwitcher.currentTheme">
-            <td style="width: 30%;">Domain Matcher</td>
-            <td>
-                <a-form-item>
-                    <a-select v-model="ruleModal.rule.domainMatcher" style="width: 250px;" :dropdown-class-name="themeSwitcher.currentTheme">
                         <a-select-option v-for="dm in ['','hybrid','linear']" :value="dm">[[ dm ]]</a-select-option>
                     </a-select>
-                </a-form-item>
+        </a-form-item>
-            </td>
+        <a-form-item>
-        </tr>
+            <template slot="label">
-        <tr>
-            <td>Source IPs
                 <a-tooltip>
                     <template slot="title">
                         <span>{{ i18n "pages.xray.rules.useComma" }}</span>
                     </template>
-                    <a-icon type="question-circle"></a-icon>
+                    Source IPs <a-icon type="question-circle"></a-icon>
                 </a-tooltip>
-            </td>
+            </template>
-            <td>
+            <a-input v-model.trim="ruleModal.rule.source"></a-input>
-                <a-form-item>
+        </a-form-item>
-                    <a-input v-model.trim="ruleModal.rule.source" style="width: 250px"></a-input>
+        <a-form-item>
-                </a-form-item>
+            <template slot="label">
-            </td>
-        </tr>
-        <tr>
-            <td>Source Port
                 <a-tooltip>
                     <template slot="title">
                         <span>{{ i18n "pages.xray.rules.useComma" }}</span>
                     </template>
-                    <a-icon type="question-circle"></a-icon>
+                    Source Port <a-icon type="question-circle"></a-icon>
                 </a-tooltip>
-            </td>
+            </template>
-            <td>
+            <a-input v-model.trim="ruleModal.rule.sourcePort"></a-input>
-                <a-form-item>
+        </a-form-item>
-                    <a-input v-model.trim="ruleModal.rule.sourcePort" style="width: 250px"></a-input>
+        <a-form-item label='Network'>
-                </a-form-item>
+            <a-select v-model="ruleModal.rule.network" :dropdown-class-name="themeSwitcher.currentTheme">
-            </td>
+                <a-select-option v-for="x in ['','tcp','udp','tcp,udp']" :value="x">[[ x ]]</a-select-option>
-        </tr>
+            </a-select>
-        <tr>
+        </a-form-item>
-            <td>Network</td>
+        <a-form-item label='Protocol'>
-            <td>
+            <a-select v-model="ruleModal.rule.protocol" mode="multiple" :dropdown-class-name="themeSwitcher.currentTheme">
-                <a-form-item>
+                <a-select-option v-for="x in ['http','tls','bittorrent']" :value="x">[[ x ]]</a-select-option>
-                    <a-select v-model="ruleModal.rule.network" style="width: 250px;" :dropdown-class-name="themeSwitcher.currentTheme">
+            </a-select>
-                        <a-select-option v-for="x in ['','tcp','tdp','tcp,udp']" :value="x">[[ x ]]</a-select-option>
+        </a-form-item>
-                    </a-select>
+        <a-form-item label='Attributes'>
-                </a-form-item>
+            <a-button size="small" style="margin-left: 10px" @click="ruleModal.rule.attrs.push(['', ''])">+</a-button>
-            </td>
+        </a-form-item>
-        </tr>
+        <a-form-item :wrapper-col="{span: 24}">
-        <tr>
+            <a-input-group compact v-for="(attr,index) in ruleModal.rule.attrs">
-            <td>Protocol</td>
+                <a-input style="width: 50%" v-model="attr[0]" placeholder='{{ i18n "pages.inbounds.stream.general.name" }}'>
-            <td>
+                    <template slot="addonBefore" style="margin: 0;">[[ index+1 ]]</template>
-                <a-form-item>
+                </a-input>
-                    <a-select v-model="ruleModal.rule.protocol" style="width: 250px;" :dropdown-class-name="themeSwitcher.currentTheme">
+                <a-input style="width: 50%" v-model="attr[1]" placeholder='{{ i18n "pages.inbounds.stream.general.value" }}'>
-                        <a-select-option v-for="x in ['','http','tls','bittorrent']" :value="x">[[ x ]]</a-select-option>
+                    <a-button slot="addonAfter" size="small" @click="ruleModal.rule.attrs.splice(index,1)">-</a-button>
-                    </a-select>
+                </a-input>
-                </a-form-item>
+            </a-input-group>
-            </td>
+        </a-form-item>
-        </tr>
+        <a-form-item>
-        <tr>
+            <template slot="label">
-            <td colspan="2">
-                <a-form-item>
-                    <span>Attributes</span>
-                    <a-button size="small" style="margin-left: 10px" @click="ruleModal.rule.attrs.push(['', ''])">+</a-button>
-                    <a-input-group compact v-for="(attr,index) in ruleModal.rule.attrs">
-                        <a-input style="width: 50%" v-model="attr[0]" 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="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-input>
-                    </a-input-group>
-                </a-form-item>
-            </td>
-        </tr>
-        <tr>
-            <td>IP
                 <a-tooltip>
                     <template slot="title">
                         <span>{{ i18n "pages.xray.rules.useComma" }}</span>
                     </template>
-                    <a-icon type="question-circle"></a-icon>
+                    IP <a-icon type="question-circle"></a-icon>
                 </a-tooltip>
-            </td>
+            </template>
-            <td>
+            <a-input v-model.trim="ruleModal.rule.ip"></a-input>
-                <a-form-item>
+        </a-form-item>
-                    <a-input v-model.trim="ruleModal.rule.ip" style="width: 250px"></a-input>
+        <a-form-item>
-                </a-form-item>
+            <template slot="label">
-            </td>
-        </tr>
-        <tr>
-            <td>Domain
                 <a-tooltip>
                     <template slot="title">
                         <span>{{ i18n "pages.xray.rules.useComma" }}</span>
                     </template>
-                    <a-icon type="question-circle"></a-icon>
+                    Domain <a-icon type="question-circle"></a-icon>
                 </a-tooltip>
-            </td>
+            </template>
-            <td>
+            <a-input v-model.trim="ruleModal.rule.domain"></a-input>
-                <a-form-item>
+        </a-form-item>
-                    <a-input v-model.trim="ruleModal.rule.domain" style="width: 250px"></a-input>
+        <a-form-item>
-                </a-form-item>
+            <template slot="label">
-            </td>
-        </tr>
-        <tr>
-            <td>Port
                 <a-tooltip>
                     <template slot="title">
                         <span>{{ i18n "pages.xray.rules.useComma" }}</span>
                     </template>
-                    <a-icon type="question-circle"></a-icon>
+                    User <a-icon type="question-circle"></a-icon>
                 </a-tooltip>
-            </td>
+            </template>
-            <td>
+            <a-input v-model.trim="ruleModal.rule.user"></a-input>
-                <a-form-item>
+        </a-form-item>
-                    <a-input v-model.trim="ruleModal.rule.port" style="width: 250px"></a-input>
+        <a-form-item>
-                </a-form-item>
+            <template slot="label">
-            </td>
+                <a-tooltip>
-        </tr>
+                    <template slot="title">
-        <tr>
+                        <span>{{ i18n "pages.xray.rules.useComma" }}</span>
-            <td>Inbound Tags</td>
+                    </template>
-            <td>
+                    Port <a-icon type="question-circle"></a-icon>
-                <a-form-item>
+                </a-tooltip>
-                    <a-select v-model="ruleModal.rule.inboundTag" mode="multiple" style="width: 250px;" :dropdown-class-name="themeSwitcher.currentTheme">
+            </template>
-                        <a-select-option v-for="tag in ruleModal.inboundTags" :value="tag">[[ tag ]]</a-select-option>
+            <a-input v-model.trim="ruleModal.rule.port"></a-input>
-                    </a-select>
+        </a-form-item>
-                </a-form-item>
+        <a-form-item label='Inbound Tags'>
-            </td>
+            <a-select v-model="ruleModal.rule.inboundTag" mode="multiple" :dropdown-class-name="themeSwitcher.currentTheme">
-        </tr>
+                <a-select-option v-for="tag in ruleModal.inboundTags" :value="tag">[[ tag ]]</a-select-option>
-        <tr>
+            </a-select>
-            <td>Outbound Tag</td>
+        </a-form-item>
-            <td>
+        <a-form-item label='Outbound Tag'>
-                <a-form-item>
+            <a-select v-model="ruleModal.rule.outboundTag" :dropdown-class-name="themeSwitcher.currentTheme">
-                    <a-select v-model="ruleModal.rule.outboundTag" style="width: 250px;" :dropdown-class-name="themeSwitcher.currentTheme">
+                <a-select-option v-for="tag in ruleModal.outboundTags" :value="tag">[[ tag ]]</a-select-option>
-                        <a-select-option v-for="tag in ruleModal.outboundTags" :value="tag">[[ tag ]]</a-select-option>
+            </a-select>
-                    </a-select>
+        </a-form-item>
-                </a-form-item>
+        <a-form-item>
-            </td>
+            <template slot="label">
-        </tr>
+                <a-tooltip>
+                    <template slot="title">
+                        <span>{{ i18n "pages.xray.balancer.balancerDesc" }}</span>
+                    </template>
+                    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>
@@ -154,7 +129,7 @@
         title: '',
         visible: false,
         confirmLoading: false,
-        okText: '{{ i18n "sure" }}',
+        okText: '{{ i18n "confirm" }}',
         isEdit: false,
         confirm: null,
         rule: {
@@ -171,6 +146,7 @@
             protocol: [],
             attrs: [],
             outboundTag: "",
+            balancerTag: "",
         },
         inboundTags: [],
         outboundTags: [],
@@ -180,7 +156,7 @@
             newRule = ruleModal.getResult();
             ObjectUtil.execute(ruleModal.confirm, newRule);
         },
-        show({ title='', okText='{{ i18n "sure" }}', rule, confirm=(rule)=>{}, isEdit=false  }) {
+        show({ title='', okText='{{ i18n "confirm" }}', rule, confirm=(rule)=>{}, isEdit=false  }) {
             this.title = title;
             this.okText = okText;
             this.confirm = confirm;
@@ -198,6 +174,7 @@
                 this.rule.protocol = rule.protocol;
                 this.rule.attrs = rule.attrs ? Object.entries(rule.attrs) : [];
                 this.rule.outboundTag = rule.outboundTag;
+                this.rule.balancerTag = rule.balancerTag ? rule.balancerTag : "";
             } else {
                 this.rule = {
                     domainMatcher: "",
@@ -212,6 +189,7 @@
                     protocol: [],
                     attrs: [],
                     outboundTag: "",
+                    balancerTag: "",
                 }
             }
             this.isEdit = isEdit;
@@ -224,12 +202,15 @@
                 }
                 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)
+            }
         },
         close() {
             ruleModal.visible = false;
             ruleModal.loading(false);
         },
-        loading(loading) {
+        loading(loading=true) {
             ruleModal.confirmLoading = loading;
         },
         getResult() {
@@ -249,6 +230,7 @@
             rule.protocol = value.protocol;
             rule.attrs = Object.fromEntries(value.attrs);
             rule.outboundTag = value.outboundTag;
+            rule.balancerTag = value.balancerTag;
 
             for (const [key, value] of Object.entries(rule)) {
                 if (

web/service/inbound.go

@@ -474,6 +474,10 @@ func (s *InboundService) DelInboundClient(inboundId int, clientId string) (bool,
 		}
 	}
 
+	if len(newClients) == 0 {
+		return false, common.NewError("no client remained in Inbound")
+	}
+
 	settings["clients"] = newClients
 	newSettings, err := json.MarshalIndent(settings, "", "  ")
 	if err != nil {

web/service/server.go

@@ -33,9 +33,9 @@ import (
 type ProcessState string
 
 const (
-	Running ProcessState = "running"
+	Running ProcessState = "Running"
-	Stop    ProcessState = "stop"
+	Stop    ProcessState = "Stop"
-	Error   ProcessState = "error"
+	Error   ProcessState = "Error"
 )
 
 type Status struct {

web/service/setting.go

@@ -55,6 +55,10 @@ var defaultValueMap = map[string]string{
 	"subEncrypt":         "true",
 	"subShowInfo":        "false",
 	"subURI":             "",
+	"subJsonPath":        "/json/",
+	"subJsonURI":         "",
+	"subJsonFragment":    "",
+	"warp":               "",
 }
 
 type SettingService struct {
@@ -352,17 +356,11 @@ func (s *SettingService) GetSubPort() (int, error) {
 }
 
 func (s *SettingService) GetSubPath() (string, error) {
-	subPath, err := s.getString("subPath")
+	return s.getString("subPath")
-	if err != nil {
+}
-		return "", err
+
-	}
+func (s *SettingService) GetSubJsonPath() (string, error) {
-	if !strings.HasPrefix(subPath, "/") {
+	return s.getString("subJsonPath")
-		subPath = "/" + subPath
-	}
-	if !strings.HasSuffix(subPath, "/") {
-		subPath += "/"
-	}
-	return subPath, nil
 }
 
 func (s *SettingService) GetSubDomain() (string, error) {
@@ -377,8 +375,8 @@ func (s *SettingService) GetSubKeyFile() (string, error) {
 	return s.getString("subKeyFile")
 }
 
-func (s *SettingService) GetSubUpdates() (int, error) {
+func (s *SettingService) GetSubUpdates() (string, error) {
-	return s.getInt("subUpdates")
+	return s.getString("subUpdates")
 }
 
 func (s *SettingService) GetSubEncrypt() (bool, error) {
@@ -397,6 +395,21 @@ func (s *SettingService) GetSubURI() (string, error) {
 	return s.getString("subURI")
 }
 
+func (s *SettingService) GetSubJsonURI() (string, error) {
+	return s.getString("subJsonURI")
+}
+
+func (s *SettingService) GetSubJsonFragment() (string, error) {
+	return s.getString("subJsonFragment")
+}
+
+func (s *SettingService) GetWarp() (string, error) {
+	return s.getString("warp")
+}
+func (s *SettingService) SetWarp(data string) error {
+	return s.setString("warp", data)
+}
+
 func (s *SettingService) UpdateAllSetting(allSetting *entity.AllSetting) error {
 	if err := allSetting.CheckValid(); err != nil {
 		return err
@@ -438,6 +451,7 @@ func (s *SettingService) GetDefaultSettings(host string) (interface{}, error) {
 		"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() },
 		"remarkModel": func() (interface{}, error) { return s.GetRemarkModel() },
 	}
 
@@ -451,10 +465,11 @@ func (s *SettingService) GetDefaultSettings(host string) (interface{}, error) {
 		result[key] = value
 	}
 
-	if result["subEnable"].(bool) && result["subURI"].(string) == "" {
+	if result["subEnable"].(bool) && (result["subURI"].(string) == "" || result["subJsonURI"].(string) == "") {
 		subURI := ""
 		subPort, _ := s.GetSubPort()
 		subPath, _ := s.GetSubPath()
+		subJsonPath, _ := s.GetSubJsonPath()
 		subDomain, _ := s.GetSubDomain()
 		subKeyFile, _ := s.GetSubKeyFile()
 		subCertFile, _ := s.GetSubCertFile()
@@ -475,12 +490,12 @@ func (s *SettingService) GetDefaultSettings(host string) (interface{}, error) {
 		} else {
 			subURI += fmt.Sprintf("%s:%d", subDomain, subPort)
 		}
-		if subPath[0] == byte('/') {
+		if result["subURI"].(string) == "" {
-			subURI += subPath
+			result["subURI"] = subURI + subPath
-		} else {
+		}
-			subURI += "/" + subPath
+		if result["subJsonURI"].(string) == "" {
+			result["subJsonURI"] = subURI + subJsonPath
 		}
-		result["subURI"] = subURI
 	}
 
 	return result, nil

web/service/xray_setting.go

@@ -1,8 +1,13 @@
 package service
 
 import (
+	"bytes"
 	_ "embed"
 	"encoding/json"
+	"fmt"
+	"net/http"
+	"os"
+	"time"
 	"x-ui/util/common"
 	"x-ui/xray"
 )
@@ -26,3 +31,142 @@ 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
+}

web/session/session.go

@@ -4,7 +4,7 @@ import (
 	"encoding/gob"
 	"x-ui/database/model"
 
-	"github.com/gin-contrib/sessions"
+	sessions "github.com/Calidity/gin-sessions"
 	"github.com/gin-gonic/gin"
 )
 

web/translation/translate.en_US.toml

@@ -1,6 +1,6 @@
 "username" = "Username"
 "password" = "Password"
-"login" = "Login"
+"login" = "Log In"
 "confirm" = "Confirm"
 "cancel" = "Cancel"
 "close" = "Close"
@@ -8,7 +8,7 @@
 "copied" = "Copied"
 "download" = "Download"
 "remark" = "Remark"
-"enable" = "Enable"
+"enable" = "Enabled"
 "protocol" = "Protocol"
 "search" = "Search"
 "filter" = "Filter"
@@ -26,13 +26,13 @@
 "edit" = "Edit"
 "delete" = "Delete"
 "reset" = "Reset"
-"copySuccess" = "Copied successfully"
+"copySuccess" = "Copied Successful"
 "sure" = "Sure"
 "encryption" = "Encryption"
 "transmission" = "Transmission"
 "host" = "Host"
 "path" = "Path"
-"camouflage" = "Camouflage"
+"camouflage" = "Obfuscation"
 "status" = "Status"
 "enabled" = "Enabled"
 "disabled" = "Disabled"
@@ -40,104 +40,109 @@
 "depletingSoon" = "Depleting"
 "offline" = "Offline"
 "online" = "Online"
-"domainName" = "Domain name"
+"domainName" = "Domain Name"
 "monitor" = "Listen IP"
 "certificate" = "Certificate"
-"fail" = " Fail"
+"fail" = " Failed"
-"success" = " Success"
+"success" = " Successful"
-"getVersion" = "Get version"
+"getVersion" = "Get Version"
 "install" = "Install"
 "clients" = "Clients"
 "usage" = "Usage"
-"remained" = "Remained"
+"remained" = "Remaining"
 "secAlertTitle" = "Security Alert"
-"secAlertSsl" = "This connection is not secure; Please refrain from entering sensitive information until TLS is activated for data protection"
+"secAlertSsl" = "This connection is not secure. Please avoid entering sensitive information until TLS is activated for data protection."
+"secAlertConf" = "Certain configurations have been identified as susceptible to attacks, prompting immediate action to reinforce security protocols and safeguard against potential security breaches."
 "security" = "Security"
 
 [menu]
-"dashboard" = "System Status"
+"dashboard" = "Overview"
 "inbounds" = "Inbounds"
 "settings" = "Panel Settings"
-"xray" = "Xray Settings"
+"xray" = "Xray Configs"
-"logout" = "Logout"
+"logout" = "Log Out"
-"link" = "Other"
+"link" = "Manage"
 
 [pages.login]
-"title" = "Login"
+"title" = "Welcome"
-"loginAgain" = "The login time limit has expired, please log in again"
+"loginAgain" = "Your session has expired, please log in again"
 
 [pages.login.toasts]
-"invalidFormData" = "Input data format is invalid."
+"invalidFormData" = "The input data format is invalid"
-"emptyUsername" = "Please enter username."
+"emptyUsername" = "Username is required"
-"emptyPassword" = "Please enter password."
+"emptyPassword" = "Password is required"
-"wrongUsernameOrPassword" = "Invalid username or password."
+"wrongUsernameOrPassword" = "The username or password is incorrect"
 "successLogin" = "Login"
 
 [pages.index]
-"title" = "System Status"
+"title" = "Overview"
-"memory" = "Memory"
+"memory" = "RAM"
-"hard" = "Hard Disk"
+"hard" = "Disk"
-"xrayStatus" = "Xray Status"
+"serverInfo" = "Server"
+"hostname" = "Hostname"
+"xrayStatus" = "Xray"
 "stopXray" = "Stop"
 "restartXray" = "Restart"
-"xraySwitch" = "Switch Version"
+"xraySwitch" = "Change Xray Version"
-"xraySwitchClick" = "Choose the version you want to switch to."
+"xraySwitchClick" = "Choose the version you want to switch."
-"xraySwitchClickDesk" = "Choose wisely, as older versions may not be compatible with current configurations."
+"xraySwitchClickDesk" = "Choose carefully, as older versions may not be compatible with the current configurations."
-"operationHours" = "Operation Hours"
+"operationHours" = "Uptime"
-"operationHoursDesc" = "System uptime: time since startup."
+"operationHoursDesc" = "Uptime since OS startup"
+"xrayoperationHoursDesc" = "Uptime since Xray last restart"
 "systemLoad" = "System Load"
-"connectionTcpCountDesc" = "Total TCP connections across all network cards."
+"systemLoadDesc" = "Average load for the past 1, 5, and 15 minutes"
-"connectionUdpCountDesc" = "Total UDP connections across all network cards."
+"connectionTcpCountDesc" = "Total TCP connections"
-"upSpeed" = "Total upload speed for all network cards."
+"connectionUdpCountDesc" = "Total UDP connections"
-"downSpeed" = "Total download speed for all network cards."
+"upSpeed" = "Overall upload speed"
-"totalSent" = "Total upload traffic of all network cards since system startup."
+"downSpeed" = "Overall download speed"
-"totalReceive" = "Total download data across all network cards since system startup."
+"totalSent" = "Total data sent since OS startup"
-"xraySwitchVersionDialog" = "Switch Xray Version"
+"totalReceive" = "Total data received since OS startup"
-"xraySwitchVersionDialogDesc" = "Are you sure you want to switch the Xray version to"
+"xraySwitchVersionDialog" = "Change Xray Version"
+"xraySwitchVersionDialogDesc" = "Are you sure you want to change the Xray version to"
 "dontRefresh" = "Installation is in progress, please do not refresh this page."
 "logs" = "Logs"
 "config" = "Config"
 "backup" = "Backup & Restore"
-"backupTitle" = "Backup & Restore Database"
+"backupTitle" = "Database Backup & Restore"
-"backupDescription" = "Remember to backup before importing a new database."
+"backupDescription" = "It is recommended to make a backup before restoring a database."
-"exportDatabase" = "Download Database"
+"exportDatabase" = "Get Backup"
-"importDatabase" = "Upload Database"
+"importDatabase" = "Restore"
 
 [pages.inbounds]
 "title" = "Inbounds"
-"totalDownUp" = "Total Uploads/Downloads"
+"totalDownUp" = "Total Sent/Received"
 "totalUsage" = "Total Usage"
-"inboundCount" = "Number of Inbounds"
+"inboundCount" = "Total Inbounds"
 "operate" = "Menu"
-"enable" = "Enable"
+"enable" = "Enabled"
 "remark" = "Remark"
 "protocol" = "Protocol"
 "port" = "Port"
 "traffic" = "Traffic"
 "details" = "Details"
 "transportConfig" = "Transport Config"
-"expireDate" = "Expire Date"
+"expireDate" = "Expiration"
 "resetTraffic" = "Reset Traffic"
 "addInbound" = "Add Inbound"
 "generalActions" = "General Actions"
 "create" = "Create"
 "update" = "Update"
-"modifyInbound" = "Modify Inbound"
+"modifyInbound" = "Edit Inbound"
 "deleteInbound" = "Delete Inbound"
 "deleteInboundContent" = "Are you sure you want to delete inbound?"
 "deleteClient" = "Delete Client"
 "deleteClientContent" = "Are you sure you want to delete client?"
 "resetTrafficContent" = "Are you sure you want to reset traffic?"
-"copyLink" = "Copy Link"
+"copyLink" = "Copy URL"
 "address" = "Address"
 "network" = "Network"
 "destinationPort" = "Destination Port"
 "targetAddress" = "Target Address"
-"monitorDesc" = "Leave blank by default"
+"monitorDesc" = "Leave blank to listen on all IPs"
-"meansNoLimit" = "Means No Limit"
+"meansNoLimit" = "Zero means unlimited. (Unit: GB)"
-"totalFlow" = "Total Flow"
+"totalFlow" = "Total Traffic"
 "leaveBlankToNeverExpire" = "Leave blank to never expire"
-"noRecommendKeepDefault" = "No special requirements to keep the default"
+"noRecommendKeepDefault" = "It is recommended to keep the default"
 "certificatePath" = "File Path"
 "certificateContent" = "File Content"
 "publicKeyPath" = "Public Key Path"
@@ -146,40 +151,40 @@
 "keyContent" = "Private Key Content"
 "clickOnQRcode" = "Click on QR Code to Copy"
 "client" = "Client"
-"export" = "Export Links"
+"export" = "Export All URLs"
 "clone" = "Clone"
 "cloneInbound" = "Clone"
-"cloneInboundContent" = "All settings of this inbound, except for Port, Listening IP, and Clients, will be applied to the clone."
+"cloneInboundContent" = "All settings for this inbound, except Port, Listen IP, and Clients, will be applied to the clone."
 "cloneInboundOk" = "Clone"
 "resetAllTraffic" = "Reset All Inbounds Traffic"
-"resetAllTrafficTitle" = "Reset all inbounds traffic"
+"resetAllTrafficTitle" = "Reset All Inbounds Traffic"
-"resetAllTrafficContent" = "Are you sure you want to reset all inbounds traffic?"
+"resetAllTrafficContent" = "Are you sure you want to reset the traffic of all inbounds?"
 "resetInboundClientTraffics" = "Reset Clients Traffic"
-"resetInboundClientTrafficTitle" = "Reset all clients traffic"
+"resetInboundClientTrafficTitle" = "Reset Clients Traffic"
-"resetInboundClientTrafficContent" = "Are you sure you want to reset all traffic for this inbound's clients?"
+"resetInboundClientTrafficContent" = "Are you sure you want to reset the traffic of this inbound's clients?"
 "resetAllClientTraffics" = "Reset All Clients Traffic"
-"resetAllClientTrafficTitle" = "Reset all clients traffic"
+"resetAllClientTrafficTitle" = "Reset All Clients Traffic"
-"resetAllClientTrafficContent" = "Are you sure you want to reset all traffics for all clients?"
+"resetAllClientTrafficContent" = "Are you sure you want to reset the traffic of all clients?"
 "delDepletedClients" = "Delete Depleted Clients"
-"delDepletedClientsTitle" = "Delete depleted clients"
+"delDepletedClientsTitle" = "Delete Depleted Clients"
-"delDepletedClientsContent" = "Are you sure you want to delete all depleted clients?"
+"delDepletedClientsContent" = "Are you sure you want to delete all the depleted clients?"
 "email" = "Email"
-"emailDesc" = "Please provide a unique email address."
+"emailDesc" = "Please provide a unique email address"
-"setDefaultCert" = "Set cert from panel"
+"setDefaultCert" = "Set Cert from Panel"
-"telegramDesc" = "Use Telegram ID without @ or chat IDs ( you can get it here @userinfobot or use '/id' command in bot )"
+"telegramDesc" = "Please provide Chat ID(s) without using the '@' symbol. (Get it here @userinfobot) or (Use '/id' command in the bot)"
-"subscriptionDesc" = "You can find your sub link on Details, also you can use the same name for several configurations"
+"subscriptionDesc" = "To find your subscription URL, navigate to the 'More Information'. Additionally, you can use the same name for several clients."
 "info" = "Info" 
 "same" = "Same"
-"inboundData" = "Inbound's data"
+"inboundData" = "Inbound's Data"
-"copyToClipboard" = "Copy to clipboard"
+"exportInbound" = "Export Inbound"
 "import" = "Import"
-"importInbound" = "Import an inbound"
+"importInbound" = "Import an Inbound"
 
 [pages.client]
 "add" = "Add Client"
 "edit" = "Edit Client"
 "submitAdd" = "Add Client"
-"submitEdit" = "Save changes"
+"submitEdit" = "Save Changes"
 "clientCount" = "Number of Clients"
 "bulk" = "Add Bulk"
 "method" = "Method"
@@ -187,178 +192,196 @@
 "last" = "Last"
 "prefix" = "Prefix"
 "postfix" = "Postfix"
-"delayedStart" = "Start after first use"
+"delayedStart" = "Start on Initial Use"
-"expireDays" = "Expire days"
+"expireDays" = "Duration"
-"days" = "day(s)"
+"days" = "Day(s)"
-"renew" = "Auto renew"
+"renew" = "Auto Renew"
-"renewDesc" = "Auto renew days after expiration. 0 = disable"
+"renewDesc" = "Auto-renewal after expiration. (0 = disable)(Unit: day)"
 
 [pages.inbounds.toasts]
 "obtain" = "Obtain"
 
 [pages.inbounds.stream.general]
-"requestHeader" = "Request header"
+"request" = "Request"
+"response" = "Response"
 "name" = "Name"
 "value" = "Value"
 
 [pages.inbounds.stream.tcp]
-"requestVersion" = "Request version"
+"version" = "Version"
-"requestMethod" = "Request method"
+"method" = "Method"
-"requestPath" = "Request path"
+"path" = "Path"
-"responseVersion" = "Response version"
+"status" = "Status"
-"responseStatus" = "Response status"
+"statusDescription" = "Status Description"
-"responseStatusDescription" = "Response status description"
+"requestHeader" = "Request Header"
-"responseHeader" = "Response header"
+"responseHeader" = "Response Header"
 
 [pages.inbounds.stream.quic]
 "encryption" = "Encryption"
 
 [pages.settings]
-"title" = "Settings"
+"title" = "Panel Settings"
 "save" = "Save"
 "infoDesc" = "Every change made here needs to be saved. Please restart the panel for the changes to take effect."
-"restartPanel" = "Restart Panel "
+"restartPanel" = "Restart Panel"
-"restartPanelDesc" = "Are you sure you want to restart the panel? Click OK to restart after 3 seconds. If you cannot access the panel after restarting, please view the panel log information on the server."
+"restartPanelDesc" = "Are you sure you want to restart the panel? If you are unable to access the panel after restarting, please check the logs in the terminal script"
-"resetDefaultConfig" = "Reset to default config"
+"resetDefaultConfig" = "Reset to Default"
-"panelConfig" = "Panel Configurations"
+"panelConfig" = "General"
-"userSettings" = "User Settings"
+"userSettings" = "Authentication"
-"TGBotSettings" = "Telegram Bot Settings"
+"TGBotSettings" = "Telegram Bot"
-"panelListeningIP" = "Panel Listening IP"
+"panelListeningIP" = "Listen IP"
-"panelListeningIPDesc" = "Leave blank by default to monitor all IPs."
+"panelListeningIPDesc" = "The IP address for the web panel. (Leave blank to listen on all IPs)"
-"panelListeningDomain" = "Panel Listening Domain"
+"panelListeningDomain" = "Listen Domain"
-"panelListeningDomainDesc" = "Leave blank by default to monitor all domains and IPs"
+"panelListeningDomainDesc" = "The domain name for the web panel. (Leave blank to listen on all domains and IPs)"
-"panelPort" = "Panel Port"
+"panelPort" = "Listen Port"
-"panelPortDesc" = "Port number for serving the panel."
+"panelPortDesc" = "The port number for the web panel. (Must be an unused port)"
-"publicKeyPath" = "Panel Certificate Public Key File Path"
+"publicKeyPath" = "Public Key Path"
-"publicKeyPathDesc" = "Fill in an absolute path starting with '/'"
+"publicKeyPathDesc" = "The public key file path for the web panel. (Begins with ‘/‘)"
-"privateKeyPath" = "Panel Certificate Private Key File Path"
+"privateKeyPath" = "Private Key Path"
-"privateKeyPathDesc" = "Fill in an absolute path starting with '/'"
+"privateKeyPathDesc" = "The private key file path for the web panel. (Begins with ‘/‘)"
-"panelUrlPath" = "Panel URL Root Path"
+"panelUrlPath" = "URI Path"
-"panelUrlPathDesc" = "Must start with '/' and end with '/'"
+"panelUrlPathDesc" = "The URI path for the web panel. (Begins with ‘/‘ and concludes with ‘/‘)"
-"pageSize" = "Pagination size"
+"pageSize" = "Pagination Size"
-"pageSizeDesc" = "Define page size for inbounds table. Set 0 to disable"
+"pageSizeDesc" = "The page size for the inbounds table. (0 = disable)"
-"remarkModel" = "Remark Model and Seperation charachter"
+"remarkModel" = "Remark Model & Separation Character"
-"sampleRemark" = "Sample remark"
+"sampleRemark" = "Sample Remark"
 "oldUsername" = "Current Username"
 "currentPassword" = "Current Password"
 "newUsername" = "New Username"
 "newPassword" = "New Password"
-"telegramBotEnable" = "Enable Telegram bot"
+"telegramBotEnable" = "Enable Telegram Bot"
-"telegramBotEnableDesc" = "Your telegram bot will interact with the panel"
+"telegramBotEnableDesc" = "Enables the Telegram bot."
 "telegramToken" = "Telegram Token"
-"telegramTokenDesc" = "The Token you have got from @BotFather"
+"telegramTokenDesc" = "The Telegram token. (Get it here @BotFather)"
-"telegramChatId" = "Telegram Admin ChatIDs"
+"telegramChatId" = "Admin Chat ID"
-"telegramChatIdDesc" = "Multiple Chat IDs separated by comma. use @userinfobot or use '/id' command in bot to get your Chat IDs."
+"telegramChatIdDesc" = "The Telegram Admin Chat ID(s). (Comma-separated)(Get it here @userinfobot) or (Use '/id' command in the bot)"
-"telegramNotifyTime" = "Telegram bot notification time"
+"telegramNotifyTime" = "Notification Time"
-"telegramNotifyTimeDesc" = "Use Crontab timing format."
+"telegramNotifyTimeDesc" = "The Telegram bot notification time set for periodic reports. (Use the crontab time format)"
 "tgNotifyBackup" = "Database Backup"
-"tgNotifyBackupDesc" = "Send database backup file with report notification"
+"tgNotifyBackupDesc" = "Get a database backup file with a report."
 "tgNotifyLogin" = "Login Notification"
-"tgNotifyLoginDesc" = "Displays the username, IP address, and time when someone tries to log into your panel."
+"tgNotifyLoginDesc" = "Get notified about the username, IP, and time whenever someone attempts to log into your web panel."
-"sessionMaxAge" = "Session maximum age"
+"sessionMaxAge" = "Session Duration"
-"sessionMaxAgeDesc" = "The time that you can stay login (unit: minute)"
+"sessionMaxAgeDesc" = "The duration for which you can stay logged in. (Unit: minute)"
-"expireTimeDiff" = "Expiration threshold for notification"
+"expireTimeDiff" = "Expiration Time Notification"
-"expireTimeDiffDesc" = "Get notified about account expiration before the threshold (unit: day)"
+"expireTimeDiffDesc" = "Get notified when the remaining time reaches the set threshold. (Unit: day)"
-"trafficDiff" = "Traffic threshold for notification"
+"trafficDiff" = "Traffic Limit Notification"
-"trafficDiffDesc" = "Get notified about traffic exhaustion before reaching the threshold (unit: GB)"
+"trafficDiffDesc" = "Get notified when remaining traffic reaches the set threshold. (Unit: GB)"
-"tgNotifyCpu" = "CPU percentage alert threshold"
+"tgNotifyCpu" = "CPU Load Notification"
-"tgNotifyCpuDesc" = "Receive notification if CPU usage exceeds this threshold (unit: %)"
+"tgNotifyCpuDesc" = "Get notified if CPU load exceeds the set threshold. (Unit: %)"
 "timeZone" = "Time Zone"
-"timeZoneDesc" = "Scheduled tasks run according to the time in this time zone."
+"timeZoneDesc" = "Scheduled tasks will run based on this time zone."
 "subSettings" = "Subscription"
-"subEnable" = "Enable service"
+"subEnable" = "Enable Subscription Service"
-"subEnableDesc" = "Subscription feature with separate configuration"
+"subEnableDesc" = "Enables the subscription service."
-"subListen" = "Listening IP"
+"subListen" = "Listen IP"
-"subListenDesc" = "Leave blank by default to monitor all IPs"
+"subListenDesc" = "The IP address for the subscription service. (Leave blank to listen on all IPs)"
-"subPort" = "Subscription Port"
+"subPort" = "Listen Port"
-"subPortDesc" = "Port number for serving the subscription service must be unused in server"
+"subPortDesc" = "The port number for the subscription service. (Must be an unused port)"
-"subCertPath" = "Subscription Certificate Public Key File Path"
+"subCertPath" = "Public Key Path"
-"subCertPathDesc" = "Fill in an absolute path starting with '/'"
+"subCertPathDesc" = "The public key file path for the subscription service. (Begins with ‘/‘)"
-"subKeyPath" = "Subscription Certificate Private Key File Path"
+"subKeyPath" = "Private Key Path"
-"subKeyPathDesc" = "Fill in an absolute path starting with '/'"
+"subKeyPathDesc" = "The private key file path for the subscription service. (Begins with ‘/‘)"
-"subPath" = "Subscription URL Root Path"
+"subPath" = "URI Path"
-"subPathDesc" = "Must start with '/' and end with '/'"
+"subPathDesc" = "The URI path for the subscription service. (Begins with ‘/‘ and concludes with ‘/‘)"
-"subDomain" = "Listening Domain"
+"subDomain" = "Listen Domain"
-"subDomainDesc" = "Leave blank by default to monitor all domains and IPs"
+"subDomainDesc" = "The domain name for the subscription service. (Leave blank to listen on all domains and IPs)"
-"subUpdates" = "Subscription update intervals"
+"subUpdates" = "Update Intervals"
-"subUpdatesDesc" = "Interval hours between updates in client application"
+"subUpdatesDesc" = "The update intervals of the subscription URL in the client apps. (Unit: hour)"
-"subEncrypt" = "Encrypt configs"
+"subEncrypt" = "Encode"
-"subEncryptDesc" = "Encrypt the returned configs in subscription"
+"subEncryptDesc" = "The returned content of subscription service will be Base64 encoded."
-"subShowInfo" = "Show usage info"
+"subShowInfo" = "Show Usage Info"
-"subShowInfoDesc" = "Show remained traffic and date after config name"
+"subShowInfoDesc" = "The remaining traffic and date will be displayed in the client apps."
 "subURI" = "Reverse Proxy URI"
-"subURIDesc" = "Change base URI of subscription URL for using on behind of proxies"
+"subURIDesc" = "The subscription service will use the URI that has been set up behind reverse proxies."
+"fragment" = "Fragmentation"
+"fragmentDesc" = "Enable fragmentation for TLS hello packet"
 
 [pages.settings.toasts]
-"modifySettings" = "Modify Settings "
+"modifySettings" = "Modify Settings"
-"getSettings" = "Get Settings "
+"getSettings" = "Get Settings"
-"modifyUser" = "Modify User "
+"modifyUser" = "Modify Admin"
-"originalUserPassIncorrect" = "Incorrect original username or password"
+"originalUserPassIncorrect" = "The current username or password is incorrect"
-"userPassMustBeNotEmpty" = "New username and new password cannot be empty"
+"userPassMustBeNotEmpty" = "The new username or password is required"
 
 [pages.xray]
-"title" = "Xray Settings"
+"title" = "Xray Configs"
-"save" = "Save Settings"
+"save" = "Save"
 "restart" = "Restart Xray"
-"basicTemplate" = "Basic Template"
+"basicTemplate" = "Basics"
-"advancedTemplate" = "Advanced Template"
+"advancedTemplate" = "Advanced"
-"generalConfigs" = "General Configs"
+"generalConfigs" = "General Strategy"
-"generalConfigsDesc" = "These options will provide general adjustments."
+"generalConfigsDesc" = "These options will determine general strategy adjustments."
-"blockConfigs" = "Blocking Configs"
+"logConfigs" = "Log"
-"blockConfigsDesc" = "These options will prevent users from connecting to specific protocols and websites."
+"logConfigsDesc" = "Logs may affect your server's efficiency. It is recommended to enable it wisely only in case of your needs"
-"blockCountryConfigs" = "Block Country Configs"
+"blockConfigs" = "Protection Shield"
-"blockCountryConfigsDesc" = "These options will prevent users from connecting to specific country domains."
+"blockConfigsDesc" = "These options will block traffic based on specific requested protocols and websites."
-"directCountryConfigs" = "Direct Country Configs"
+"blockCountryConfigs" = "Block Country"
-"directCountryConfigsDesc" = "These options will connect users directly to specific country domains."
+"blockCountryConfigsDesc" = "These options will block traffic based on the specific requested country."
-"ipv4Configs" = "IPv4 Configs"
+"directCountryConfigs" = "Direct Country"
-"ipv4ConfigsDesc" = "These options will route to target domains only via IPv4."
+"directCountryConfigsDesc" = "These options will directly forward traffic based on the specific requested country."
-"Template" = "Xray Configuration Template"
+"ipv4Configs" = "IPv4 Routing"
-"TemplateDesc" = "Generate the final Xray configuration file based on this template."
+"ipv4ConfigsDesc" = "These options will route traffic based on specific requested destination via system's IPv4."
-"FreedomStrategy" = "Configure Strategy for Freedom Protocol"
+"warpConfigs" = "WARP Config"
-"FreedomStrategyDesc" = "Set the output strategy of the network in the Freedom Protocol."
+"warpConfigsDesc" = "These options will route traffic based on specific requested destination via WARP."
-"RoutingStrategy" = "Configure Domains Routing Strategy"
+"Template" = "Advanced Xray Configuration Template"
-"RoutingStrategyDesc" = "Set the overall routing strategy for DNS resolving."
+"TemplateDesc" = "The final Xray config file will be generated based on this template."
-"Torrent" = "Ban BitTorrent Usage"
+"FreedomStrategy" = "Freedom Protocol Strategy"
-"TorrentDesc" = "Change the configuration template to avoid using BitTorrent by users."
+"FreedomStrategyDesc" = "Set the output strategy for the network in the Freedom Protocol."
-"PrivateIp" = "Ban Private IP Ranges to Connect"
+"RoutingStrategy" = "Overall Routing Strategy"
-"PrivateIpDesc" = "Change the configuration template to avoid connecting to private IP ranges."
+"RoutingStrategyDesc" = "Set the overall traffic routing strategy for resolving all requests."
+"Torrent" = "Block BitTorrent Protocol"
+"TorrentDesc" = "Blocks BitTorrent protocol."
+"PrivateIp" = "Block Connection to Private IPs"
+"PrivateIpDesc" = "Blocks establishing connections to private IP ranges."
 "Ads" = "Block Ads"
-"AdsDesc" = "Change the configuration template to block ads"
+"AdsDesc" = "Blocks advertising websites."
-"Family" = "Enable Family-Friendly Configuration"
+"Family" = "Family Protection"
-"FamilyDesc" = "Avoid connecting to unsafe websites for family protection."
+"FamilyDesc" = "Blocks adult content, and malware websites."
-"IRIp" = "Disable connection to Iran IP ranges"
+"IRIp" = "Block Connection to Iran IPs"
-"IRIpDesc" = "Change the configuration template to avoid connecting to Iran IP ranges."
+"IRIpDesc" = "Blocks establishing connections to Iran IP ranges."
-"IRDomain" = "Disable connection to Iran domains"
+"IRDomain" = "Block Connection to Iran Domains"
-"IRDomainDesc" = "Change the configuration template to avoid connecting to Iran domains."
+"IRDomainDesc" = "Blocks establishing connections to Iran domains."
-"ChinaIp" = "Disable connection to China IP ranges"
+"ChinaIp" = "Block Connection to China IPs"
-"ChinaIpDesc" = "Change the configuration template to avoid connecting to China IP ranges."
+"ChinaIpDesc" = "Blocks establishing connections to China IP ranges."
-"ChinaDomain" = "Disable connection to China domains"
+"ChinaDomain" = "Block Connection to China Domains"
-"ChinaDomainDesc" = "Change the configuration template to avoid connecting to China domains."
+"ChinaDomainDesc" = "Blocks establishing connections to China domains."
-"RussiaIp" = "Disable connection to Russia IP ranges"
+"RussiaIp" = "Block Connection to Russia IPs"
-"RussiaIpDesc" = "Change the configuration template to avoid connecting to Russia IP ranges."
+"RussiaIpDesc" = "Blocks establishing connections to Russia IP ranges."
-"RussiaDomain" = "Disable connection to Russia domains"
+"RussiaDomain" = "Block Connection to Russia Domains"
-"RussiaDomainDesc" = "Change the configuration template to avoid connecting to Russia domains."
+"RussiaDomainDesc" = "Blocks establishing connections to Russia domains."
-"DirectIRIp" = "Direct connection to Iran IP ranges"
+"DirectIRIp" = "Direct Connection to Iran IPs"
-"DirectIRIpDesc" = "Change the configuration template for direct connecting to Iran IP ranges."
+"DirectIRIpDesc" = "Directly establishes connections to Iran IP ranges."
-"DirectIRDomain" = "Direct connection to Iran domains"
+"DirectIRDomain" = "Direct Connection to Iran Domains"
-"DirectIRDomainDesc" = "Change the configuration template for direct connecting to Iran domains."
+"DirectIRDomainDesc" = "Directly establishes connections to Iran domains."
-"DirectChinaIp" = "Direct connection to China IP ranges"
+"DirectChinaIp" = "Direct Connection to China IPs"
-"DirectChinaIpDesc" = "Change the configuration template for direct connecting to China IP ranges."
+"DirectChinaIpDesc" = "Directly establishes connections to China IP ranges."
-"DirectChinaDomain" = "Direct connection to China domains"
+"DirectChinaDomain" = "Direct Connection to China Domains"
-"DirectChinaDomainDesc" = "Change the configuration template for direct connecting to China domains."
+"DirectChinaDomainDesc" = "Directly establishes connections to China domains."
-"DirectRussiaIp" = "Direct connection to Russia IP ranges"
+"DirectRussiaIp" = "Direct Connection to Russia IPs"
-"DirectRussiaIpDesc" = "Change the configuration template for direct connecting to Russia IP ranges."
+"DirectRussiaIpDesc" = "Directly establishes connections to Russia IP ranges."
-"DirectRussiaDomain" = "Direct connection to Russia domains"
+"DirectRussiaDomain" = "Direct Connection to Russia Domains"
-"DirectRussiaDomainDesc" = "Change the configuration template for direct connecting to Russia domains."
+"DirectRussiaDomainDesc" = "Directly establishes connections to Russia domains."
-"GoogleIPv4" = "Use IPv4 for Google"
+"GoogleIPv4" = "Google"
-"GoogleIPv4Desc" = "Add routing for Google to connect with IPv4."
+"GoogleIPv4Desc" = "Routes traffic to Google via IPv4."
-"NetflixIPv4" = "Use IPv4 for Netflix"
+"NetflixIPv4" = "Netflix"
-"NetflixIPv4Desc" = "Add routing for Netflix to connect with IPv4."
+"NetflixIPv4Desc" = "Routes traffic to Netflix via IPv4."
+"GoogleWARP" = "Google"
+"GoogleWARPDesc" = "Routes traffic to Google via WARP."
+"OpenAIWARP" = "ChatGPT"
+"OpenAIWARPDesc" = "Routes traffic to ChatGPT via WARP."
+"NetflixWARP" = "Netflix"
+"NetflixWARPDesc" = "Routes traffic to Netflix via WARP."
+"MetaWARP" = "Meta"
+"MetaWARPDesc" = "Routes traffic to Meta (Instagram, Facebook, WhatsApp, Threads,...) via WARP."
+"SpotifyWARP" = "Spotify"
+"SpotifyWARPDesc" = "Routes traffic to Spotify via WARP."
 "completeTemplate" = "All"
 "Inbounds" = "Inbounds"
 "Outbounds" = "Outbounds"
-"Routings" = "Routing rules"
+"Routings" = "Routing Rules"
 "RoutingsDesc" = "The priority of each rule is important!"
+"Balancers" = "Balancers"
 
 [pages.xray.rules]
 "first" = "First"
@@ -372,15 +395,16 @@
 "info" = "Info"
 "add" = "Add Rule"
 "edit" = "Edit Rule"
-"useComma" = "Comma separated items"
+"useComma" = "Comma-separated items"
+"balancer" = "Balancer"
 
 [pages.xray.outbound]
-"addOutbound" = "Add outbound"
+"addOutbound" = "Add Outbound"
-"addReverse" = "Add reverse"
+"addReverse" = "Add Reverse"
-"editOutbound" = "Edit outbound"
+"editOutbound" = "Edit Outbound"
-"editReverse" = "Edit reverse"
+"editReverse" = "Edit Reverse"
 "tag" = "Tag"
-"tagDesc" = "Unique tag"
+"tagDesc" = "Unique Tag"
 "address" = "Address"
 "reverse" = "Reverse"
 "domain" = "Domain"
@@ -388,6 +412,41 @@
 "bridge" = "Bridge"
 "portal" = "Portal"
 "intercon" = "Interconnection"
+"settings" = "Settings"
+"accountInfo" = "Account Information"
+"outboundStatus" = "Outbound Status"
+
+[pages.xray.balancer]
+"addBalancer" = "Add Balancer"
+"editBalancer" = "Edit Balancer"
+"balancerStrategy" = "Strategy"
+"balancerSelectors" = "Selectors"
+"tag" = "Tag"
+"tagDesc" = "Unique Tag"
+"balancerDesc" = "It is not possible to use balancerTag and outboundTag at the same time. If used at the same time, only outboundTag will work."
+
+[pages.xray.wireguard]
+"secretKey" = "Secret Key"
+"publicKey" = "Public Key"
+"allowedIPs" = "Allowed IPs"
+"endpoint" = "Endpoint"
+"psk" = "PreShared Key"
+"domainStrategy" = "Domain Strategy"
+
+[pages.xray.dns]
+"enable" = "Enable DNS"
+"enableDesc" = "Enable built-in DNS server"
+"strategy" = "Query Strategy"
+"strategyDesc" = "Overall strategy to resolve domain names"
+"add" = "Add Server"
+"edit" = "Edit Server"
+"domains" = "Domains"
+
+[pages.xray.fakedns]
+"add" = "Add Fake DNS"
+"edit" = "Edit Fake DNS"
+"ipPool" = "IP Pool Subnet"
+"poolSize" = "Pool Size"
 
 [tgbot]
 "noResult" = "❗ No result!"
@@ -401,41 +460,41 @@
 "clients" = "Clients"
 
 [tgbot.commands]
-"unknown" = "❗ Unknown command"
+"unknown" = "❗️Unknown command"
 "pleaseChoose" = "👇 Please choose:\r\n"
-"help" = "🤖 Welcome to this bot! It's designed to offer you specific data from the server, and it allows you to make modifications as needed.\r\n\r\n"
+"help" = "🤖 Welcome to this bot! It's designed to provide you with specific data from the web panel and allows you to make modifications as needed.\r\n\r\n"
 "start" = "👋 Hello <i>{{ .Firstname }}</i>.\r\n"
 "welcome" = "🤖 Welcome to <b>{{ .Hostname }}</b> management bot.\r\n"
-"status" = "✅ Bot is ok!"
+"status" = "✅ Bot is OK!"
-"usage" = "❗ Please provide a text to search!"
+"usage" = "❗️ Please provide a text to search!"
 "getID" = "🆔 Your ID: <code>{{ .ID }}</code>"
-"helpAdminCommands" = "Search for a client email:\r\n<code>/usage [Email]</code>\r\n \r\nSearch for inbounds (with client stats):\r\n<code>/inbound [Remark]</code>"
+"helpAdminCommands" = "Search for a client email:\r\n<code>/Usage [Email]</code>\r\n\r\nSearch for inbounds (with client stats):\r\n<code>/inbound [Remark]</code>"
-"helpClientCommands" = "To search for statistics, just use the following command:\r\n \r\n<code>/usage [UUID|Password]</code>\r\n \r\nUse UUID for vmess/vless and Password for Trojan."
+"helpClientCommands" = "To search for statistics, simply use the following command:\r\n\r\n<code>/Usage [UUID|Password]</code>\r\n\r\nUse UUID for VMess/VLESS and Password for Trojan/Shadowsocks."
 
 [tgbot.messages]
-"cpuThreshold" = "🔴 The CPU usage {{ .Percent }}% is more than threshold {{ .Threshold }}%"
+"cpuThreshold" = "🔴 CPU load {{ .Percent }}% Exceeds the threshold of {{ .Threshold }}%"
-"loginSuccess" = "✅ Successfully logged-in to the panel.\r\n"
+"loginSuccess" = "✅ Logged in to the web panel successfully.\r\n"
-"loginFailed" = "❗️ Login to the panel failed.\r\n"
+"loginFailed" = "❗Log in to the web panel failed.\r\n"
-"report" = "🕰 Scheduled Reports: {{ .RunTime }}\r\n"
+"report" = "🕰 Scheduled reports: {{ .RunTime }}\r\n"
-"datetime" = "⏰ Date-Time: {{ .DateTime }}\r\n"
+"datetime" = "⏰ Date&Time: {{ .DateTime }}\r\n"
-"hostname" = "💻 Hostname: {{ .Hostname }}\r\n"
+"hostname" = "💻 Host: {{ .Hostname }}\r\n"
-"version" = "🚀 X-UI Version: {{ .Version }}\r\n"
+"version" = "🚀 X-UI: {{ .Version }}\r\n"
 "ipv6" = "🌐 IPv6: {{ .IPv6 }}\r\n"
 "ipv4" = "🌐 IPv4: {{ .IPv4 }}\r\n"
 "ip" = "🌐 IP: {{ .IP }}\r\n"
-"serverUpTime" = "⏳ Server Uptime: {{ .UpTime }} {{ .Unit }}\r\n"
+"serverUpTime" = "⏳ Uptime: {{ .UpTime }} {{ .Unit }}\r\n"
-"serverLoad" = "📈 Server Load: {{ .Load1 }}, {{ .Load2 }}, {{ .Load3 }}\r\n"
+"serverLoad" = "📈 System load: {{ .Load1 }}, {{ .Load2 }}, {{ .Load3 }}\r\n"
-"serverMemory" = "📋 Server Memory: {{ .Current }}/{{ .Total }}\r\n"
+"serverMemory" = "📋 RAM: {{ .Current }}/{{ .Total }}\r\n"
-"tcpCount" = "🔹 TcpCount: {{ .Count }}\r\n"
+"tcpCount" = "🔹 TCP: {{ .Count }}\r\n"
-"udpCount" = "🔸 UdpCount: {{ .Count }}\r\n"
+"udpCount" = "🔸 UDP: {{ .Count }}\r\n"
 "traffic" = "🚦 Traffic: {{ .Total }} (↑{{ .Upload }},↓{{ .Download }})\r\n"
-"xrayStatus" = "ℹ️ Xray Status: {{ .State }}\r\n"
+"xrayStatus" = "ℹ️ Status: {{ .State }}\r\n"
-"username"   = "👤 Username: {{ .Username }}\r\n"
+"username" = "👤 Username: {{ .Username }}\r\n"
 "time" = "⏰ Time: {{ .Time }}\r\n"
 "inbound" = "📍 Inbound: {{ .Remark }}\r\n"
 "port" = "🔌 Port: {{ .Port }}\r\n"
-"expire" = "📅 Expire Date: {{ .DateTime }}\r\n \r\n"
+"expire" = "📅 Expiry date: {{ .DateTime }}\r\n \r\n"
-"expireIn" = "📅 Expire In: {{ .Time }}\r\n \r\n"
+"expireIn" = "📅 Expire in: {{ .Time }}\r\n \r\n"
 "active" = "💡 Active: {{ .Enable }}\r\n"
 "online" = "🌐 Connection status: {{ .Status }}\r\n"
 "email" = "📧 Email: {{ .Email }}\r\n"
@@ -443,24 +502,24 @@
 "download" = "🔽 Download↓: {{ .Download }}\r\n"
 "total" = "🔄 Total: {{ .UpDown }} / {{ .Total }}\r\n"
 "exhaustedMsg" = "🚨 Exhausted {{ .Type }}:\r\n"
-"exhaustedCount" = "🚨 Exhausted {{ .Type }} count:\r\n"
+"exhaustedCount" = "🚨 Exhausted {{ .Type }} Count:\r\n"
-"onlinesCount" = "🌐 Online clients count: {{ .Count }}\r\n"
+"onlinesCount" = "🌐 Online clients: {{ .Count }}\r\n"
 "disabled" = "🛑 Disabled: {{ .Disabled }}\r\n"
 "depleteSoon" = "🔜 Deplete soon: {{ .Deplete }}\r\n \r\n"
-"backupTime" = "🗄 Backup Time: {{ .Time }}\r\n"
+"backupTime" = "🗄 Backup time: {{ .Time }}\r\n"
 "yes" = "✅ Yes"
 "no" = "❌ No"
 
 [tgbot.buttons]
-"dbBackup" = "Get DB Backup"
+"dbBackup" = "Get Backup"
-"serverUsage" = "Server Usage"
+"serverUsage" = "System Usage"
 "getInbounds" = "Get Inbounds"
-"depleteSoon" = "Deplete soon"
+"depleteSoon" = "Deplete Soon"
 "clientUsage" = "Get Usage"
 "onlines" = "Online Clients"
 "commands" = "Commands"
 
 [tgbot.answers]
 "getInboundsFailed" = "❌ Failed to get inbounds"
-"askToAddUser" = "Your configuration is not found!\r\nYou should configure your telegram username and ask your Admin to add it to your configuration."
+"askToAddUser" = "Your configuration is not found!\r\nPlease set a Telegram username, and then ask the service admin to add it to the configuration(s)."
-"askToAddUserName" = "Your configuration is not found!\r\nPlease ask your Admin to use your telegram username in your configuration(s).\r\n\r\nYour username: <b>@{{ .TgUserName }}</b>"
+"askToAddUserName" = "Your configuration is not found!\r\nPlease ask the service admin to add your Telegram username to the configuration(s).\r\n\r\nYour Username: <b>@{{ .TgUserName }}</b>"

web/translation/translate.fa_IR.toml

@@ -1,5 +1,5 @@
-"username" = "نام کاربری"
+"username" = "نام‌کاربری"
-"password" = "رمز عبور"
+"password" = "رمزعبور"
 "login" = "ورود"
 "confirm" = "تایید"
 "cancel" = "انصراف"
@@ -12,7 +12,7 @@
 "protocol" = "پروتکل"
 "search" = "جستجو"
 "filter" = "فیلتر"
-"loading" = "در حال بروزرسانی..."
+"loading" = "...در حال بارگذاری"
 "second" = "ثانیه"
 "minute" = "دقیقه"
 "hour" = "ساعت"
@@ -26,153 +26,158 @@
 "edit" = "ویرایش"
 "delete" = "حذف"
 "reset" = "ریست"
-"copySuccess" = "با موفقیت کپی شد"
+"copySuccess" = "باموفقیت کپی‌شد"
 "sure" = "مطمئن"
 "encryption" = "رمزگذاری"
-"transmission" = "راه اتصال"
+"transmission" = "راه‌اتصال"
 "host" = "آدرس"
 "path" = "مسیر"
-"camouflage" = "استتار"
+"camouflage" = "مبهم‌سازی"
 "status" = "وضعیت"
 "enabled" = "فعال"
 "disabled" = "غیرفعال"
 "depleted" = "منقضی"
-"depletingSoon" = "در حال انقضا"
+"depletingSoon" = "در‌حال‌انقضا"
 "offline" = "آفلاین"
 "online" = "آنلاین"
 "domainName" = "آدرس دامنه"
-"monitor" = "آی پی اتصال"
+"monitor" = "آدرس آی‌پی"
-"certificate" = "گواهی دیجیتال"
+"certificate" = "گواهی"
-"fail" = "خطا"
+"fail" = "ناموفق"
 "success" = " موفق"
-"getVersion" = "دریافت ورژن"
+"getVersion" = "دریافت نسخه"
 "install" = "نصب"
 "clients" = "کاربران"
 "usage" = "استفاده"
-"remained" = "باقیمانده"
+"remained" = "باقی‌مانده"
-"secAlertTitle" = "هشدار امنیتی"
+"secAlertTitle" = "هشدار‌امنیتی"
-"secAlertSsl" = "این اتصال امن نیست؛ لطفا تا زمانی که تی‌ال‌اس برای حفاظت از داده ها فعال نشده است از وارد کردن اطلاعات حساس خودداری کنید"
+"secAlertSsl" = "این‌اتصال‌امن نیست. لطفا‌ تازمانی‌که تی‌ال‌اس برای محافظت از‌ داده‌ها فعال نشده‌است، از وارد کردن اطلاعات حساس خودداری کنید"
+"secAlertConf" = "پیکربندی‌های خاصی مستعد حملات سایبری شناسایی شده‌اند، اقدام فوری برای تقویت پروتکل‌های امنیتی و محافظت در برابر نقض‌های امنیتی لازم است"
 "security" = "امنیت"
 
 [menu]
-"dashboard" = "وضعیت سیستم"
+"dashboard" = "نمای کلی"
-"inbounds" = "سرویس ها"
+"inbounds" = "ورودی‌ها"
 "settings" = "تنظیمات پنل"
-"xray" = "الگوی ایکس‌ری"
+"xray" = "پیکربندی ایکس‌ری"
 "logout" = "خروج"
-"link" = "دیگر"
+"link" = "مدیریت"
 
 [pages.login]
-"title" = "ورود به سیستم"
+"title" = "خوش‌آمدید"
-"loginAgain" = "مدت زمان استفاده به اتمام رسیده ، لطفا دوباره وارد شوید"
+"loginAgain" = "مدت زمان استفاده به‌اتمام ‌رسیده، لطفا دوباره وارد شوید"
 
 [pages.login.toasts]
-"invalidFormData" = "اطلاعات وارد شده به صورت درست وارد نشده است"
+"invalidFormData" = "اطلاعات به‌درستی وارد نشده‌است"
-"emptyUsername" = "نام کاربری خالی میباشد"
+"emptyUsername" = "لطفا یک نام‌کاربری وارد کنید‌"
-"emptyPassword" = "رمز عبور خالی میباشد"
+"emptyPassword" = "لطفا یک رمزعبور وارد کنید"
-"wrongUsernameOrPassword" = "نام کاربری و رمز عبور اشتباه میباشد"
+"wrongUsernameOrPassword" = "نام‌کاربری یا رمزعبور‌اشتباه‌است"
-"successLogin" = "خوش آمدید"
+"successLogin" = "ورود"
 
 [pages.index]
-"title" = "وضعیت سیستم"
+"title" = "نمای کلی"
-"memory" = "حافظه رم"
+"memory" = "RAM"
-"hard" = "حافظه دیسک"
+"hard" = "Disk"
-"xrayStatus" = "وضعیت Xray"
+"serverInfo" = "سرور"
+"hostname" = "نام میزبان"
+"xrayStatus" = "‌ایکس‌ری"
 "stopXray" = "توقف"
-"restartXray" = "شروع مجدد"
+"restartXray" = "ریستارت"
-"xraySwitch" = "تغییر ورژن"
+"xraySwitch" = "تغییر‌ نسخه ایکس‌ری"
-"xraySwitchClick" = "ورژن مورد نظر را انتخاب کنید"
+"xraySwitchClick" = "نسخه‌ مورد نظر را انتخاب کنید"
-"xraySwitchClickDesk" = "لطفا با دقت انتخاب کنید ، در صورت انتخاب اشتباه امکان قطعی سیستم وجود دارد "
+"xraySwitchClickDesk" = "لطفا بادقت انتخاب کنید. درصورت انتخاب نسخه قدیمی‌تر، امکان ناهماهنگی با پیکربندی‌های فعلی وجود دارد"
-"operationHours" = "مدت فعالیت"
+"operationHours" = "مدت‌کارکرد"
-"operationHoursDesc" = "مدت فعالیت سیستم بعد از روشن شدن"
+"operationHoursDesc" = "مدت کارکرد سیستم‌عامل پس‌از شروع به‌کار"
-"systemLoad" = "بار روی سیستم"
+"xrayoperationHoursDesc" = "مدت کارکرد ایکس‌ری پس‌از آخرین ریستارت"
-"connectionTcpCountDesc" = "مجموع اتصالات TCP در تمام کارت های شبکه"
+"systemLoad" = "بارسیستم"
-"connectionUdpCountDesc" = "مجموع اتصالات UDP در تمام کارت های شبکه"
+"systemLoadDesc" = "میانگین بار در 1، 5 و 15 دقیقه گذشته"
-"upSpeed" = "سرعت آپلود در حال حاضر سیستم"
+"connectionTcpCountDesc" = "TCP کل اتصالات"
-"downSpeed" = "سرعت دانلود در حال حاضر سیستم"
+"connectionUdpCountDesc" = "UDP کل اتصالات"
-"totalSent" = "جمع کل ترافیک آپلود مصرفی"
+"upSpeed" = "سرعت کلی آپلود"
-"totalReceive" = "جمع کل ترافیک دانلود مصرفی"
+"downSpeed" = "‌سرعت کلی دانلود"
-"xraySwitchVersionDialog" = "تغییر ورژن Xray"
+"totalSent" = "کل ترافیک ارسالی پس‌از شروع به‌کار سیستم‌عامل"
-"xraySwitchVersionDialogDesc" = "آیا از تغییر ورژن مطمئن هستین"
+"totalReceive" = "کل ترافیک دریافتی پس‌از شروع به‌کار سیستم‌عامل"
-"dontRefresh" = "در حال نصب ، لطفا رفرش نکنید "
+"xraySwitchVersionDialog" = "تغییرنسخه‌ایکس‌ری"
-"logs" = "گزارش ها"
+"xraySwitchVersionDialogDesc" = "آیا از تغییر نسخه‌ مطمئن هستید؟"
-"config" = "تنظیمات"
+"dontRefresh" = "در حال نصب، لطفا صفحه را رفرش نکنید"
-"backup" = "پشتیبان گیری"
+"logs" = "گزارش‌ها"
-"backupTitle" = "پشتیبان گیری دیتابیس"
+"config" = "کانفیگ"
-"backupDescription" = "به یاد داشته باشید که قبل از وارد کردن یک دیتابیس جدید، نسخه پشتیبان تهیه کنید"
+"backup" = "پشتیبان‌گیری و بازیابی"
-"exportDatabase" = "دانلود دیتابیس"
+"backupTitle" = "پشتیبان‌گیری و بازیابی دیتابیس"
-"importDatabase" = "آپلود دیتابیس"
+"backupDescription" = "توصیه‌می‌شود قبل‌از بازیابی دیتابیس، یک نسخه پشتیبان تهیه ‌کنید"
+"exportDatabase" = "پشتیبان‌گیری"
+"importDatabase" = "بازیابی"
 
 [pages.inbounds]
 "title" = "کاربران"
-"totalDownUp" = "جمع آپلود/دانلود"
+"totalDownUp" = "دریافت/ارسال کل"
-"totalUsage" = "جمع کل"
+"totalUsage" = "‌‌‌مصرف کل"
-"inboundCount" = "تعداد سرویس ها"
+"inboundCount" = "کل ورودی‌ها"
-"operate" = "عملیات"
+"operate" = "منو"
 "enable" = "فعال"
 "remark" = "نام"
 "protocol" = "پروتکل"
 "port" = "پورت"
 "traffic" = "ترافیک"
-"details" = "توضیحات"
+"details" = "جزئیات"
 "transportConfig" = "نحوه اتصال"
 "expireDate" = "تاریخ انقضا"
 "resetTraffic" = "ریست ترافیک"
-"addInbound" = "اضافه کردن سرویس"
+"addInbound" = "افزودن ورودی"
 "generalActions" = "عملیات کلی"
-"create" = "اضافه کردن"
+"create" = "افزودن"
 "update" = "ویرایش"
-"modifyInbound" = "ویرایش سرویس"
+"modifyInbound" = "ویرایش ورودی"
-"deleteInbound" = "حذف سرویس"
+"deleteInbound" = "حذف ورودی"
-"deleteInboundContent" = "آیا مطمئن به حذف سرویس هستید ؟"
+"deleteInboundContent" = "آیا مطمئن به حذف ورودی هستید؟"
 "deleteClient" = "حذف کاربر"
-"deleteClientContent" = "آیا مطمئن به حذف کاربر هستید ؟"
+"deleteClientContent" = "آیا مطمئن به حذف کاربر هستید؟"
-"resetTrafficContent" = "آیا مطمئن به ریست ترافیک هستید ؟"
+"resetTrafficContent" = "آیا مطمئن به ریست ترافیک هستید؟"
 "copyLink" = "کپی لینک"
 "address" = "آدرس"
 "network" = "شبکه"
 "destinationPort" = "پورت مقصد"
 "targetAddress" = "آدرس مقصد"
-"monitorDesc" = "به طور پیش فرض خالی بگذارید"
+"monitorDesc" = "برای گوش‌دادن به‌تمام آی‌پی‌ها خالی‌بگذارید"
-"meansNoLimit" = "یعنی بدون محدودیت"
+"meansNoLimit" = "صفر یعنی نامحدود. واحد: گیگابایت"
-"totalFlow" = "کل ترافیک"
+"totalFlow" = "ترافیک کل"
-"leaveBlankToNeverExpire" = "خالی بگذارید تا هرگز منقضی نشود"
+"leaveBlankToNeverExpire" = "برای منقضی‌نشدن خالی‌بگذارید"
-"noRecommendKeepDefault" = "توصیه می شود به عنوان پیش فرض حفظ شود"
+"noRecommendKeepDefault" = "توصیه‌می‌شود به‌طور پیش‌فرض حفظ‌شود"
 "certificatePath" = "مسیر فایل"
 "certificateContent" = "محتوای فایل"
 "publicKeyPath" = "مسیر کلید عمومی"
 "publicKeyContent" = "محتوای کلید عمومی"
 "keyPath" = "مسیر کلید خصوصی"
 "keyContent" = "محتوای کلید خصوصی"
-"clickOnQRcode" = "برای کپی بر روی کد تصویری کلیک کنید"
+"clickOnQRcode" = "برای کپی لینک بر روی کدتصویری کلیک کنید"
 "client" = "کاربر"
 "export" = "استخراج لینک‌ها"
-"clone" = "شبیه سازی"
+"clone" = "شبیه‌سازی"
-"cloneInbound" = "شبیه‌سازی سرویس"
+"cloneInbound" = "شبیه‌سازی ورودی"
-"cloneInboundContent" = "همه موارد این ورودی بجز پورت ، ای پی و کلاینت ها شبیه سازی خواهند شد"
+"cloneInboundContent" = "همه موارد این ورودی بجز پورت، آی‌پی و کاربر‌ها شبیه‌سازی خواهند شد"
-"resetAllTraffic" = "ریست ترافیک کل سرویس ها"
+"resetAllTraffic" = "ریست ترافیک کل ورودی‌ها"
-"resetAllTrafficTitle" = "ریست ترافیک کل سرویس ها"
+"resetAllTrafficTitle" = "ریست ترافیک کل ورودی‌ها"
-"resetAllTrafficContent" = "آیا مطمئن هستید که میخواهید تمام ترافیک سرویس ها را ریست کنید؟"
+"resetAllTrafficContent" = "آیا مطمئن به ریست ترافیک تمام ورودی‌ها هستید؟"
 "resetInboundClientTraffics" = "ریست ترافیک کاربران"
-"resetInboundClientTrafficTitle" = "ریست ترافیک کل کاربران"
+"resetInboundClientTrafficTitle" = "ریست ترافیک کاربران"
-"resetInboundClientTrafficContent" = "آیا مطمئن هستید که میخواهید تمام ترافیک کاربران این سرویس را ریست کنید؟"
+"resetInboundClientTrafficContent" = "آیا مطمئن به ریست ترافیک تمام کاربران این‌ ورودی هستید؟"
-"resetAllClientTraffics" = "ریست ترافیک کاربران"
+"resetAllClientTraffics" = "ریست ترافیک کل کاربران"
 "resetAllClientTrafficTitle" = "ریست ترافیک کل کاربران"
-"resetAllClientTrafficContent" = "آیا مطمئن هستید که میخواهید تمام ترافیک کاربران را ریست کنید؟"
+"resetAllClientTrafficContent" = "آیا مطمئن به ریست ترافیک تمام کاربران هستید؟"
 "delDepletedClients" = "حذف کاربران منقضی"
 "delDepletedClientsTitle" = "حذف کاربران منقضی"
-"delDepletedClientsContent" = "آیا مطمئن هستید مه میخواهید تمامی کاربران منقضی شده را حذف کنید؟"
+"delDepletedClientsContent" = "آیا مطمئن به حذف تمام کاربران منقضی‌شده ‌هستید؟"
 "email" = "ایمیل"
-"emailDesc" = "ایمیل باید کاملا منحصر به فرد باشد"
+"emailDesc" = "باید یک ایمیل یکتا باشد"
 "setDefaultCert" = "استفاده از گواهی پنل"
-"telegramDesc" = "از آیدی تلگرام بدون @ یا آیدی چت استفاده کنید (می توانید آن را از اینجا دریافت کنید @userinfobot یا در ربات دستور '/id' را وارد کنید)"
+"telegramDesc" = "دریافت کنید‌ '/id'یا دستور @userinfobot آی‌دی‌(های) چت مدیر را بدون '@' واردکنید. از"
-"subscriptionDesc" = "می توانید ساب لینک خود را در جزئیات پیدا کنید، همچنین می توانید از همین نام برای چندین کانفیگ استفاده کنید"
+"subscriptionDesc" = "لینک سابسکربپشن خودرا در 'اطلاعات بیشتر' پیدا کنید، همچنین می‌توانید از همین نام برای چندین کاربر استفاده‌کنید"
 "info" = "اطلاعات"
 "same" = "همسان"
-"inboundData" = "داده‌های سرویس"
+"inboundData" = "داده‌های ورودی"
-"copyToClipboard" = "کپی در حافظه"
+"exportInbound" = "استخراج ورودی"
-"import" = "وارد کردن"
+"import" = "افزودن"
-"importInbound" = "وارد کردن یک سرویس"
+"importInbound" = "افزودن یک ورودی"
 
 [pages.client]
 "add" = "کاربر جدید"
@@ -180,184 +185,202 @@
 "submitAdd" = "اضافه کردن"
 "submitEdit" = "ذخیره تغییرات"
 "clientCount" = "تعداد کاربران"
-"bulk" = "انبوه سازی"
+"bulk" = "انبوه‌سازی"
 "method" = "روش"
 "first" = "از"
 "last" = "تا"
 "prefix" = "پیشوند"
 "postfix" = "پسوند"
-"delayedStart" = "شروع بعد از اولین استفاده"
+"delayedStart" = "شروع‌پس‌از‌اولین‌استفاده"
-"expireDays" = "روزهای اعتبار"
+"expireDays" = "مدت زمان"
 "days" = "(روز)"
 "renew" = "تمدید خودکار"
-"renewDesc" = "روزهای تمدید خودکار پس از انقضا. 0 = غیرفعال"
+"renewDesc" = "تمدید خودکار پس‌از ‌انقضا. 0 = غیرفعال - واحد: روز"
 
 [pages.inbounds.toasts]
-"obtain" = "Obtain"
+"obtain" = "فراهم‌سازی"
 
 [pages.inbounds.stream.general]
-"requestHeader" = "درخواست سربرگ"
+"request" = "درخواست"
+"response" = "پاسخ"
 "name" = "نام"
 "value" = "مقدار"
 
 [pages.inbounds.stream.tcp]
-"requestVersion" = "ورژن درخواست"
+"version" = "نسخه"
-"requestMethod" = "متد درخواست"
+"method" = "متد"
-"requestPath" = "مسیر درخواست"
+"path" = "مسیر"
-"responseVersion" = "ورژن پاسخ"
+"status" = "وضعیت"
-"responseStatus" = "وضعیت پاسخ"
+"statusDescription" = "توضیحات وضعیت"
-"responseStatusDescription" = "توضیحات وضعیت پاسخ"
+"requestHeader" = "سربرگ درخواست"
 "responseHeader" = "سربرگ پاسخ"
 
 [pages.inbounds.stream.quic]
 "encryption" = "رمزنگاری"
 
 [pages.settings]
-"title" = "تنظیمات"
+"title" = "تنظیمات پنل"
 "save" = "ذخیره"
 "infoDesc" = "برای اعمال تغییرات در این بخش باید پس از ذخیره کردن، پنل را ریستارت کنید"
 "restartPanel" = "ریستارت پنل"
-"restartPanelDesc" = "آیا مطمئن هستید که می خواهید پنل را دوباره راه اندازی کنید؟ برای راه اندازی مجدد روی OK کلیک کنید. اگر بعد از 3 ثانیه نمی توانید به پنل دسترسی پیدا کنید، لطفاً برای مشاهده اطلاعات گزارش پانل به سرور برگردید"
+"restartPanelDesc" = "آیا مطمئن به ریستارت پنل هستید؟ اگر پس‌از ریستارت نتوانستید به پنل دسترسی پیدا کنید، گزارش‌های موجود در اسکریپت پنل را بررسی کنید"
-"resetDefaultConfig" = "برگشت به تنظیمات پیشفرض"
+"resetDefaultConfig" = "برگشت به پیش‌فرض"
-"panelConfig" = "تنظیمات پنل"
+"panelConfig" = "عمومی"
-"userSettings" = "تنظیمات مدیر"
+"userSettings" = "احرازهویت"
-"TGBotSettings" = "تنظیمات ربات تلگرام"
+"TGBotSettings" = "ربات تلگرام"
-"panelListeningIP" = "محدودیت آی پی پنل"
+"panelListeningIP" = "آدرس آی‌پی"
-"panelListeningIPDesc" = "برای استفاده از تمام آی‌پیها به طور پیش فرض خالی بگذارید"
+"panelListeningIPDesc" = "آدرس آی‌پی برای وب پنل. برای گوش‌دادن به‌تمام آی‌پی‌ها خالی‌بگذارید"
-"panelListeningDomain" = "محدودیت دامین پنل"
+"panelListeningDomain" = "نام دامنه"
-"panelListeningDomainDesc" = "برای استفاده از تمام دامنه‌ها و آی‌پی‌ها به طور پیش فرض خالی بگذارید"
+"panelListeningDomainDesc" = "آدرس دامنه برای وب پنل. برای گوش‌دادن به‌تمام دامنه‌ها و آی‌پی‌ها خالی‌بگذارید"
-"panelPort" = "پورت پنل"
+"panelPort" = "شماره پورت"
-"panelPortDesc" = "پورت مورد استفاده برای نمایش این پنل"
+"panelPortDesc" = "شماره پورت برای وب پنل. باید پورت استفاده نشده‌باشد"
-"publicKeyPath" = "مسیر فایل گواهی کلید عمومی پنل"
+"publicKeyPath" = "مسیر کلید عمومی"
-"publicKeyPathDesc" = "باید یک مسیر مطلق باشد که با / شروع می شود "
+"publicKeyPathDesc" = "مسیر فایل کلیدعمومی برای وب پنل. با '/' شروع‌می‌شود"
-"privateKeyPath" = "مسیر فایل گواهی کلید خصوصی پنل"
+"privateKeyPath" = "مسیر کلید خصوصی"
-"privateKeyPathDesc" = "باید یک مسیر مطلق باشد که با / شروع می شود "
+"privateKeyPathDesc" = "مسیر فایل کلیدخصوصی برای وب پنل. با '/' شروع‌می‌شود"
-"panelUrlPath" = "آدرس روت پنل"
+"panelUrlPath" = "URI مسیر"
-"panelUrlPathDesc" = "باید با '/' شروع شود و با '/' تمام شود"
+"panelUrlPathDesc" = "مسیر لینک وب پنل. با '/' شروع‌ و با '/' خاتمه‌ می‌یابد"
 "pageSize" = "اندازه صفحه بندی جدول"
-"pageSizeDesc" = "اندازه صفحه را برای جدول سرویس ها تعریف کنید. 0: غیرفعال"
+"pageSizeDesc" = "اندازه صفحه برای جدول ورودی‌ها. 0 = غیرفعال"
-"remarkModel" = "نام کانفیگ و جداکننده"
+"remarkModel" = "نام‌کانفیگ و جداکننده"
-"sampleRemark" = "نمونه نام"
+"sampleRemark" = "نمونه‌نام"
-"oldUsername" = "نام کاربری فعلی"
+"oldUsername" = "نام‌کاربری فعلی"
-"currentPassword" = "رمز عبور فعلی"
+"currentPassword" = "رمز‌عبور فعلی"
-"newUsername" = "نام کاربری جدید"
+"newUsername" = "نام‌کاربری جدید"
-"newPassword" = "رمز عبور جدید"
+"newPassword" = "رمزعبور جدید"
-"telegramBotEnable" = "فعالسازی ربات تلگرام"
+"telegramBotEnable" = "فعال‌سازی ربات تلگرام"
-"telegramBotEnableDesc" = "از طریق بات تلگرام به امکانات ابن پنل متصل شوید"
+"telegramBotEnableDesc" = "ربات تلگرام را فعال می‌کند"
 "telegramToken" = "توکن تلگرام"
-"telegramTokenDesc" = "توکن را باید از مدیر بات های تلگرام دریافت کنید @botfather"
+"telegramTokenDesc" = "دریافت کنید @botfather توکن تلگرام، از"
-"telegramChatId" = "آی دی تلگرام مدیریت"
+"telegramChatId" = "آی‌دی چت مدیر"
-"telegramChatIdDesc" = "از @userinfobot یا دستور '/id' در ربات برای دریافت شناسه های چت خود استفاده کنید. با استفاده از کاما میتونید چند آی دی را از هم جدا کنید. "
+"telegramChatIdDesc" = "دریافت کنید '/id'یا دستور @userinfobot آی‌دی(های) چت مدیر، از"
-"telegramNotifyTime" = "مدت زمان نوتیفیکیشن ربات تلگرام"
+"telegramNotifyTime" = "زمان اطلاع‌رسانی"
-"telegramNotifyTimeDesc" = "از فرمت زمان بندی لینوکس استفاده کنید "
+"telegramNotifyTimeDesc" = "زمان‌اطلاع‌رسانی ربات تلگرام برای ارسال گزارش‌های دوره‌ای. از فرمت زمانی کرون‌تاب استفاده‌کنید‌"
-"tgNotifyBackup" = "پشتیبان گیری از پایگاه داده"
+"tgNotifyBackup" = "پشتیبان‌گیری دیتابیس"
-"tgNotifyBackupDesc" = "ارسال کپی فایل پایگاه داده به همراه گزارش دوره ای"
+"tgNotifyBackupDesc" = "فایل پشتیبان دیتابیس را به‌همراه گزارش‌ دریافت می‌کنید‌"
-"tgNotifyLogin" = "اعلان ورود"
+"tgNotifyLogin" = "اطلاع‌رسانی ورود"
-"tgNotifyLoginDesc" = "نام کاربری، آدرس ای پی، و زمان وقتی که فردی سعی می‌کند به پنل شما وارد شود نمایش میدهد"
+"tgNotifyLoginDesc" = "هر زمان کسی سعی به ورود به وب پنل شما را داشت. درباره نام‌کاربری، آی‌پی و زمان، مطلع می‌شوید"
-"sessionMaxAge" = "بیشینه زمان جلسه وب"
+"sessionMaxAge" = "مدت جلسه"
-"sessionMaxAgeDesc" = "بیشینه زمانی که میتوانید لاگین بمانید (واحد: دقیقه)"
+"sessionMaxAgeDesc" = "بیشینه مدت زمانی‌که می‌توانید لاگین بمانید. واحد: دقیقه"
-"expireTimeDiff" = "آستانه زمان باقی مانده"
+"expireTimeDiff" = "اطلاع‌رسانی زمان‌انقضا"
-"expireTimeDiffDesc" = "فاصله زمانی هشدار تا رسیدن به زمان انقضا (واحد: روز)"
+"expireTimeDiffDesc" = "وقتی زمان باقی‌مانده به‌آستانه تعیین‌شده رسید، مطلع می‌شوید. واحد: روز"
-"trafficDiff" = "آستانه ترافیک باقی مانده"
+"trafficDiff" = "اطلاع‌رسانی ترافیک باقی‌مانده"
-"trafficDiffDesc" = "فاصله زمانی هشدار تا رسیدن به اتمام ترافیک (واحد: گیگابایت)"
+"trafficDiffDesc" = "وقتی‌ ترافیک باقی‌مانده به‌آستانه تعیین‌شده رسید، مطلع می‌شوید. واحد: گیگابایت"
-"tgNotifyCpu" = "آستانه هشدار درصد پردازنده"
+"tgNotifyCpu" = "اطلاع‌رسانی بار پردازنده"
-"tgNotifyCpuDesc" = "این ربات تلگرام در صورت استفاده پردازنده بیشتر از این درصد برای شما پیام ارسال می کند.(واحد: درصد)"
+"tgNotifyCpuDesc" = "اگر بار پردازنده از آستانه تعیین‌شده فراتر رفت، مطلع می‌شوید. واحد: درصد"
-"timeZone" = "منظقه زمانی"
+"timeZone" = "منطقه زمانی"
-"timeZoneDesc" = "وظایف برنامه ریزی شده بر اساس این منطقه زمانی اجرا می شوند. پنل را مجدداً راه اندازی می کند تا اعمال شود"
+"timeZoneDesc" = "وظایف برنامه ریزی شده بر اساس این منطقه‌زمانی اجرا می‌شود"
 "subSettings" = "سابسکریپشن"
-"subEnable" = "فعال کردن سرویس"
+"subEnable" = "فعال‌سازی سرویس سابسکریپشن"
-"subEnableDesc" = "ویژگی سابسکریپشن با پیکربندی جداگانه"
+"subEnableDesc" = " سرویس سابسکریپشن‌ را فعال می‌کند"
-"subListen" = "محدودیت آی‌پی"
+"subListen" = "آدرس آی‌پی"
-"subListenDesc" = "برای استفاده از همه آی‌پی ها به طور پیش فرض خالی بگذارید"
+"subListenDesc" = "آدرس آی‌پی برای سابسکریپشن. برای گوش‌دادن به‌تمام آی‌پی‌ها خالی‌بگذارید"
-"subPort" = "پورت سرویس"
+"subPort" = "شماره پورت"
-"subPortDesc" = "شماره پورت برای ارائه خدمات سابسکریپشن"
+"subPortDesc" = "شماره پورت برای سابسکریپشن. باید پورت استفاده نشده‌باشد"
-"subCertPath" = "مسیر فایل کلید عمومی گواهی سابسکریپشن"
+"subCertPath" = "مسیر کلید عمومی"
-"subCertPathDesc" = "یک مسیر مطلق که با '/' شروع می شود را پر کنید."
+"subCertPathDesc" = "مسیر فایل کلیدعمومی برای سابیکریپشن. با '/' شروع‌می‌شود"
-"subKeyPath" = "مسیر فایل کلید خصوصی گواهی سابسکریپشن"
+"subKeyPath" = "مسیر کلید خصوصی"
-"subKeyPathDesc" = "یک مسیر مطلق که با '/' شروع می شود را پر کنید."
+"subKeyPathDesc" = "مسیر فایل کلیدخصوصی برای سابسکریپشن. با '/' شروع‌می‌شود"
-"subPath" = "مسیر ریشه سابسکریپشن"
+"subPath" = "URI مسیر"
-"subPathDesc" = "باید با '/' شروع شود و با '/' ختم شود."
+"subPathDesc" = "مسیر لینک سابسکریپشن. با '/' شروع‌ و با '/' خاتمه‌ می‌یابد"
-"subDomain" = "دامنه مخصوص سابسکریپشن"
+"subDomain" = "نام دامنه"
-"subDomainDesc" = "برای نظارت بر همه دامنه ها و آی‌پی ها به طور پیش فرض خالی بگذارید"
+"subDomainDesc" = "آدرس دامنه برای سابسکریپشن. برای گوش‌دادن به‌تمام دامنه‌ها و آی‌پی‌ها خالی‌بگذارید‌"
-"subUpdates" = "فاصله به روز رسانی های سابسکریپشن"
+"subUpdates" = "فاصله بروزرسانی‌"
-"subUpdatesDesc" = "ساعت های فاصله بین به روز رسانی در برنامه کاربر"
+"subUpdatesDesc" = "فاصله مابین بروزرسانی لینک سابسکریپشن در برنامه‌های کاربری. واحد: ساعت"
-"subEncrypt" = "رمزگذاری کانفیگ ها"
+"subEncrypt" = "کدگذاری"
-"subEncryptDesc" = "رمزگذاری کانفیگ های بازگشتی سابسکریپشن"
+"subEncryptDesc" = " محتوای برگشتی سابسکریپشن برپایه بیس64 کدگذاری خواهدشد"
 "subShowInfo" = "نمایش اطلاعات مصرف"
-"subShowInfoDesc" = "ترافیک و زمان باقیمانده را در هر کانفیگ نمایش میدهد"
+"subShowInfoDesc" = "ترافیک و زمان باقی‌مانده را در برنامه‌های کاربری نمایش می‌دهد"
-"subURI" = "آدرس پایه پروکسی معکوس"
+"subURI" = "پراکسی معکوس URI"
-"subURIDesc" = "آدرس پایه سابسکریپشن را برای استفاده در پشت پراکسی ها تغییر میدهد"
+"subURIDesc" = "سابسکریپشن از لینکی که در پشت پراکسی‌های معکوس تنظیم شده‌، استفاده خواهدکرد"
+"fragment" = "تکه‌تکه شدن"
+"fragmentDesc" = "فعال کردن تکه تکه شدن برای بسته نخست تی‌ال‌اس"
 
 [pages.settings.toasts]
 "modifySettings" = "ویرایش تنظیمات"
 "getSettings" = "دریافت تنظیمات"
-"modifyUser" = "ویرایش کاربر"
+"modifyUser" = "ویرایش مدیر"
-"originalUserPassIncorrect" = "نام کاربری و رمز عبور فعلی اشتباه می باشد "
+"originalUserPassIncorrect" = "نام‌کاربری یا رمزعبور فعلی اشتباه‌است"
-"userPassMustBeNotEmpty" = "نام کاربری و رمز عبور جدید نمیتواند خالی باشد "
+"userPassMustBeNotEmpty" = "نام‌کاربری یا رمزعبور جدید خالی‌است"
 
 [pages.xray]
-"title" = "تنظیمات Xray"
+"title" = "پیکربندی ایکس‌ری"
-"save" = "ذخیره تنظیمات"
+"save" = "ذخیره"
 "restart" = "ریستارت ایکس‌ری"
-"basicTemplate" = "بخش الگو پایه"
+"basicTemplate" = "پایه"
-"advancedTemplate" = "بخش الگو پیشرفته"
+"advancedTemplate" = "پیشرفته"
-"generalConfigs" = "تنظیمات عمومی"
+"generalConfigs" = "استراتژی‌ کلی"
-"generalConfigsDesc" = "این تنظیمات میتواند ترافیک کلی سرویس را متاثر کند"
+"generalConfigsDesc" = "این گزینه‌ها استراتژی کلی ترافیک را تعیین می‌کنند"
-"blockConfigs" = "مسدود سازی"
+"logConfigs" = "گزارش‌ها"
-"blockConfigsDesc" = "این گزینه ها از اتصال کاربران به پروتکل ها و وب سایت های خاص جلوگیری می کند"
+"logConfigsDesc" = "گزارش‌ها ممکن است بر کارایی سرور شما تأثیر بگذارند. توصیه می شود فقط در صورت نیاز آن را آگاهانه فعال کنید"
-"blockCountryConfigs" = "تنظیمات برای مسدودسازی کشورها"
+"blockConfigs" = "سپر محافظ"
-"blockCountryConfigsDesc" = "این گزینه اتصال کاربران به دامنه های کشوری خاص را مسدود می کند"
+"blockConfigsDesc" = "این گزینه‌ها ترافیک را بر اساس پروتکل‌های درخواستی خاص، و وب سایت‌ها مسدود می‌کند"
-"directCountryConfigs" = "تنظیمات برای اتصال مستقیم کشورها"
+"blockCountryConfigs" = "مسدودسازی کشور"
-"directCountryConfigsDesc" = "این گزینه کاربران را به دامنه های کشوری خاص را به طور مستقیم، متصل می کند"
+"blockCountryConfigsDesc" = "این گزینه‌ها ترافیک را بر اساس کشور درخواستی خاص مسدود می‌کند"
-"ipv4Configs" = "تنظیمات برای IPv4"
+"directCountryConfigs" = "اتصال مستقیم کشور"
-"ipv4ConfigsDesc" = "این گزینه فقط از طریق آیپی ورژن ۴ به دامنه های هدف هدایت می شود"
+"directCountryConfigsDesc" = "این گزینه‌ها ترافیک را بر اساس کشور درخواستی خاص بصورت مستقیم ارسال می‌کند"
-"Template" = "تنظیمات الگو ایکس ری"
+"ipv4Configs" = "IPv4 مسیریابی"
-"TemplateDesc" = "فایل پیکربندی ایکس ری نهایی بر اساس این الگو ایجاد میشود. لطفاً این را تغییر ندهید مگر اینکه دقیقاً بدانید که چه کاری انجام می دهید!"
+"ipv4ConfigsDesc" = "این گزینه‌ها ترافیک را از طریق آی‌پی نسخه4 ماشین، به مقصد هدایت می‌کند"
-"FreedomStrategy" = "روش استفاده از شبکه خروجی مستقیم"
+"warpConfigs" = "WARP تنظمیات"
-"FreedomStrategyDesc" = "تعیین روش استفاده از خروجی برای پرتکل مستقیم"
+"warpConfigsDesc" = "این گزینه‌ها ترافیک‌ را از طریق وارپ کلادفلر به مقصد هدایت می‌کند"
-"RoutingStrategy" = "پیکربندی استراتژی حل دامنه در مسیریابی"
+"Template" = "‌پیکربندی پیشرفته الگو ایکس‌ری"
-"RoutingStrategyDesc" = "تعیین استراتژی مسیریابی کلی برای پیدا کردن دامنه"
+"TemplateDesc" = "فایل پیکربندی نهایی ایکس‌ری بر اساس این الگو ایجاد می‌شود"
-"Torrent" = "فیلتر کردن بیت تورنت"
+"FreedomStrategy" = "Freedom استراتژی پروتکل"
-"TorrentDesc" = "الگوی تنظیمات را برای فیلتر کردن پروتکل بیت تورنت برای کاربران تغییر میدهد"
+"FreedomStrategyDesc" = "تعیین می‌کند Freedom استراتژی خروجی شبکه را برای پروتکل"
-"PrivateIp" = "جلوگیری از اتصال آیپی های خصوصی یا محلی"
+"RoutingStrategy" = "استراتژی کلی مسیریابی"
-"PrivateIpDesc" = "الگوی تنظیمات را برای فیلتر کردن اتصال آیپی های خصوصی یا محلی و بسته های سرگردان تغییر میدهد"
+"RoutingStrategyDesc" = "استراتژی کلی مسیریابی برای حل تمام درخواست‌ها را تعیین می‌کند"
-"Ads" = "مسدود کردن تبلیغات"
+"Torrent" = "مسدودسازی پروتکل بیت‌تورنت"
-"AdsDesc" = "الگوی تنظیمات را برای مسدود کردن تبلیغات تغییر میدهد"
+"TorrentDesc" = "پروتکل بیت تورنت را مسدود می‌کند"
-"Family" = "فعال کردن حالت خانواده"
+"PrivateIp" = "مسدودسازی اتصال آی‌پی‌های خصوصی"
-"FamilyDesc" = "برای جلوگیری از ارتباط با وبسایت های ناامن"
+"PrivateIpDesc" = "اتصال به آی‌پی‌های رنج خصوصی را مسدود می‌کند"
-"IRIp" = "جلوگیری از اتصال آیپی های ایران"
+"Ads" = "مسدودسازی تبلیغات"
-"IRIpDesc" = "الگوی تنظیمات را برای فیلتر کردن اتصال آیپی های ایران تغییر میدهد"
+"AdsDesc" = "وب‌سایت‌های تبلیغاتی را مسدود می‌کند"
-"IRDomain" = "جلوگیری از اتصال دامنه های ایران"
+"Family" = "محافظ خانواده"
-"IRDomainDesc" = "الگوی تنظیمات را برای فیلتر کردن اتصال دامنه های ایران تغییر میدهد"
+"FamilyDesc" = "محتوای مخصوص بزرگسالان، و وبسایت‌های ناامن را مسدود می‌کند"
-"ChinaIp" = "جلوگیری از اتصال آیپی های چین"
+"IRIp" = "مسدودسازی اتصال به آی‌پی‌های ایران"
-"ChinaIpDesc" = "الگوی تنظیمات را برای فیلتر کردن اتصال آیپی های چین تغییر میدهد"
+"IRIpDesc" = "اتصال به آی‌پی‌های کشور ایران را مسدود می‌کند"
-"ChinaDomain" = "جلوگیری از اتصال دامنه های چین"
+"IRDomain" = "مسدودسازی اتصال به دامنه‌های‌ ایران"
-"ChinaDomainDesc" = "الگوی تنظیمات را برای فیلتر کردن اتصال دامنه های چین تغییر میدهد"
+"IRDomainDesc" = "اتصال به دامنه‌های کشور ایران را مسدود می‌کند"
-"RussiaIp" = "جلوگیری از اتصال آیپی های روسیه"
+"ChinaIp" = "مسدودسازی اتصال به آی‌‌پی‌های چین"
-"RussiaIpDesc" = "الگوی تنظیمات را برای فیلتر کردن اتصال آیپی های روسیه تغییر میدهد"
+"ChinaIpDesc" = "اتصال به آی‌پی‌های کشور چین را مسدود می‌کند"
-"RussiaDomain" = "جلوگیری از اتصال دامنه های روسیه"
+"ChinaDomain" = "مسدودسازی اتصال به دامنه‌های چین"
-"RussiaDomainDesc" = "الگوی تنظیمات را برای فیلتر کردن اتصال دامنه های روسیه تغییر میدهد"
+"ChinaDomainDesc" = "اتصال به دامنه‌های کشور چین را مسدود می‌کند"
-"DirectIRIp" = "ارتباط مستقیم به آیپی های ایران"
+"RussiaIp" = "مسدودسازی اتصال به آی‌پی‌های روسیه"
-"DirectIRIpDesc" = "الگوی تنظیمات را برای ارتباط مستقیم به آیپی های ایران تغییر میدهد"
+"RussiaIpDesc" = "اتصال به آی‌پی‌های کشور روسیه را مسدود می‌کند"
-"DirectIRDomain" = "ارتباط مستقیم به دامنه های ایران"
+"RussiaDomain" = "مسدودسازی اتصال به دامنه‌های روسیه"
-"DirectIRDomainDesc" = "الگوی تنظیمات را برای ارتباط مستقیم به دامنه های ایران تغییر میدهد"
+"RussiaDomainDesc" = "اتصال به دامنه‌های کشور روسیه را مسدود می‌کند"
-"DirectChinaIp" = "ارتباط مستقیم به آیپی های چین"
+"DirectIRIp" = "اتصال مستقیم آی‌پی‌های ایران"
-"DirectChinaIpDesc" = "الگوی تنظیمات را برای ارتباط مستقیم به آیپی های چین تغییر میدهد"
+"DirectIRIpDesc" = "اتصال مستقیم به آی‌پی‌های کشور ایران"
-"DirectChinaDomain" = "ارتباط مستقیم به دامنه های چین"
+"DirectIRDomain" = "اتصال مستقیم دامنه‌های ایران"
-"DirectChinaDomainDesc" = "الگوی تنظیمات را برای ارتباط مستقیم به دامنه های چین تغییر میدهد"
+"DirectIRDomainDesc" = "اتصال مستقیم به دامنه‌های کشور ایران"
-"DirectRussiaIp" = "ارتباط مستقیم به آیپی های روسیه"
+"DirectChinaIp" = "اتصال مستقیم آی‌پی‌های چین"
-"DirectRussiaIpDesc" = "الگوی تنظیمات را برای ارتباط مستقیم به آیپی های روسیه تغییر میدهد"
+"DirectChinaIpDesc" = "اتصال مستقیم به آی‌پی‌های کشور چین"
-"DirectRussiaDomain" = "ارتباط مستقیم به دامنه های روسیه"
+"DirectChinaDomain" = "ارتباط مستقیم دامنه‌های چین"
-"DirectRussiaDomainDesc" = "الگوی تنظیمات را برای ارتباط مستقیم به دامنه های روسیه تغییر میدهد"
+"DirectChinaDomainDesc" = "اتصال مستقیم به دامنه‌های کشور چین"
-"GoogleIPv4" = "استفاده از آیپی ورژن 4 برای اتصال به گوگل"
+"DirectRussiaIp" = "ارتباط مستقیم آی‌پی‌های روسیه"
-"GoogleIPv4Desc" = "مسیردهی جدید برای اتصال به گوگل با آیپی ورژن 4 اضافه میکند"
+"DirectRussiaIpDesc" = "اتصال مستقیم به آی‌پی‌های کشور روسیه"
-"NetflixIPv4" = "استفاده از آیپی ورژن 4 برای اتصال به نتفلیکس"
+"DirectRussiaDomain" = "ارتباط مستقیم دامنه های روسیه"
-"NetflixIPv4Desc" = "مسیردهی جدید برای اتصال به نتفلیکس با آیپی ورژن 4 اضافه میکند"
+"DirectRussiaDomainDesc" = "اتصال مستقیم به دامنه‌های کشور روسیه"
+"GoogleIPv4" = "گوگل"
+"GoogleIPv4Desc" = "ترافیک را از طریق آی‌پی نسخه4، به گوگل هدایت می‌کند"
+"NetflixIPv4" = "نتفلیکس"
+"NetflixIPv4Desc" = "ترافیک را از طریق آی‌پی نسخه4، به نتفلیکس هدایت می‌کند"
 "completeTemplate" = "کامل"
+"GoogleWARP" = "گوگل"
+"GoogleWARPDesc" = "ترافیک را از طریق وارپ به گوگل هدایت می‌کند"
+"OpenAIWARP" = "چت جی‌پی‌تی"
+"OpenAIWARPDesc" = "ترافیک را از طریق وارپ به چت جی‌پی‌تی هدایت می‌کند"
+"NetflixWARP" = "نتفلیکس"
+"NetflixWARPDesc" = "ترافیک را از طریق وارپ به نتفلیکس هدایت می‌کند"
+"MetaWARP" = "متا"
+"MetaWARPDesc" = "ترافیک را از طریق وارپ به متا (اینستاگرام، فیس بوک، واتساپ، تردز و...) هدایت می کند."
+"SpotifyWARP" = "اسپاتیفای"
+"SpotifyWARPDesc" = " ترافیک را از طریق وارپ به اسپاتیفای هدایت می‌کند"
 "Inbounds" = "ورودی‌ها"
 "Outbounds" = "خروجی‌ها"
 "Routings" = "قوانین مسیریابی"
-"RoutingsDesc" = "اولویت هر قانون مهم است!"
+"RoutingsDesc" = "اولویت هر قانون مهم است"
+"Balancers" = "بالانسرها"
 
 [pages.xray.rules]
 "first" = "اولین"
@@ -371,7 +394,8 @@
 "info" = "اطلاعات"
 "add" = "افزودن قانون"
 "edit" = "ویرایش قانون"
-"useComma" = "موارد جدا شده با کاما"
+"useComma" = "موارد جداشده با کاما"
+"balancer" = "بالانسر"
 
 [pages.xray.outbound]
 "addOutbound" = "افزودن خروجی"
@@ -385,81 +409,116 @@
 "domain" = "دامنه"
 "type" = "نوع"
 "bridge" = "پل"
-"portal" = "پرتال"
+"portal" = "پورتال"
 "intercon" = "اتصال میانی"
+"settings" = "تنظیمات"
+"accountInfo" = "اطلاعات حساب"
+"outboundStatus" = "وضعیت خروجی"
+
+[pages.xray.balancer]
+"addBalancer" = "افزودن بالانسر"
+"editBalancer" = "ویرایش بالانسر"
+"balancerStrategy" = "استراتژی"
+"balancerSelectors" = "انتخاب‌گرها"
+"tag" = "برچسب"
+"tagDesc" = "برچسب یگانه"
+"balancerDesc" = "امکان استفاده همزمان برچسب خروجی و برچسب بالانسر باهم وجود ندارد. درصورت استفاده همزمان فقط برجسب خروجی عمل خواهد کرد."
+
+[pages.xray.wireguard]
+"secretKey" = "کلید شخصی"
+"publicKey" = "کلید عمومی"
+"allowedIPs" = "آی‌پی‌های مجاز"
+"endpoint" = "نقطه پایانی"
+"psk" = "کلید مشترک"
+"domainStrategy" = "استراتژی حل دامنه"
+
+[pages.xray.dns]
+"enable" = "فعال کردن حل دامنه"
+"enableDesc" = "سرور حل دامنه داخلی را فعال کنید"
+"strategy" = "استراتژی پرس‌وجو"
+"strategyDesc" = "استراتژی کلی برای حل نام دامنه"
+"add" = "افزودن سرور"
+"edit" = "ویرایش سرور"
+"domains" = "دامنه‌ها"
+
+[pages.xray.fakedns]
+"add" = "افزودن دی‌ان‌اس جعلی"
+"edit" = "ویرایش دی‌ان‌اس جعلی"
+"ipPool" = "زیرشبکه استخر آی‌پی"
+"poolSize" = "اندازه استخر"
 
 [tgbot]
-"noResult" = "❗ نتیجه‌ای یافت نشد!"
+"noResult" = "❗نتیجه‌ای یافت نشد"
-"wentWrong" = "❌ مشکلی رخ داده است!"
+"wentWrong" = "❌ مشکلی رخ داده‌است"
-"noInbounds" = "❗ هیچ ورودی یافت نشد!"
+"noInbounds" = " هیچ ورودی یافت نشد"
 "unlimited" = "♾ نامحدود"
 "day" = "روز"
 "days" = "روزها"
 "unknown" = "نامشخص"
 "inbounds" = "ورودی‌ها"
-"clients" = "کلاینت‌ها"
+"clients" = "کاربران"
 
 [tgbot.commands]
 "unknown" = "❗ دستور ناشناخته"
-"pleaseChoose" = "👇 لطفاً انتخاب کنید:\r\n"
+"pleaseChoose" = "👇 لطفاًانتخاب کنید:\r\n"
-"help" = "🤖 به این ربات خوش آمدید! این ربات برای ارائه داده‌های خاص از سرور طراحی شده است و به شما امکان تغییرات لازم را می‌دهد.\r\n\r\n"
+"help" = "🤖 به این ربات خوش‌آمدید! این ربات برای ارائه داده‌های خاص از وب پنل طراحی شده‌است و به‌شما امکان تغییرات لازم را می‌دهد\r\n\r\n"
 "start" = "👋 سلام <i>{{ .Firstname }}</i>.\r\n"
-"welcome" = "🤖 به ربات مدیریت <b>{{ .Hostname }}</b> خوش آمدید.\r\n"
+"welcome" = "🤖 به‌ربات مدیریت <b>{{ .Hostname }}</b> خوش‌آمدید\r\n"
-"status" = "✅ ربات در حالت عادی است!"
+"status" = "✅ ربات‌درحالت‌عادی‌است"
-"usage" = "❗ لطفاً یک متن برای جستجو وارد کنید!"
+"usage" = "❗ لطفا یک متن برای جستجو واردکنید"
-"getID" = "🆔 شناسه شما: <code>{{ .ID }}</code>"
+"getID" = "🆔 شناسه‌شما: <code>{{ .ID }}</code>"
-"helpAdminCommands" = "برای جستجوی ایمیل مشتری:\r\n<code>/usage [ایمیل]</code>\r\n \r\nبرای جستجوی ورودی‌ها (با آمار مشتری):\r\n<code>/inbound [توضیح]</code>"
+"helpAdminCommands" = "برای جستجوی ایمیل کاربر:\r\n<code>/usage [ایمیل]</code>\r\n \r\nبرای جستجوی ورودی‌ها (با آمار کاربر):\r\n<code>/inbound [توضیح]</code>"
-"helpClientCommands" = "برای جستجوی آمار، فقط از دستور زیر استفاده کنید:\r\n \r\n<code>/usage [UUID|رمز عبور]</code>\r\n \r\nاز UUID برای vmess/vless و از رمز عبور برای Trojan استفاده کنید."
+"helpClientCommands" = "برای جستجوی آمار، فقط از دستور زیر استفاده‌کنید:\r\n \r\n<code>/usage [UUID|رمز عبور]</code>\r\n \r\nاز رمزعبور استفاده کنید Trojan/Shadowsocks و برای UUID از VMess/VLESS برای"
 
 [tgbot.messages]
-"cpuThreshold" = "🔴 میزان استفاده از CPU {{ .Percent }}% بیشتر از آستانه {{ .Threshold }}% است."
+"cpuThreshold" = "🔴 بار ‌پردازنده {{ .Percent }}% بیشتر از آستانه است {{ .Threshold }}%"
-"loginSuccess" = "✅ با موفقیت به پنل وارد شدید.\r\n"
+"loginSuccess" = "✅ باموفقیت به پنل واردشدید \r\n"
-"loginFailed" = "❗️ ورود به پنل ناموفق بود.\r\n"
+"loginFailed" = "❗️ ورود به پنل ناموفق‌بود \r\n"
-"report" = "🕰 گزارشات زمان‌بندی شده: {{ .RunTime }}\r\n"
+"report" = "🕰 گزارشات‌زمان‌بندی‌شده: {{ .RunTime }}\r\n"
-"datetime" = "⏰ تاریخ-زمان: {{ .DateTime }}\r\n"
+"datetime" = "⏰ تاریخ‌وزمان: {{ .DateTime }}\r\n"
-"hostname" = "💻 نام میزبان: {{ .Hostname }}\r\n"
+"hostname" = "💻 نام‌میزبان: {{ .Hostname }}\r\n"
-"version" = "🚀 نسخه X-UI: {{ .Version }}\r\n"
+"version" = "🚀 X-UI: {{ .Version }}\r\n"
 "ipv6" = "🌐 IPv6: {{ .IPv6 }}\r\n"
 "ipv4" = "🌐 IPv4: {{ .IPv4 }}\r\n"
-"ip" = "🌐 آدرس IP: {{ .IP }}\r\n"
+"ip" = "🌐 IP: {{ .IP }}\r\n"
-"serverUpTime" = "⏳ زمان کارکرد سرور: {{ .UpTime }} {{ .Unit }}\r\n"
+"serverUpTime" = "⏳ مدت‌کارکرد: {{ .UpTime }} {{ .Unit }}\r\n"
-"serverLoad" = "📈 بار سرور: {{ .Load1 }}, {{ .Load2 }}, {{ .Load3 }}\r\n"
+"serverLoad" = "📈 بارسیستم: {{ .Load1 }}, {{ .Load2 }}, {{ .Load3 }}\r\n"
-"serverMemory" = "📋 حافظه سرور: {{ .Current }}/{{ .Total }}\r\n"
+"serverMemory" = "📋 RAM: {{ .Current }}/{{ .Total }}\r\n"
-"tcpCount" = "🔹 تعداد ترافیک TCP: {{ .Count }}\r\n"
+"tcpCount" = "🔹 TCP: {{ .Count }}\r\n"
-"udpCount" = "🔸 تعداد ترافیک UDP: {{ .Count }}\r\n"
+"udpCount" = "🔸 UDP: {{ .Count }}\r\n"
 "traffic" = "🚦 ترافیک: {{ .Total }} (↑{{ .Upload }},↓{{ .Download }})\r\n"
-"xrayStatus" = "ℹ️ وضعیت Xray: {{ .State }}\r\n"
+"xrayStatus" = "ℹ️ وضعیت‌: {{ .State }}\r\n"
-"username" = "👤 نام کاربری: {{ .Username }}\r\n"
+"username" = "👤 نام‌کاربری: {{ .Username }}\r\n"
 "time" = "⏰ زمان: {{ .Time }}\r\n"
-"inbound" = "📍 ورودی: {{ .Remark }}\r\n"
+"inbound" = "📍 نام‌ورودی: {{ .Remark }}\r\n"
 "port" = "🔌 پورت: {{ .Port }}\r\n"
-"expire" = "📅 تاریخ انقضا: {{ .DateTime }}\r\n \r\n"
+"expire" = "📅 تاریخ‌انقضا: {{ .DateTime }}\r\n \r\n"
-"expireIn" = "📅 باقیمانده از انقضا: {{ .Time }}\r\n \r\n"
+"expireIn" = "📅 انقضا در: {{ .Time }}\r\n \r\n"
 "active" = "💡 فعال: {{ .Enable }}\r\n"
-"online" = "🌐 وضعیت اتصال: {{ .Status }}\r\n"
+"online" = "🌐 وضعیت‌اتصال: {{ .Status }}\r\n"
 "email" = "📧 ایمیل: {{ .Email }}\r\n"
 "upload" = "🔼 آپلود↑: {{ .Upload }}\r\n"
 "download" = "🔽 دانلود↓: {{ .Download }}\r\n"
 "total" = "🔄 کل: {{ .UpDown }} / {{ .Total }}\r\n"
-"exhaustedMsg" = "🚨 {{ .Type }} به اتمام رسیده است:\r\n"
+"exhaustedMsg" = "🚨 {{ .Type }} به‌اتمام‌رسیده‌است:\r\n"
-"exhaustedCount" = "🚨 تعداد {{ .Type }} به اتمام رسیده:\r\n"
+"exhaustedCount" = "🚨 تعداد {{ .Type }} به‌اتمام رسیده‌است:\r\n"
-"onlinesCount" = "🌐 تعداد کاربران آنلاین: {{ .Count }}\r\n"
+"onlinesCount" = "🌐 کاربران‌آنلاین: {{ .Count }}\r\n"
 "disabled" = "🛑 غیرفعال: {{ .Disabled }}\r\n"
-"depleteSoon" = "🔜 به زودی به پایان خواهد رسید: {{ .Deplete }}\r\n \r\n"
+"depleteSoon" = "🔜 به‌زودی به‌پایان خواهدرسید: {{ .Deplete }}\r\n \r\n"
-"backupTime" = "🗄 زمان پشتیبان‌گیری: {{ .Time }}\r\n"
+"backupTime" = "🗄 زمان‌پشتیبان‌گیری: {{ .Time }}\r\n"
 "yes" = "✅ بله"
 "no" = "❌ خیر"
 
 [tgbot.buttons]
-"dbBackup" = "دریافت پشتیبان پایگاه داده"
+"dbBackup" = "دریافت فایل پشتیبان"
-"serverUsage" = "استفاده از سرور"
+"serverUsage" = "استفاده از سیستم"
 "getInbounds" = "دریافت ورودی‌ها"
-"depleteSoon" = "به زودی به پایان خواهد رسید"
+"depleteSoon" = "به‌زودی به‌پایان خواهدرسید"
 "clientUsage" = "دریافت آمار کاربر"
 "onlines" = "کاربران آنلاین"
 "commands" = "دستورات"
 
 [tgbot.answers]
-"getInboundsFailed" = "❌ دریافت ورودی‌ها با خطا مواجه شد."
+"getInboundsFailed" = "❌ دریافت ورودی‌ها باخطا مواجه شد"
-"askToAddUser" = "پیکربندی شما یافت نشد!\r\nشما باید نام کاربری تلگرام خود را پیکربندی کنید و از مدیر خود درخواست اضافه کردن آن به پیکربندی خود بکنید."
+"askToAddUser" = "پیکربندی شما پیدا نشد!\r\nشما باید نام‌کاربری تلگرام خود را تنظیم کنید و از مدیر سرویس خود بخواهید که آن را به پیکربندی(های) شما اضافه کند"
-"askToAddUserName" = "پیکربندی شما یافت نشد!\r\nلطفاً از مدیر خود درخواست استفاده از نام کاربری تلگرام خود در پیکربندی (ها) خود را بکنید.\r\n\r\nنام کاربری شما: <b>@{{ .TgUserName }}</b>"
+"askToAddUserName" = "پیکربندی شما یافت نشد!\r\nلطفاً از مدیر سرویس خود بخواهید اطلاعات تلگرام شما را به پیکربندی(های) شما اضافه کند \r\n\r\nنام‌کاربری شما: @{{ .TgUserName }}"

web/translation/translate.ru_RU.toml

@@ -32,7 +32,7 @@
 "transmission" = "Протокол передачи"
 "host" = "Хост"
 "path" = "Путь"
-"camouflage" = "Маскировка"
+"camouflage" = "Затемнение"
 "status" = "Статус"
 "enabled" = "Включено"
 "disabled" = "Отключено"
@@ -52,6 +52,7 @@
 "remained" = "Осталось"
 "secAlertTitle" = "Предупреждение системы безопасности"
 "secAlertSsl" = "Это соединение не защищено. Пожалуйста, воздержитесь от ввода конфиденциальной информации до тех пор, пока не будет активирован TLS для защиты данных"
+"secAlertConf" = "Некоторые конфигурации были определены как уязвимые для атак, что требует немедленных действий по усилению протоколов безопасности и защите от потенциальных нарушений безопасности."
 "security" = "Безопасность"
 
 [menu]
@@ -60,10 +61,10 @@
 "settings" = "Настройки"
 "xray" = "Xray Настройки"
 "logout" = "Выйти"
-"link" = "Другое"
+"link" = "Менеджмент"
 
 [pages.login]
-"title" = "Войти"
+"title" = "Добро пожаловать"
 "loginAgain" = "Время сессии истекло. Пожалуйста, войдите в систему снова"
 
 [pages.login.toasts]
@@ -77,15 +78,19 @@
 "title" = "Статус системы"
 "memory" = "ОЗУ"
 "hard" = "Место на диске"
-"xrayStatus" = "Статус Xray"
+"serverInfo" = "Сервер"
+"hostname" = "Имя хоста"
+"xrayStatus" = "Xray"
 "stopXray" = "Остановка"
-"restartXray" = "Перезапуск Xray"
+"restartXray" = "Перезапуск"
 "xraySwitch" = "Сменить версию"
 "xraySwitchClick" = "Выберите желаемую версию"
 "xraySwitchClickDesk" = "Выбирайте внимательно, так как старые версии могут быть несовместимы с текущими конфигурациями"
 "operationHours" = "Время работы"
-"operationHoursDesc" = "Время работы системы: время с момента запуска."
+"operationHoursDesc" = "Время безотказной работы с момента запуска ОС"
+"xrayoperationHoursDesc" = "Время работы с момента последней перезагрузки Xray"
 "systemLoad" = "Системная нагрузка"
+"systemLoadDesc" = "Средняя нагрузка за последние 1, 5 и 15 минут"
 "connectionTcpCountDesc" = "Всего подключений TCP по всем сетевым картам."
 "connectionUdpCountDesc" = "Общее количество подключений UDP по всем сетевым картам."
 "upSpeed" = "Общая скорость отдачи"
@@ -100,8 +105,8 @@
 "backup" = "Бекап и восстановление"
 "backupTitle" = "База данных бекапа и восстановления"
 "backupDescription" = "Не забудьте сделать резервную копию перед импортом новой базы данных"
-"exportDatabase" = "Экспорт базы данных"
+"exportDatabase" = "Резерв"
-"importDatabase" = "Импорт базы данных"
+"importDatabase" = "Восстановить"
 
 [pages.inbounds]
 "title" = "Подключения"
@@ -134,7 +139,7 @@
 "destinationPort" = "Порт назначения"
 "targetAddress" = "Целевой адрес"
 "monitorDesc" = "Оставьте пустым по умолчанию"
-"meansNoLimit" = "Значит без ограничений"
+"meansNoLimit" = "Ноль означает неограниченно. (значение: ГБ)"
 "totalFlow" = "Общий расход"
 "leaveBlankToNeverExpire" = "Оставьте пустым, чтобы сделать бессрочно"
 "noRecommendKeepDefault" = "Нет особых требований для сохранения настроек по умолчанию"
@@ -167,11 +172,11 @@
 "emailDesc" = "Пожалуйста, укажите уникальный Email"
 "setDefaultCert" = "Установить сертификат с панели"
 "telegramDesc" = "Используйте идентификатор Telegram без символа @ или идентификатора чата (можно получить его здесь @userinfobot или использовать команду '/id' в боте)"
-"subscriptionDesc" = "вы можете найти свою ссылку подписки в разделе «Подробнее», также вы можете использовать одно и то же имя для нескольких конфигов"
+"subscriptionDesc" = "вы можете найти свою ссылку подписки в разделе «Подробнее», также вы можете использовать одно и то же имя для нескольких клиенты"
 "info" = "Информация"
 "same" = "Тот же"
 "inboundData" = "Входящие данные"
-"copyToClipboard" = "Копировать в буфер обмена"
+"exportInbound" = "Экспорт входящих"
 "import" = "Импортировать"
 "importInbound" = "Импортировать входящее сообщение"
 
@@ -188,26 +193,27 @@
 "prefix" = "Префикс"
 "postfix" = "Постфикс"
 "delayedStart" = "Начать со времени первого подключения"
-"expireDays" = "Срок действия"
+"expireDays" = "Длительность"
 "days" = "дней"
 "renew" = "Автопродление"
-"renewDesc" = "Автоматическое продление через несколько дней после истечения срока действия. 0 = отключить"
+"renewDesc" = "Автопродление после истечения срока действия. (0 = отключить)(единица: день) "
 
 [pages.inbounds.toasts]
 "obtain" = "Получить"
 
 [pages.inbounds.stream.general]
-"requestHeader" = "Заголовок запроса"
+"request" = "Запрос"
+"response" = "Ответ"
 "name" = "Имя"
-"value" = "Значение"
+"value" = "Ценить"
 
 [pages.inbounds.stream.tcp]
-"requestVersion" = "Версия запроса"
+"version" = "Версия"
-"requestMethod" = "Метод запроса"
+"method" = "Метод"
-"requestPath" = "Петь запроса"
+"path" = "Путь"
-"responseVersion" = "Версия ответа"
+"status" = "Положение дел"
-"responseStatus" = "Статус ответа"
+"statusDescription" = "Описание статуса"
-"responseStatusDescription" = "Описание статуса ответа"
+"requestHeader" = "Заголовок запроса"
 "responseHeader" = "Заголовок ответа"
 
 [pages.inbounds.stream.quic]
@@ -288,6 +294,8 @@
 "subShowInfoDesc" = "Показывать восстановленный трафик и дату после имени конфигурации"
 "subURI" = "URI обратного прокси"
 "subURIDesc" = "Изменить базовый URI URL-адреса подписки для использования за прокси-серверами"
+"fragment" = "Фрагментация"
+"fragmentDesc" = "Включить фрагментацию для пакета приветствия TLS"
 
 [pages.settings.toasts]
 "modifySettings" = "Изменение настроек"
@@ -304,6 +312,8 @@
 "advancedTemplate" = "Расширенные шаблоны"
 "generalConfigs" = "Основные настройки"
 "generalConfigsDesc" = "Общие настройки"
+"logConfigs" = "Журнал"
+"logConfigsDesc" = "Журналы могут повлиять на эффективность вашего сервера. Рекомендуется включать их с умом только в случае ваших нужд!"
 "blockConfigs" = "Блокирующие конфигурации"
 "blockConfigsDesc" = "Эти параметры не позволят пользователям подключаться к определенным протоколам и веб-сайтам."
 "blockCountryConfigs" = "Конфигурация блокировки стран"
@@ -312,6 +322,8 @@
 "directCountryConfigsDesc" = "Эти параметры будут подключать пользователей напрямую к доменам определенной страны."
 "ipv4Configs" = "Настройки IPv4"
 "ipv4ConfigsDesc" = "Эти параметры будут маршрутизироваться к целевым доменам только через IPv4"
+"warpConfigs" = "Настройки WARP"
+"warpConfigsDesc" = "WARP будет направлять трафик на веб-сайты через серверы Cloudflare"
 "Template" = "Шаблон конфигурации Xray"
 "TemplateDesc" = "Создание файла конфигурации Xray на основе этого шаблона."
 "FreedomStrategy" = "Настроить стратегию протокола Freedom"
@@ -354,11 +366,22 @@
 "GoogleIPv4Desc" = "Применить маршрутизацию Google для подключения к IPv4."
 "NetflixIPv4" = "Использовать IPv4 для Netflix"
 "NetflixIPv4Desc" = "Применить маршрутизацию Netflix для подключения к IPv4."
+"GoogleWARP" = "Маршрутизация Google через WARP"
+"GoogleWARPDesc" = "Добавить маршрутизацию для Google через WARP"
+"OpenAIWARP" = "Маршрутизация OpenAI (ChatGPT) через WARP"
+"OpenAIWARPDesc" = "Добавить маршрутизацию для OpenAI (ChatGPT) через WARP"
+"NetflixWARP" = "Маршрутизация Netflix через WARP"
+"NetflixWARPDesc" = "Добавить маршрутизацию для Netflix через WARP"
+"MetaWARP" = "Мета"
+"MetaWARPDesc" = "Направляет трафик в Meta (Instagram, Facebook, WhatsApp, Threads...) через WARP."
+"SpotifyWARP" = "Маршрутизация Spotify через WARP"
+"SpotifyWARPDesc" = "Добавить маршрутизацию для Spotify через WARP"
 "completeTemplate" = "Все"
 "Inbounds" = "Входящие"
 "Outbounds" = "Исходящие"
 "Routings" = "Правила маршрутизации"
 "RoutingsDesc" = "Важен приоритет каждого правила!"
+"Balancers" = "Балансиры"
 
 [pages.xray.rules]
 "first" = "Первый"
@@ -368,11 +391,12 @@
 "source" = "Источник"
 "dest" = "Пункт назначения"
 "inbound" = "Входящий"
-"outboun" = "Исходящий"
+"outbound" = "Исходящий"
 "info" = "Информация"
 "add" = "Добавить правило"
 "edit" = "Редактировать правило"
 "useComma" = "Элементы, разделенные запятыми"
+"balancer" = "балансир"
 
 [pages.xray.outbound]
 "addOutbound" = "Добавить исходящий"
@@ -388,6 +412,41 @@
 "bridge" = "Мост"
 "portal" = "Портал"
 "intercon" = "Соединение"
+"settings" = "Настройки"
+"accountInfo" = "Информация Об Учетной Записи"
+"outboundStatus" = "Исходящий статус"
+
+[pages.xray.balancer]
+"addBalancer" = "Добавить балансир"
+"editBalancer" = "Редактировать балансир"
+"balancerStrategy" = "Стратегия"
+"balancerSelectors" = "Селекторы"
+"tag" = "Тег"
+"tagDesc" = "уникальный тег"
+"balancerDesc" = "Невозможно одновременно использовать balancerTag и outboundTag. При одновременном использовании будет работать только outboundTag."
+
+[pages.xray.wireguard]
+"secretKey" = "Секретный ключ"
+"publicKey" = "Открытый ключ"
+"allowedIPs" = "Разрешенные IP-адреса"
+"endpoint" = "Конечная точка"
+"psk" = "Общий ключ"
+"domainStrategy" = "Стратегия домена"
+
+[pages.xray.dns]
+"enable" = "Включить DNS"
+"enableDesc" = "Включить встроенный DNS-сервер"
+"strategy" = "Стратегия запроса"
+"strategyDesc" = "Общая стратегия разрешения доменных имен"
+"add" = "Добавить сервер"
+"edit" = "Редактировать сервер"
+"domains" = "Домены"
+
+[pages.xray.fakedns]
+"add" = "Добавить поддельный DNS"
+"edit" = "Редактировать поддельный DNS"
+"ipPool" = "Подсеть пула IP"
+"poolSize" = "Размер пула"
 
 [tgbot]
 "noResult" = "❗ Нет результатов!"

web/translation/translate.vi_VN.toml

@@ -32,7 +32,7 @@
 "transmission" = "Truyền tải"
 "host" = "Máy chủ"
 "path" = "Đường dẫn"
-"camouflage" = "Ngụy trang"
+"camouflage" = "Sự làm xáo trộn"
 "status" = "Trạng thái"
 "enabled" = "Đã kích hoạt"
 "disabled" = "Đã tắt"
@@ -52,6 +52,7 @@
 "remained" = "Còn lại"
 "secAlertTitle" = "Cảnh báo an ninh-Tiếng Việt by Ohoang7"
 "secAlertSsl" = "Kết nối này không an toàn; Vui lòng không nhập thông tin nhạy cảm cho đến khi TLS được kích hoạt để bảo vệ dữ liệu của Bạn"
+"secAlertConf" = "Một số cấu hình nhất định đã được xác định là dễ bị tấn công, thúc đẩy hành động ngay lập tức để củng cố các giao thức bảo mật và bảo vệ chống lại các vi phạm bảo mật tiềm ẩn."
 "security" = "Bảo vệ"
 
 [menu]
@@ -60,10 +61,10 @@
 "settings" = "Cài đặt bảng điều khiển"
 "xray" = "Cài đặt Xray"
 "logout" = "Đăng xuất"
-"link" = "Khác"
+"link" = "Sự quản lý"
 
 [pages.login]
-"title" = "Đăng nhập"
+"title" = "Chào mừng"
 "loginAgain" = "Thời hạn đăng nhập đã hết, Vui lòng đăng nhập lại."
 
 [pages.login.toasts]
@@ -77,15 +78,19 @@
 "title" = "Trạng thái hệ thống"
 "memory" = "Bộ nhớ"
 "hard" = "Ổ cứng"
-"xrayStatus" = "Trạng thái của Xray"
+"serverInfo" = "Máy chủ"
-"stopXray" = "Dừng Xray"
+"hostname" = "Tên máy chủ"
-"restartXray" = "Khởi động lại Xray"
+"xrayStatus" = "Xray"
+"stopXray" = "Dừng"
+"restartXray" = "Khởi động lại"
 "xraySwitch" = "Chuyển đổi phiên bản"
 "xraySwitchClick" = "Chọn phiên bản mà bạn muốn chuyển đổi sang."
 "xraySwitchClickDesk" = "Hãy lựa chọn thận trọng, vì các phiên bản cũ có thể không tương thích với các cấu hình hiện tại, của Bạn"
 "operationHours" = "Thời gian hoạt động"
-"operationHoursDesc" = "Thời gian hoạt động của hệ thống: thời gian kể từ khi khởi động."
+"operationHoursDesc" = "Thời gian hoạt động kể từ khi khởi động hệ điều hành"
+"xrayoperationHoursDesc" = "Thời gian hoạt động kể từ lần khởi động Xray cuối cùng"
 "systemLoad" = "Tải hệ thống"
+"systemLoadDesc" = "Tải trung bình trong 1, 5 và 15 phút qua"
 "connectionTcpCountDesc" = "Tổng số kết nối TCP trên tất cả các card mạng."
 "connectionUdpCountDesc" = "Tổng số kết nối UDP trên tất cả các card mạng."
 "upSpeed" = "Tổng tốc độ tải lên cho tất cả các thẻ mạng."
@@ -100,8 +105,8 @@
 "backup" = "Phục hồi dữ liệu đã lưu"
 "backupTitle" = "Sao lưu và Khôi phục cơ sở dữ liệu"
 "backupDescription" = "Bạn hãy nhớ sao lưu trước khi nhập cơ sở dữ liệu mới."
-"exportDatabase" = "Tải xuống cơ sở dữ liệu"
+"exportDatabase" = "Sao lưu"
-"importDatabase" = "Tải lên cơ sở dữ liệu"
+"importDatabase" = "Khôi phục"
 
 [pages.inbounds]
 "title" = "Điểm vào (Inbounds)"
@@ -134,7 +139,7 @@
 "destinationPort" = "Cổng đích"
 "targetAddress" = "Địa chỉ mục tiêu"
 "monitorDesc" = "Mặc định để trống"
-"meansNoLimit" = "Nghĩa là không giới hạn"
+"meansNoLimit" = "Số không có nghĩa là không giới hạn. (đơn vị: GB)"
 "totalFlow" = "Tổng lưu lượng"
 "leaveBlankToNeverExpire" = "Để trống để không bao giờ hết hạn"
 "noRecommendKeepDefault" = "Không yêu cầu đặc biệt để giữ nguyên cài đặt mặc định"
@@ -167,11 +172,11 @@
 "emailDesc" = "vui lòng cung cấp một địa chỉ email duy nhất."
 "setDefaultCert" = "Đặt chứng chỉ từ bảng điều khiển"
 "telegramDesc" = "Sử dụng ID Telegram không có @ hoặc ID trò chuyện (bạn có thể lấy nó tại đây @userinfobot hoặc sử dụng lệnh '/id' trong bot)"
-"subscriptionDesc" = "Bạn có thể tìm thấy liên kết phụ của mình trên Chi tiết, bạn cũng có thể sử dụng cùng tên cho một số cấu hình"
+"subscriptionDesc" = "Bạn có thể tìm thấy liên kết phụ của mình trên Chi tiết, bạn cũng có thể sử dụng cùng tên cho một số khách hàng"
 "info" = "Thông tin"
 "same" = "Như nhau"
 "inboundData" = "Dữ liệu gửi đến"
-"copyToClipboard" = "Sao chép vào bảng nhớ tạm"
+"exportInbound" = "Xuất nhập khẩu"
 "import" = "Nhập"
 "importInbound" = "Nhập hàng gửi về"
 
@@ -188,26 +193,27 @@
 "prefix" = "Tiền Tố (Được ưu đãi)"
 "postfix" = "Hậu tố"
 "delayedStart" = "Bắt đầu sau lần sử dụng đầu tiên"
-"expireDays" = "Số ngày hết hạn"
+"expireDays" = "Khoảng thời gian"
 "days" = "Ngày(s)"
 "renew" = "Tự động gia hạn"
-"renewDesc" = "Tự động gia hạn ngày sau khi hết hạn. 0 = tắt"
+"renewDesc" = "Tự động gia hạn sau khi hết hạn. (0 = tắt)(đơn vị: ngày)"
 
 [pages.inbounds.toasts]
 "obtain" = "Nhận được"
 
 [pages.inbounds.stream.general]
-"requestHeader" = "Tiêu đề yêu cầu"
+"request" = "Lời yêu cầu"
+"response" = "Phản ứng"
 "name" = "Tên"
 "value" = "Giá trị"
 
 [pages.inbounds.stream.tcp]
-"requestVersion" = "Phiên bản yêu cầu"
+"version" = "Phiên bản"
-"requestMethod" = "Phương thức yêu cầu"
+"method" = "Phương pháp"
-"requestPath" = "Đường dẫn yêu cầu"
+"path" = "Con đường"
-"responseVersion" = "Phiên bản phản hồi"
+"status" = "Trạng thái"
-"responseStatus" = "Trạng thái phản hồi"
+"statusDescription" = "Tình trạng Mô tả"
-"responseStatusDescription" = "Mô tả trạng thái phản hồi"
+"requestHeader" = "Tiêu đề yêu cầu"
 "responseHeader" = "Tiêu đề phản hồi"
 
 [pages.inbounds.stream.quic]
@@ -288,6 +294,8 @@
 "subShowInfoDesc" = "Hiển thị lưu lượng truy cập còn lại và ngày sau tên cấu hình"
 "subURI" = "URI proxy ngược"
 "subURIDesc" = "Thay đổi URI cơ sở của URL đăng ký để sử dụng ở phía sau proxy"
+"fragment" = "Sự phân mảnh"
+"fragmentDesc" = "Kích hoạt phân mảnh cho gói TLS hello"
 
 [pages.settings.toasts]
 "modifySettings" = "Sửa đổi cài đặt"
@@ -304,6 +312,8 @@
 "advancedTemplate" = "Mẫu nâng cao"
 "generalConfigs" = "Cấu hình Chung"
 "generalConfigsDesc" = "Những tùy chọn này sẽ cung cấp điều chỉnh tổng quát."
+"logConfigs" = "Nhật ký"
+"logConfigsDesc" = "Nhật ký có thể ảnh hưởng đến hiệu suất máy chủ của bạn. Bạn chỉ nên kích hoạt nó một cách khôn ngoan trong trường hợp bạn cần"
 "blockConfigs" = "Cấu hình Chặn"
 "blockConfigsDesc" = "Những tùy chọn này sẽ ngăn người dùng kết nối đến các giao thức và trang web cụ thể."
 "blockCountryConfigs" = "Cấu hình Chặn Quốc gia"
@@ -312,6 +322,8 @@
 "directCountryConfigsDesc" = "Những tùy chọn này sẽ kết nối người dùng trực tiếp đến các tên miền quốc gia cụ thể."
 "ipv4Configs" = "Cấu hình IPv4"
 "ipv4ConfigsDesc" = "Những tùy chọn này sẽ chỉ định kết nối đến các tên miền mục tiêu qua IPv4."
+"warpConfigs" = "Cấu hình WARP"
+"warpConfigsDesc" = "WARP sẽ định tuyến lưu lượng đến các trang web qua máy chủ Cloudflare."
 "Template" = "Mẫu cấu hình Xray"
 "TemplateDesc" = "Tạo tệp cấu hình Xray cuối cùng dựa trên mẫu này."
 "FreedomStrategy" = "Cấu hình chiến lược cho giao thức tự do"
@@ -354,11 +366,22 @@
 "GoogleIPv4Desc" = "Thêm định tuyến để Google kết nối với IPv4."
 "NetflixIPv4" = "Sử dụng IPv4 cho Netflix"
 "NetflixIPv4Desc" = "Thêm định tuyến cho Netflix để kết nối với IPv4."
+"GoogleWARP" = "Định tuyến Google qua WARP."
+"GoogleWARPDesc" = "Thêm định tuyến cho Google qua WARP."
+"OpenAIWARP" = "Định tuyến OpenAI (ChatGPT) qua WARP."
+"OpenAIWARPDesc" = "Thêm định tuyến cho OpenAI (ChatGPT) qua WARP."
+"NetflixWARP" = "Định tuyến Netflix qua WARP."
+"NetflixWARPDesc" = "Thêm định tuyến cho Netflix qua WARP."
+"MetaWARP" = "Meta"
+"MetaWARPDesc" = "Định tuyến lưu lượng truy cập tới Meta (Instagram, Facebook, WhatsApp, Threads,...) thông qua WARP."
+"SpotifyWARP" = "Định tuyến Spotify qua WARP."
+"SpotifyWARPDesc" = "Thêm định tuyến cho Spotify qua WARP."
 "completeTemplate" = "Tất cả"
 "Inbounds" = "Đầu vào"
 "Outbounds" = "Đầu ra"
 "Routings" = "Quy tắc định tuyến"
 "RoutingsDesc" = "Mức độ ưu tiên của mỗi quy tắc là quan trọng!"
+"Balancers" = "Cân bằng"
 
 [pages.xray.rules]
 "first" = "Đầu tiên"
@@ -373,6 +396,7 @@
 "add" = "Thêm quy tắc"
 "edit" = "Chỉnh sửa quy tắc"
 "useComma" = "Các mục được phân tách bằng dấu phẩy"
+"balancer" = "Cân bằng"
 
 [pages.xray.outbound]
 "addOutbound" = "Thêm Đầu vào"
@@ -388,6 +412,41 @@
 "bridge" = "Liên kết"
 "portal" = "Cổng thông tin"
 "intercon" = "Kết nối"
+"settings" = "cài đặt"
+"accountInfo" = "Thông tin tài khoản"
+"outboundStatus" = "Trạng thái đầu ra"
+
+[pages.xray.balancer]
+"addBalancer" = "Thêm cân bằng"
+"editBalancer" = "Chỉnh sửa cân bằng"
+"balancerStrategy" = "Chiến lược"
+"balancerSelectors" = "Bộ chọn"
+"tag" = "Thẻ"
+"tagDesc" = "thẻ duy nhất"
+"balancerDesc" = "Không thể sử dụng balancerTag và outboundTag cùng một lúc. Nếu sử dụng cùng lúc thì chỉ outboundTag mới hoạt động."
+
+[pages.xray.wireguard]
+"secretKey" = "Chìa khoá bí mật"
+"publicKey" = "Khóa công khai"
+"allowedIPs" = "IP được phép"
+"endpoint" = "Điểm cuối"
+"psk" = "Khóa chia sẻ"
+"domainStrategy" = "Chiến lược tên miền"
+
+[pages.xray.dns]
+"enable" = "Kích hoạt DNS"
+"enableDesc" = "Kích hoạt máy chủ DNS tích hợp"
+"strategy" = "Chiến lược truy vấn"
+"strategyDesc" = "Chiến lược tổng thể để phân giải tên miền"
+"add" = "Thêm máy chủ"
+"edit" = "Chỉnh sửa máy chủ"
+"domains" = "Tên miền"
+
+[pages.xray.fakedns]
+"add" = "Thêm DNS giả"
+"edit" = "Chỉnh sửa DNS giả"
+"ipPool" = "Mạng con nhóm IP"
+"poolSize" = "Kích thước bể bơi"
 
 [tgbot]
 "noResult" = "❗ Không có kết quả!"
@@ -436,7 +495,7 @@
 "port" = "🔌 Cổng: {{ .Port }}\r\n"
 "expire" = "📅 Hạn sử dụng: {{ .DateTime }}\r\n \r\n"
 "expireIn" = "📅 Hết hạn vào: {{ .Time }}\r\n \r\n"
-"active" = "💡 Có hiệu lực {{ .Enable }}\r\n"
+"active" = "💡 Có hiệu lực {{ .Enable }}\r\n"
 "online" = "🌐 Tình trạng kết nối: {{ .Status }}\r\n"
 "email" = "📧 Email: {{ .Email }}\r\n"
 "upload" = "🔼 Tải lên↑: {{ .Upload }}\r\n"

web/translation/translate.zh_Hans.toml

@@ -10,7 +10,7 @@
 "remark" = "备注"
 "enable" = "启用"
 "protocol" = "协议"
-"search" = "搜尋"
+"search" = "查找"
 "filter" = "过滤器"
 "loading" = "加载中..."
 "second" = "秒"
@@ -30,9 +30,9 @@
 "sure" = "确定"
 "encryption" = "加密"
 "transmission" = "传输"
-"host" = "主持人"
+"host" = "主机"
-"path" = "小路"
+"path" = "路径"
-"camouflage" = "伪装"
+"camouflage" = "混淆"
 "status" = "状态"
 "enabled" = "开启"
 "disabled" = "关闭"
@@ -52,6 +52,7 @@
 "remained" = "仍然存在"
 "secAlertTitle" = "安全警报"
 "secAlertSsl" = "此连接不安全；在激活 TLS 进行数据保护之前，请勿输入敏感信息"
+"secAlertConf" = "某些配置已被确定为容易受到攻击，促使立即采取行动以加强安全协议并防范潜在的安全漏洞。"
 "security" = "安全"
 
 [menu]
@@ -60,32 +61,36 @@
 "settings" = "面板设置"
 "xray" = "Xray 设置"
 "logout" = "退出登录"
-"link" = "其他"
+"link" = "管理"
 
 [pages.login]
-"title" = "登录"
+"title" = "欢迎"
-"loginAgain" = "登录时效已过，请重新登录"
+"loginAgain" = "会话过期，请重新登录"
 
 [pages.login.toasts]
 "invalidFormData" = "数据格式错误"
 "emptyUsername" = "请输入用户名"
 "emptyPassword" = "请输入密码"
 "wrongUsernameOrPassword" = "用户名或密码错误"
-"successLogin" = "登录"
+"successLogin" = "登录成功"
 
 [pages.index]
 "title" = "系统状态"
 "memory" = "内存"
 "hard" = "硬盘"
-"xrayStatus" = "Xray 状态"
+"serverInfo" = "服务器"
+"hostname" = "主机名"
+"xrayStatus" = "Xray"
 "stopXray" = "停止"
 "restartXray" = "重启"
 "xraySwitch" = "切换版本"
 "xraySwitchClick" = "点击你想切换的版本"
 "xraySwitchClickDesk" = "请谨慎选择，旧版本可能配置不兼容"
 "operationHours" = "运行时间"
-"operationHoursDesc" = "系统自启动以来的运行时间"
+"operationHoursDesc" = "自操作系统启动以来的正常运行时间"
+"xrayoperationHoursDesc" = "自 Xray 上次重启以来的正常运行时间"
 "systemLoad" = "系统负载"
+"systemLoadDesc" = "过去 1 分钟、5 分钟和 15 分钟的平均负载"
 "connectionTcpCountDesc" = "所有网卡的总 TCP 连接数。"
 "connectionUdpCountDesc" = "所有网卡的总 UDP 连接数。"
 "upSpeed" = "所有网卡的总上传速度"
@@ -94,14 +99,14 @@
 "totalReceive" = "系统启动以来所有网卡的总下载流量"
 "xraySwitchVersionDialog" = "切换 Xray 版本"
 "xraySwitchVersionDialogDesc" = "是否切换 Xray 版本至"
-"dontRefresh" = "安装中，请不要刷新此页面"
+"dontRefresh" = "安装中，请勿刷新此页面"
 "logs" = "日志"
 "config" = "配置"
 "backup" = "备份"
 "backupTitle" = "备份数据库"
 "backupDescription" = "请记住在导入新数据库之前进行备份"
-"exportDatabase" = "下载数据库"
+"exportDatabase" = "备份"
-"importDatabase" = "上传数据库"
+"importDatabase" = "恢复"
 
 [pages.inbounds]
 "title" = "入站列表"
@@ -118,7 +123,7 @@
 "transportConfig" = "传输配置"
 "expireDate" = "到期时间"
 "resetTraffic" = "重置流量"
-"addInbound" = "添加入"
+"addInbound" = "添加入站"
 "generalActions" = "通用操作"
 "create" = "添加"
 "update" = "修改"
@@ -134,7 +139,7 @@
 "destinationPort" = "目标端口"
 "targetAddress" = "目标地址"
 "monitorDesc" = "默认留空即可"
-"meansNoLimit" = "表示不限制"
+"meansNoLimit" = "零意味着无限。(单位：GB)"
 "totalFlow" = "总流量"
 "leaveBlankToNeverExpire" = "留空则永不到期"
 "noRecommendKeepDefault" = "没有特殊需求保持默认即可"
@@ -148,9 +153,9 @@
 "client" = "客户"
 "export" = "导出链接"
 "clone" = "克隆"
-"cloneInbound" = "创造"
+"cloneInbound" = "创建"
 "cloneInboundContent" = "此入站的所有项目除 Port、Listening IP、Clients 将应用于克隆"
-"cloneInboundOk" = "创造"
+"cloneInboundOk" = "创建"
 "resetAllTraffic" = "重置所有入站流量"
 "resetAllTrafficTitle" = "重置所有入站流量"
 "resetAllTrafficContent" = "您确定要重置所有入站流量吗？"
@@ -164,16 +169,16 @@
 "delDepletedClientsTitle" = "删除耗尽的客户"
 "delDepletedClientsContent" = "你确定要删除所有耗尽的客户端吗？"
 "email" = "电子邮件"
-"emailDesc" = "电子邮件必须完全唯"
+"emailDesc" = "电子邮件必须完全唯一"
 "setDefaultCert" = "从面板设置证书"
 "telegramDesc" = "使用 Telegram ID，不包含 @ 符号或聊天 ID（可以在 @userinfobot 处获取，或在机器人中使用'/id'命令）"
-"subscriptionDesc" = "您可以在详细信息上找到您的子链接，也可以对多个配置使用相同的名称"
+"subscriptionDesc" = "您可以在详细信息上找到您的子链接，你可以为多个客户端使用相同的名称"
 "info" = "信息"
 "same" = "相同"
 "inboundData" = "入站数据"
-"copyToClipboard" = "复制到剪贴板"
+"exportInbound" = "导出入站数据"
 "import"="导入"
-"importInbound" = "导入入站"
+"importInbound" = "导入入站数据"
 
 [pages.client]
 "add" = "添加客户端"
@@ -183,31 +188,32 @@
 "clientCount" = "客户数量"
 "bulk" = "批量创建"
 "method" = "方法"
-"first" = "第一"
+"first" = "第一个"
 "last" = "最后"
 "prefix" = "前缀"
 "postfix" = "后缀"
 "delayedStart" = "首次使用后开始"
-"expireDays" = "过期天数"
+"expireDays" = "期间"
 "days" = "天"
 "renew" = "自动续订"
-"renewDesc" = "过期后自动续订。0 = 禁用"
+"renewDesc" = "到期后自动续订。(0 = 禁用)(单元: 天)"
 
 [pages.inbounds.toasts]
 "obtain" = "获取"
 
 [pages.inbounds.stream.general]
-"requestHeader" = "请求头"
+"request" = "请求"
+"response" = "响应"
 "name" = "名称"
 "value" = "值"
 
 [pages.inbounds.stream.tcp]
-"requestVersion" = "请求版本"
+"version" = "版本"
-"requestMethod" = "请求方法"
+"method" = "方法"
-"requestPath" = "请求路径"
+"path" = "路径"
-"responseVersion" = "响应版本"
+"status" = "状态"
-"responseStatus" = "响应状态"
+"statusDescription" = "状态描述"
-"responseStatusDescription" = "响应状态说明"
+"requestHeader" = "请求头"
 "responseHeader" = "响应头"
 
 [pages.inbounds.stream.quic]
@@ -218,15 +224,15 @@
 "save" = "保存配置"
 "infoDesc" = "此处的所有更改都需要保存并重启面板才能生效"
 "restartPanel" = "重启面板"
-"restartPanelDesc" = "确定要重启面板吗？点击确定将于 3 秒后重启，若重启后无法访问面板，请前往服务器查看面板日志信息"
+"restartPanelDesc" = "是否重启面板？点击确定将于 3 秒后重启，若重启后无法访问面板，请前往服务器查看面板日志信息"
 "resetDefaultConfig" = "重置为默认配置"
 "panelConfig" = "面板配置"
 "userSettings" = "用户设置"
-"TGBotSettings" = "TG提醒相关设置"
+"TGBotSettings" = "TG 提醒相关设置"
 "panelListeningIP" = "面板监听 IP"
 "panelListeningIPDesc" = "默认留空监听所有 IP"
 "panelListeningDomain" = "面板监听域名"
-"panelListeningDomainDesc" = "默认情况下留空以监视所有域名和 IP 地址"
+"panelListeningDomainDesc" = "默认留空以监视所有域名和 IP 地址"
 "panelPort" = "面板监听端口"
 "panelPortDesc" = "重启面板生效"
 "publicKeyPath" = "面板证书公钥文件路径"
@@ -250,13 +256,13 @@
 "telegramChatId" = "以逗号分隔的多个 chatID"
 "telegramChatIdDesc" = "多个聊天 ID 用逗号分隔。使用 @userinfobot 或在机器人中使用'/id'命令获取您的聊天 ID。"
 "telegramNotifyTime" = "电报机器人通知时间"
-"telegramNotifyTimeDesc" = "采用Crontab定时格式"
+"telegramNotifyTimeDesc" = "采用 Crontab 定时格式"
 "tgNotifyBackup" = "数据库备份"
 "tgNotifyBackupDesc" = "正在发送数据库备份文件和报告通知"
 "tgNotifyLogin" = "登录通知"
-"tgNotifyLoginDesc" = "当有人试图登录您的面板时显示用户名、IP 地址和时间"
+"tgNotifyLoginDesc" = "有登录面板请求时显示用户名、IP 地址和时间"
-"sessionMaxAge" = "会话最大年龄"
+"sessionMaxAge" = "会话最大时长"
-"sessionMaxAgeDesc" = "您可以保持登录状态的时间（单位：分钟）"
+"sessionMaxAgeDesc" = "您可以保持登录状态的最长时间（单位：分钟）"
 "expireTimeDiff" = "耗尽时间阈值"
 "expireTimeDiffDesc" = "到期前检测耗尽（单位：天）"
 "trafficDiff" = "耗尽流量阈值"
@@ -288,6 +294,8 @@
 "subShowInfoDesc" = "在配置名称后显示剩余流量和日期"
 "subURI" = "反向代理 URI"
 "subURIDesc" = "更改订阅 URL 的基本 URI 以在代理后面使用"
+"fragment" = "碎片"
+"fragmentDesc" = "启用 TLS hello 数据包分段"
 
 [pages.settings.toasts]
 "modifySettings" = "修改设置"
@@ -303,23 +311,27 @@
 "basicTemplate" = "基本模板"
 "advancedTemplate" = "高级模板部件"
 "generalConfigs" = "通用配置"
-"generalConfigsDesc" = "这些选项将提供一般调整"
+"generalConfigsDesc" = "这些选项提供通用设置调整"
+"logConfigs"="日志"
+"logConfigsDesc" = "日志可能会影响您服务器的效率。建议仅在您需要时明智地启用它"
 "blockConfigs" = "阻塞配置"
-"blockConfigsDesc" = "这些选项将阻止用户连接到特定协议和网站"
+"blockConfigsDesc" = "这些选项将禁止用户连接到特定协议和网站"
-"blockCountryConfigs" = "阻止国家配置"
+"blockCountryConfigs" = "禁连国家配置"
-"blockCountryConfigsDesc" = "这些选项将阻止用户连接到特定国家/地区的域。"
+"blockCountryConfigsDesc" = "这些选项将禁止用户连接到特定国家/地区的域。"
-"directCountryConfigs" = "直接国家配置"
+"directCountryConfigs" = "直连国家配置"
 "directCountryConfigsDesc" = "这些选项会将用户直接连接到特定国家/地区的域。"
 "ipv4Configs" = "IPv4 配置"
 "ipv4ConfigsDesc" = "此选项将仅通过 IPv4 路由到目标域"
+"warpConfigs" = "WARP 配置"
+"warpConfigsDesc" = "WARP 将通过 Cloudflare 服务器将流量路由到网站。"
 "Template" = "Xray 配置模板"
 "TemplateDesc" = "以该模型为基础生成最终的Xray配置文件，重新启动面板生成效率"
 "FreedomStrategy" = "配置自由协议的策略"
 "FreedomStrategyDesc" = "在自由协议中设置网络输出策略"
 "RoutingStrategy" = "配置路由域策略"
 "RoutingStrategyDesc" = "设置DNS解析的整体路由策略"
-"Torrent" = "禁止使用 bittorrent"
+"Torrent" = "禁止使用 bitTorrent"
-"TorrentDesc" = "更改配置模板避免用户使用bittorrent"
+"TorrentDesc" = "更改配置模板避免用户使用 bitTorrent"
 "PrivateIp" = "禁止私人 IP 范围连接"
 "PrivateIpDesc" = "更改配置模板以避免连接私有 IP 范围"
 "Ads" = "屏蔽广告"
@@ -354,14 +366,25 @@
 "GoogleIPv4Desc" = "添加谷歌连接IPv4的路由"
 "NetflixIPv4" = "为 Netflix 使用 IPv4"
 "NetflixIPv4Desc" = "添加Netflix连接IPv4的路由"
+"GoogleWARP" = "将谷歌路由到 WARP"
+"GoogleWARPDesc" = "为谷歌添加路由到WARP"
+"OpenAIWARP" = "将 OpenAI (ChatGPT) 路由到 WARP"
+"OpenAIWARPDesc" = "将OpenAI（ChatGPT）路由添加到WARP"
+"NetflixWARP" = "将 Netflix 路由到 WARP"
+"NetflixWARPDesc" = "为Netflix添加路由到WARP"
+"MetaWARP"="元"
+"MetaWARPDesc" = "通过 WARP 将流量路由到 Meta（Instagram、Facebook、WhatsApp、Threads...）"
+"SpotifyWARP" = "将 Spotify 路由到 WARP"
+"SpotifyWARPDesc" = "为Spotify添加路由到WARP"
 "completeTemplate" = "全部"
 "Inbounds" = "界内"
 "Outbounds" = "出站"
 "Routings" = "路由规则"
 "RoutingsDesc" = "每条规则的优先级都很重要"
+"Balancers" = "平衡器"
 
 [pages.xray.rules]
-"firsto" = "第一个"
+"first" = "第一个"
 "last" = "最后"
 "up" = "向上"
 "down" = "向下"
@@ -373,6 +396,7 @@
 "add" = "添加规则"
 "edit" = "编辑规则"
 "useComma" = "逗号分隔的项目"
+"balancer" = "平衡器"
 
 [pages.xray.outbound]
 "addOutbound" = "添加出站"
@@ -382,12 +406,47 @@
 "tag" = "标签"
 "tagDesc" = "独特的标签"
 "address" = "地址"
-"rreverse" = "反转"
+"reverse" = "反转"
 "domain" = "域名"
 "type" = "类型"
 "bridge" = "桥"
 "portal" = "门户"
 "intercon" = "互连"
+"settings" = "设置"
+"accountInfo" = "帐户信息"
+"outboundStatus" = "出站状态"
+
+[pages.xray.balancer]
+"addBalancer" = "添加平衡器"
+"editBalancer" = "编辑平衡器"
+"balancerStrategy" = "战略"
+"balancerSelectors" = "选择器"
+"tag" = "标签"
+"tagDesc" = "唯一标记"
+"balancerDesc" = "不能同时使用balancerTag和outboundTag。 如果同时使用，则只有outboundTag起作用。"
+
+[pages.xray.wireguard]
+"secretKey" = "密钥"
+"publicKey" = "公钥"
+"allowedIPs" = "允许的 IP"
+"endpoint" = "终点"
+"psk" = "共享密钥"
+"domainStrategy" = "域策略"
+
+[pages.xray.dns]
+"enable" = "启用 DNS"
+"enableDesc" = "启用内置 DNS 服务器"
+"strategy" = "查询策略"
+"strategyDesc" = "解析域名的总体策略"
+"add" = "添加服务器"
+"edit" = "编辑服务器"
+"domains" = "域"
+
+[pages.xray.fakedns]
+"add" = "添加假 DNS"
+"edit" = "编辑假 DNS"
+"ipPool" = "IP 池子网"
+"poolSize" = "池大小"
 
 [tgbot]
 "noResult" = "❗ 没有结果！"

web/web.go

@@ -23,9 +23,9 @@ import (
 	"x-ui/web/network"
 	"x-ui/web/service"
 
+	sessions "github.com/Calidity/gin-sessions"
+	"github.com/Calidity/gin-sessions/cookie"
 	"github.com/gin-contrib/gzip"
-	"github.com/gin-contrib/sessions"
-	"github.com/gin-contrib/sessions/cookie"
 	"github.com/gin-gonic/gin"
 	"github.com/robfig/cron/v3"
 )

x-ui.sh

@@ -115,8 +115,32 @@ update() {
     fi
 }
 
+custom_version() {
+    echo "Enter the panel version (like 1.6.0):"
+    read panel_version
+
+    if [ -z "$panel_version" ]; then
+        echo "Panel version cannot be empty. Exiting."
+    exit 1
+    fi
+
+    download_link="https://raw.githubusercontent.com/alireza0/x-ui/master/install.sh"
+
+    # Use the entered panel version in the download link
+    install_command="bash <(curl -Ls $download_link) $panel_version"
+
+    echo "Downloading and installing panel version $panel_version..."
+    eval $install_command
+}
+
+# Function to handle the deletion of the script file
+delete_script() {
+    rm "$0"  # Remove the script file itself
+    exit 1
+}
+
 uninstall() {
-    confirm "Are you sure you want to uninstall the panel? xray will also uninstalled!" "n"
+    confirm "Are you sure you want to uninstall the panel? xray will also uninstalled!" " n"
     if [[ $? != 0 ]]; then
         if [[ $# == 0 ]]; then
             show_menu
@@ -130,14 +154,14 @@ uninstall() {
     systemctl reset-failed
     rm /etc/x-ui/ -rf
     rm /usr/local/x-ui/ -rf
-
+    echo -e "\nUninstalled Successfully."
     echo ""
-    echo -e "Uninstalled Successfully，If you want to remove this script，then after exiting the script run ${green}rm /usr/bin/x-ui -f${plain} to delete it."
+    echo -e "If you need to install this panel again, you can use below command:"
+    echo -e "${green}bash <(curl -Ls https://raw.githubusercontent.com/alireza0/x-ui/master/install.sh)${plain}"
     echo ""
-
+    # Trap the SIGTERM signal
-    if [[ $# == 0 ]]; then
+    trap delete_script SIGTERM
-        before_show_menu
+    delete_script
-    fi
 }
 
 reset_user() {
@@ -283,12 +307,6 @@ show_log() {
     fi
 }
 
-migrate_v2_ui() {
-    /usr/local/x-ui/x-ui v2-ui
-
-    before_show_menu
-}
-
 install_bbr() {
     # temporary workaround for installing bbr
     bash <(curl -L -s https://raw.githubusercontent.com/teddysun/across/master/bbr.sh)
@@ -362,7 +380,7 @@ show_status() {
     check_status
     case $? in
     0)
-        echo -e "Panel state: ${green}Runing${plain}"
+        echo -e "Panel state: ${green}Running${plain}"
         show_enable_status
         ;;
     1)
@@ -397,7 +415,7 @@ check_xray_status() {
 show_xray_status() {
     check_xray_status
     if [[ $? == 0 ]]; then
-        echo -e "xray state: ${green}Runing${plain}"
+        echo -e "xray state: ${green}Running${plain}"
     else
         echo -e "xray state: ${red}Not Running${plain}"
     fi
@@ -653,18 +671,18 @@ show_usage() {
     echo "X-UI Control Menu Usage"
     echo "------------------------------------------"
     echo "SUBCOMMANDS:" 
-    echo "x-ui              - Admin management script"
+    echo "x-ui              - Admin Management Script"
-    echo "x-ui start        - Start X-UI"
+    echo "x-ui start        - Start"
-    echo "x-ui stop         - Stop X-UI"
+    echo "x-ui stop         - Stop"
-    echo "x-ui restart      - Restart X-UI"
+    echo "x-ui restart      - Restart"
-    echo "x-ui status       - Current X-UI status"
+    echo "x-ui status       - Current Status"
-    echo "x-ui enable       - Enable X-UI on system startup"
+    echo "x-ui enable       - Enable Autostart on OS Startup"
-    echo "x-ui disable      - Disable X-UI on system startup"
+    echo "x-ui disable      - Disable Autostart on OS Startup"
-    echo "x-ui log          - Check X-UI logs"
+    echo "x-ui log          - Check Logs"
-    echo "x-ui update       - Update X-UI"
+    echo "x-ui update       - Update"
-    echo "x-ui install      - Install X-UI"
+    echo "x-ui install      - Install"
-    echo "x-ui uninstall    - Uninstall X-UI"
+    echo "x-ui uninstall    - Uninstall"
-    echo "x-ui help         - Control menu usage"
+    echo "x-ui help         - Control Menu Usage"
     echo "------------------------------------------"
 }
 
@@ -674,32 +692,33 @@ show_menu() {
 ————————————————
   ${green}0.${plain} Exit 
 ————————————————
-  ${green}1.${plain} Install X-UI
+  ${green}1.${plain} Install
-  ${green}2.${plain} Update X-UI
+  ${green}2.${plain} Update
-  ${green}3.${plain} Uninstall X-UI
+  ${green}3.${plain} Custom Version
+  ${green}4.${plain} Uninstall
 ————————————————
-  ${green}4.${plain} Reset Username and Password
+  ${green}5.${plain} Reset Username and Password
-  ${green}5.${plain} Reset Panel Settings
+  ${green}6.${plain} Reset Panel Settings
-  ${green}6.${plain} Set Panel Port
+  ${green}7.${plain} Set Panel Port
-  ${green}7.${plain} View Current Panel Settings
+  ${green}8.${plain} View Panel Settings
 ————————————————
-  ${green}8.${plain} Start X-UI
+  ${green}9.${plain} Start
-  ${green}9.${plain} Stop X-UI
+  ${green}10.${plain} Stop
-  ${green}10.${plain} Restart X-UI
+  ${green}11.${plain} Restart
-  ${green}11.${plain} Check X-UI State
+  ${green}12.${plain} Check State
-  ${green}12.${plain} Check X-UI Logs
+  ${green}13.${plain} Check Logs
 ————————————————
-  ${green}13.${plain} Set X-UI Autostart
+  ${green}14.${plain} Enable Autostart
-  ${green}14.${plain} Cancel X-UI Autostart
+  ${green}15.${plain} Disable Autostart
 ————————————————
-  ${green}15.${plain} 一A Key Installation BBR (latest kernel)
+  ${green}16.${plain} A Key Installation BBR (latest kernel)
-  ${green}16.${plain} 一SSL Certificate Management
+  ${green}17.${plain} SSL Certificate Management
-  ${green}17.${plain} 一Cloudflare SSL Certificate
+  ${green}18.${plain} Cloudflare SSL Certificate
-  ${green}18.${plain} 一Update Geo files
+  ${green}19.${plain} Update Geo Files
 ————————————————
  "
     show_status
-    echo && read -p "Please enter your selection [0-18]: " num
+    echo && read -p "Please enter your selection [0-19]: " num
 
     case "${num}" in
     0)
@@ -712,55 +731,58 @@ show_menu() {
         check_install && update
         ;;
     3)
-        check_install && uninstall
+        check_install && custom_version
         ;;
     4)
-        check_install && reset_user
+        check_install && uninstall
         ;;
     5)
-        check_install && reset_config
+        check_install && reset_user
         ;;
     6)
-        check_install && set_port
+        check_install && reset_config
         ;;
     7)
-        check_install && check_config
+        check_install && set_port
         ;;
     8)
-        check_install && start
+        check_install && check_config
         ;;
     9)
-        check_install && stop
+        check_install && start
         ;;
     10)
-        check_install && restart
+        check_install && stop
         ;;
     11)
-        check_install && status
+        check_install && restart
         ;;
     12)
-        check_install && show_log
+        check_install && status
         ;;
     13)
-        check_install && enable
+        check_install && show_log
         ;;
     14)
-        check_install && disable
+        check_install && enable
         ;;
     15)
-        install_bbr
+        check_install && disable
         ;;
     16)
-        ssl_cert_issue_main
+        install_bbr
         ;;
     17)
-        ssl_cert_issue_CF
+        ssl_cert_issue_main
         ;;
     18)
+        ssl_cert_issue_CF
+        ;;
+    19)
         update_geo
         ;;
     *)
-        LOGE "Please enter the correct number [0-18]"
+        LOGE "Please enter the correct number [0-19]"
         ;;
     esac
 }
@@ -788,9 +810,6 @@ if [[ $# > 0 ]]; then
     "log")
         check_install 0 && show_log 0
         ;;
-    "v2-ui")
-        check_install 0 && migrate_v2_ui 0
-        ;;
     "update")
         check_install 0 && update 0
         ;;

xray/config.go

@@ -16,7 +16,8 @@ type Config struct {
 	API             json_util.RawMessage `json:"api"`
 	Stats           json_util.RawMessage `json:"stats"`
 	Reverse         json_util.RawMessage `json:"reverse"`
-	FakeDNS         json_util.RawMessage `json:"fakeDns"`
+	FakeDNS         json_util.RawMessage `json:"fakedns"`
+	Observatory     json_util.RawMessage `json:"observatory"`
 }
 
 func (c *Config) Equals(other *Config) bool {

xray/log_writer.go

@@ -1,6 +1,7 @@
 package xray
 
 import (
+	"regexp"
 	"strings"
 	"x-ui/logger"
 )
@@ -14,32 +15,31 @@ type LogWriter struct {
 }
 
 func (lw *LogWriter) Write(m []byte) (n int, err error) {
+	regex := regexp.MustCompile(`^(\d{4}/\d{2}/\d{2} \d{2}:\d{2}:\d{2}) \[([^\]]+)\] (.+)$`)
+
 	// Convert the data to a string
 	message := strings.TrimSpace(string(m))
+
 	messages := strings.Split(message, "\n")
 	lw.lastLine = messages[len(messages)-1]
 
 	for _, msg := range messages {
-		// Remove timestamp
+		matches := regex.FindStringSubmatch(msg)
-		messageBody := strings.TrimSpace(strings.SplitN(msg, " ", 3)[2])
 
-		// Find level in []
+		if len(matches) > 3 {
-		startIndex := strings.Index(messageBody, "[")
+			level := matches[2]
-		endIndex := strings.Index(messageBody, "]")
+			msgBody := matches[3]
-		if startIndex != -1 && endIndex != -1 {
-			level := strings.TrimSpace(messageBody[startIndex+1 : endIndex])
-			msgBody := "XRAY: " + strings.TrimSpace(messageBody[endIndex+1:])
 
 			// Map the level to the appropriate logger function
 			switch level {
 			case "Debug":
-				logger.Debug(msgBody)
+				logger.Debug("XRAY: " + msgBody)
 			case "Info":
-				logger.Info(msgBody)
+				logger.Info("XRAY: " + msgBody)
 			case "Warning":
-				logger.Warning(msgBody)
+				logger.Warning("XRAY: " + msgBody)
 			case "Error":
-				logger.Error(msgBody)
+				logger.Error("XRAY: " + msgBody)
 			default:
 				logger.Debug("XRAY: " + msg)
 			}