v2.1.0

2024-01-16 01:37:50 +03:30
41 changed files with 867 additions and 555 deletions
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -1,5 +1,4 @@
-name: Release 3X-UI for Docker
-
+name: Release 3X-UI dockerhub
 on:
  push:
    tags:
@@ -7,44 +6,36 @@ on:
  workflow_dispatch:

 jobs:
-  build:
+  build_and_push:
    runs-on: ubuntu-latest

    steps:
-      - name: Checkout repository
+      - name: Check out the code
        uses: actions/checkout@v4.1.1
-        with:
-          submodules: true
-
-      - name: Docker meta
-        id: meta
-        uses: docker/metadata-action@v5
-        with:
-          images: |
-            ghcr.io/mhsanaei/3x-ui
-          tags: |
-            type=ref,event=branch
-            type=ref,event=tag
-            type=pep440,pattern={{version}}
-
      - name: Set up QEMU
        uses: docker/setup-qemu-action@v3.0.0

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

-      - name: Login to GHCR
+      - name: Log in to GitHub Container Registry
        uses: docker/login-action@v3.0.0
        with:
          registry: ghcr.io
-          username: ${{ github.repository_owner }}
+          username: ${{ github.actor }}
          password: ${{ secrets.GITHUB_TOKEN }}

-      - name: Build and push
+      - name: Docker meta
+        id: meta
+        uses: docker/metadata-action@v5.5.0
+        with:
+          images: ghcr.io/${{ github.repository }}
+
+      - name: Build and push Docker image
        uses: docker/build-push-action@v5.1.0
        with:
          context: .
-          push: true
-          platforms: linux/amd64,linux/arm64/v8,linux/arm/v7,linux/arm/v6,linux/386
+          push: ${{ github.event_name != 'pull_request' }}
+          platforms: linux/amd64, linux/arm64/v8, linux/arm/v7, linux/arm/v6
          tags: ${{ steps.meta.outputs.tags }}
          labels: ${{ steps.meta.outputs.labels }}
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -15,8 +15,6 @@ jobs:
          - arm64
          - armv7
          - armv6
-          - 386
-          - armv5
    runs-on: ubuntu-20.04
    steps:
      - name: Checkout repository
@@ -32,14 +30,8 @@ jobs:
          sudo apt-get update
          if [ "${{ matrix.platform }}" == "arm64" ]; then
            sudo apt install gcc-aarch64-linux-gnu
-          elif [ "${{ matrix.platform }}" == "armv7" ]; then
+          elif [ "${{ matrix.platform }}" == "armv7" ] || [ "${{ matrix.platform }}" == "armv6" ]; then
            sudo apt install gcc-arm-linux-gnueabihf
-          elif [ "${{ matrix.platform }}" == "armv6" ]; then
-            sudo apt install gcc-arm-linux-gnueabihf
-          elif [ "${{ matrix.platform }}" == "386" ]; then
-            sudo apt install gcc-i686-linux-gnu
-          elif [ "${{ matrix.platform }}" == "armv5" ]; then
-            sudo apt install gcc-arm-linux-gnueabi
          fi

      - name: Build x-ui
@@ -50,21 +42,10 @@ jobs:
          if [ "${{ matrix.platform }}" == "arm64" ]; then
            export GOARCH=arm64
            export CC=aarch64-linux-gnu-gcc
-          elif [ "${{ matrix.platform }}" == "armv7" ]; then
+          elif [ "${{ matrix.platform }}" == "armv7" ] || [ "${{ matrix.platform }}" == "armv6" ]; then
            export GOARCH=arm
            export GOARM=7
            export CC=arm-linux-gnueabihf-gcc
-          elif [ "${{ matrix.platform }}" == "armv6" ]; then
-            export GOARCH=arm
-            export GOARM=6
-            export CC=arm-linux-gnueabihf-gcc
-          elif [ "${{ matrix.platform }}" == "386" ]; then
-            export GOARCH=386
-            export CC=i686-linux-gnu-gcc
-          elif [ "${{ matrix.platform }}" == "armv5" ]; then
-            export GOARCH=arm
-            export GOARM=5
-            export CC=arm-linux-gnueabi-gcc
          fi
          go build -o xui-release -v main.go
          
@@ -94,14 +75,6 @@ jobs:
            wget ${Xray_URL}Xray-linux-arm32-v6.zip
            unzip Xray-linux-arm32-v6.zip
            rm -f Xray-linux-arm32-v6.zip
-          elif [ "${{ matrix.platform }}" == "386" ]; then
-            wget ${Xray_URL}Xray-linux-32.zip
-            unzip Xray-linux-32.zip
-            rm -f Xray-linux-32.zip
-          elif [ "${{ matrix.platform }}" == "armv5" ]; then
-            wget ${Xray_URL}Xray-linux-arm32-v5.zip
-            unzip Xray-linux-arm32-v5.zip
-            rm -f Xray-linux-arm32-v5.zip
          fi
          rm -f geoip.dat geosite.dat
          wget https://github.com/Loyalsoldier/v2ray-rules-dat/releases/latest/download/geoip.dat
--- a/DockerInit.sh
+++ b/DockerInit.sh
@@ -1,13 +1,10 @@
 #!/bin/sh
+
 case $1 in
    amd64)
        ARCH="64"
        FNAME="amd64"
        ;;
-    i386)
-        ARCH="32"
-        FNAME="i386"
-        ;;
    armv8 | arm64 | aarch64)
        ARCH="arm64-v8a"
        FNAME="arm64"
@@ -25,16 +22,19 @@ case $1 in
        FNAME="amd64"
        ;;
 esac
+
+
 mkdir -p build/bin
 cd build/bin
+
 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
+rm -f "Xray-linux-${ARCH}.zip" geoip.dat geosite.dat geoip_IR.dat geosite_IR.dat geoip_VN.dat geosite_VN.dat
 mv xray "xray-linux-${FNAME}"
+
 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
 wget -O geoip_VN.dat https://github.com/vuong2023/vn-v2ray-rules/releases/latest/download/geoip.dat
 wget -O geosite_VN.dat https://github.com/vuong2023/vn-v2ray-rules/releases/latest/download/geosite.dat
-cd ../../
--- a/12
+++ b/12
@@ -1,9 +1,11 @@
 # ========================================================
 # Stage: Builder
 # ========================================================
-FROM golang:1.21-alpine AS builder
+FROM --platform=$BUILDPLATFORM golang:1.21-alpine AS builder
 WORKDIR /app
 ARG TARGETARCH
+ENV CGO_ENABLED=1
+ENV CGO_CFLAGS="-D_LARGEFILE64_SOURCE"

 RUN apk --no-cache --update add \
  build-base \
@@ -13,8 +15,6 @@ RUN apk --no-cache --update add \

 COPY . .

-ENV CGO_ENABLED=1
-ENV CGO_CFLAGS="-D_LARGEFILE64_SOURCE"
 RUN go build -o build/x-ui main.go
 RUN ./DockerInit.sh "$TARGETARCH"

@@ -30,9 +30,9 @@ RUN apk add --no-cache --update \
  tzdata \
  fail2ban

-COPY --from=builder /app/build/ /app/
-COPY --from=builder /app/DockerEntrypoint.sh /app/
-COPY --from=builder /app/x-ui.sh /usr/bin/x-ui
+COPY --from=builder  /app/build/ /app/
+COPY --from=builder  /app/DockerEntrypoint.sh /app/
+COPY --from=builder  /app/x-ui.sh /usr/bin/x-ui

 # Configure fail2ban
 RUN rm -f /etc/fail2ban/jail.d/alpine-ssh.conf \
