v1.7.5

update dependencies
Bump github.com/mymmrac/telego from 0.25.1 to 0.26.0 (#852 )
2023-08-02 17:19:50 +03:30 · 2023-08-02 17:02:32 +03:30 · 2023-08-02 14:23:19 +03:30 · 2023-08-02 00:28:51 +03:30 · 2023-08-02 00:28:16 +03:30 · 2023-08-02 00:27:12 +03:30
30 changed files with 397 additions and 234 deletions
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -47,18 +47,18 @@ jobs:
          
          # Download dependencies
          if [ "${{ matrix.platform }}" == "amd64" ]; then
-            wget https://github.com/mhsanaei/Xray-core/releases/latest/download/Xray-linux-64.zip
+            wget https://github.com/XTLS/Xray-core/releases/download/v1.8.1/Xray-linux-64.zip
            unzip Xray-linux-64.zip
            rm -f Xray-linux-64.zip
          else
-            wget https://github.com/mhsanaei/Xray-core/releases/latest/download/Xray-linux-arm64-v8a.zip
+            wget https://github.com/XTLS/Xray-core/releases/download/v1.8.1/Xray-linux-arm64-v8a.zip
            unzip Xray-linux-arm64-v8a.zip
            rm -f Xray-linux-arm64-v8a.zip
          fi
          rm -f geoip.dat geosite.dat iran.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 https://github.com/bootmortis/iran-hosted-domains/releases/latest/download/iran.dat
+          wget https://github.com/MasterKia/iran-hosted-domains/releases/latest/download/iran.dat
          mv xray xray-linux-${{ matrix.platform }}
          cd ../..
          
@@ -66,7 +66,7 @@ jobs:
        run: tar -zcvf x-ui-linux-${{ matrix.platform }}.tar.gz x-ui
        
      - name: Upload
-        uses: svenstaro/upload-release-action@2.6.1
+        uses: svenstaro/upload-release-action@2.7.0
        with:
          repo_token: ${{ secrets.GITHUB_TOKEN }}
          tag: ${{ github.ref }}
--- a/DockerEntrypoint.sh
+++ b/DockerEntrypoint.sh
@@ -1,7 +1,7 @@
 #!/bin/sh

 # Start fail2ban
-fail2ban-client -x -f start
+fail2ban-client -x start

 # Run x-ui
 exec /app/x-ui
--- a/DockerInit.sh
+++ b/DockerInit.sh
@@ -18,11 +18,11 @@ esac
 mkdir -p build/bin
 cd build/bin

-wget "https://github.com/mhsanaei/xray-core/releases/latest/download/Xray-linux-${ARCH}.zip"
+wget "https://github.com/XTLS/Xray-core/releases/download/v1.8.1/Xray-linux-${ARCH}.zip"
 unzip "Xray-linux-${ARCH}.zip"
 rm -f "Xray-linux-${ARCH}.zip" geoip.dat geosite.dat iran.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 "https://github.com/bootmortis/iran-hosted-domains/releases/latest/download/iran.dat"
+wget "https://github.com/MasterKia/iran-hosted-domains/releases/latest/download/iran.dat"
--- a/4
+++ b/4
@@ -36,7 +36,9 @@ COPY --from=builder  /app/x-ui.sh /usr/bin/x-ui
 # Configure fail2ban
 RUN rm -f /etc/fail2ban/jail.d/alpine-ssh.conf \
  && cp /etc/fail2ban/jail.conf /etc/fail2ban/jail.local \
-  && sed -i "s/^\[ssh\]$/&\nenabled = false/" /etc/fail2ban/jail.local
+  && sed -i "s/^\[ssh\]$/&\nenabled = false/" /etc/fail2ban/jail.local \
+  && sed -i "s/^\[sshd\]$/&\nenabled = false/" /etc/fail2ban/jail.local \
+  && sed -i "s/#allowipv6 = auto/allowipv6 = auto/g" /etc/fail2ban/fail2ban.conf

 RUN chmod +x \
  /app/DockerEntrypoint.sh \
--- a/README.md
+++ b/README.md
@@ -23,10 +23,10 @@ bash <(curl -Ls https://raw.githubusercontent.com/mhsanaei/3x-ui/master/install.

 # Install custom version

-To install your desired version you can add the version to the end of install command. Example for ver `v1.6.1`:
+To install your desired version you can add the version to the end of install command. Example for ver `v1.7.1`:

 ```
-bash <(curl -Ls https://raw.githubusercontent.com/mhsanaei/3x-ui/master/install.sh) v1.6.1
+bash <(curl -Ls https://raw.githubusercontent.com/mhsanaei/3x-ui/master/install.sh) v1.7.1
 ```

 # SSL
@@ -191,6 +191,27 @@ If you want to use routing to WARP follow steps as below:

 </details>

+# IP Limit
+
+<details>
+  <summary>Click for IP Limit details</summary>
+
+**Note: IP Limit won't work correctly when using IP Tunnel**
+
+- For versions up to `v1.6.1`:
+
+  - IP limit is built-in into the panel.
+
+- For versions `v1.7.0` and newer:
+
+  - To make IP Limit work properly, you need to install fail2ban and its required files by following these steps:
+
+    1. Use the `x-ui` command inside the shell.
+    2. Select `16. IP Limit Management`.
+    3. Choose the appropriate options based on your needs.
+
+</details>
+
 # Telegram Bot

 <details>
--- a/config/version
+++ b/config/version
@@ -1 +1 @@
-1.7.1
+1.7.5
--- a/go.mod
+++ b/go.mod
@@ -7,17 +7,16 @@ require (
 	github.com/Workiva/go-datastructures v1.1.0
 	github.com/gin-gonic/gin v1.9.1
 	github.com/goccy/go-json v0.10.2
-	github.com/mymmrac/telego v0.25.1
+	github.com/mymmrac/telego v0.26.0
 	github.com/nicksnyder/go-i18n/v2 v2.2.1
 	github.com/op/go-logging v0.0.0-20160315200505-970db520ece7
 	github.com/pelletier/go-toml/v2 v2.0.9
 	github.com/robfig/cron/v3 v3.0.1
-	github.com/shirou/gopsutil/v3 v3.23.6
+	github.com/shirou/gopsutil/v3 v3.23.7
 	github.com/xtls/xray-core v1.8.3
-	github.com/yaa110/go-persian-calendar v1.1.5
 	go.uber.org/atomic v1.11.0
 	golang.org/x/text v0.11.0
-	google.golang.org/grpc v1.56.2
+	google.golang.org/grpc v1.57.0
 	gorm.io/driver/sqlite v1.5.2
 	gorm.io/gorm v1.25.2
 )
@@ -25,10 +24,11 @@ require (
 require (
 	github.com/BurntSushi/toml v1.3.2 // indirect
 	github.com/andybalholm/brotli v1.0.5 // indirect
-	github.com/bytedance/sonic v1.9.2 // indirect
-	github.com/chenzhuoyu/base64x v0.0.0-20221115062448-fe3a3abad311 // indirect
+	github.com/bytedance/sonic v1.10.0-rc // indirect
+	github.com/chenzhuoyu/base64x v0.0.0-20230717121745-296ad89f973d // indirect
+	github.com/chenzhuoyu/iasm v0.9.0 // indirect
 	github.com/dgryski/go-metro v0.0.0-20211217172704-adc40b04c140 // indirect
-	github.com/fasthttp/router v1.4.19 // indirect
+	github.com/fasthttp/router v1.4.20 // indirect
 	github.com/francoispqt/gojay v1.2.13 // indirect
 	github.com/gabriel-vasile/mimetype v1.4.2 // indirect
 	github.com/gaukas/godicttls v0.0.4 // indirect
@@ -63,7 +63,7 @@ require (
 	github.com/quic-go/qtls-go1-19 v0.3.2 // indirect
 	github.com/quic-go/qtls-go1-20 v0.2.2 // indirect
 	github.com/quic-go/quic-go v0.35.1 // indirect
-	github.com/refraction-networking/utls v1.3.2 // indirect
+	github.com/refraction-networking/utls v1.3.3 // indirect
 	github.com/riobard/go-bloom v0.0.0-20200614022211-cdc8013cb5b3 // indirect
 	github.com/rogpeppe/go-internal v1.11.0 // indirect
 	github.com/sagernet/sing v0.2.7 // indirect
@@ -85,7 +85,7 @@ require (
 	golang.org/x/crypto v0.11.0 // indirect
 	golang.org/x/exp v0.0.0-20230522175609-2e198f4a06a1 // indirect
 	golang.org/x/mod v0.11.0 // indirect
-	golang.org/x/net v0.12.0 // indirect
+	golang.org/x/net v0.13.0 // indirect
 	golang.org/x/sys v0.10.0 // indirect
 	golang.org/x/time v0.3.0 // indirect
 	golang.org/x/tools v0.10.0 // indirect
--- a/go.sum
+++ b/go.sum
@@ -22,11 +22,14 @@ github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24
 github.com/bradfitz/go-smtpd v0.0.0-20170404230938-deb6d6237625/go.mod h1:HYsPBTaaSFSlLx/70C2HPIMNZpVV8+vt/A+FMnYP11g=
 github.com/buger/jsonparser v0.0.0-20181115193947-bf1c66bbce23/go.mod h1:bbYlZJ7hK1yFx9hf58LP0zeX7UjIGs20ufpu3evjr+s=
 github.com/bytedance/sonic v1.5.0/go.mod h1:ED5hyg4y6t3/9Ku1R6dU/4KyJ48DZ4jPhfY1O2AihPM=
-github.com/bytedance/sonic v1.9.2 h1:GDaNjuWSGu09guE9Oql0MSTNhNCLlWwO8y/xM5BzcbM=
-github.com/bytedance/sonic v1.9.2/go.mod h1:i736AoUSYt75HyZLoJW9ERYxcy6eaN6h4BZXU064P/U=
+github.com/bytedance/sonic v1.10.0-rc h1:3S5HeWxjX08CUqNrXtEittExpJsEKBNzrV5UnrzHxVQ=
+github.com/bytedance/sonic v1.10.0-rc/go.mod h1:ElCzW+ufi8qKqNW0FY314xriJhyJhuoJ3gFZdAHF7NM=
 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 h1:9fhXjVzq5hUy2gkhhgHl95zG2cEAhw9OSGs8toWWAwo=
+github.com/chenzhuoyu/iasm v0.9.0/go.mod h1:Xjy2NpN3h7aUqeqM+woSuuvxmIe6+DDsiNLIrkAmYog=
 github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
 github.com/coreos/go-systemd v0.0.0-20181012123002-c6f51f82210d/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
@@ -36,8 +39,8 @@ github.com/dgryski/go-metro v0.0.0-20200812162917-85c65e2d0165/go.mod h1:c9O8+fp
 github.com/dgryski/go-metro v0.0.0-20211217172704-adc40b04c140 h1:y7y0Oa6UawqTFPCDw9JG6pdKt4F9pAhHv0B7FMGaGD0=
 github.com/dgryski/go-metro v0.0.0-20211217172704-adc40b04c140/go.mod h1:c9O8+fpSOX1DM8cPNSkX/qsBWdkD4yd2dpciOWQjpBw=
 github.com/dustin/go-humanize v1.0.0/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk=
-github.com/fasthttp/router v1.4.19 h1:RLE539IU/S4kfb4MP56zgP0TIBU9kEg0ID9GpWO0vqk=
-github.com/fasthttp/router v1.4.19/go.mod h1:+Fh3YOd8x1+he6ZS+d2iUDBH9MGGZ1xQFUor0DE9rKE=
+github.com/fasthttp/router v1.4.20 h1:yPeNxz5WxZGojzolKqiP15DTXnxZce9Drv577GBrDgU=
+github.com/fasthttp/router v1.4.20/go.mod h1:um867yNQKtERxBm+C+yzgWxjspTiQoA8z86Ec3fK/tc=
 github.com/flynn/go-shlex v0.0.0-20150515145356-3f9db97f8568/go.mod h1:xEzjJPgXI435gkrCt3MPfRiAkVrwSbHsst4LCFVfpJc=
 github.com/francoispqt/gojay v1.2.13 h1:d2m3sFjloqoIUQU3TsHBgj6qg/BVGlTBeHDUmyJnXKk=
 github.com/francoispqt/gojay v1.2.13/go.mod h1:ehT5mTG4ua4581f1++1WLG0vPdaA9HaiDsoyrBGkyDY=
@@ -123,6 +126,7 @@ github.com/klauspost/compress v1.16.7/go.mod h1:ntbaceVETuRiXiv4DpjP66DpAtAGkEQs
 github.com/klauspost/cpuid/v2 v2.0.9/go.mod h1:FInQzS24/EEf25PyTYn52gqo7WaD8xa0213Md/qVLRg=
 github.com/klauspost/cpuid/v2 v2.2.5 h1:0E5MSMDEoAulmXNFquVs//DdoomxaoTY1kUhbc/qbZg=
 github.com/klauspost/cpuid/v2 v2.2.5/go.mod h1:Lcz8mBdAVJIBVzewtcLocK12l3Y+JytZYpaMropDUws=
+github.com/knz/go-libedit v1.10.1/go.mod h1:MZTVkCWyz0oBc7JOWP3wNAzd002ZbM/5hgShxwh4x8M=
 github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
 github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE=
 github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
@@ -149,8 +153,8 @@ github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJ
 github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=
 github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9Gz0M=
 github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk=
-github.com/mymmrac/telego v0.25.1 h1:tMNmrRm0YGyLS56CBi0NDHwO1ZI6V7QMgX4KWSWuT1U=
-github.com/mymmrac/telego v0.25.1/go.mod h1:nBO4SUqRV8j60JOS7trIr6bHPofwYCGJxYeqtQWgu2c=
+github.com/mymmrac/telego v0.26.0 h1:m4B3SW9dxL4uHpyjBnmhQeiFO7GWCxFjsUKUvFx3mf0=
+github.com/mymmrac/telego v0.26.0/go.mod h1:kizipjY3MhxmkcGvyz8jiw/26vEKAhR2V7YTE69iqvw=
 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.2.1 h1:aOzRCdwsJuoExfZhoiXHy4bjruwCMdt5otbYojM/PaA=
@@ -183,8 +187,8 @@ github.com/quic-go/qtls-go1-20 v0.2.2 h1:WLOPx6OY/hxtTxKV1Zrq20FtXtDEkeY00CGQm8G
 github.com/quic-go/qtls-go1-20 v0.2.2/go.mod h1:JKtK6mjbAVcUTN/9jZpvLbGxvdWIKS8uT7EiStoU1SM=
 github.com/quic-go/quic-go v0.35.1 h1:b0kzj6b/cQAf05cT0CkQubHM31wiA+xH3IBkxP62poo=
 github.com/quic-go/quic-go v0.35.1/go.mod h1:+4CVgVppm0FNjpG3UcX8Joi/frKOH7/ciD5yGcwOO1g=
-github.com/refraction-networking/utls v1.3.2 h1:o+AkWB57mkcoW36ET7uJ002CpBWHu0KPxi6vzxvPnv8=
-github.com/refraction-networking/utls v1.3.2/go.mod h1:fmoaOww2bxzzEpIKOebIsnBvjQpqP7L2vcm/9KUfm/E=
+github.com/refraction-networking/utls v1.3.3 h1:f/TBLX7KBciRyFH3bwupp+CE4fzoYKCirhdRcC490sw=
+github.com/refraction-networking/utls v1.3.3/go.mod h1:DlecWW1LMlMJu+9qpzzQqdHDT/C2LAe03EdpLUz/RL8=
 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=
@@ -203,8 +207,8 @@ github.com/savsgio/gotils v0.0.0-20230208104028-c358bd845dee/go.mod h1:qwtSXrKuJ
 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.6 h1:5y46WPI9QBKBbK7EEccUPNXpJpNrvPuTD0O2zHEHT08=
-github.com/shirou/gopsutil/v3 v3.23.6/go.mod h1:j7QX50DrXYggrpN30W0Mo+I4/8U2UUIQrnrhqUeWrAU=
+github.com/shirou/gopsutil/v3 v3.23.7 h1:C+fHO8hfIppoJ1WdsVm1RoI0RwXoNdfTK7yWXV0wVj4=
+github.com/shirou/gopsutil/v3 v3.23.7/go.mod h1:c4gnmoRC0hQuaLqvxnx1//VXQ0Ms/X9UnJF8pddY5z4=
 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=
@@ -270,8 +274,6 @@ github.com/xtls/reality v0.0.0-20230613075828-e07c3b04b983 h1:AMyzgjkh54WocjQSlC
 github.com/xtls/reality v0.0.0-20230613075828-e07c3b04b983/go.mod h1:rkuAY1S9F8eI8gDiPDYvACE8e2uwkyg8qoOTuwWov7Y=
 github.com/xtls/xray-core v1.8.3 h1:lxaVklPjLKqUU4ua4qH8SBaRcAaNHlH+LmXOx0U/Ejg=
 github.com/xtls/xray-core v1.8.3/go.mod h1:i7t4JFnq828P2+XK0XjGQ8W9x78iu+EJ7jI4l3sonIw=
-github.com/yaa110/go-persian-calendar v1.1.5 h1:EUipRRhzE6bR2NZaSyZ5BEOP46LGbUjzQgdC+Ivrbe4=
-github.com/yaa110/go-persian-calendar v1.1.5/go.mod h1:qtnmHCS9u1EiwzzSCSttGoxD5NfV9ZMzymxFCBYmqfg=
 github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
 github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k=
 github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
@@ -280,6 +282,7 @@ github.com/yusufpapurcu/wmi v1.2.3/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQ
 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.2.0 h1:TaP3xedm7JaAgScZO7tlvlKrqT0p7I6OsdGB5YNSMDU=
 go4.org v0.0.0-20180809161055-417644f6feb5/go.mod h1:MkTOUMDaeVYJUOUsaDXIhWPZYa1yOyC1qaOBpL57BhE=
 golang.org/x/arch v0.0.0-20210923205945-b76863e36670/go.mod h1:5om86z9Hs0C8fWVUuoMHwpExlXzs5Tkyp9hOrfG7pp8=
 golang.org/x/arch v0.4.0 h1:A8WCeEWhLwPBKNbFi5Wv5UTCBx5zzubnXDlMOFAzFMc=
@@ -318,8 +321,8 @@ golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwY
 golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
 golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM=
 golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
-golang.org/x/net v0.12.0 h1:cfawfvKITfUsFCeJIHJrbSxpeu/E81khclypR0GVT50=
-golang.org/x/net v0.12.0/go.mod h1:zEVYFnQC7m/vmpQFELhcD1EWkZlX69l4oqgmer6hfKA=
+golang.org/x/net v0.13.0 h1:Nvo8UFsZ8X3BhAC9699Z1j7XQ3rsZnUUm7jfBEk1ueY=
+golang.org/x/net v0.13.0/go.mod h1:zEVYFnQC7m/vmpQFELhcD1EWkZlX69l4oqgmer6hfKA=
 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=
@@ -353,7 +356,6 @@ golang.org/x/sys v0.2.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.9.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.10.0 h1:SqMFp9UcQJZa+pmYuAKjd9xq1f0j5rLcDIk0mj4qAsA=
 golang.org/x/sys v0.10.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
@@ -402,14 +404,14 @@ 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.56.2 h1:fVRFRnXvU+x6C4IlHZewvJOVHoOv1TUuQyoRsYnB4bI=
-google.golang.org/grpc v1.56.2/go.mod h1:I9bI3vqKfayGqPUAwGdOSu7kt6oIJLixfffKrpXqQ9s=
+google.golang.org/grpc v1.57.0 h1:kfzNeI/klCGD2YPMUlaGNT3pxvYfga7smW3Vth8Zsiw=
+google.golang.org/grpc v1.57.0/go.mod h1:Sd+9RMTACXwmub0zcNY2c4arhtrbBYD1AUHI/dt16Mo=
 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.31.0 h1:g0LDEJHgrBl9N9r17Ru3sqWhkIx2NB67okBHPwC7hs8=
 google.golang.org/protobuf v1.31.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
-gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 h1:qIbj1fsPNlZgppZ+VLlY7N33q108Sa+fhmuc+sWQYwY=
+gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=
 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=
@@ -431,6 +433,7 @@ honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWh
 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=
--- a/logger/logger.go
+++ b/logger/logger.go
@@ -1,98 +1,118 @@
 package logger

 import (
+	"fmt"
 	"os"
-	"sync"
+	"time"

 	"github.com/op/go-logging"
 )

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

 func init() {
 	InitLogger(logging.INFO)
 }

 func InitLogger(level logging.Level) {
-	mu.Lock()
-	defer mu.Unlock()
+	newLogger := logging.MustGetLogger("x-ui")
+	var err error
+	var backend logging.Backend
+	var format logging.Formatter
+	ppid := os.Getppid()

-	if logger != nil {
-		return
+	if ppid == 1 {
+		backend, err = logging.NewSyslogBackend("")
+		format = logging.MustStringFormatter(
+			`%{level} - %{message}`,
+		)
+	}
+	if err != nil || ppid != 1 {
+		backend = logging.NewLogBackend(os.Stderr, "", 0)
+		format = logging.MustStringFormatter(
+			`%{time:2006/01/02 15:04:05} %{level} - %{message}`,
+		)
 	}

-	format := logging.MustStringFormatter(
-		`%{time:2006/01/02 15:04:05} %{level} - %{message}`,
-	)
-	newLogger := logging.MustGetLogger("x-ui")
-	backend := logging.NewLogBackend(os.Stderr, "", 0)
 	backendFormatter := logging.NewBackendFormatter(backend, format)
 	backendLeveled := logging.AddModuleLevel(backendFormatter)
-	backendLeveled.SetLevel(level, "")
-	newLogger.SetBackend(logging.MultiLogger(backendLeveled))
+	backendLeveled.SetLevel(level, "x-ui")
+	newLogger.SetBackend(backendLeveled)

 	logger = newLogger
 }

 func Debug(args ...interface{}) {
-	if logger != nil {
-		logger.Debug(args...)
-	}
+	logger.Debug(args...)
+	addToBuffer("DEBUG", fmt.Sprint(args...))
 }

 func Debugf(format string, args ...interface{}) {
-	if logger != nil {
-		logger.Debugf(format, args...)
-	}
+	logger.Debugf(format, args...)
+	addToBuffer("DEBUG", fmt.Sprintf(format, args...))
 }

 func Info(args ...interface{}) {
-	if logger != nil {
-		logger.Info(args...)
-	}
+	logger.Info(args...)
+	addToBuffer("INFO", fmt.Sprint(args...))
 }

 func Infof(format string, args ...interface{}) {
-	if logger != nil {
-		logger.Infof(format, args...)
-	}
+	logger.Infof(format, args...)
+	addToBuffer("INFO", fmt.Sprintf(format, args...))
 }

 func Warning(args ...interface{}) {
-	if logger != nil {
-		logger.Warning(args...)
-	}
+	logger.Warning(args...)
+	addToBuffer("WARNING", fmt.Sprint(args...))
 }

 func Warningf(format string, args ...interface{}) {
-	if logger != nil {
-		logger.Warningf(format, args...)
-	}
+	logger.Warningf(format, args...)
+	addToBuffer("WARNING", fmt.Sprintf(format, args...))
 }

 func Error(args ...interface{}) {
-	if logger != nil {
-		logger.Error(args...)
-	}
+	logger.Error(args...)
+	addToBuffer("ERROR", fmt.Sprint(args...))
 }

 func Errorf(format string, args ...interface{}) {
-	if logger != nil {
-		logger.Errorf(format, args...)
-	}
+	logger.Errorf(format, args...)
+	addToBuffer("ERROR", fmt.Sprintf(format, args...))
 }

-func Notice(args ...interface{}) {
-	if logger != nil {
-		logger.Notice(args...)
+func addToBuffer(level string, newLog string) {
+	t := time.Now()
+	if len(logBuffer) >= 10240 {
+		logBuffer = logBuffer[1:]
 	}
+
+	logLevel, _ := logging.LogLevel(level)
+	logBuffer = append(logBuffer, struct {
+		time  string
+		level logging.Level
+		log   string
+	}{
+		time:  t.Format("2006/01/02 15:04:05"),
+		level: logLevel,
+		log:   newLog,
+	})
 }

-func Noticef(format string, args ...interface{}) {
-	if logger != nil {
-		logger.Noticef(format, args...)
+func GetLogs(c int, level string) []string {
+	var output []string
+	logLevel, _ := logging.LogLevel(level)
+
+	for i := len(logBuffer) - 1; i >= 0 && len(output) <= c; i-- {
+		if logBuffer[i].level <= logLevel {
+			output = append(output, fmt.Sprintf("%s %s - %s", logBuffer[i].time, logBuffer[i].level, logBuffer[i].log))
+		}
 	}
+	return output
 }
--- a/sub/subService.go
+++ b/sub/subService.go
@@ -14,7 +14,6 @@ import (
 	"x-ui/xray"

 	"github.com/goccy/go-json"
-	ptime "github.com/yaa110/go-persian-calendar"
 )

 type SubService struct {
@@ -145,8 +144,15 @@ func (s *SubService) genVmessLink(inbound *model.Inbound, email string, expiryTi

 	remainedTraffic := s.getRemainedTraffic(email)
 	expiryTimeString := getExpiryTime(expiryTime)
+	remark := ""
+	isTerminated := strings.Contains(expiryTimeString, "Terminated") || strings.Contains(remainedTraffic, "Terminated")
+
+	if isTerminated {
+		remark = fmt.Sprintf("%s: %s⛔️", email, "Terminated")
+	} else {
+		remark = fmt.Sprintf("%s: %s - %s", email, remainedTraffic, expiryTimeString)
+	}

-	remark := fmt.Sprintf("%s: %s- %s", email, remainedTraffic, expiryTimeString)
 	obj := map[string]interface{}{
 		"v":    "2",
 		"ps":   remark,
@@ -458,8 +464,14 @@ func (s *SubService) genVlessLink(inbound *model.Inbound, email string, expiryTi

 	remainedTraffic := s.getRemainedTraffic(email)
 	expiryTimeString := getExpiryTime(expiryTime)
+	remark := ""
+	isTerminated := strings.Contains(expiryTimeString, "Terminated") || strings.Contains(remainedTraffic, "Terminated")

-	remark := fmt.Sprintf("%s: %s- %s", email, remainedTraffic, expiryTimeString)
+	if isTerminated {
+		remark = fmt.Sprintf("%s: %s⛔️", email, "Terminated")
+	} else {
+		remark = fmt.Sprintf("%s: %s - %s", email, remainedTraffic, expiryTimeString)
+	}

 	if len(domains) > 0 {
 		links := ""
@@ -670,8 +682,14 @@ func (s *SubService) genTrojanLink(inbound *model.Inbound, email string, expiryT

 	remainedTraffic := s.getRemainedTraffic(email)
 	expiryTimeString := getExpiryTime(expiryTime)
+	remark := ""
+	isTerminated := strings.Contains(expiryTimeString, "Terminated") || strings.Contains(remainedTraffic, "Terminated")

-	remark := fmt.Sprintf("%s: %s- %s", email, remainedTraffic, expiryTimeString)
+	if isTerminated {
+		remark = fmt.Sprintf("%s: %s⛔️", email, "Terminated")
+	} else {
+		remark = fmt.Sprintf("%s: %s - %s", email, remainedTraffic, expiryTimeString)
+	}

 	if len(domains) > 0 {
 		links := ""
@@ -756,7 +774,10 @@ func (s *SubService) genShadowsocksLink(inbound *model.Inbound, email string, ex
 		}
 	}

-	encPart := fmt.Sprintf("%s:%s:%s", method, inboundPassword, clients[clientIndex].Password)
+	encPart := fmt.Sprintf("%s:%s", method, clients[clientIndex].Password)
+	if method[0] == '2' {
+		encPart = fmt.Sprintf("%s:%s:%s", method, inboundPassword, clients[clientIndex].Password)
+	}
 	link := fmt.Sprintf("ss://%s@%s:%d", base64.StdEncoding.EncodeToString([]byte(encPart)), address, inbound.Port)
 	url, _ := url.Parse(link)
 	q := url.Query()
@@ -770,8 +791,15 @@ func (s *SubService) genShadowsocksLink(inbound *model.Inbound, email string, ex

 	remainedTraffic := s.getRemainedTraffic(email)
 	expiryTimeString := getExpiryTime(expiryTime)
+	remark := ""
+	isTerminated := strings.Contains(expiryTimeString, "Terminated") || strings.Contains(remainedTraffic, "Terminated")

-	remark := fmt.Sprintf("%s: %s- %s", clients[clientIndex].Email, remainedTraffic, expiryTimeString)
+	if isTerminated {
+		remark = fmt.Sprintf("%s: %s⛔️", clients[clientIndex].Email, "Terminated")
+	} else {
+		remark = fmt.Sprintf("%s: %s - %s", clients[clientIndex].Email, remainedTraffic, expiryTimeString)
+	}
+	
 	url.Fragment = remark
 	return url.String()
 }
@@ -823,15 +851,18 @@ func getExpiryTime(expiryTime int64) string {
 	expiryString := ""

 	timeDifference := expiryTime/1000 - now
+	isTerminated := timeDifference/3600 <= 0

 	if expiryTime == 0 {
 		expiryString = "♾ ⏳"
 	} else if timeDifference > 172800 {
-		expiryString = fmt.Sprintf("%s ⏳", ptime.Unix((expiryTime/1000), 0).Format("yy-MM-dd hh:mm"))
+		expiryString = fmt.Sprintf("%d %s⏳", timeDifference/86400, "Days")
 	} else if expiryTime < 0 {
-		expiryString = fmt.Sprintf("%d ⏳", expiryTime/-86400000)
+		expiryString = fmt.Sprintf("%d %s⏳", expiryTime/-86400000, "Days")
+	} else if isTerminated {
+		expiryString = fmt.Sprintf("%s⛔️", "Terminated")
 	} else {
-		expiryString = fmt.Sprintf("%s %d ⏳", "ساعت", timeDifference/3600)
+		expiryString = fmt.Sprintf("%d %s⏳", timeDifference/3600, "Hours")
 	}

 	return expiryString
@@ -844,8 +875,12 @@ func (s *SubService) getRemainedTraffic(email string) string {
 	}

 	remainedTraffic := ""
+	isTerminated := traffic.Total-(traffic.Up+traffic.Down) < 0
+
 	if traffic.Total == 0 {
 		remainedTraffic = "♾ 📊"
+	} else if isTerminated {
+		remainedTraffic = fmt.Sprintf("%s⛔️", "Terminated")
 	} else {
 		remainedTraffic = fmt.Sprintf("%s%s", common.FormatTraffic(traffic.Total-(traffic.Up+traffic.Down)), "📊")
 	}
--- a/web/assets/js/model/xray.js
+++ b/web/assets/js/model/xray.js
@@ -16,9 +16,10 @@ const VmessMethods = {
 };

 const SSMethods = {
-    CHACHA20_POLY1305: 'chacha20-poly1305',
    AES_256_GCM: 'aes-256-gcm',
    AES_128_GCM: 'aes-128-gcm',
+    CHACHA20_POLY1305: 'chacha20-poly1305',
+    XCHACHA20_POLY1305: 'xchacha20-poly1305',
    BLAKE3_AES_128_GCM: '2022-blake3-aes-128-gcm',
    BLAKE3_AES_256_GCM: '2022-blake3-aes-256-gcm',
    BLAKE3_CHACHA20_POLY1305: '2022-blake3-chacha20-poly1305',
@@ -386,12 +387,10 @@ class HttpStreamSettings extends XrayCommonClass {
    constructor(
        path='/',
        host=[''],
-        sockopt={acceptProxyProtocol: false}
        ) {
        super();
        this.path = path;
        this.host = host.length === 0 ? [''] : host;
-        this.sockopt = sockopt;
    }

    addHost(host) {
@@ -403,7 +402,7 @@ class HttpStreamSettings extends XrayCommonClass {
    }

    static fromJson(json={}) {
-        return new HttpStreamSettings(json.path, json.host, json.sockopt);
+        return new HttpStreamSettings(json.path, json.host);
    }

    toJson() {
@@ -416,7 +415,6 @@ class HttpStreamSettings extends XrayCommonClass {
        return {
            path: this.path,
            host: host,
-            sockopt: this.sockopt,
        }
    }
 }
@@ -424,7 +422,7 @@ class HttpStreamSettings extends XrayCommonClass {

 class QuicStreamSettings extends XrayCommonClass {
    constructor(security=VmessMethods.NONE,
-                key='', type='none') {
+                key=RandomUtil.randomSeq(10), type='none') {
        super();
        this.security = security;
        this.key = key;
@@ -454,19 +452,16 @@ class GrpcStreamSettings extends XrayCommonClass {
    constructor(
        serviceName="",
        multiMode=false,
-        sockopt={acceptProxyProtocol: false}
        ) {
        super();
        this.serviceName = serviceName;
        this.multiMode = multiMode;
-        this.sockopt = sockopt;
    }

    static fromJson(json={}) {
        return new GrpcStreamSettings(
            json.serviceName,
-            json.multiMode,
-            json.sockopt
+            json.multiMode
            );
    }

@@ -474,7 +469,6 @@ class GrpcStreamSettings extends XrayCommonClass {
        return {
            serviceName: this.serviceName,
            multiMode: this.multiMode,
-            sockopt: this.sockopt
        }
    }
 }
@@ -806,6 +800,27 @@ RealityStreamSettings.Settings = class extends XrayCommonClass {
    }
 };

+class SockoptStreamSettings extends XrayCommonClass {
+    constructor(
+        acceptProxyProtocol = false,
+    ) {
+        super();
+        this.acceptProxyProtocol = acceptProxyProtocol;
+    }
+
+    static fromJson(json = {}) {
+        return new SockoptStreamSettings(
+            json.acceptProxyProtocol,
+        );
+    }
+
+    toJson() {
+        return {
+            acceptProxyProtocol: this.acceptProxyProtocol,
+        };
+    }
+}
+
 class StreamSettings extends XrayCommonClass {
    constructor(network='tcp',
        security='none',
@@ -818,6 +833,7 @@ class StreamSettings extends XrayCommonClass {
        httpSettings=new HttpStreamSettings(),
        quicSettings=new QuicStreamSettings(),
        grpcSettings=new GrpcStreamSettings(),
+        sockopt = new SockoptStreamSettings(),
        ) {
        super();
        this.network = network;
@@ -831,6 +847,7 @@ class StreamSettings extends XrayCommonClass {
        this.http = httpSettings;
        this.quic = quicSettings;
        this.grpc = grpcSettings;
+        this.sockopt = sockopt;
    }

    get isTls() {
@@ -870,6 +887,16 @@ class StreamSettings extends XrayCommonClass {
        }
    }

+    get isSockopt() {
+        return ['http', 'grpc'].indexOf(this.network) !== -1;
+    }
+
+    set isSockopt(isSockopt) {
+        if (isSockopt) {
+            return ['http', 'grpc'].indexOf(this.network) !== -1;
+        }
+    }
+
    static fromJson(json={}) {

        return new StreamSettings(
@@ -884,6 +911,7 @@ class StreamSettings extends XrayCommonClass {
            HttpStreamSettings.fromJson(json.httpSettings),
            QuicStreamSettings.fromJson(json.quicSettings),
            GrpcStreamSettings.fromJson(json.grpcSettings),
+            SockoptStreamSettings.fromJson(json.sockopt),
        );
    }

@@ -901,6 +929,7 @@ class StreamSettings extends XrayCommonClass {
            httpSettings: network === 'http' ? this.http.toJson() : undefined,
            quicSettings: network === 'quic' ? this.quic.toJson() : undefined,
            grpcSettings: network === 'grpc' ? this.grpc.toJson() : undefined,
+            sockopt: this.isSockopt ? this.sockopt.toJson() : undefined,
        };
    }
 }
@@ -1040,7 +1069,10 @@ class Inbound extends XrayCommonClass {
        }
    }
    get isSSMultiUser() {
-        return [SSMethods.BLAKE3_AES_128_GCM,SSMethods.BLAKE3_AES_256_GCM].includes(this.method);
+        return this.method != SSMethods.BLAKE3_CHACHA20_POLY1305;
+    }
+    get isSS2022(){
+        return this.method.substring(0,4) === "2022";
    }

    get serverName() {
@@ -1470,9 +1502,11 @@ class Inbound extends XrayCommonClass {
                break;
        }

-        let clientPassword = this.isSSMultiUser ? ':' + settings.shadowsockses[clientIndex].password : '';
+        let password = new Array();
+        if (this.isSSMultiUser) password.push(settings.shadowsockses[clientIndex].password);
+        if (this.isSS2022) password.push(settings.password);

-        let link = `ss://${safeBase64(settings.method + ':' + settings.password + clientPassword)}@${address}:${this.port}`;
+        let link = `ss://${safeBase64(settings.method + ':' + password.join(':'))}@${address}:${this.port}`;
        const url = new URL(link);
        for (const [key, value] of params) {
            url.searchParams.set(key, value)
@@ -2097,8 +2131,9 @@ Inbound.ShadowsocksSettings = class extends Inbound.Settings {
 };

 Inbound.ShadowsocksSettings.Shadowsocks = class extends XrayCommonClass {
-    constructor(password=RandomUtil.randomShadowsocksPassword(), email=RandomUtil.randomLowerAndNum(8),limitIp=0, totalGB=0, expiryTime=0, enable=true, tgId='', subId=RandomUtil.randomLowerAndNum(16)) {
+    constructor(method='', password=RandomUtil.randomShadowsocksPassword(), email=RandomUtil.randomLowerAndNum(8),limitIp=0, totalGB=0, expiryTime=0, enable=true, tgId='', subId=RandomUtil.randomLowerAndNum(16)) {
        super();
+        this.method = method;
        this.password = password;
        this.email = email;
        this.limitIp = limitIp;
@@ -2111,6 +2146,7 @@ Inbound.ShadowsocksSettings.Shadowsocks = class extends XrayCommonClass {

    toJson() {
        return {
+            method: this.method,
            password: this.password,
            email: this.email,
            limitIp: this.limitIp,
@@ -2124,6 +2160,7 @@ Inbound.ShadowsocksSettings.Shadowsocks = class extends XrayCommonClass {

    static fromJson(json = {}) {
        return new Inbound.ShadowsocksSettings.Shadowsocks(
+            json.method,
            json.password,
            json.email,
            json.limitIp,
--- a/web/controller/server.go
+++ b/web/controller/server.go
@@ -118,12 +118,9 @@ func (a *ServerController) restartXrayService(c *gin.Context) {

 func (a *ServerController) getLogs(c *gin.Context) {
 	count := c.Param("count")
-	logLevel := c.PostForm("logLevel")
-	logs, err := a.serverService.GetLogs(count, logLevel)
-	if err != nil {
-		jsonMsg(c, "getLogs", err)
-		return
-	}
+	level := c.PostForm("level")
+	syslog := c.PostForm("syslog")
+	logs := a.serverService.GetLogs(count, level, syslog)
 	jsonObj(c, logs, nil)
 }

--- a/web/html/xui/client_bulk_modal.html
+++ b/web/html/xui/client_bulk_modal.html
@@ -200,21 +200,12 @@
            this.inbound = dbInbound.toInbound();
            this.delayedStart = false;
        },
-        getClients(protocol, clientSettings) {
-            switch (protocol) {
-                case Protocols.VMESS: return clientSettings.vmesses;
-                case Protocols.VLESS: return clientSettings.vlesses;
-                case Protocols.TROJAN: return clientSettings.trojans;
-                case Protocols.SHADOWSOCKS: return clientSettings.shadowsockses;
-                default: return null;
-            }
-        },
        newClient(protocol) {
            switch (protocol) {
                case Protocols.VMESS: return new Inbound.VmessSettings.Vmess();
                case Protocols.VLESS: return new Inbound.VLESSSettings.VLESS();
                case Protocols.TROJAN: return new Inbound.TrojanSettings.Trojan();
-                case Protocols.SHADOWSOCKS: return new Inbound.ShadowsocksSettings.Shadowsocks();
+                case Protocols.SHADOWSOCKS: return new Inbound.ShadowsocksSettings.Shadowsocks(clientsBulkModal.inbound.settings.shadowsockses[0].method);
                default: return null;
            }
        },
--- a/web/html/xui/client_modal.html
+++ b/web/html/xui/client_modal.html
@@ -70,7 +70,7 @@
                case Protocols.VMESS: return clients.push(new Inbound.VmessSettings.Vmess());
                case Protocols.VLESS: return clients.push(new Inbound.VLESSSettings.VLESS());
                case Protocols.TROJAN: return clients.push(new Inbound.TrojanSettings.Trojan());
-                case Protocols.SHADOWSOCKS: return clients.push(new Inbound.ShadowsocksSettings.Shadowsocks());
+                case Protocols.SHADOWSOCKS: return clients.push(new Inbound.ShadowsocksSettings.Shadowsocks(clients[0].method));
                default: return null;
            }
        },
--- a/web/html/xui/form/protocol/shadowsocks.html
+++ b/web/html/xui/form/protocol/shadowsocks.html
@@ -115,7 +115,7 @@
            <a-select-option v-for="method in SSMethods" :value="method">[[ method ]]</a-select-option>
        </a-select>
    </a-form-item>
-    <a-form-item label='{{ i18n "password" }}'>
+    <a-form-item v-if="inbound.isSS2022" label='{{ i18n "password" }}'>
        <a-icon @click="inbound.settings.password = RandomUtil.randomShadowsocksPassword()" type="sync"> </a-icon>
        <a-input v-model.trim="inbound.settings.password" style="width: 250px;"></a-input>
    </a-form-item>
--- a/web/html/xui/form/stream/stream_grpc.html
+++ b/web/html/xui/form/stream/stream_grpc.html
@@ -1,7 +1,7 @@
 {{define "form/streamGRPC"}}
 <a-form layout="inline">
    <a-form-item label="AcceptProxyProtocol">
-        <a-switch v-model="inbound.stream.grpc.sockopt.acceptProxyProtocol"></a-switch>
+        <a-switch v-model="inbound.stream.sockopt.acceptProxyProtocol"></a-switch>
    </a-form-item>
    <br>
    <a-form-item label="ServiceName">
--- a/web/html/xui/form/stream/stream_http.html
+++ b/web/html/xui/form/stream/stream_http.html
@@ -1,7 +1,7 @@
 {{define "form/streamHTTP"}}
 <a-form layout="inline">
    <a-form-item label="AcceptProxyProtocol">
-        <a-switch v-model="inbound.stream.http.sockopt.acceptProxyProtocol"></a-switch>
+        <a-switch v-model="inbound.stream.sockopt.acceptProxyProtocol"></a-switch>
    </a-form-item>
    <br>
    <a-form-item label='{{ i18n "path" }}'>
--- a/web/html/xui/form/stream/stream_kcp.html
+++ b/web/html/xui/form/stream/stream_kcp.html
@@ -12,7 +12,8 @@
    </a-form-item>
    <br>
    <a-form-item label='{{ i18n "password" }}'>
-        <a-input v-model="inbound.stream.kcp.seed"></a-input>
+        <a-icon @click="inbound.stream.kcp.seed = RandomUtil.randomSeq(10)" type="sync"> </a-icon>
+        <a-input v-model="inbound.stream.kcp.seed" style="width: 150px;" ></a-input>
    </a-form-item>
    <br>
    <a-form-item label="MTU">
--- a/web/html/xui/form/stream/stream_quic.html
+++ b/web/html/xui/form/stream/stream_quic.html
@@ -8,7 +8,8 @@
        </a-select>
    </a-form-item>
    <a-form-item label='{{ i18n "password" }}'>
-        <a-input v-model.trim="inbound.stream.quic.key"></a-input>
+        <a-icon @click="inbound.stream.quic.key = RandomUtil.randomSeq(10)" type="sync"> </a-icon>
+        <a-input v-model.trim="inbound.stream.quic.key" style="width: 150px;"></a-input>
    </a-form-item>
    <a-form-item label='{{ i18n "camouflage" }}'>
        <a-select v-model="inbound.stream.quic.type" style="width: 280px;" :dropdown-class-name="themeSwitcher.darkCardClass">
--- a/web/html/xui/inbound_modal.html
+++ b/web/html/xui/inbound_modal.html
@@ -110,6 +110,15 @@
                    if (this.inModal.inbound.settings.shadowsockses.length ==0){
                        this.inModal.inbound.settings.shadowsockses = [new Inbound.ShadowsocksSettings.Shadowsocks()];
                    }
+                    if (["aes-128-gcm", "aes-256-gcm", "chacha20-poly1305", "xchacha20-poly1305"].includes(this.inModal.inbound.settings.method)) {
+                        this.inModal.inbound.settings.shadowsockses.forEach(client => {
+                            client.method = this.inModal.inbound.settings.method;
+                        })
+                    } else {
+                        this.inModal.inbound.settings.shadowsockses.forEach(client => {
+                            client.method = "";
+                        })
+                    }
                } else {
                    if (this.inModal.inbound.settings.shadowsockses.length > 0){
                        this.inModal.inbound.settings.shadowsockses = [];
--- a/web/html/xui/index.html
+++ b/web/html/xui/index.html
@@ -86,7 +86,7 @@
                    <a-col :sm="24" :md="12">
                        <a-card hoverable :class="themeSwitcher.darkCardClass">
                            {{ i18n "menu.link" }}:
-                            <a-tag color="blue" style="cursor: pointer;" @click="openLogs(logModal.rows, logModal.logLevel)">{{ i18n "pages.index.logs" }}</a-tag>
+                            <a-tag color="blue" style="cursor: pointer;" @click="openLogs()">{{ i18n "pages.index.logs" }}</a-tag>
                            <a-tag color="blue" style="cursor: pointer;" @click="openConfig">{{ i18n "pages.index.config" }}</a-tag>
                            <a-tag color="blue" style="cursor: pointer;" @click="openBackup">{{ i18n "pages.index.backup" }}</a-tag>
                        </a-card>
@@ -253,7 +253,7 @@
            <a-form-item label="Count">
                <a-select v-model="logModal.rows"
                style="width: 80px"
-                @change="openLogs(logModal.rows, logModal.logLevel)"
+                @change="openLogs()"
                :dropdown-class-name="themeSwitcher.darkCardClass">
                    <a-select-option value="10">10</a-select-option>
                    <a-select-option value="20">20</a-select-option>
@@ -262,9 +262,9 @@
                </a-select>
            </a-form-item>
            <a-form-item label="Log Level">
-                <a-select v-model="logModal.logLevel"
+                <a-select v-model="logModal.level"
                style="width: 120px"
-                @change="openLogs(logModal.rows, logModal.logLevel)"
+                @change="openLogs()"
                :dropdown-class-name="themeSwitcher.darkCardClass">
                    <a-select-option value="debug">Debug</a-select-option>
                    <a-select-option value="info">Info</a-select-option>
@@ -273,8 +273,11 @@
                    <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>
-                <button class="ant-btn ant-btn-primary" @click="openLogs(logModal.rows, logModal.logLevel)"><a-icon type="sync"></a-icon> Reload</button>
+                <button class="ant-btn ant-btn-primary" @click="openLogs()"><a-icon type="sync"></a-icon> Reload</button>
            </a-form-item>
            <a-form-item>
                <a-button type="primary" style="margin-bottom: 10px;"
@@ -409,11 +412,11 @@
        visible: false,
        logs: '',
        rows: 20,
-        logLevel: 'info',
-        show(logs, rows) {
+        level: 'info',
+        syslog: false,
+        show(logs) {
            this.visible = true;
-            this.rows = rows;
-            this.logs = logs.join("\n");
+            this.logs = logs? logs.join("\n"): "No Record...";
        },
        hide() {
            this.visible = false;
@@ -514,14 +517,14 @@
                    return;
                }
            },
-            async openLogs(rows, logLevel) {
+            async openLogs(){
                this.loading(true);
-                const msg = await HttpUtil.post('server/logs/' + rows, { logLevel: `${logLevel}` });
+                const msg = await HttpUtil.post('server/logs/'+logModal.rows,{level: logModal.level, syslog: logModal.syslog});
                this.loading(false);
                if (!msg.success) {
                    return;
                }
-                logModal.show(msg.obj, rows);
+                logModal.show(msg.obj);
            },
            async openConfig() {
                this.loading(true);
--- a/web/job/check_client_ip_job.go
+++ b/web/job/check_client_ip_job.go
@@ -20,7 +20,6 @@ type CheckClientIpJob struct {}
 var job *CheckClientIpJob
 var disAllowedIps []string
 var ipFiles = []string{
-	xray.GetBlockedIPsPath(),
 	xray.GetIPLimitLogPath(),
 	xray.GetIPLimitBannedLogPath(),
 	xray.GetAccessPersistentLogPath(),
@@ -45,11 +44,6 @@ func (j *CheckClientIpJob) Run() {
 	if j.hasLimitIp() {
 		j.processLogFile()
 	}
-
-	// write to blocked ips
-	blockedIps := []byte(strings.Join(disAllowedIps, ","))
-	err := os.WriteFile(xray.GetBlockedIPsPath(), blockedIps, 0644)
-	j.checkError(err)
 }

 func (j *CheckClientIpJob) hasLimitIp() bool {
@@ -136,8 +130,8 @@ func (j *CheckClientIpJob) processLogFile() {

 	}

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

 	if shouldCleanLog {
 		// copy access log to persistent file
--- a/web/service/inbound.go
+++ b/web/service/inbound.go
@@ -316,21 +316,17 @@ func (s *InboundService) UpdateInbound(inbound *model.Inbound) (*model.Inbound,

 	needRestart := false
 	s.xrayApi.Init(p.GetAPIPort())
-	err1 := s.xrayApi.DelInbound(tag)
-	if err1 != nil {
-		logger.Debug("Unable to delete old inbound by api:", err1)
-		needRestart = true
-	} else {
+	if s.xrayApi.DelInbound(tag) == nil {
 		logger.Debug("Old inbound deleted by api:", tag)
-
-		if inbound.Enable {
-			inboundJson, err2 := json.MarshalIndent(oldInbound.GenXrayInboundConfig(), "", "  ")
-			if err2 != nil {
-				logger.Debug("Unable to marshal updated inbound config:", err2)
-			}
-
+	}
+	if inbound.Enable {
+		inboundJson, err2 := json.MarshalIndent(oldInbound.GenXrayInboundConfig(), "", "  ")
+		if err2 != nil {
+			logger.Debug("Unable to marshal updated inbound config:", err2)
+			needRestart = true
+		} else {
 			err2 = s.xrayApi.AddInbound(inboundJson)
-			if err1 == nil {
+			if err2 == nil {
 				logger.Debug("Updated inbound added by api:", oldInbound.Tag)
 			} else {
 				logger.Debug("Unable to update inbound by api:", err2)
@@ -461,15 +457,21 @@ func (s *InboundService) AddInboundClient(data *model.Inbound) (bool, error) {
 		if len(client.Email) > 0 {
 			s.AddClientStat(tx, data.Id, &client)
 			if client.Enable {
+				cipher := ""
+				if oldInbound.Protocol == "shadowsocks" {
+					cipher = oldSettings["method"].(string)
+				}
 				err1 := s.xrayApi.AddUser(string(oldInbound.Protocol), oldInbound.Tag, map[string]interface{}{
 					"email":    client.Email,
 					"id":       client.ID,
 					"flow":     client.Flow,
 					"password": client.Password,
+					"cipher":   cipher,
 				})
 				if err1 == nil {
 					logger.Debug("Client added by api:", client.Email)
 				} else {
+					logger.Debug("Error in adding client by api:", err1)
 					needRestart = true
 				}
 			}
@@ -536,15 +538,18 @@ func (s *InboundService) DelInboundClient(inboundId int, clientId string) (bool,
 		return false, err
 	}
 	needRestart := false
-	s.xrayApi.Init(p.GetAPIPort())
 	if len(email) > 0 {
-		err = s.xrayApi.RemoveUser(oldInbound.Tag, email)
-		if err == nil {
+		s.xrayApi.Init(p.GetAPIPort())
+		err1 := s.xrayApi.RemoveUser(oldInbound.Tag, email)
+		if err1 == nil {
 			logger.Debug("Client deleted by api:", email)
 			needRestart = false
+		} else {
+			logger.Debug("Unable to del client by api:", err1)
+			needRestart = true
 		}
+		s.xrayApi.Close()
 	}
-	s.xrayApi.Close()
 	return needRestart, db.Save(oldInbound).Error
 }

@@ -650,26 +655,35 @@ func (s *InboundService) UpdateInboundClient(data *model.Inbound, clientId strin
 		}
 	}
 	needRestart := false
-	s.xrayApi.Init(p.GetAPIPort())
 	if len(oldEmail) > 0 {
-		s.xrayApi.RemoveUser(oldInbound.Tag, oldEmail)
+		s.xrayApi.Init(p.GetAPIPort())
+		if s.xrayApi.RemoveUser(oldInbound.Tag, oldEmail) == nil {
+			logger.Debug("Old client deleted by api:", clients[0].Email)
+		}
 		if clients[0].Enable {
+			cipher := ""
+			if oldInbound.Protocol == "shadowsocks" {
+				cipher = oldSettings["method"].(string)
+			}
 			err1 := s.xrayApi.AddUser(string(oldInbound.Protocol), oldInbound.Tag, map[string]interface{}{
 				"email":    clients[0].Email,
 				"id":       clients[0].ID,
 				"flow":     clients[0].Flow,
 				"password": clients[0].Password,
+				"cipher":   cipher,
 			})
 			if err1 == nil {
 				logger.Debug("Client edited by api:", clients[0].Email)
-				needRestart = false
+			} else {
+				logger.Debug("Error in adding client by api:", err1)
+				needRestart = true
 			}
-		} else {
-			logger.Debug("Client disabled by api:", clients[0].Email)
-			needRestart = false
 		}
+		s.xrayApi.Close()
+	} else {
+		logger.Debug("Client old email not found")
+		needRestart = true
 	}
-	s.xrayApi.Close()
 	return needRestart, tx.Save(oldInbound).Error
 }

@@ -723,6 +737,11 @@ func (s *InboundService) AddClientTraffic(traffics []*xray.ClientTraffic) (err e
 		return err
 	}

+	// Avoid empty slice error
+	if len(dbClientTraffics) == 0 {
+		return nil
+	}
+
 	dbClientTraffics, err = s.adjustTraffics(tx, dbClientTraffics)
 	if err != nil {
 		return err
@@ -814,10 +833,11 @@ func (s *InboundService) DisableInvalidInbounds() (bool, int64, error) {
 		}
 		s.xrayApi.Init(p.GetAPIPort())
 		for _, tag := range tags {
-			err = s.xrayApi.DelInbound(tag)
+			err1 := s.xrayApi.DelInbound(tag)
 			if err == nil {
 				logger.Debug("Inbound disabled by api:", tag)
 			} else {
+				logger.Debug("Error in disabling inbound by api:", err1)
 				needRestart = true
 			}
 		}
@@ -853,10 +873,11 @@ func (s *InboundService) DisableInvalidClients() (bool, int64, error) {
 		}
 		s.xrayApi.Init(p.GetAPIPort())
 		for _, result := range results {
-			err = s.xrayApi.RemoveUser(result.Tag, result.Email)
-			if err == nil {
+			err1 := s.xrayApi.RemoveUser(result.Tag, result.Email)
+			if err1 == nil {
 				logger.Debug("Client disabled by api:", result.Email)
 			} else {
+				logger.Debug("Error in disabling client by api:", err1)
 				needRestart = true
 			}
 		}
@@ -1254,15 +1275,26 @@ func (s *InboundService) ResetClientTraffic(id int, clientEmail string) (bool, e
 		for _, client := range clients {
 			if client.Email == clientEmail {
 				s.xrayApi.Init(p.GetAPIPort())
+				cipher := ""
+				if string(inbound.Protocol) == "shadowsocks" {
+					var oldSettings map[string]interface{}
+					err = json.Unmarshal([]byte(inbound.Settings), &oldSettings)
+					if err != nil {
+						return false, err
+					}
+					cipher = oldSettings["method"].(string)
+				}
 				err1 := s.xrayApi.AddUser(string(inbound.Protocol), inbound.Tag, map[string]interface{}{
 					"email":    client.Email,
 					"id":       client.ID,
 					"flow":     client.Flow,
 					"password": client.Password,
+					"cipher":   cipher,
 				})
 				if err1 == nil {
 					logger.Debug("Client enabled due to reset traffic:", clientEmail)
 				} else {
+					logger.Debug("Error in enabling client by api:", err1)
 					needRestart = true
 				}
 				s.xrayApi.Close()
--- a/web/service/server.go
+++ b/web/service/server.go
@@ -12,6 +12,7 @@ import (
 	"os"
 	"os/exec"
 	"runtime"
+	"strconv"
 	"strings"
 	"time"

@@ -224,7 +225,7 @@ func (s *ServerService) GetStatus(lastStatus *Status) *Status {
 }

 func (s *ServerService) GetXrayVersions() ([]string, error) {
-	url := "https://api.github.com/repos/MHSanaei/Xray-core/releases"
+	url := "https://api.github.com/repos/XTLS/Xray-core/releases"
 	resp, err := http.Get(url)
 	if err != nil {
 		return nil, err
@@ -243,14 +244,17 @@ func (s *ServerService) GetXrayVersions() ([]string, error) {
 	if err != nil {
 		return nil, err
 	}
-	versions := make([]string, 0, len(releases))
+	var versions []string
 	for _, release := range releases {
-		versions = append(versions, release.TagName)
+		if release.TagName >= "v1.7.5" {
+			versions = append(versions, release.TagName)
+		}
 	}
 	return versions, nil
 }

 func (s *ServerService) StopXrayService() (string error) {
+
 	err := s.xrayService.StopXray()
 	if err != nil {
 		logger.Error("stop xray failed:", err)
@@ -261,6 +265,7 @@ func (s *ServerService) StopXrayService() (string error) {
 }

 func (s *ServerService) RestartXrayService() (string error) {
+
 	s.xrayService.StopXray()
 	defer func() {
 		err := s.xrayService.RestartXray(true)
@@ -289,7 +294,7 @@ func (s *ServerService) downloadXRay(version string) (string, error) {
 	}

 	fileName := fmt.Sprintf("Xray-%s-%s.zip", osName, arch)
-	url := fmt.Sprintf("https://github.com/MHSanaei/Xray-core/releases/download/%s/%s", version, fileName)
+	url := fmt.Sprintf("https://github.com/XTLS/Xray-core/releases/download/%s/%s", version, fileName)
 	resp, err := http.Get(url)
 	if err != nil {
 		return "", err
@@ -370,36 +375,30 @@ func (s *ServerService) UpdateXray(version string) error {
 	if err != nil {
 		return err
 	}
-	err = copyZipFile("iran.dat", xray.GetIranPath())
-	if err != nil {
-		return err
-	}

 	return nil
 }

-func (s *ServerService) GetLogs(count string, logLevel string) ([]string, error) {
-	var cmdArgs []string
-	if runtime.GOOS == "linux" {
-		cmdArgs = []string{"journalctl", "-u", "x-ui", "--no-pager", "-n", count}
-		if logLevel != "" {
-			cmdArgs = append(cmdArgs, "-p", logLevel)
+func (s *ServerService) GetLogs(count string, level string, syslog string) []string {
+	c, _ := strconv.Atoi(count)
+	var lines []string
+
+	if syslog == "true" {
+		cmdArgs := []string{"journalctl", "-u", "x-ui", "--no-pager", "-n", count, "-p", level}
+		// Run the command
+		cmd := exec.Command(cmdArgs[0], cmdArgs[1:]...)
+		var out bytes.Buffer
+		cmd.Stdout = &out
+		err := cmd.Run()
+		if err != nil {
+			return []string{"Failed to run journalctl command!"}
 		}
+		lines = strings.Split(out.String(), "\n")
 	} else {
-		return []string{"Unsupported operating system"}, nil
+		lines = logger.GetLogs(c, level)
 	}

-	cmd := exec.Command(cmdArgs[0], cmdArgs[1:]...)
-	var out bytes.Buffer
-	cmd.Stdout = &out
-	err := cmd.Run()
-	if err != nil {
-		return nil, err
-	}
-
-	lines := strings.Split(out.String(), "\n")
-
-	return lines, nil
+	return lines
 }

 func (s *ServerService) GetConfigJson() (interface{}, error) {
@@ -417,6 +416,7 @@ func (s *ServerService) GetConfigJson() (interface{}, error) {
 	if err != nil {
 		return nil, err
 	}
+
 	return jsonData, nil
 }

--- a/web/service/tgbot.go
+++ b/web/service/tgbot.go
@@ -827,7 +827,7 @@ func (t *Tgbot) clientTelegramUserInfo(chatId int64, email string, messageID ...
 		t.SendMsgToTgbot(chatId, output, inlineKeyboard)
 		requestUser := telego.KeyboardButtonRequestUser{
 			RequestID: int32(traffic.Id),
-			UserIsBot: false,
+			UserIsBot: new(bool),
 		}
 		keyboard := tu.Keyboard(
 			tu.KeyboardRow(
--- a/web/service/xray.go
+++ b/web/service/xray.go
@@ -116,7 +116,7 @@ func (s *XrayService) GetXrayConfig() (*xray.Config, error) {
 					}
 				}
 				for key := range c {
-					if key != "email" && key != "id" && key != "password" && key != "flow" {
+					if key != "email" && key != "id" && key != "password" && key != "flow" && key != "method" {
 						delete(c, key)
 					}
 					if c["flow"] == "xtls-rprx-vision-udp443" {
--- a/web/web.go
+++ b/web/web.go
@@ -250,8 +250,8 @@ func (s *Server) startTask() {
 	// Check the inbound traffic every 30 seconds that the traffic exceeds and expires
 	s.cron.AddJob("@every 30s", job.NewCheckInboundJob())

-	// check client ips from log file every 20 sec
-	s.cron.AddJob("@every 20s", job.NewCheckClientIpJob())
+	// check client ips from log file every 10 sec
+	s.cron.AddJob("@every 10s", job.NewCheckClientIpJob())

 	// check client ips from log file every 3 day
 	s.cron.AddJob("@every 3d", job.NewClearLogsJob())
--- a/x-ui.sh
+++ b/x-ui.sh
@@ -508,7 +508,7 @@ update_geo() {
    rm -f geoip.dat geosite.dat iran.dat
    wget -N https://github.com/Loyalsoldier/v2ray-rules-dat/releases/latest/download/geoip.dat
    wget -N https://github.com/Loyalsoldier/v2ray-rules-dat/releases/latest/download/geosite.dat
-    wget -N https://github.com/bootmortis/iran-hosted-domains/releases/latest/download/iran.dat
+    wget -N https://github.com/MasterKia/iran-hosted-domains/releases/latest/download/iran.dat
    systemctl start x-ui
    echo -e "${green}Geosite.dat + Geoip.dat + Iran.dat have been updated successfully in bin folder '${binfolder}'!${plain}"
    before_show_menu
@@ -713,8 +713,8 @@ enabled=true
 filter=3x-ipl
 action=3x-ipl
 logpath=${iplimit_log_path}
-maxretry=3
-findtime=100
+maxretry=4
+findtime=60
 bantime=${bantime}m
 EOF

@@ -772,7 +772,8 @@ iplimit_main() {
    echo -e "${green}\t2.${plain} Change Ban Duration"
    echo -e "${green}\t3.${plain} Unban Everyone"
    echo -e "${green}\t4.${plain} Check Logs"
-    echo -e "${green}\t5.${plain} Uninstall IP Limit"
+    echo -e "${green}\t5.${plain} fail2ban status"
+    echo -e "${green}\t6.${plain} Uninstall IP Limit"
    echo -e "${green}\t0.${plain} Back to Main Menu"
    read -p "Choose an option: " choice
    case "$choice" in
@@ -788,7 +789,7 @@ iplimit_main() {
        2)
            read -rp "Please enter new Ban Duration in Minutes [default 5]: " NUM
            if [[ $NUM =~ ^[0-9]+$ ]]; then
-                create_iplimit_jail ${NUM}
+                create_iplimit_jails ${NUM}
                systemctl restart fail2ban
            else
                echo -e "${red}${NUM} is not a number! Please, try again.${plain}"
@@ -816,6 +817,10 @@ iplimit_main() {
                iplimit_main
            fi ;;
        5)
+            service fail2ban status
+            ;;
+
+        6)
            remove_iplimit ;;
        *) echo "Invalid choice" ;;
    esac
@@ -886,23 +891,19 @@ remove_iplimit(){
            echo -e "${green}IP Limit removed successfully!${plain}\n"
            before_show_menu ;;
        2)  
-            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
+            rm -rf /etc/fail2ban
            systemctl stop fail2ban
-            systemctl disable fail2ban
            case "${release}" in
                ubuntu|debian)
-                    apt remove fail2ban -y ;;
+                    apt-get purge fail2ban -y;;
                centos)
-                    yum -y remove fail2ban ;;
+                    yum remove fail2ban -y;;
                fedora)
-                    dnf -y remove fail2ban ;;
+                    dnf remove fail2ban -y;;
                *)
                    echo -e "${red}Unsupported operating system. Please uninstall Fail2ban manually.${plain}\n"
                    exit 1 ;;
            esac
-            rm -rf /etc/fail2ban
            echo -e "${green}Fail2ban and IP Limit removed successfully!${plain}\n"
            before_show_menu ;;
        0) 
--- a/xray/api.go
+++ b/xray/api.go
@@ -15,6 +15,7 @@ import (
 	"github.com/xtls/xray-core/common/serial"
 	"github.com/xtls/xray-core/infra/conf"
 	"github.com/xtls/xray-core/proxy/shadowsocks"
+	"github.com/xtls/xray-core/proxy/shadowsocks_2022"
 	"github.com/xtls/xray-core/proxy/trojan"
 	"github.com/xtls/xray-core/proxy/vless"
 	"github.com/xtls/xray-core/proxy/vmess"
@@ -62,10 +63,12 @@ func (x *XrayAPI) AddInbound(inbound []byte) error {
 	err := json.Unmarshal(inbound, conf)
 	if err != nil {
 		logger.Debug("Failed to unmarshal inbound:", err)
+		return err
 	}
 	config, err := conf.Build()
 	if err != nil {
 		logger.Debug("Failed to build inbound Detur:", err)
+		return err
 	}
 	inboundConfig := command.AddInboundRequest{Inbound: config}

@@ -99,9 +102,31 @@ func (x *XrayAPI) AddUser(Protocol string, inboundTag string, user map[string]in
 			Password: user["password"].(string),
 		})
 	case "shadowsocks":
-		account = serial.ToTypedMessage(&shadowsocks.Account{
-			Password: user["password"].(string),
-		})
+		var ssCipherType shadowsocks.CipherType
+		switch user["cipher"].(string) {
+		case "aes-128-gcm":
+			ssCipherType = shadowsocks.CipherType_AES_128_GCM
+		case "aes-256-gcm":
+			ssCipherType = shadowsocks.CipherType_AES_256_GCM
+		case "chacha20-poly1305":
+			ssCipherType = shadowsocks.CipherType_CHACHA20_POLY1305
+		case "xchacha20-poly1305":
+			ssCipherType = shadowsocks.CipherType_XCHACHA20_POLY1305
+		default:
+			ssCipherType = shadowsocks.CipherType_NONE
+		}
+
+		if ssCipherType != shadowsocks.CipherType_NONE {
+			account = serial.ToTypedMessage(&shadowsocks.Account{
+				Password:   user["password"].(string),
+				CipherType: ssCipherType,
+			})
+		} else {
+			account = serial.ToTypedMessage(&shadowsocks_2022.User{
+				Key:   user["password"].(string),
+				Email: user["email"].(string),
+			})
+		}
 	default:
 		return nil
 	}
--- a/xray/process.go
+++ b/xray/process.go
@@ -40,14 +40,6 @@ func GetGeoipPath() string {
 	return config.GetBinFolderPath() + "/geoip.dat"
 }

-func GetIranPath() string {
-	return config.GetBinFolderPath() + "/iran.dat"
-}
-
-func GetBlockedIPsPath() string {
-	return config.GetBinFolderPath() + "/BlockedIps"
-}
-
 func GetIPLimitLogPath() string {
 	return config.GetLogFolder() + "/3xipl.log"
 }
@@ -88,7 +80,6 @@ func stopProcess(p *Process) {
 	p.Stop()
 }

-
 type Process struct {
 	*process
 }
@@ -203,7 +194,7 @@ func (p *process) Start() (err error) {
 		return common.NewErrorf("Failed to write configuration file: %v", err)
 	}

-	cmd := exec.Command(GetBinaryPath(), "-c", configPath, "-restrictedIPsPath", GetBlockedIPsPath())
+	cmd := exec.Command(GetBinaryPath(), "-c", configPath)
 	p.cmd = cmd

 	stdReader, err := cmd.StdoutPipe()
Author	SHA1	Message	Date
MHSanaei	329889ec00	v1.7.5	2023-08-02 17:19:50 +03:30
MHSanaei	95268dbc61	update dependencies	2023-08-02 17:02:32 +03:30
dependabot[bot]	9a3200c9b5	Bump github.com/mymmrac/telego from 0.25.1 to 0.26.0 (#852 ) Bumps [github.com/mymmrac/telego](https://github.com/mymmrac/telego) from 0.25.1 to 0.26.0. - [Release notes](https://github.com/mymmrac/telego/releases) - [Commits](https://github.com/mymmrac/telego/compare/v0.25.1...v0.26.0) --- updated-dependencies: - dependency-name: github.com/mymmrac/telego dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2023-08-02 14:23:19 +03:30
TeleDark	c213fb6216	Display 'terminated' in title when service is terminated (#839 )	2023-08-02 00:28:51 +03:30
somebodywashere	dd0217b46b	IP Limit Tweaks to reduce false bans (#850 ) * IP Limit Tweaks to reduce false bans 1) Check IPs every 10s instead of 20s 2) F2B jail: maxretry 3 -> 4, findtime 100 -> 60 * USERS SHOULD UPDATE BANTIME ONCE AFTER UPDATE to recreate jail for Ip Limit	2023-08-02 00:28:16 +03:30
MMR	b805bf6222	change bootmortis project to MasterKia fork (#849 ) * Update x-ui.sh change bootmortis project to MasterKia fork * Update DockerInit.sh replace bootmortis with MasterKia * Update release.yml Replace bootmortis with MasterKia	2023-08-02 00:27:12 +03:30
dependabot[bot]	07b9474212	Bump github.com/shirou/gopsutil/v3 from 3.23.6 to 3.23.7 (#845 ) Bumps [github.com/shirou/gopsutil/v3](https://github.com/shirou/gopsutil) from 3.23.6 to 3.23.7. - [Release notes](https://github.com/shirou/gopsutil/releases) - [Commits](https://github.com/shirou/gopsutil/compare/v3.23.6...v3.23.7) --- updated-dependencies: - dependency-name: github.com/shirou/gopsutil/v3 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2023-08-01 13:18:29 +03:30
MHSanaei	bf971911d5	log level & syslog Co-Authored-By: Alireza Ahmadi <alireza7@gmail.com>	2023-07-31 20:11:47 +03:30
MHSanaei	c46ced0c4c	fix logs in api Co-Authored-By: Alireza Ahmadi <alireza7@gmail.com>	2023-07-31 19:52:28 +03:30
MHSanaei	dd3bbbc4af	[SS] fix bulk creation Co-Authored-By: Alireza Ahmadi <alireza7@gmail.com>	2023-07-31 19:49:27 +03:30
dependabot[bot]	a97f90d225	Bump svenstaro/upload-release-action from 2.6.1 to 2.7.0 (#834 ) Bumps [svenstaro/upload-release-action](https://github.com/svenstaro/upload-release-action) from 2.6.1 to 2.7.0. - [Release notes](https://github.com/svenstaro/upload-release-action/releases) - [Changelog](https://github.com/svenstaro/upload-release-action/blob/master/CHANGELOG.md) - [Commits](https://github.com/svenstaro/upload-release-action/compare/2.6.1...2.7.0) --- updated-dependencies: - dependency-name: svenstaro/upload-release-action dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2023-07-29 16:01:33 +03:30
MHSanaei	6066edd510	sockopt acceptProxyProtocol for h2 , gRPC #773	2023-07-29 15:52:02 +03:30
MHSanaei	eaec9e54ad	random password button for kcp , quic	2023-07-28 18:27:04 +03:30
dependabot[bot]	fafcb2e8e7	Bump google.golang.org/grpc from 1.56.2 to 1.57.0 (#823 ) Bumps [google.golang.org/grpc](https://github.com/grpc/grpc-go) from 1.56.2 to 1.57.0. - [Release notes](https://github.com/grpc/grpc-go/releases) - [Commits](https://github.com/grpc/grpc-go/compare/v1.56.2...v1.57.0) --- updated-dependencies: - dependency-name: google.golang.org/grpc dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2023-07-27 17:55:28 +03:30
MHSanaei	145ea1e6f1	full multiuser shadowsocks full multiuser shadowsocks + fix logs after api changes Co-Authored-By: Alireza Ahmadi <alireza7@gmail.com>	2023-07-27 11:58:46 +03:30
MHSanaei	4cfed17650	[api] fix actions for shadowsocks Co-Authored-By: Alireza Ahmadi <alireza7@gmail.com>	2023-07-27 11:34:46 +03:30
MHSanaei	c2b1fb4855	because of #815 now we can use XTLS/Xray-core change MHSanaei/Xray-core to XTLS/Xray-core	2023-07-27 11:06:27 +03:30
somebodywashere	09807b39aa	No reason to write to BlockedIPs (#815 )	2023-07-26 20:03:28 +03:30
Hamidreza	a0ec2f3972	Merge pull request #798 from hamid-gh98/main Update README.md	2023-07-21 18:46:40 +03:30
Hamidreza Ghavami	e4b1dc20c3	Update README.md	2023-07-21 19:45:20 +04:30
Hamidreza	2f05d4960e	silence allowipv6 warning in docker	2023-07-20 21:54:51 +03:30
Hamidreza	e63d2644bd	Fix fail2ban inside DockerEntrypoint.sh	2023-07-20 21:48:55 +03:30
MHSanaei	56e4d13179	change date format to days remaining example: kkv4fhs4: 5.00GB📊- 6 Days⏳ far6160p: 2.00GB📊- 23 Hours⏳ Co-Authored-By: somebodywashere <68244480+somebodywashere@users.noreply.github.com>	2023-07-19 20:46:06 +03:30
MHSanaei	0dd0ba717f	fail2ban status + apt-get purge	2023-07-19 15:06:55 +03:30
Hamidreza	8050330e2e	Fix x-ui.sh bug #778	2023-07-19 12:34:38 +03:30
MHSanaei	65e35c1711	v1.7.1	2023-07-18 19:20:32 +03:30
@@ -1 +1 @@
 .7.1
 .7.5