--- a/README.md
+++ b/README.md
@@ -25,10 +25,10 @@ bash <(curl -Ls https://raw.githubusercontent.com/mhsanaei/3x-ui/master/install.

 ## Install Custom Version

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

 ```
-bash <(curl -Ls https://raw.githubusercontent.com/mhsanaei/3x-ui/master/install.sh) v2.1.2
+bash <(curl -Ls https://raw.githubusercontent.com/mhsanaei/3x-ui/master/install.sh) v2.0.2
 ```
 ## Manual Install & Upgrade

@@ -103,24 +103,6 @@ systemctl restart x-ui
      ghcr.io/mhsanaei/3x-ui:latest
   ```

-update to latest version
-
-   ```sh
-    cd 3x-ui
-    docker compose down
-    docker compose pull 3x-ui
-    docker compose up -d
-   ```
-
-remove 3x-ui from docker 
-
-   ```sh
-    docker stop 3x-ui
-    docker rm 3x-ui
-    cd --
-    rm -r 3x-ui
-   ```
-
 </details>


@@ -136,22 +118,7 @@ remove 3x-ui from docker
 - AlmaLinux 9+
 - Rockylinux 9+

-## Compatible Architectures & Devices

-Supports a variety of different architectures and devices. Here are some of the main architectures that we support:
-
- **amd64**: This is the most common architecture for personal computers and servers. It supports most modern operating systems. 
-
- **x86 / i386**: This architecture is prevalent in desktop and laptop computers. It's widely supported by various operating systems and applications. (Ex: Most Windows, macOS, and Linux systems)
-
- **armv8 / arm64 / aarch64**: This is the architecture for modern mobile and embedded devices, including smartphones and tablets. (Ex: Raspberry Pi 4, Raspberry Pi 3, Raspberry Pi Zero 2/Zero 2 W, Orange Pi 3 LTS,...)
-
- **armv7 / arm / arm32**: This is the architecture for older mobile and embedded devices. It is still widely used in many devices. (Ex: Orange Pi Zero LTS, Orange Pi PC Plus, Raspberry Pi 2,...)
-
- **armv6 / arm / arm32**: This is the architecture for very old embedded devices. While not as common as before, there are still some devices using this architecture. (Ex: Raspberry Pi 1, Raspberry Pi Zero/Zero W,...)
-
- **armv5 / arm / arm32**: This is an older architecture primarily used in early embedded systems. While it's less common today, some legacy devices may still rely on this architecture. (Ex: Early versions of Raspberry Pi, some older smartphones)
-  
 ## Languages

 - English
@@ -229,6 +196,26 @@ certbot renew --dry-run

 </details>

+
+## Xray Configurations
+
+<details>
+  <summary>Click for Xray configurations details</summary>
+  
+#### Usage
+
+**1.** Copy & paste into the Advanced Xray Configuration:
+
+- [traffic](./media/configs/traffic.json)
+- [traffic + Block all Iran IP address](./media/configs/traffic+block-iran-ip.json)
+- [traffic + Block all Iran Domains](./media/configs/traffic+block-iran-domains.json)
+- [traffic + Block Ads + Use IPv4 for Google](./media/configs/traffic+block-ads+ipv4-google.json)
+- [traffic + Block Ads + Route Google + Netflix + Spotify + OpenAI (ChatGPT) to WARP](./media/configs/traffic+block-ads+warp.json)
+
+***Tip:*** *You don't need to do this for a fresh install.*
+
+</details>
+
 ## [WARP Configuration](https://gitlab.com/fscarmen/warp)

 <details>
@@ -236,21 +223,21 @@ certbot renew --dry-run

 #### Usage

-If you want to use routing to WARP before v2.1.0 follow steps as below:
+If you want to use routing to WARP follow steps as below:

-**1.** Install WARP on **SOCKS Proxy Mode**:
-
-   ```sh
-   bash <(curl -sSL https://raw.githubusercontent.com/hamid-gh98/x-ui-scripts/main/install_warp_proxy.sh)
-   ```
-
-**2.** If you already installed warp, you can uninstall using below command:
+**1.** If you already installed warp, you can uninstall using below command:

   ```sh
   warp u
   ```

-**3.** Turn on the config you need in panel
+**2.** Install WARP on **SOCKS Proxy Mode**:
+
+   ```sh
+   bash <(curl -sSL https://raw.githubusercontent.com/hamid-gh98/x-ui-scripts/main/install_warp_proxy.sh)
+   ```
+
+**3.** Turn on the config you need in panel or [Copy and paste this file to Xray Configuration](./media/configs/traffic+block-ads+warp.json)

   Config Features:

@@ -422,6 +409,20 @@ XUI_BIN_FOLDER="bin" XUI_DB_FOLDER="/etc/x-ui" go build main.go

 </details>

+
+## Supported Architectures and Devices
+
+Supports a variety of different architectures and devices. Here are some of the main architectures that we support:
+
+- **amd64**: This is the most common architecture for personal computers and servers. It supports most modern operating systems. 
+
+- **armv8 / arm64 / aarch64**: This is the architecture for modern mobile and embedded devices, including smartphones and tablets. (Ex: Raspberry Pi 4, Raspberry Pi 3, Raspberry Pi Zero 2/Zero 2 W, Orange Pi 3 LTS,...)
+
+- **armv7 / arm / arm32**: This is the architecture for older mobile and embedded devices. It is still widely used in many devices. (Ex: Orange Pi Zero LTS, Orange Pi PC Plus, Raspberry Pi 2,...)
+
+- **armv6 / arm / arm32**: This is the architecture for very old embedded devices. While not as common as before, there are still some devices using this architecture. (Ex: Raspberry Pi 1, Raspberry Pi Zero/Zero W,...)
+
+  
 ## Preview

 ![1](./media/1.png)
--- a/config/version
+++ b/config/version
@@ -1 +1 @@
-2.1.2
+2.1.0
--- a/database/model/model.go
+++ b/database/model/model.go
@@ -37,7 +37,7 @@ type Inbound struct {

 	// config part
 	Listen         string   `json:"listen" form:"listen"`
-	Port           int      `json:"port" form:"port"`
+	Port           int      `json:"port" form:"port" gorm:"unique"`
 	Protocol       Protocol `json:"protocol" form:"protocol"`
 	Settings       string   `json:"settings" form:"settings"`
 	StreamSettings string   `json:"streamSettings" form:"streamSettings"`
--- a/go.mod
+++ b/go.mod
@@ -17,9 +17,9 @@ require (
 	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.61.0
+	google.golang.org/grpc v1.60.1
 	gorm.io/driver/sqlite v1.5.4
-	gorm.io/gorm v1.25.6
+	gorm.io/gorm v1.25.5
 )

 require (
@@ -36,7 +36,7 @@ require (
 	github.com/go-ole/go-ole v1.3.0 // indirect
 	github.com/go-playground/locales v0.14.1 // indirect
 	github.com/go-playground/universal-translator v0.18.1 // indirect
-	github.com/go-playground/validator/v10 v10.17.0 // indirect
+	github.com/go-playground/validator/v10 v10.16.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
--- a/go.sum
+++ b/go.sum
@@ -76,8 +76,8 @@ github.com/go-playground/universal-translator v0.18.0/go.mod h1:UvRDBj+xPUEGrFYl
 github.com/go-playground/universal-translator v0.18.1 h1:Bcnm0ZwsGyWbCzImXv+pAJnYK9S473LQFuzCbDbfSFY=
 github.com/go-playground/universal-translator v0.18.1/go.mod h1:xekY+UJKNuX9WP91TpwSH2VMlDf28Uj24BCp08ZFTUY=
 github.com/go-playground/validator/v10 v10.10.0/go.mod h1:74x4gJWsvQexRdW8Pn3dXSGrTK4nAUsbPlLADvpJkos=
-github.com/go-playground/validator/v10 v10.17.0 h1:SmVVlfAOtlZncTxRuinDPomC2DkXJ4E5T9gDA0AIH74=
-github.com/go-playground/validator/v10 v10.17.0/go.mod h1:9iXMNT7sEkjXb0I+enO7QXmzG6QCsPWY4zveKFVRSyU=
+github.com/go-playground/validator/v10 v10.16.0 h1:x+plE831WK4vaKHO/jpgUGsvLKIqRRkz6M78GuJAfGE=
+github.com/go-playground/validator/v10 v10.16.0/go.mod h1:9iXMNT7sEkjXb0I+enO7QXmzG6QCsPWY4zveKFVRSyU=
 github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 h1:tfuBGBXKqDEevZMzYi5KSi8KkcZtzBcTgAUUtapy0OI=
 github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572/go.mod h1:9Pwr4B2jHnOSGXyyzV8ROjYa2ojvAY6HCGYYfMoC3Ls=
 github.com/goccy/go-json v0.9.7/go.mod h1:6MelG93GURQebXPDq3khkgXZkazVtN9CRI+MGFi0w8I=
@@ -413,8 +413,8 @@ google.golang.org/grpc v1.14.0/go.mod h1:yo6s7OP7yaDglbqo1J04qKzAhqBH6lvTonzMVmE
 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.61.0 h1:TOvOcuXn30kRao+gfcvsebNEa5iZIiLkisYEkf7R7o0=
-google.golang.org/grpc v1.61.0/go.mod h1:VUbo7IFqmF1QtCAstipjG0GIoq49KvMe9+h1jFLBNJs=
+google.golang.org/grpc v1.60.1 h1:26+wFr+cNqSGFcOXcabYC0lUVJVRa2Sb2ortSK7VrEU=
+google.golang.org/grpc v1.60.1/go.mod h1:OlCHIeLYqSSsLi6i49B5QGdzaMZK9+M7LXN2FKz4eGM=
 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=
@@ -437,8 +437,8 @@ 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.4/go.mod h1:qxAuCol+2r6PannQDpOP1FP6ag3mKi4esLnB/jHed+4=
-gorm.io/gorm v1.25.6 h1:V92+vVda1wEISSOMtodHVRcUIOPYa2tgQtyF+DfFx+A=
-gorm.io/gorm v1.25.6/go.mod h1:hbnx/Oo0ChWMn1BIhpy1oYozzpM15i4YPuHDmfYtwg8=
+gorm.io/gorm v1.25.5 h1:zR9lOiiYf09VNh5Q1gphfyia1JpiClIWG9hQaxB/mls=
+gorm.io/gorm v1.25.5/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=
--- a/install.sh
+++ b/install.sh
@@ -26,15 +26,12 @@ echo "The OS release is: $release"
 arch3xui() {
    case "$(uname -m)" in
    x86_64 | x64 | amd64) echo 'amd64' ;;
-    i*86 | x86) echo '386' ;;
    armv8* | armv8 | arm64 | aarch64) echo 'arm64' ;;
    armv7* | armv7 | arm) echo 'armv7' ;;
-    armv6* | armv6) echo 'armv6' ;;
-    armv5* | armv5) echo 'armv5' ;;
+    armv6* | armv6 | arm) echo 'armv6' ;;
    *) echo -e "${green}Unsupported CPU architecture! ${plain}" && rm -f install.sh && exit 1 ;;
    esac
 }
-
 echo "arch: $(arch3xui)"

 os_version=""
@@ -81,21 +78,19 @@ fi

 install_base() {
    case "${release}" in
-    centos | almalinux | rocky)
-        yum -y update && yum install -y -q wget curl tar
-        ;;
-    fedora)
-        dnf -y update && dnf install -y -q wget curl tar
-        ;;
-    arch | manjaro)
-        pacman -Syu && pacman -Syu --noconfirm wget curl tar
-        ;;
-    *)
-        apt-get update && apt install -y -q wget curl tar
-        ;;
+        centos|fedora|almalinux|rocky)
+            yum -y update && yum install -y -q wget curl tar
+            ;;
+        arch|manjaro)
+            pacman -Syu && pacman -Syu --noconfirm wget curl tar
+            ;;
+        *)
+            apt-get update && apt install -y -q wget curl tar
+            ;;
    esac
 }

+
 # This function will be called when user installed x-ui out of security
 config_after_install() {
    echo -e "${yellow}Install/update finished! For security it's recommended to modify panel settings ${plain}"
@@ -123,9 +118,9 @@ config_after_install() {
            echo -e "${green}username:${usernameTemp}${plain}"
            echo -e "${green}password:${passwordTemp}${plain}"
            echo -e "###############################################"
-            echo -e "${red}if you forgot your login info,you can type x-ui and then type 8 to check after installation${plain}"
+            echo -e "${red}if you forgot your login info,you can type x-ui and then type 7 to check after installation${plain}"
        else
-            echo -e "${red} this is your upgrade,will keep old settings,if you forgot your login info,you can type x-ui and then type 8 to check${plain}"
+            echo -e "${red} this is your upgrade,will keep old settings,if you forgot your login info,you can type x-ui and then type 7 to check${plain}"
        fi
    fi
    /usr/local/x-ui/x-ui migrate
@@ -165,21 +160,18 @@ install_x-ui() {
    tar zxvf x-ui-linux-$(arch3xui).tar.gz
    rm x-ui-linux-$(arch3xui).tar.gz -f
    cd x-ui
-    chmod +x x-ui
-
-    # Check the system's architecture and rename the file accordingly
-    if [[ $(arch3xui) == "armv5" || $(arch3xui) == "armv6" || $(arch3xui) == "armv7" ]]; then
-        mv bin/xray-linux-$(arch3xui) bin/xray-linux-arm
-        chmod +x bin/xray-linux-arm
-    fi
-
    chmod +x x-ui bin/xray-linux-$(arch3xui)
    cp -f x-ui.service /etc/systemd/system/
    wget --no-check-certificate -O /usr/bin/x-ui https://raw.githubusercontent.com/MHSanaei/3x-ui/main/x-ui.sh
    chmod +x /usr/local/x-ui/x-ui.sh
    chmod +x /usr/bin/x-ui
    config_after_install
-
+    #echo -e "If it is a new installation, the default web port is ${green}2053${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 2053 has been released${plain}"
+    #    echo -e "If you want to modify the 2053 to other ports and enter the x-ui command to modify it, you must also ensure that the port you modify is also released"
+    #echo -e ""
+    #echo -e "If it is updated panel, access the panel in your previous way"
+    #echo -e ""
    systemctl daemon-reload
    systemctl enable x-ui
    systemctl start x-ui
--- a/media/configs/traffic+block-ads+ipv4-google.json
+++ b/media/configs/traffic+block-ads+ipv4-google.json
@@ -0,0 +1,97 @@
+{
+  "log": {
+    "loglevel": "warning",
+    "error": "./error.log"
+  },
+  "api": {
+    "tag": "api",
+    "services": [
+      "HandlerService",
+      "LoggerService",
+      "StatsService"
+    ]
+  },
+  "inbounds": [
+    {
+      "tag": "api",
+      "listen": "127.0.0.1",
+      "port": 62789,
+      "protocol": "dokodemo-door",
+      "settings": {
+        "address": "127.0.0.1"
+      }
+    }
+  ],
+  "outbounds": [
+    {
+      "protocol": "freedom",
+      "settings": {}
+    },
+    {
+      "tag": "blocked",
+      "protocol": "blackhole",
+      "settings": {}
+    },
+    {
+      "tag": "IPv4",
+      "protocol": "freedom",
+      "settings": {
+        "domainStrategy": "UseIPv4"
+      }
+    }
+  ],
+  "policy": {
+    "levels": {
+      "0": {
+        "statsUserDownlink": true,
+        "statsUserUplink": true
+      }
+    },
+    "system": {
+      "statsInboundDownlink": true,
+      "statsInboundUplink": true
+    }
+  },
+  "routing": {
+    "domainStrategy": "IPIfNonMatch",
+    "rules": [
+      {
+        "type": "field",
+        "inboundTag": [
+          "api"
+        ],
+        "outboundTag": "api"
+      },
+      {
+        "type": "field",
+        "outboundTag": "blocked",
+        "ip": [
+          "geoip:private"
+        ]
+      },
+      {
+        "type": "field",
+        "outboundTag": "blocked",
+        "protocol": [
+          "bittorrent"
+        ]
+      },
+      {
+        "type": "field",
+        "outboundTag": "blocked",
+        "domain": [
+          "geosite:category-ads-all",
+          "ext:geosite_IR.dat:category-ads-all"
+        ]
+      },
+      {
+        "type": "field",
+        "outboundTag": "IPv4",
+        "domain": [
+          "geosite:google"
+        ]
+      }
+    ]
+  },
+  "stats": {}
+}
--- a/media/configs/traffic+block-ads+warp.json
+++ b/media/configs/traffic+block-ads+warp.json
@@ -0,0 +1,105 @@
+{
+  "log": {
+    "loglevel": "warning",
+    "error": "./error.log"
+  },
+  "api": {
+    "tag": "api",
+    "services": [
+      "HandlerService",
+      "LoggerService",
+      "StatsService"
+    ]
+  },
+  "inbounds": [
+    {
+      "tag": "api",
+      "listen": "127.0.0.1",
+      "port": 62789,
+      "protocol": "dokodemo-door",
+      "settings": {
+        "address": "127.0.0.1"
+      }
+    }
+  ],
+  "outbounds": [
+    {
+      "protocol": "freedom",
+      "settings": {}
+    },
+    {
+      "tag": "blocked",
+      "protocol": "blackhole",
+      "settings": {}
+    },
+    {
+      "tag": "WARP",
+      "protocol": "socks",
+      "settings": {
+        "servers": [
+          {
+            "address": "127.0.0.1",
+            "port": 40000
+          }
+        ]
+      }
+    }
+  ],
+  "policy": {
+    "levels": {
+      "0": {
+        "statsUserDownlink": true,
+        "statsUserUplink": true
+      }
+    },
+    "system": {
+      "statsInboundDownlink": true,
+      "statsInboundUplink": true
+    }
+  },
+  "routing": {
+    "domainStrategy": "IPIfNonMatch",
+    "rules": [
+      {
+        "type": "field",
+        "inboundTag": [
+          "api"
+        ],
+        "outboundTag": "api"
+      },
+      {
+        "type": "field",
+        "outboundTag": "blocked",
+        "ip": [
+          "geoip:private"
+        ]
+      },
+      {
+        "type": "field",
+        "outboundTag": "blocked",
+        "protocol": [
+          "bittorrent"
+        ]
+      },
+      {
+        "type": "field",
+        "outboundTag": "blocked",
+        "domain": [
+          "geosite:category-ads-all",
+          "ext:geosite_IR.dat:category-ads-all"
+        ]
+      },
+      {
+        "type": "field",
+        "outboundTag": "WARP",
+        "domain": [
+          "geosite:spotify",
+          "geosite:netflix",
+          "geosite:openai",
+          "geosite:google"
+        ]
+      }
+    ]
+  },
+  "stats": {}
+}
--- a/media/configs/traffic+block-iran-domains.json
+++ b/media/configs/traffic+block-iran-domains.json
@@ -0,0 +1,84 @@
+{
+  "log": {
+    "loglevel": "warning",
+    "error": "./error.log"
+  },
+  "api": {
+    "tag": "api",
+    "services": [
+      "HandlerService",
+      "LoggerService",
+      "StatsService"
+    ]
+  },
+  "inbounds": [
+    {
+      "tag": "api",
+      "listen": "127.0.0.1",
+      "port": 62789,
+      "protocol": "dokodemo-door",
+      "settings": {
+        "address": "127.0.0.1"
+      }
+    }
+  ],
+  "outbounds": [
+    {
+      "protocol": "freedom",
+      "settings": {}
+    },
+    {
+      "tag": "blocked",
+      "protocol": "blackhole",
+      "settings": {}
+    }
+  ],
+  "policy": {
+    "levels": {
+      "0": {
+        "statsUserDownlink": true,
+        "statsUserUplink": true
+      }
+    },
+    "system": {
+      "statsInboundDownlink": true,
+      "statsInboundUplink": true
+    }
+  },
+  "routing": {
+    "domainStrategy": "IPIfNonMatch",
+    "rules": [
+      {
+        "type": "field",
+        "inboundTag": [
+          "api"
+        ],
+        "outboundTag": "api"
+      },
+      {
+        "type": "field",
+        "outboundTag": "blocked",
+        "ip": [
+          "geoip:private"
+        ]
+      },
+      {
+        "type": "field",
+        "outboundTag": "blocked",
+        "protocol": [
+          "bittorrent"
+        ]
+      },
+      {
+        "type": "field",
+        "outboundTag": "blocked",
+        "domain": [
+          "regexp:.*\\.ir$",
+          "regexp:.*\\.xn--mgba3a4f16a$", 
+          "ext:geosite_IR.dat:ir"
+        ]
+      }
+    ]
+  },
+  "stats": {}
+}
--- a/media/configs/traffic+block-iran-ip.json
+++ b/media/configs/traffic+block-iran-ip.json
@@ -0,0 +1,76 @@
+{
+  "log": {
+    "loglevel": "warning",
+    "error": "./error.log"
+  },
+  "api": {
+    "tag": "api",
+    "services": [
+      "HandlerService",
+      "LoggerService",
+      "StatsService"
+    ]
+  },
+  "inbounds": [
+    {
+      "tag": "api",
+      "listen": "127.0.0.1",
+      "port": 62789,
+      "protocol": "dokodemo-door",
+      "settings": {
+        "address": "127.0.0.1"
+      }
+    }
+  ],
+  "outbounds": [
+    {
+      "protocol": "freedom",
+      "settings": {}
+    },
+    {
+      "tag": "blocked",
+      "protocol": "blackhole",
+      "settings": {}
+    }
+  ],
+  "policy": {
+    "levels": {
+      "0": {
+        "statsUserDownlink": true,
+        "statsUserUplink": true
+      }
+    },
+    "system": {
+      "statsInboundDownlink": true,
+      "statsInboundUplink": true
+    }
+  },
+  "routing": {
+    "domainStrategy": "IPIfNonMatch",
+    "rules": [
+      {
+        "type": "field",
+        "inboundTag": [
+          "api"
+        ],
+        "outboundTag": "api"
+      },
+      {
+        "type": "field",
+        "outboundTag": "blocked",
+        "ip": [
+          "geoip:private",
+          "ext:geoip_IR.dat:ir"
+        ]
+      },
+      {
+        "type": "field",
+        "outboundTag": "blocked",
+        "protocol": [
+          "bittorrent"
+        ]
+      }
+    ]
+  },
+  "stats": {}
+}
--- a/media/configs/traffic.json
+++ b/media/configs/traffic.json
@@ -0,0 +1,65 @@
+{
+  "log": {
+    "loglevel": "warning",
+    "error": "./error.log"
+  },
+  "api": {
+    "tag": "api",
+    "services": ["HandlerService", "LoggerService", "StatsService"]
+  },
+  "inbounds": [
+    {
+      "tag": "api",
+      "listen": "127.0.0.1",
+      "port": 62789,
+      "protocol": "dokodemo-door",
+      "settings": {
+        "address": "127.0.0.1"
+      }
+    }
+  ],
+  "outbounds": [
+    {
+      "protocol": "freedom",
+      "settings": {}
+    },
+    {
+      "tag": "blocked",
+      "protocol": "blackhole",
+      "settings": {}
+    }
+  ],
+  "policy": {
+    "levels": {
+      "0": {
+        "statsUserDownlink": true,
+        "statsUserUplink": true
+      }
+    },
+    "system": {
+      "statsInboundDownlink": true,
+      "statsInboundUplink": true
+    }
+  },
+  "routing": {
+    "domainStrategy": "IPIfNonMatch",
+    "rules": [
+      {
+        "type": "field",
+        "inboundTag": ["api"],
+        "outboundTag": "api"
+      },
+      {
+        "type": "field",
+        "outboundTag": "blocked",
+        "ip": ["geoip:private"]
+      },
+      {
+        "type": "field",
+        "outboundTag": "blocked",
+        "protocol": ["bittorrent"]
+      }
+    ]
+  },
+  "stats": {}
+}
--- a/web/assets/js/model/outbound.js
+++ b/web/assets/js/model/outbound.js
@@ -915,7 +915,7 @@ Outbound.HttpSettings = class extends CommonClass {
 Outbound.WireguardSettings = class extends CommonClass {
    constructor(
            mtu=1420, secretKey=Wireguard.generateKeypair().privateKey,
-            address=[''], workers=2, domainStrategy='ForceIPv6v4', reserved='',
+            address='', workers=2, domainStrategy='', reserved='',
            peers=[new Outbound.WireguardSettings.Peer()], kernelMode=false) {
        super();
        this.mtu = mtu;
@@ -965,7 +965,7 @@ Outbound.WireguardSettings = class extends CommonClass {
 };

 Outbound.WireguardSettings.Peer = class extends CommonClass {
-    constructor(publicKey=Wireguard.generateKeypair().publicKey, psk='', allowedIPs=['0.0.0.0/0','::/0'], endpoint='', keepAlive=0) {
+    constructor(publicKey='', psk='', allowedIPs=['0.0.0.0/0','::/0'], endpoint='', keepAlive=0) {
        super();
        this.publicKey = publicKey;
        this.psk = psk;
--- a/web/assets/js/model/xray.js
+++ b/web/assets/js/model/xray.js
@@ -2297,7 +2297,7 @@ Inbound.WireguardSettings = class extends XrayCommonClass {
 };

 Inbound.WireguardSettings.Peer = class extends XrayCommonClass {
-    constructor(publicKey=Wireguard.generateKeypair().publicKey, psk='', allowedIPs=['0.0.0.0/0','::/0'], keepAlive=0) {
+    constructor(publicKey='', psk='', allowedIPs=['0.0.0.0/0','::/0'], keepAlive=0) {
        super();
        this.publicKey = publicKey;
        this.psk = psk;
--- a/web/controller/inbound.go
+++ b/web/controller/inbound.go
@@ -85,11 +85,7 @@ func (a *InboundController) addInbound(c *gin.Context) {
 	}
 	user := session.GetLoginUser(c)
 	inbound.UserId = user.Id
-	if inbound.Listen == "" || inbound.Listen == "0.0.0.0" || inbound.Listen == "::" || inbound.Listen == "::0" {
-		inbound.Tag = fmt.Sprintf("inbound-0.0.0.0:%v", inbound.Port)
-	} else {
-		inbound.Tag = fmt.Sprintf("inbound-%v:%v", inbound.Listen, inbound.Port)
-	}
+	inbound.Tag = fmt.Sprintf("inbound-%v", inbound.Port)

 	needRestart := false
 	inbound, needRestart, err = a.inboundService.AddInbound(inbound)
@@ -282,11 +278,7 @@ func (a *InboundController) importInbound(c *gin.Context) {
 	user := session.GetLoginUser(c)
 	inbound.Id = 0
 	inbound.UserId = user.Id
-	if inbound.Listen == "" || inbound.Listen == "0.0.0.0" || inbound.Listen == "::" || inbound.Listen == "::0" {
-		inbound.Tag = fmt.Sprintf("inbound-0.0.0.0:%v", inbound.Port)
-	} else {
-		inbound.Tag = fmt.Sprintf("inbound-%v:%v", inbound.Listen, inbound.Port)
-	}
+	inbound.Tag = fmt.Sprintf("inbound-%v", inbound.Port)

 	for index := range inbound.ClientStats {
 		inbound.ClientStats[index].Id = 0
--- a/web/html/xui/client_bulk_modal.html
+++ b/web/html/xui/client_bulk_modal.html
@@ -106,7 +106,7 @@
            </template>
            <a-date-picker v-if="datepicker == 'gregorian'" :show-time="{ format: 'HH:mm:ss' }" format="YYYY-MM-DD HH:mm:ss"
                :dropdown-class-name="themeSwitcher.currentTheme" v-model="clientsBulkModal.expiryTime"></a-date-picker>
-            <persian-datepicker v-else placeholder='{{ i18n "pages.settings.datepickerPlaceholder" }}'
+            <persian-datepicker v-else :dropdown-class-name="themeSwitcher.currentTheme"
                                value="clientsBulkModal.expiryTime" v-model="clientsBulkModal.expiryTime"></persian-datepicker>
        </a-form-item>
        <a-form-item v-if="clientsBulkModal.expiryTime != 0">
--- a/web/html/xui/component/persianDatepicker.html
+++ b/web/html/xui/component/persianDatepicker.html
@@ -3,7 +3,7 @@
    <div>
        <a-input :value="value" type="text" v-model="date" data-jdp class="persian-datepicker"
                 @input="$emit('input', convertToGregorian($event.target.value)); jalaliDatepicker.hide();"
-                 :placeholder="placeholder">
+                 placeholder="انتخاب تاریخ">
            <template #addonAfter>
                <a-icon type="calendar" style="font-size: 16px;"/>
            </template>
@@ -21,7 +21,7 @@
    const persianDatepicker = {};

    Vue.component('persian-datepicker', {
-        props: ['placeholder', 'format', 'value'],
+        props: ['dropdown-class-name', 'format', 'value'],
        template: `{{template "component/persianDatepickerTemplate"}}`,
        data() {
            return {
@@ -48,7 +48,7 @@
            listenToDatepicker() {
                jalaliDatepicker.startWatch({
                    time: true,
-                    zIndex: '9999',
+                    container: '.ant-modal-wrap',
                    hideAfterChange: true,
                    useDropDownYears: false,
                    changeMonthRotateYear: true,
--- a/web/html/xui/component/themeSwitch.html
+++ b/web/html/xui/component/themeSwitch.html
@@ -11,7 +11,6 @@
  function createThemeSwitcher() {
    const isDarkTheme = localStorage.getItem('dark-mode') === 'true';
    const theme = isDarkTheme ? 'dark' : 'light';
-    document.querySelector('body').setAttribute('class', theme)
    return {
      isDarkTheme,
      get currentTheme() {
@@ -20,7 +19,6 @@
      toggleTheme() {
        this.isDarkTheme = !this.isDarkTheme;
        localStorage.setItem('dark-mode', this.isDarkTheme);
-        document.querySelector('body').setAttribute('class', this.isDarkTheme ? 'dark' : 'light')
      },
    };
  }
--- a/web/html/xui/form/client.html
+++ b/web/html/xui/form/client.html
@@ -152,7 +152,7 @@
        </template>
        <a-date-picker v-if="datepicker == 'gregorian'" :show-time="{ format: 'HH:mm:ss' }" format="YYYY-MM-DD HH:mm:ss"
            :dropdown-class-name="themeSwitcher.currentTheme" v-model="client._expiryTime"></a-date-picker>
-        <persian-datepicker v-else placeholder='{{ i18n "pages.settings.datepickerPlaceholder" }}'
+        <persian-datepicker v-else :dropdown-class-name="themeSwitcher.currentTheme"
                            value="client._expiryTime" v-model="client._expiryTime"></persian-datepicker>
        <a-tag color="red" v-if="isEdit && isExpiry">Expired</a-tag>
    </a-form-item>
--- a/web/html/xui/form/inbound.html
+++ b/web/html/xui/form/inbound.html
@@ -57,8 +57,8 @@
            <a-date-picker v-if="datepicker == 'gregorian'" :show-time="{ format: 'HH:mm:ss' }" format="YYYY-MM-DD HH:mm:ss"
                :dropdown-class-name="themeSwitcher.currentTheme"
                v-model="dbInbound._expiryTime"></a-date-picker>
-            <persian-datepicker v-else placeholder='{{ i18n "pages.settings.datepickerPlaceholder" }}'
-                            value="dbInbound._expiryTime" v-model="dbInbound._expiryTime"></persian-datepicker>
+            <persian-datepicker v-else :dropdown-class-name="themeSwitcher.currentTheme"
+                                value="dbInbound._expiryTime" v-model="dbInbound._expiryTime"></persian-datepicker>
        </a-form-item>
 </a-form>

--- a/web/html/xui/form/outbound.html
+++ b/web/html/xui/form/outbound.html
@@ -134,28 +134,10 @@
        <a-form-item label='{{ i18n "pages.xray.wireguard.endpoint" }}'>
            <a-input v-model.trim="peer.endpoint"></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.publicKey" }}
-                    <a-icon @click="peer.publicKey = publicKey=Wireguard.generateKeypair().publicKey"type="sync"> </a-icon>
-                </a-tooltip>
-            </template>
+        <a-form-item label='{{ i18n "pages.xray.wireguard.publicKey" }}'>
            <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 = publicKey=Wireguard.generateKeypair().publicKey"type="sync"> </a-icon>
-                </a-tooltip>
-            </template>
+        <a-form-item label='{{ i18n "pages.xray.wireguard.psk" }}'>
            <a-input v-model.trim="peer.psk"></a-input>
        </a-form-item>
        <a-form-item>
--- a/web/html/xui/form/protocol/wireguard.html
+++ b/web/html/xui/form/protocol/wireguard.html
@@ -32,28 +32,10 @@
            <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.publicKey" }}
-                    <a-icon @click="peer.publicKey = publicKey=Wireguard.generateKeypair().publicKey"type="sync"> </a-icon>
-                </a-tooltip>
-            </template>
+        <a-form-item label='{{ i18n "pages.xray.wireguard.publicKey" }}'>
            <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 = publicKey=Wireguard.generateKeypair().publicKey"type="sync"> </a-icon>
-                </a-tooltip>
-            </template>
+        <a-form-item label='{{ i18n "pages.xray.wireguard.psk" }}'>
            <a-input v-model.trim="peer.psk"></a-input>
        </a-form-item>
        <a-form-item>
--- a/web/html/xui/inbounds.html
+++ b/web/html/xui/inbounds.html
@@ -230,7 +230,7 @@
                                        </template>
                                        <a-menu-item key="clipboard">
                                            <a-icon type="copy"></a-icon>
-                                            {{ i18n "pages.inbounds.exportInbound" }}
+                                            {{ i18n "pages.inbounds.copyToClipboard" }}
                                        </a-menu-item>
                                        <a-menu-item key="resetTraffic">
                                            <a-icon type="retweet"></a-icon> {{ i18n "pages.inbounds.resetTraffic" }}
--- a/web/html/xui/index.html
+++ b/web/html/xui/index.html
@@ -93,7 +93,7 @@
                    <a-col :sm="24" :md="12">
                        <a-card hoverable>
                            {{ i18n "pages.index.xrayStatus" }}:
-                            <a-tag :color="status.xray.color">[[ status.xray.state ]]</a-tag>
+                            <a-tag :color="status.xray.color">[[ status.xray.state.toUpperCase() ]]</a-tag>
                            <a-popover v-if="status.xray.state === State.Error"
                                :overlay-class-name="themeSwitcher.currentTheme">
                                <span slot="title" style="font-size: 12pt">An error occurred while running Xray
@@ -299,12 +299,12 @@
            </a-form-item>
            <a-form-item>
                <a-button type="primary" style="margin-bottom: 10px;"
-                :href="'data:application/text;charset=utf-8,' + encodeURIComponent(logModal.logs.join('\n'))" download="x-ui.log">
+                :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>
-        <div class="ant-input" style="height: auto; max-height: 500px; overflow: auto;" v-html="logModal.formattedLogs"></div>
+        <div class="ant-input" style="height: auto; max-height: 500px; overflow: auto;" v-html="logModal.logs"></div>
    </a-modal>

    <a-modal id="backup-modal" v-model="backupModal.visible" :title="backupModal.title"
@@ -432,16 +432,14 @@

    const logModal = {
        visible: false,
-        logs: [],
-        formattedLogs: '',
+        logs: '',
        rows: 20,
        level: 'info',
        syslog: false,
        loading: false,
        show(logs) {
            this.visible = true;
-            this.logs = logs;
-            this.formattedLogs = logs.length > 0 ? this.formatLogs(logs) : "No Record...";
+            this.logs = logs? this.formatLogs(logs) : "No Record...";
        },
        formatLogs(logs) {
            let formattedLogs = '';
--- a/web/html/xui/settings.html
+++ b/web/html/xui/settings.html
@@ -244,7 +244,7 @@
                                <setting-list-item type="switch" title='{{ i18n "pages.settings.tgNotifyBackup" }}' desc='{{ i18n "pages.settings.tgNotifyBackupDesc" }}' v-model="allSetting.tgBotBackup"></setting-list-item>
                                <setting-list-item type="switch" title='{{ i18n "pages.settings.tgNotifyLogin" }}' desc='{{ i18n "pages.settings.tgNotifyLoginDesc" }}' v-model="allSetting.tgBotLoginNotify"></setting-list-item>
                                <setting-list-item type="number" title='{{ i18n "pages.settings.tgNotifyCpu" }}' desc='{{ i18n "pages.settings.tgNotifyCpuDesc" }}' v-model="allSetting.tgCpu" :min="0" :max="100"></setting-list-item>
-                                <setting-list-item type="text" title='{{ i18n "pages.settings.telegramProxy"}}' desc='{{ i18n "pages.settings.telegramProxyDesc"}}' v-model="allSetting.tgBotProxy" placeholder="socks5://user:pass@host:port"></setting-list-item>
+                                <setting-list-item type="text" title='{{ i18n "pages.settings.telegramProxy"}}' desc='{{ i18n "pages.settings.telegramProxyDesc"}}' v-model="allSetting.tgBotProxy" placeholder="socks5://[user:pass@]host:port"></setting-list-item>
                                <a-list-item>
                                    <a-row style="padding: 20px">
                                        <a-col :lg="24" :xl="12">
--- a/web/html/xui/warp_modal.html
+++ b/web/html/xui/warp_modal.html
@@ -140,7 +140,6 @@
                            mtu: 1420,
                            secretKey: warpModal.warpData.private_key,
                            address: Object.values(config.interface.addresses),
-                            domainStrategy: 'ForceIPv6v4',
                            peers: [{
                                publicKey: peer.public_key,
                                endpoint: peer.endpoint.host,
--- a/web/html/xui/xray.html
+++ b/web/html/xui/xray.html
@@ -569,11 +569,9 @@
                familyProtectDNS: {
                    "servers": [
                        "1.1.1.3",  // https://developers.cloudflare.com/1.1.1.1/setup/
-                        "1.0.0.3",
-                        "2606:4700:4700::1113",
-                        "2606:4700:4700::1003"
+                        "1.0.0.3"
                    ],
-                    "queryStrategy": "UseIP"
+                    "queryStrategy": "UseIPv4"
                },
            }
        },
@@ -1124,6 +1122,26 @@
                    this.templateRuleSetter({ outboundTag: "warp", property: "domain", data: newValue });
                }
            },
+            manualBlockedIPs: {
+                get: function () { return JSON.stringify(this.blockedIPs, null, 2); },
+                set: debounce(function (value) { this.blockedIPs = JSON.parse(value); }, 1000)
+            },
+            manualBlockedDomains: {
+                get: function () { return JSON.stringify(this.blockedDomains, null, 2); },
+                set: debounce(function (value) { this.blockedDomains = JSON.parse(value); }, 1000)
+            },
+            manualDirectIPs: {
+                get: function () { return JSON.stringify(this.directIPs, null, 2); },
+                set: debounce(function (value) { this.directIPs = JSON.parse(value); }, 1000)
+            },
+            manualDirectDomains: {
+                get: function () { return JSON.stringify(this.directDomains, null, 2); },
+                set: debounce(function (value) { this.directDomains = JSON.parse(value); }, 1000)
+            },
+            manualIPv4Domains: {
+                get: function () { return JSON.stringify(this.ipv4Domains, null, 2); },
+                set: debounce(function (value) { this.ipv4Domains = JSON.parse(value); }, 1000)
+            },
            torrentSettings: {
                get: function () {
                    return doAllItemsExist(this.settingsData.protocols.bittorrent, this.blockedProtocols);
--- a/web/job/check_client_ip_job.go
+++ b/web/job/check_client_ip_job.go
@@ -16,18 +16,17 @@ import (
 	"x-ui/xray"
 )

-type CheckClientIpJob struct {
-	disAllowedIps []string
-}
+type CheckClientIpJob struct{}

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

 func NewCheckClientIpJob() *CheckClientIpJob {
@@ -131,6 +130,7 @@ func (j *CheckClientIpJob) processLogFile() {
 		}
 	}

+	disAllowedIps = []string{}
 	shouldCleanLog := false

 	for clientEmail, ips := range InboundClientIps {
@@ -237,7 +237,6 @@ func (j *CheckClientIpJob) updateInboundClientIps(inboundClientIps *model.Inboun
 	json.Unmarshal([]byte(inbound.Settings), &settings)
 	clients := settings["clients"]
 	shouldCleanLog := false
-	j.disAllowedIps = []string{}

 	// create iplimit log file channel
 	logIpFile, err := os.OpenFile(xray.GetIPLimitLogPath(), os.O_CREATE|os.O_APPEND|os.O_RDWR, 0644)
@@ -256,7 +255,7 @@ func (j *CheckClientIpJob) updateInboundClientIps(inboundClientIps *model.Inboun
 				shouldCleanLog = true

 				if limitIp < len(ips) && inbound.Enable {
-					j.disAllowedIps = append(j.disAllowedIps, ips[limitIp:]...)
+					disAllowedIps = append(disAllowedIps, ips[limitIp:]...)
 					for i := limitIp; i < len(ips); i++ {
 						log.Printf("[LIMIT_IP] Email = %s || SRC = %s", clientEmail, ips[i])
 					}
@@ -264,12 +263,8 @@ func (j *CheckClientIpJob) updateInboundClientIps(inboundClientIps *model.Inboun
 			}
 		}
 	}
-
-	sort.Strings(j.disAllowedIps)
-
-	if len(j.disAllowedIps) > 0 {
-		logger.Debug("disAllowedIps ", j.disAllowedIps)
-	}
+	logger.Debug("disAllowedIps ", disAllowedIps)
+	sort.Strings(disAllowedIps)

 	db := database.GetDB()
 	err = db.Save(inboundClientIps).Error
--- a/web/service/config.json
+++ b/web/service/config.json
@@ -24,7 +24,6 @@
  ],
  "outbounds": [
    {
-      "tag": "direct",
      "protocol": "freedom",
      "settings": {}
    },
--- a/web/service/inbound.go
+++ b/web/service/inbound.go
@@ -38,25 +38,9 @@ func (s *InboundService) GetAllInbounds() ([]*model.Inbound, error) {
 	return inbounds, nil
 }

-func (s *InboundService) checkPortExist(listen string, port int, ignoreId int) (bool, error) {
+func (s *InboundService) checkPortExist(port int, ignoreId int) (bool, error) {
 	db := database.GetDB()
-	if listen == "" || listen == "0.0.0.0" || listen == "::" || listen == "::0" {
-		db = db.Model(model.Inbound{}).Where("port = ?", port)
-	} else {
-		db = db.Model(model.Inbound{}).
-			Where("port = ?", port).
-			Where(
-				db.Model(model.Inbound{}).Where(
-					"listen = ?", listen,
-				).Or(
-					"listen = \"\"",
-				).Or(
-					"listen = \"0.0.0.0\"",
-				).Or(
-					"listen = \"::\"",
-				).Or(
-					"listen = \"::0\""))
-	}
+	db = db.Model(model.Inbound{}).Where("port = ?", port)
 	if ignoreId > 0 {
 		db = db.Where("id != ?", ignoreId)
 	}
@@ -151,7 +135,7 @@ func (s *InboundService) checkEmailExistForInbound(inbound *model.Inbound) (stri
 }

 func (s *InboundService) AddInbound(inbound *model.Inbound) (*model.Inbound, bool, error) {
-	exist, err := s.checkPortExist(inbound.Listen, inbound.Port, 0)
+	exist, err := s.checkPortExist(inbound.Port, 0)
 	if err != nil {
 		return inbound, false, err
 	}
@@ -268,7 +252,7 @@ func (s *InboundService) GetInbound(id int) (*model.Inbound, error) {
 }

 func (s *InboundService) UpdateInbound(inbound *model.Inbound) (*model.Inbound, bool, error) {
-	exist, err := s.checkPortExist(inbound.Listen, inbound.Port, inbound.Id)
+	exist, err := s.checkPortExist(inbound.Port, inbound.Id)
 	if err != nil {
 		return inbound, false, err
 	}
@@ -311,11 +295,7 @@ func (s *InboundService) UpdateInbound(inbound *model.Inbound) (*model.Inbound,
 	oldInbound.Settings = inbound.Settings
 	oldInbound.StreamSettings = inbound.StreamSettings
 	oldInbound.Sniffing = inbound.Sniffing
-	if inbound.Listen == "" || inbound.Listen == "0.0.0.0" || inbound.Listen == "::" || inbound.Listen == "::0" {
-		oldInbound.Tag = fmt.Sprintf("inbound-0.0.0.0:%v", inbound.Port)
-	} else {
-		oldInbound.Tag = fmt.Sprintf("inbound-%v:%v", inbound.Listen, inbound.Port)
-	}
+	oldInbound.Tag = fmt.Sprintf("inbound-%v", inbound.Port)

 	needRestart := false
 	s.xrayApi.Init(p.GetAPIPort())
@@ -508,10 +488,6 @@ 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 {
--- a/web/service/xray_setting.go
+++ b/web/service/xray_setting.go
@@ -80,7 +80,7 @@ func (s *XraySettingService) RegWarp(secretKey string, publicKey string) (string
 	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"
+	url := fmt.Sprintf("https://api.cloudflareclient.com/v0a2158/reg")

 	req, err := http.NewRequest("POST", url, bytes.NewBuffer([]byte(data)))
 	if err != nil {
--- a/web/translation/translate.en_US.toml
+++ b/web/translation/translate.en_US.toml
@@ -54,11 +54,11 @@
 "security" = "Security"

 [menu]
-"dashboard" = "Overview"
-"inbounds" = "Inbounds"
-"settings" = "Panel Settings"
-"xray" = "Xray Configs"
-"logout" = "Log Out"
+"dashboard" = "OVERVIEW"
+"inbounds" = "INBOUNDS"
+"settings" = "PANEL SETTINGS"
+"xray" = "XRAY CONFIGS"
+"logout" = "LOG OUT"
 "link" = "Manage"

 [pages.login]
@@ -178,7 +178,7 @@
 "info" = "Info"
 "same" = "Same"
 "inboundData" = "Inbound's Data"
-"exportInbound" = "Export Inbound"
+"copyToClipboard" = "Copy to Clipboard"
 "import" = "Import"
 "importInbound" = "Import an Inbound"

@@ -248,7 +248,6 @@
 "pageSizeDesc" = "Define page size for inbounds table. (0 = disable)"
 "remarkModel" = "Remark Model & Separation Character"
 "datepicker" = "Calendar Type"
-"datepickerPlaceholder" = "Select date"
 "datepickerDescription" = "Scheduled tasks will run based on this calendar."
 "sampleRemark" = "Sample Remark"
 "oldUsername" = "Current Username"
@@ -320,7 +319,7 @@
 "ipv4Configs" = "IPv4 Routing"
 "ipv4ConfigsDesc" = "These options will route traffic based on a specific destination via IPv4."
 "warpConfigs" = "WARP Routing"
-"warpConfigsDesc" = "These options will route traffic based on a specific destination via WARP."
+"warpConfigsDesc" = "These options will route traffic based on a specific destination via WARP. (follow the guide on the Panel’s GitHub)"
 "Template" = "Advanced Xray Configuration Template"
 "TemplateDesc" = "The final Xray config file will be generated based on this template."
 "FreedomStrategy" = "Freedom Protocol Strategy"
@@ -477,6 +476,7 @@
 "helpAdminCommands" = "To search for a client email:\r\n<code>/usage [Email]</code>\r\n\r\nTo search for inbounds (with client stats):\r\n<code>/inbound [Remark]</code>"
 "helpClientCommands" = "To search for statistics, use the following command:\r\n\r\n<code>/usage [Email]</code>"

+
 [tgbot.messages]
 "cpuThreshold" = "🔴 CPU Load {{ .Percent }}% exceeds the threshold of {{ .Threshold }}%"
 "selectUserFailed" = "❌ Error in user selection!"
@@ -522,6 +522,7 @@
 "yes" = "✅ Yes"
 "no" = "❌ No"

+
 [tgbot.buttons]
 "closeKeyboard" = "❌ Close Keyboard"
 "cancel" = "❌ Cancel"
@@ -555,6 +556,7 @@
 "limitTraffic" = "🚧 Traffic Limit"
 "getBanLogs" = "Get Ban Logs"

+
 [tgbot.answers]
 "successfulOperation" = "✅ Operation successful!"
 "errorOperation" = "❗ Error in operation."
--- a/web/translation/translate.es_ES.toml
+++ b/web/translation/translate.es_ES.toml
@@ -1,6 +1,6 @@
 "username" = "Nombre de Usuario"
 "password" = "Contraseña"
-"login" = "Acceder"
+"login" = "Acceso"
 "confirm" = "Confirmar"
 "cancel" = "Cancelar"
 "close" = "Cerrar"
@@ -59,10 +59,10 @@
 "settings" = "Configuraciones"
 "xray" = "Configuración Xray"
 "logout" = "Cerrar Sesión"
-"link" = "Gestionar"
+"link" = "Otro"

 [pages.login]
-"title" = "Bienvenido"
+"title" = "Grata"
 "loginAgain" = "El límite de tiempo de inicio de sesión ha expirado. Por favor, inicia sesión nuevamente."

 [pages.login.toasts]
@@ -178,7 +178,7 @@
 "info" = "Info"
 "same" = "misma"
 "inboundData" = "Datos de entrada"
-"exportInbound" = "Exportación entrante"
+"copyToClipboard" = "Copiar al portapapeles"
 "import" = "Importar"
 "importInbound" = "Importar un entrante"

@@ -248,7 +248,6 @@
 "pageSizeDesc" = "Defina el tamaño de página para la tabla de entradas. Establezca 0 para desactivar"
 "remarkModel" = "Modelo de observación y carácter de separación"
 "datepicker" = "selector de fechas"
-"datepickerPlaceholder" = "Seleccionar fecha"
 "datepickerDescription" = "El tipo de calendario selector especifica la fecha de vencimiento"
 "sampleRemark" = "Observación de muestra"
 "oldUsername" = "Nombre de Usuario Actual"
--- a/web/translation/translate.fa_IR.toml
+++ b/web/translation/translate.fa_IR.toml
@@ -178,7 +178,7 @@
 "info" = "اطلاعات"
 "same" = "همسان"
 "inboundData" = "داده‌های ورودی"
-"exportInbound" = "استخراج ورودی"
+"copyToClipboard" = "کپی در حافظه"
 "import" = "افزودن"
 "importInbound" = "افزودن یک ورودی"

@@ -248,7 +248,6 @@
 "pageSizeDesc" = "(اندازه صفحه برای جدول ورودی‌ها.(0 = غیرفعال"
 "remarkModel" = "نام‌کانفیگ و جداکننده"
 "datepicker" = "نوع تقویم"
-"datepickerPlaceholder" = "انتخاب تاریخ"
 "datepickerDescription" = "وظایف برنامه ریزی شده بر اساس این تقویم اجرا می‌شود"
 "sampleRemark" = "نمونه‌نام"
 "oldUsername" = "نام‌کاربری فعلی"
@@ -502,8 +501,8 @@
 "time" = "⏰ زمان: {{ .Time }}\r\n"
 "inbound" = "📍 نام‌ورودی: {{ .Remark }}\r\n"
 "port" = "🔌 پورت: {{ .Port }}\r\n"
-"expire" = "📅 تاریخ‌انقضا: {{ .Time }}\r\n\r\n"
-"expireIn" = "📅 باقی‌مانده‌تاانقضا: {{ .Time }}\r\n\r\n"
+"expire" = "📅 تاریخ‌انقضا: {{ .DateTime }}\r\n \r\n"
+"expireIn" = "📅 باقی‌مانده‌تاانقضا: {{ .Time }}\r\n \r\n"
 "active" = "💡 فعال: {{ .Enable }}\r\n"
 "enabled" = "🚨 وضعیت: {{ .Enable }}\r\n"
 "online" = "🌐 وضعیت اتصال: {{ .Status }}\r\n"
@@ -516,7 +515,7 @@
 "exhaustedCount" = "🚨 تعداد {{ .Type }} به‌اتمام‌رسیده‌است:\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"
 "refreshedOn" = "\r\n📋🔄 تازه‌سازی شده در: {{ .Time }}\r\n\r\n"
 "yes" = "✅ بله"
@@ -538,6 +537,7 @@
 "clientUsage" = "دریافت آمار کاربر"
 "onlines" = "کاربران آنلاین"
 "commands" = "دستورات"
+
 "refresh" = "🔄 تازه‌سازی"
 "clearIPs" = "❌ پاک‌سازی آدرس‌ها"
 "removeTGUser" = "❌ حذف کاربر تلگرام"
--- a/web/translation/translate.ru_RU.toml
+++ b/web/translation/translate.ru_RU.toml
@@ -178,7 +178,7 @@
 "info" = "Информация"
 "same" = "Тот же"
 "inboundData" = "Входящие данные"
-"exportInbound" = "Экспорт входящих"
+"copyToClipboard" = "Копировать в буфер обмена"
 "import" = "Импортировать"
 "importInbound" = "Импортировать входящее сообщение"

@@ -248,7 +248,6 @@
 "pageSizeDesc" = "Определить размер страницы для входящей таблицы. Установите 0, чтобы отключить"
 "remarkModel" = "Модель примечания и символ разделения"
 "datepicker" = "выбор даты"
-"datepickerPlaceholder" = "Выберите дату"
 "datepickerDescription" = "Тип календаря выбора указывает дату истечения срока действия."
 "sampleRemark" = "Пример замечания"
 "oldUsername" = "Текущее имя пользователя"
@@ -504,7 +503,7 @@
 "port" = "🔌 Порт: {{ .Port }}\r\n"
 "expire" = "📅 Дата окончания: {{ .Time }}\r\n"
 "expireIn" = "📅 Окончание через: {{ .Time }}\r\n"
-"active" = "💡 Активен: {{ .Enable }}\r\n"
+"active" = "💡 Активен: ✅ Да\r\n"
 "enabled" = "🚨 Включен: {{ .Enable }}\r\n"
 "online" = "🌐 Статус соединения: {{ .Status }}\r\n"
 "email" = "📧 Email: {{ .Email }}\r\n"
--- a/web/translation/translate.vi_VN.toml
+++ b/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" = "camouflage"
 "status" = "Trạng thái"
 "enabled" = "Đã kích hoạt"
 "disabled" = "Đã tắt"
@@ -59,7 +59,7 @@
 "settings" = "Cài đặt bảng điều khiển"
 "logout" = "Đăng xuất"
 "xray" = "Cài đặt Xray"
-"link" = "Quản lý"
+"link" = "sự quản lý"

 [pages.login]
 "title" = "Chào mừng"
@@ -74,9 +74,9 @@

 [pages.index]
 "title" = "Trạng thái hệ thống"
-"memory" = "Ram"
+"memory" = "Bộ nhớ"
 "hard" = "Dung lượng"
-"xrayStatus" = "Trạng thái Xray"
+"xrayStatus" = "Trạng thái"
 "stopXray" = "Dừng lại"
 "restartXray" = "Khởi động lại"
 "xraySwitch" = "Phiên bản"
@@ -125,8 +125,8 @@
 "modifyInbound" = "Chỉnh sửa điểm vào (Inbound)"
 "deleteInbound" = "Xóa điểm vào (Inbound)"
 "deleteInboundContent" = "Xác nhận xóa điểm vào? (Inbound)"
-"deleteClient" = "Xóa người dùng"
-"deleteClientContent" = "Bạn có chắc chắn muốn xóa người dùng không?"
+"deleteClient" = "Xóa khách hàng"
+"deleteClientContent" = "Bạn có chắc chắn muốn xóa ứng dụng khách không?"
 "resetTrafficContent" = "Xác nhận đặt lại lưu lượng?"
 "copyLink" = "Sao chép liên kết"
 "address" = "Địa chỉ"
@@ -145,7 +145,7 @@
 "keyPath" = "Đường dẫn khóa riêng tư"
 "keyContent" = "Nội dung khóa riêng tư"
 "clickOnQRcode" = "Nhấn vào Mã QR để sao chép"
-"client" = "Người dùng"
+"client" = "Máy Khách"
 "export" = "Xuất liên kết"
 "clone" = "Sao chép"
 "cloneInbound" = "Sao chép điểm vào (Inbound)"
@@ -154,15 +154,15 @@
 "resetAllTraffic" = "Đặt lại lưu lượng cho tất cả điểm vào"
 "resetAllTrafficTitle" = "Đặt lại lưu lượng cho tất cả điểm vào"
 "resetAllTrafficContent" = "Bạn có chắc chắn muốn đặt lại lưu lượng cho tất cả điểm vào không?"
-"resetInboundClientTraffics" = "Đặt lại lưu lượng toàn bộ người dùng của điểm vào"
-"resetInboundClientTrafficTitle" = "Đặt lại lưu lượng cho toàn bộ người dùng của điểm vào"
-"resetInboundClientTrafficContent" = "Bạn có chắc chắn muốn đặt lại tất cả lưu lượng cho các người dùng của điểm vào này không?"
-"resetAllClientTraffics" = "Đặt lại lưu lượng cho toàn bộ người dùng"
-"resetAllClientTrafficTitle" = "Đặt lại lưu lượng cho toàn bộ người dùng"
-"resetAllClientTrafficContent" = "Bạn có chắc chắn muốn đặt lại tất cả lưu lượng cho toàn bộ người dùng không?"
-"delDepletedClients" = "Xóa các người dùng đã cạn kiệt"
-"delDepletedClientsTitle" = "Xóa các người dùng đã cạn kiệt"
-"delDepletedClientsContent" = "Bạn có chắc chắn muốn xóa toàn bộ người dùng đã cạn kiệt không?"
+"resetInboundClientTraffics" = "Đặt lại lưu lượng cho các client của điểm vào"
+"resetInboundClientTrafficTitle" = "Đặt lại lưu lượng cho tất cả lưu lượng của client"
+"resetInboundClientTrafficContent" = "Bạn có chắc chắn muốn đặt lại tất cả lưu lượng cho các client của điểm vào này không?"
+"resetAllClientTraffics" = "Đặt lại lưu lượng cho tất cả client"
+"resetAllClientTrafficTitle" = "Đặt lại lưu lượng cho tất cả client"
+"resetAllClientTrafficContent" = "Bạn có chắc chắn muốn đặt lại tất cả lưu lượng cho tất cả client không?"
+"delDepletedClients" = "Xóa các client đã cạn kiệt"
+"delDepletedClientsTitle" = "Xóa các client đã cạn kiệt"
+"delDepletedClientsContent" = "Bạn có chắc chắn muốn xóa tất cả các client đã cạn kiệt không?"
 "email" = "Email"
 "emailDesc" = "Vui lòng cung cấp một địa chỉ email duy nhất."
 "IPLimit" = "Giới hạn IP"
@@ -174,20 +174,20 @@
 "xtlsDesc" = "Xray core cần phiên bản 1.7.5"
 "realityDesc" = "Xray core cần phiên bản 1.8.0 hoặc cao hơn."
 "telegramDesc" = "Chỉ sử dụng ID trò chuyện (bạn có thể nhận được nó ở đây @userinfobot hoặc sử dụng lệnh '/id' trong bot)"
-"subscriptionDesc" = "Bạn có thể tìm liên kết gói đăng ký của mình trong Chi tiết, cũng như bạn có thể sử dụng cùng tên cho nhiều cấu hình khác nhau"
+"subscriptionDesc" = "Bạn có thể tìm liên kết đăng ký của mình trong Chi tiết, cũng như bạn có thể sử dụng cùng tên cho nhiều cấu hình khác nhau"
 "info" = "Thông tin"
 "same" = "Giống nhau"
 "inboundData" = "Dữ liệu gửi đến"
-"exportInbound" = "Xuất nhập khẩu"
+"copyToClipboard" = "Sao chép vào bảng nhớ tạm"
 "import" = "Nhập"
-"importInbound" = "Nhập inbound"
+"importInbound" = "Nhập hàng gửi về"

 [pages.client]
-"add" = "Thêm người dùng"
-"edit" = "Chỉnh sửa người dùng"
-"submitAdd" = "Thêm"
+"add" = "Thêm Client"
+"edit" = "Chỉnh sửa Client"
+"submitAdd" = "Thêm Client"
 "submitEdit" = "Lưu thay đổi"
-"clientCount" = "Số lượng người dùng"
+"clientCount" = "Số lượng Client"
 "bulk" = "Thêm hàng loạt"
 "method" = "Phương pháp"
 "first" = "Đầu tiên"
@@ -212,11 +212,11 @@
 [pages.inbounds.stream.tcp]
 "version" = "Phiên bản"
 "method" = "Phương pháp"
-"path" = "Đường dẫn"
+"path" = "Con đường"
 "status" = "Trạng thái"
 "statusDescription" = "Tình trạng Mô tả"
-"requestHeader" = "Header yêu cầu"
-"responseHeader" = "Header phản hồi"
+"requestHeader" = "Tiêu đề yêu cầu"
+"responseHeader" = "Tiêu đề phản hồi"

 [pages.inbounds.stream.quic]
 "encryption" = "Mã hóa"
@@ -225,31 +225,30 @@
 "title" = "Cài đặt"
 "save" = "Lưu"
 "infoDesc" = "Mọi thay đổi được thực hiện ở đây cần phải được lưu. Vui lòng khởi động lại bảng điều khiển để áp dụng các thay đổi."
-"restartPanel" = "Khởi động lại bảng điều khiển"
+"restartPanel" = "Khởi động lại Bảng điều khiển"
 "restartPanelDesc" = "Bạn có chắc chắn muốn khởi động lại bảng điều khiển? Nhấn OK để khởi động lại sau 3 giây. Nếu bạn không thể truy cập bảng điều khiển sau khi khởi động lại, vui lòng xem thông tin nhật ký của bảng điều khiển trên máy chủ."
 "actions" = "Hành động"
-"resetDefaultConfig" = "Đặt lại cấu hình mặc định"
-"panelSettings" = "Bảng điều khiển"
-"securitySettings" = "Bảo mật"
-"TGBotSettings" = "Bot Telegram"
-"panelListeningIP" = "IP Nghe của bảng điều khiển"
+"resetDefaultConfig" = "Đặt lại Cấu hình Mặc định"
+"panelSettings" = "Cài đặt Bảng điều khiển"
+"securitySettings" = "Cài đặt Bảo mật"
+"TGBotSettings" = "Cài đặt Bot Telegram"
+"panelListeningIP" = "IP Nghe của Bảng điều khiển"
 "panelListeningIPDesc" = "Mặc định để trống để nghe tất cả các IP."
-"panelListeningDomain" = "Tên miền của nghe bảng điều khiển"
+"panelListeningDomain" = "Tên miền của nghe Bảng điều khiển"
 "panelListeningDomainDesc" = "Mặc định để trống để nghe tất cả các tên miền và IP"
-"panelPort" = "Cổng bảng điều khiển"
-"panelPortDesc" = "Cổng được sử dụng để kết nối với bảng điều khiển này"
-"publicKeyPath" = "Đường dẫn file chứng chỉ bảng điều khiển"
-"publicKeyPathDesc" = "Điền vào đường dẫn đầy đủ (bắt đầu từ '/')"
-"privateKeyPath" = "Đường dẫn file khóa của chứng chỉ bảng điều khiển"
-"privateKeyPathDesc" = "Điền vào đường dẫn đầy đủ (bắt đầu từ '/')"
-"panelUrlPath" = "Đường dẫn gốc URL bảng điều khiển"
-"panelUrlPathDesc" = "Phải bắt đầu và kết thúc bằng '/'"
+"panelPort" = "Cổng Bảng điều khiển"
+"panelPortDesc" = "Cổng được sử dụng để hiển thị bảng điều khiển này"
+"publicKeyPath" = "Đường dẫn tập tin khóa công khai Chứng chỉ Bảng điều khiển"
+"publicKeyPathDesc" = "Điền vào đường dẫn tuyệt đối bắt đầu với."
+"privateKeyPath" = "Đường dẫn tập tin khóa riêng tư Chứng chỉ Bảng điều khiển"
+"privateKeyPathDesc" = "Điền vào đường dẫn tuyệt đối bắt đầu với."
+"panelUrlPath" = "Đường dẫn gốc URL Bảng điều khiển"
+"panelUrlPathDesc" = "Phải bắt đầu bằng '/' và kết thúc bằng."
 "pageSize" = "Kích thước phân trang"
 "pageSizeDesc" = "Xác định kích thước trang cho bảng gửi đến. Đặt 0 để tắt"
 "remarkModel" = "Ghi chú mô hình và ký tự phân tách"
-"datepicker" = "Kiểu lịch"
-"datepickerPlaceholder" = "Chọn ngày"
-"datepickerDescription" = "Tác vụ chạy theo lịch trình sẽ chạy theo kiểu lịch này."
+"datepicker" = "bảng chọn ngày"
+"datepickerDescription" = "Loại lịch chọn chỉ định ngày hết hạn"
 "sampleRemark" = "Nhận xét mẫu"
 "oldUsername" = "Tên người dùng hiện tại"
 "currentPassword" = "Mật khẩu hiện tại"
@@ -269,7 +268,7 @@
 "tgNotifyBackupDesc" = "Bao gồm tệp sao lưu cơ sở dữ liệu với thông báo báo cáo."
 "tgNotifyLogin" = "Thông báo Đăng nhập"
 "tgNotifyLoginDesc" = "Hiển thị tên người dùng, địa chỉ IP và thời gian khi ai đó cố gắng đăng nhập vào bảng điều khiển của bạn."
-"sessionMaxAge" = "Thời gian tối đa của phiên"
+"sessionMaxAge" = "Tuổi tối đa của phiên"
 "sessionMaxAgeDesc" = "Thời gian của phiên đăng nhập (đơn vị: phút)"
 "expireTimeDiff" = "Ngưỡng hết hạn cho thông báo"
 "expireTimeDiffDesc" = "Nhận thông báo về việc hết hạn tài khoản trước ngưỡng này (đơn vị: ngày)"
@@ -279,29 +278,29 @@
 "tgNotifyCpuDesc" = "Nhận thông báo nếu tỷ lệ sử dụng CPU vượt quá ngưỡng này (đơn vị: %)"
 "timeZone" = "Múi giờ"
 "timeZoneDesc" = "Các tác vụ được lên lịch chạy theo thời gian trong múi giờ này."
-"subSettings" = "Gói đăng ký"
+"subSettings" = "Đăng ký"
 "subEnable" = "Bật dịch vụ"
-"subEnableDesc" = "Tính năng gói đăng ký với cấu hình riêng"
+"subEnableDesc" = "Tính năng đăng ký với cấu hình riêng"
 "subListen" = "Listening IP"
 "subListenDesc" = "Mặc định để trống để nghe tất cả các IP"
-"subPort" = "Cổng gói đăng ký"
+"subPort" = "Cổng Đăng ký"
 "subPortDesc" = "Số cổng dịch vụ đăng ký phải chưa được sử dụng trên máy chủ"
-"subCertPath" = "Đường dẫn file chứng chỉ gói đăng ký"
-"subCertPathDesc" = "Điền vào đường dẫn đầy đủ (bắt đầu với '/')"
-"subKeyPath" = "Đường dẫn file khóa của chứng chỉ gói đăng ký"
-"subKeyPathDesc" = "Điền vào đường dẫn đầy đủ (bắt đầu với '/')"
-"subPath" = "Đường dẫn gốc URL gói đăng ký"
-"subPathDesc" = "Phải bắt đầu và kết thúc bằng '/'"
+"subCertPath" = "Đường dẫn tập tin khóa công khai Chứng chỉ Đăng ký"
+"subCertPathDesc" = "Điền vào đường dẫn tuyệt đối bắt đầu với '/'"
+"subKeyPath" = "Đường dẫn tập tin khóa riêng tư Chứng chỉ Đăng ký"
+"subKeyPathDesc" = "Điền vào đường dẫn tuyệt đối bắt đầu với '/'"
+"subPath" = "Đường dẫn gốc URL Đăng ký"
+"subPathDesc" = "Phải bắt đầu bằng '/' và kết thúc bằng '/'"
 "subDomain" = "Tên miền con"
 "subDomainDesc" = "Mặc định để trống để nghe tất cả các tên miền và IP"
-"subUpdates" = "Khoảng thời gian cập nhật gói đăng ký"
+"subUpdates" = "Khoảng thời gian cập nhật đăng ký"
 "subUpdatesDesc" = "Số giờ giữa các cập nhật trong ứng dụng khách"
 "subEncrypt" = "Mã hóa cấu hình"
-"subEncryptDesc" = "Mã hóa các cấu hình được trả về trong gói đăng ký"
+"subEncryptDesc" = "Mã hóa các cấu hình được trả về trong đăng ký"
 "subShowInfo" = "Hiển thị thông tin sử dụng"
 "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 trung gian"
-"subURIDesc" = "Thay đổi URI cơ sở của URL gói đăng ký để sử dụng cho proxy trung gian"
+"subURI" = "URI proxy ngược"
+"subURIDesc" = "Thay đổi URI cơ sở của URL đăng ký để sử dụng ở phía sau proxy"

 [pages.xray]
 "title" = "Cài đặt Xray"
@@ -423,7 +422,7 @@
 "intercon" = "Kết nối"

 [pages.xray.wireguard]
-"secretKey" = "Khoá bí mật"
+"secretKey" = "Chìa khoá bí mật"
 "publicKey" = "Khóa công khai"
 "allowedIPs" = "IP được phép"
 "endpoint" = "Điểm cuối"
@@ -435,8 +434,8 @@
 "secret" = "Mã thông báo bí mật"
 "loginSecurity" = "Bảo mật đăng nhập"
 "loginSecurityDesc" = "Bật bước bảo mật đăng nhập bổ sung cho người dùng"
-"secretToken" = "Mã bí mật"
-"secretTokenDesc" = "Vui lòng sao chép và lưu trữ mã này một cách an toàn ở nơi an toàn. Mã này cần thiết để đăng nhập và không thể phục hồi từ công cụ lệnh x-ui."
+"secretToken" = "Mã thông báo bí mật"
+"secretTokenDesc" = "Vui lòng sao chép và lưu trữ mã thông báo này một cách an toàn ở nơi an toàn. Mã thông báo này cần thiết để đăng nhập và không thể phục hồi từ công cụ lệnh x-ui."

 [pages.settings.toasts]
 "modifySettings" = "Chỉnh sửa cài đặt "
@@ -461,7 +460,7 @@
 "hours" = "Giờ"
 "unknown" = "Không rõ"
 "inbounds" = "Vào"
-"clients" = "Các người dùng"
+"clients" = "Các khách hàng"
 "offline" = "🔴 Ngoại tuyến"
 "online" = "🟢 Trực tuyến"

--- a/web/translation/translate.zh_Hans.toml
+++ b/web/translation/translate.zh_Hans.toml
@@ -178,7 +178,7 @@
 "info" = "信息"
 "same" = "相同"
 "inboundData" = "入站数据"
-"exportInbound" = "出口 入境"
+"copyToClipboard" = "复制到剪贴板"
 "import"="导入"
 "importInbound" = "导入入站"

@@ -248,7 +248,6 @@
 "pageSizeDesc" = "定义入站表的页面大小。设置 0 表示禁用"
 "remarkModel" = "备注模型和分隔符"
 "datepicker" = "日期选择器"
-"datepickerPlaceholder" = "选择日期"
 "datepickerDescription" = "选择器日历类型指定到期日期"
 "sampleRemark" = "备注示例"
 "oldUsername" = "原用户名"
@@ -504,7 +503,7 @@
 "port" = "🔌 端口：{{ .Port }}\r\n"
 "expire" = "📅 过期日期：{{ .Time }}\r\n"
 "expireIn" = "📅 剩余时间：{{ .Time }}\r\n"
-"active" = "💡 激活：{{ .Enable }}\r\n"
+"active" = "💡 激活：✅\r\n"
 "enabled" = "🚨 已启用：{{ .Enable }}\r\n"
 "online" = "🌐 连接状态：{{ .Status }}\r\n"
 "email" = "📧 邮箱：{{ .Email }}\r\n"
--- a/x-ui.sh
+++ b/x-ui.sh
@@ -70,11 +70,13 @@ elif [[ "${release}" == "armbian" ]]; then
    echo "Your OS is Armbian"
 fi

+
 # Declare Variables
 log_folder="${XUI_LOG_FOLDER:=/var/log}"
 iplimit_log_path="${log_folder}/3xipl.log"
 iplimit_banned_log_path="${log_folder}/3xipl-banned.log"

+
 confirm() {
    if [[ $# > 1 ]]; then
        echo && read -p "$1 [Default $2]: " temp
@@ -138,7 +140,7 @@ custom_version() {

    if [ -z "$panel_version" ]; then
        echo "Panel version cannot be empty. Exiting."
-        exit 1
+    exit 1
    fi

    download_link="https://raw.githubusercontent.com/mhsanaei/3x-ui/master/install.sh"
@@ -327,15 +329,15 @@ show_log() {
 }

 show_banlog() {
-    if test -f "${iplimit_banned_log_path}"; then
-        if [[ -s "${iplimit_banned_log_path}" ]]; then
-            cat ${iplimit_banned_log_path}
-        else
-            echo -e "${red}Log file is empty.${plain}\n"
-        fi
+  if test -f "${iplimit_banned_log_path}"; then
+    if [[ -s "${iplimit_banned_log_path}" ]]; then
+      cat ${iplimit_banned_log_path}
    else
-        echo -e "${red}Log file not found. Please Install Fail2ban and IP Limit first.${plain}\n"
+      echo -e "${red}Log file is empty.${plain}\n"  
    fi
+  else
+    echo -e "${red}Log file not found. Please Install Fail2ban and IP Limit first.${plain}\n"
+  fi
 }

 enable_bbr() {
@@ -346,19 +348,19 @@ enable_bbr() {

    # Check the OS and install necessary packages
    case "${release}" in
-    ubuntu | debian)
-        apt-get update && apt-get install -yqq --no-install-recommends ca-certificates
-        ;;
-    centos | almalinux | rocky)
-        yum -y update && yum -y install ca-certificates
-        ;;
-    fedora)
-        dnf -y update && dnf -y install ca-certificates
-        ;;
-    *)
-        echo -e "${red}Unsupported operating system. Please check the script and install the necessary packages manually.${plain}\n"
-        exit 1
-        ;;
+        ubuntu|debian)
+            apt-get update && apt-get install -yqq --no-install-recommends ca-certificates
+            ;;
+        centos|almalinux|rocky)
+            yum -y update && yum -y install ca-certificates
+            ;;
+        fedora)
+            dnf -y update && dnf -y install ca-certificates
+            ;;
+        *)
+            echo -e "${red}Unsupported operating system. Please check the script and install the necessary packages manually.${plain}\n"
+            exit 1
+            ;;
    esac

    # Enable BBR
@@ -579,24 +581,21 @@ ssl_cert_issue_main() {
    echo -e "${green}\t0.${plain} Back to Main Menu"
    read -p "Choose an option: " choice
    case "$choice" in
-    0)
-        show_menu
-        ;;
-    1)
-        ssl_cert_issue
-        ;;
-    2)
-        local domain=""
-        read -p "Please enter your domain name to revoke the certificate: " domain
-        ~/.acme.sh/acme.sh --revoke -d ${domain}
-        LOGI "Certificate revoked"
-        ;;
-    3)
-        local domain=""
-        read -p "Please enter your domain name to forcefully renew an SSL certificate: " domain
-        ~/.acme.sh/acme.sh --renew -d ${domain} --force
-        ;;
-    *) echo "Invalid choice" ;;
+        0)
+            show_menu ;;
+        1) 
+            ssl_cert_issue ;;
+        2) 
+            local domain=""
+            read -p "Please enter your domain name to revoke the certificate: " domain
+            ~/.acme.sh/acme.sh --revoke -d ${domain}
+            LOGI "Certificate revoked"
+            ;;
+        3)
+            local domain=""
+            read -p "Please enter your domain name to forcefully renew an SSL certificate: " domain
+            ~/.acme.sh/acme.sh --renew -d ${domain} --force ;;
+        *) echo "Invalid choice" ;;
    esac
 }

@@ -612,19 +611,15 @@ ssl_cert_issue() {
    fi
    # install socat second
    case "${release}" in
-    ubuntu | debian | armbian)
-        apt update && apt install socat -y
-        ;;
-    centos | almalinux | rocky)
-        yum -y update && yum -y install socat
-        ;;
-    fedora)
-        dnf -y update && dnf -y install socat
-        ;;
-    *)
-        echo -e "${red}Unsupported operating system. Please check the script and install the necessary packages manually.${plain}\n"
-        exit 1
-        ;;
+        ubuntu|debian|armbian)
+            apt update && apt install socat -y ;;
+        centos|almalinux|rocky)
+            yum -y update && yum -y install socat ;;
+        fedora)
+            dnf -y update && dnf -y install socat ;;
+        *)
+            echo -e "${red}Unsupported operating system. Please check the script and install the necessary packages manually.${plain}\n"
+            exit 1 ;;
    esac
    if [ $? -ne 0 ]; then
        LOGE "install socat failed, please check logs"
@@ -755,8 +750,8 @@ ssl_cert_issue_CF() {
            LOGI "Certificate issued Successfully, Installing..."
        fi
        ~/.acme.sh/acme.sh --installcert -d ${CF_Domain} -d *.${CF_Domain} --ca-file /root/cert/ca.cer \
-            --cert-file /root/cert/${CF_Domain}.cer --key-file /root/cert/${CF_Domain}.key \
-            --fullchain-file /root/cert/fullchain.cer
+        --cert-file /root/cert/${CF_Domain}.cer --key-file /root/cert/${CF_Domain}.key \
+        --fullchain-file /root/cert/fullchain.cer
        if [ $? -ne 0 ]; then
            LOGE "Certificate installation failed, script exiting..."
            exit 1
@@ -787,46 +782,72 @@ warp_cloudflare() {
    echo -e "${green}\t0.${plain} Back to Main Menu"
    read -p "Choose an option: " choice
    case "$choice" in
-    0)
-        show_menu
-        ;;
-    1)
-        bash <(curl -sSL https://raw.githubusercontent.com/hamid-gh98/x-ui-scripts/main/install_warp_proxy.sh)
-        ;;
-    2)
-        warp a
-        ;;
-    3)
-        warp y
-        ;;
-    4)
-        warp u
-        ;;
-    *) echo "Invalid choice" ;;
+        0)
+            show_menu ;;
+        1) 
+            bash <(curl -sSL https://raw.githubusercontent.com/hamid-gh98/x-ui-scripts/main/install_warp_proxy.sh)
+            ;;
+        2) 
+            warp a
+            ;;
+        3)
+            warp y
+            ;;
+        4)
+            warp u
+            ;;
+        *) echo "Invalid choice" ;;
+    esac
+}
+
+multi_protocol() {
+    echo "This script only supports Vless and Vmess. if you use another protocols, DON'T INSTALL or get backup first! "
+    echo -e "${green}\t1.${plain} Install Multi Protocol Script"
+    echo -e "${green}\t2.${plain} Uninstall"
+    echo -e "${green}\t3.${plain} Start Service"
+    echo -e "${green}\t4.${plain} Stop Service"
+    echo -e "${green}\t0.${plain} Back to Main Menu"
+    read -p "Choose an option: " choice
+    case "$choice" in
+        0)
+            show_menu ;;
+        1) 
+            bash <(curl -Ls https://raw.githubusercontent.com/M4mmad/3xui-multi-protocol/master/install.sh --ipv4)
+            ;;
+        2) 
+            bash <(curl -Ls https://raw.githubusercontent.com/M4mmad/3xui-multi-protocol/master/unistall.sh --ipv4)
+            ;;
+        3)
+            systemctl start 3xui-multi-protocol
+            ;;
+        4)
+            systemctl stop 3xui-multi-protocol
+            ;;
+        *) echo "Invalid choice" ;;
    esac
 }

 run_speedtest() {
    # Check if Speedtest is already installed
-    if ! command -v speedtest &>/dev/null; then
+    if ! command -v speedtest &> /dev/null; then
        # If not installed, install it
        local pkg_manager=""
        local speedtest_install_script=""
-
-        if command -v dnf &>/dev/null; then
+        
+        if command -v dnf &> /dev/null; then
            pkg_manager="dnf"
            speedtest_install_script="https://packagecloud.io/install/repositories/ookla/speedtest-cli/script.rpm.sh"
-        elif command -v yum &>/dev/null; then
+        elif command -v yum &> /dev/null; then
            pkg_manager="yum"
            speedtest_install_script="https://packagecloud.io/install/repositories/ookla/speedtest-cli/script.rpm.sh"
-        elif command -v apt-get &>/dev/null; then
+        elif command -v apt-get &> /dev/null; then
            pkg_manager="apt-get"
            speedtest_install_script="https://packagecloud.io/install/repositories/ookla/speedtest-cli/script.deb.sh"
-        elif command -v apt &>/dev/null; then
+        elif command -v apt &> /dev/null; then
            pkg_manager="apt"
            speedtest_install_script="https://packagecloud.io/install/repositories/ookla/speedtest-cli/script.deb.sh"
        fi
-
+        
        if [[ -z $pkg_manager ]]; then
            echo "Error: Package manager not found. You may need to install Speedtest manually."
            return 1
@@ -841,11 +862,8 @@ run_speedtest() {
 }

 create_iplimit_jails() {
-    # Use default bantime if not passed => 30 minutes
-    local bantime="${1:-30}"
-
-    # Uncomment 'allowipv6 = auto' in fail2ban.conf
-    sed -i 's/#allowipv6 = auto/allowipv6 = auto/g' /etc/fail2ban/fail2ban.conf
+    # Use default bantime if not passed => 5 minutes
+    local bantime="${1:-5}"

    cat << EOF > /etc/fail2ban/jail.d/3x-ipl.conf
 [3x-ipl]
@@ -889,7 +907,7 @@ actionunban = <iptables> -D f2b-<name> -s <ip> -j <blocktype>
 [Init]
 EOF

-    echo -e "${green}Ip Limit jail files created with a bantime of ${bantime} minutes.${plain}"
+    echo -e "${green}Created Ip Limit jail files with a bantime of ${bantime} minutes.${plain}"
 }

 iplimit_remove_conflicts() {
@@ -917,80 +935,62 @@ iplimit_main() {
    echo -e "${green}\t0.${plain} Back to Main Menu"
    read -p "Choose an option: " choice
    case "$choice" in
-    0)
-        show_menu
-        ;;
-    1)
-        confirm "Proceed with installation of Fail2ban & IP Limit?" "y"
-        if [[ $? == 0 ]]; then
-            install_iplimit
-        else
-            iplimit_main
-        fi
-        ;;
-    2)
-        read -rp "Please enter new Ban Duration in Minutes [default 30]: " NUM
-        if [[ $NUM =~ ^[0-9]+$ ]]; then
-            create_iplimit_jails ${NUM}
-            systemctl restart fail2ban
-        else
-            echo -e "${red}${NUM} is not a number! Please, try again.${plain}"
-        fi
-        iplimit_main
-        ;;
-    3)
-        confirm "Proceed with Unbanning everyone from IP Limit jail?" "y"
-        if [[ $? == 0 ]]; then
-            fail2ban-client reload --restart --unban 3x-ipl
-            truncate -s 0 "${iplimit_banned_log_path}"
-            echo -e "${green}All users Unbanned successfully.${plain}"
-            iplimit_main
-        else
-            echo -e "${yellow}Cancelled.${plain}"
-        fi
-        iplimit_main
-        ;;
-    4)
-        show_banlog
-        ;;
-    5)
-        service fail2ban status
-        ;;
+        0)
+            show_menu ;;
+        1)
+            confirm "Proceed with installation of Fail2ban & IP Limit?" "y"
+            if [[ $? == 0 ]]; then
+                install_iplimit
+            else
+                iplimit_main
+            fi ;;
+        2)
+            read -rp "Please enter new Ban Duration in Minutes [default 5]: " NUM
+            if [[ $NUM =~ ^[0-9]+$ ]]; then
+                create_iplimit_jails ${NUM}
+                systemctl restart fail2ban
+            else
+                echo -e "${red}${NUM} is not a number! Please, try again.${plain}"
+            fi
+            iplimit_main ;;
+        3)
+            confirm "Proceed with Unbanning everyone from IP Limit jail?" "y"
+            if [[ $? == 0 ]]; then
+                fail2ban-client reload --restart --unban 3x-ipl
+                echo -e "${green}All users Unbanned successfully.${plain}"
+                iplimit_main
+            else
+                echo -e "${yellow}Cancelled.${plain}"
+            fi
+            iplimit_main ;;
+        4)
+            show_banlog
+            ;;
+        5)
+            service fail2ban status
+            ;;

-    6)
-        remove_iplimit
-        ;;
-    *) echo "Invalid choice" ;;
+        6)
+            remove_iplimit ;;
+        *) echo "Invalid choice" ;;
    esac
 }

 install_iplimit() {
    if ! command -v fail2ban-client &>/dev/null; then
        echo -e "${green}Fail2ban is not installed. Installing now...!${plain}\n"
-
        # Check the OS and install necessary packages
        case "${release}" in
-        ubuntu | debian)
-            apt update && apt install fail2ban -y
-            ;;
-        centos | almalinux | rocky)
-            yum update -y && yum install epel-release -y
-            yum -y install fail2ban
-            ;;
-        fedora)
-            dnf -y update && dnf -y install fail2ban
-            ;;
-        *)
-            echo -e "${red}Unsupported operating system. Please check the script and install the necessary packages manually.${plain}\n"
-            exit 1
-            ;;
+            ubuntu|debian)
+                apt update && apt install fail2ban -y ;;
+            centos|almalinux|rocky)
+                yum -y update && yum -y install fail2ban ;;
+            fedora)
+                dnf -y update && dnf -y install fail2ban ;;
+            *)
+                echo -e "${red}Unsupported operating system. Please check the script and install the necessary packages manually.${plain}\n"
+                exit 1 ;;
        esac
-
-        if ! command -v fail2ban-client &>/dev/null; then
-            echo -e "${red}Fail2ban installation failed.${plain}\n"
-            exit 1
-        fi
-
        echo -e "${green}Fail2ban installed successfully!${plain}\n"
    else
        echo -e "${yellow}Fail2ban is already installed.${plain}\n"
@@ -1018,7 +1018,6 @@ install_iplimit() {
    # Launching fail2ban
    if ! systemctl is-active --quiet fail2ban; then
        systemctl start fail2ban
-        systemctl enable fail2ban
    else
        systemctl restart fail2ban
    fi
@@ -1028,53 +1027,41 @@ install_iplimit() {
    before_show_menu
 }

-remove_iplimit() {
+remove_iplimit(){
    echo -e "${green}\t1.${plain} Only remove IP Limit configurations"
    echo -e "${green}\t2.${plain} Uninstall Fail2ban and IP Limit"
    echo -e "${green}\t0.${plain} Abort"
    read -p "Choose an option: " num
    case "$num" in
-    1)
-        rm -f /etc/fail2ban/filter.d/3x-ipl.conf
-        rm -f /etc/fail2ban/action.d/3x-ipl.conf
-        rm -f /etc/fail2ban/jail.d/3x-ipl.conf
-        systemctl restart fail2ban
-        echo -e "${green}IP Limit removed successfully!${plain}\n"
-        before_show_menu
-        ;;
-    2)
-        rm -rf /etc/fail2ban
-        systemctl stop fail2ban
-        case "${release}" in
-        ubuntu | debian)
-            apt-get remove -y fail2ban
-            apt-get purge -y fail2ban -y
-            apt-get autoremove -y
-            ;;
-        centos | almalinux | rocky)
-            yum remove fail2ban -y
-            yum autoremove -y
-            ;;
-        fedora)
-            dnf remove fail2ban -y
-            dnf autoremove -y
-            ;;
-        *)
-            echo -e "${red}Unsupported operating system. Please uninstall Fail2ban manually.${plain}\n"
-            exit 1
-            ;;
-        esac
-        echo -e "${green}Fail2ban and IP Limit removed successfully!${plain}\n"
-        before_show_menu
-        ;;
-    0)
-        echo -e "${yellow}Cancelled.${plain}\n"
-        iplimit_main
-        ;;
-    *)
-        echo -e "${red}Invalid option. Please select a valid number.${plain}\n"
-        remove_iplimit
-        ;;
+        1) 
+            rm -f /etc/fail2ban/filter.d/3x-ipl.conf
+            rm -f /etc/fail2ban/action.d/3x-ipl.conf
+            rm -f /etc/fail2ban/jail.d/3x-ipl.conf
+            systemctl restart fail2ban
+            echo -e "${green}IP Limit removed successfully!${plain}\n"
+            before_show_menu ;;
+        2)  
+            rm -rf /etc/fail2ban
+            systemctl stop fail2ban
+            case "${release}" in
+                ubuntu|debian)
+                    apt-get purge fail2ban -y;;
+                centos|almalinux|rocky)
+                    yum remove fail2ban -y;;
+                fedora)
+                    dnf remove fail2ban -y;;
+                *)
+                    echo -e "${red}Unsupported operating system. Please uninstall Fail2ban manually.${plain}\n"
+                    exit 1 ;;
+            esac
+            echo -e "${green}Fail2ban and IP Limit removed successfully!${plain}\n"
+            before_show_menu ;;
+        0) 
+            echo -e "${yellow}Cancelled.${plain}\n"
+            iplimit_main ;;
+        *) 
+            echo -e "${red}Invalid option. Please select a valid number.${plain}\n"
+            remove_iplimit ;;
    esac
 }

@@ -1117,21 +1104,22 @@ show_menu() {
  ${green}12.${plain} Check Status
  ${green}13.${plain} Check Logs
 ————————————————
-  ${green}14.${plain} Enable Autostart
-  ${green}15.${plain} Disable Autostart
+  ${green}14.${plain} Enable x-ui On System Startup
+  ${green}15.${plain} Disable x-ui On System Startup
 ————————————————
  ${green}16.${plain} SSL Certificate Management
  ${green}17.${plain} Cloudflare SSL Certificate
  ${green}18.${plain} IP Limit Management
  ${green}19.${plain} WARP Management
+  ${green}20.${plain} Multi Protocol Management
 ————————————————
-  ${green}20.${plain} Enable BBR 
-  ${green}21.${plain} Update Geo Files
-  ${green}22.${plain} Active Firewall and open ports
-  ${green}23.${plain} Speedtest by Ookla
+  ${green}21.${plain} Enable BBR 
+  ${green}22.${plain} Update Geo Files
+  ${green}23.${plain} Active Firewall and open ports
+  ${green}24.${plain} Speedtest by Ookla
 "
    show_status
-    echo && read -p "Please enter your selection [0-23]: " num
+    echo && read -p "Please enter your selection [0-24]: " num

    case "${num}" in
    0)
@@ -1195,19 +1183,22 @@ show_menu() {
        warp_cloudflare
        ;;
    20)
-        enable_bbr
+        multi_protocol
        ;;
    21)
-        update_geo
+        enable_bbr
        ;;
    22)
-        open_ports
+        update_geo
        ;;
    23)
-        run_speedtest
+        open_ports
        ;;
+    24)
+        run_speedtest
+        ;;    
    *)
-        LOGE "Please enter the correct number [0-23]"
+        LOGE "Please enter the correct number [0-24]"
        ;;
    esac
 }
@@ -1 +1 @@
 .1.2
 .1.0