v1.1.0

Co-authored-by: admiralhr99 <admiralhr99@gmail.com>

.github/FUNDING.yml

@@ -1 +1 @@
-github: alireza0
+buy_me_a_coffee: alireza7

.github/workflows/docker.yml

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

.github/workflows/release.yml

@@ -14,7 +14,10 @@ jobs:
           - amd64
           - arm64
           - armv7
+          - armv6
+          - armv5
           - 386
+          - s390x
     runs-on: ubuntu-20.04
     steps:
       - name: Checkout repository
@@ -24,12 +27,12 @@ jobs:
         uses: actions/setup-go@v5
         with:
           cache: false
-          go-version: '1.22'
+          go-version-file: backend/go.mod
 
       - name: Setup Node.js
         uses: actions/setup-node@v4
         with:
-          node-version: '20'
+          node-version: '22'
           registry-url: 'https://registry.npmjs.org'
           
       - name: Install dependencies
@@ -39,8 +42,14 @@ jobs:
             sudo apt install gcc-aarch64-linux-gnu
           elif [ "${{ matrix.platform }}" == "armv7" ]; then
             sudo apt install gcc-arm-linux-gnueabihf
+          elif [ "${{ matrix.platform }}" == "armv6" ]; then
+            sudo apt install gcc-arm-linux-gnueabihf
+          elif [ "${{ matrix.platform }}" == "armv5" ]; then
+            sudo apt install gcc-arm-linux-gnueabi
           elif [ "${{ matrix.platform }}" == "386" ]; then
             sudo apt install gcc-i686-linux-gnu
+          elif [ "${{ matrix.platform }}" == "s390x" ]; then
+            sudo apt install gcc-s390x-linux-gnu
           fi
 
       - name: Build frontend
@@ -63,13 +72,24 @@ jobs:
             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 }}" == "armv5" ]; then
+            export GOARCH=arm
+            export GOARM=5
+            export CC=arm-linux-gnueabi-gcc
           elif [ "${{ matrix.platform }}" == "386" ]; then
             export GOARCH=386
             export CC=i686-linux-gnu-gcc
+          elif [ "${{ matrix.platform }}" == "s390x" ]; then
+            export GOARCH=s390x
+            export CC=s390x-linux-gnu-gcc
           fi
 
           #### Build Sing-Box
-          export VERSION=v1.9.3
+          export VERSION=v1.10.1
           git clone -b $VERSION https://github.com/SagerNet/sing-box
           cd sing-box
           go build -tags with_quic,with_grpc,with_wireguard,with_ech,with_utls,with_reality_server,with_acme,with_v2ray_api,with_clash_api,with_gvisor \

Dockerfile

@@ -1,9 +1,9 @@
-FROM --platform=$BUILDPLATFORM node:alpine as front-builder
+FROM --platform=$BUILDPLATFORM node:alpine AS front-builder
 WORKDIR /app
 COPY frontend/ ./
 RUN npm install && npm run build
 
-FROM golang:1.22-alpine AS backend-builder
+FROM golang:1.23-alpine AS backend-builder
 WORKDIR /app
 ARG TARGETARCH
 ENV CGO_CFLAGS="-D_LARGEFILE64_SOURCE"
@@ -20,5 +20,6 @@ ENV TZ=Asia/Tehran
 WORKDIR /app
 RUN apk add  --no-cache --update ca-certificates tzdata
 COPY --from=backend-builder  /app/sui /app/
+COPY entrypoint.sh /app/
 VOLUME [ "s-ui" ]
-CMD [ "./sui" ]
+ENTRYPOINT [ "./entrypoint.sh" ]

README.md

@@ -27,7 +27,7 @@
 | Dark/Light Theme                       | :heavy_check_mark: |
 
 
-## Default Installation Informarion
+## Default Installation Information
 - Panel Port: 2095
 - Panel Path: /app/
 - Subscription Port: 2096
@@ -40,12 +40,12 @@
 bash <(curl -Ls https://raw.githubusercontent.com/alireza0/s-ui/master/install.sh)
 ```
 
-## Install Custom Version
+## Install legacy Version
 
-**Step 1:** To install your desired version, add the version to the end of the installation command. e.g., ver `0.0.1`:
+**Step 1:** To install your desired legacy version, add the version to the end of the installation command. e.g., ver `1.0.0`:
 
 ```sh
-bash <(curl -Ls https://raw.githubusercontent.com/alireza0/s-ui/master/install.sh) 0.0.1
+bash <(curl -Ls https://raw.githubusercontent.com/alireza0/s-ui/master/install.sh) 1.0.0
 ```
 
 ## Uninstall S-UI
@@ -80,7 +80,7 @@ curl -fsSL https://get.docker.com | sh
 
 ```shell
 mkdir s-ui && cd s-ui
-wget -q https://raw.githubusercontent.com/alireza0/s-ui/main/docker-compose.yml
+wget -q https://raw.githubusercontent.com/alireza0/s-ui/master/docker-compose.yml
 docker compose up -d
 ```
 
@@ -104,7 +104,7 @@ docker build -t s-ui .
 
 </details>
 
-## Manual run + contribution
+## Manual run ( contribution )
 
 <details>
    <summary>Click for details</summary>
@@ -125,7 +125,7 @@ npm run dev
 ```
 > By this command it will run a `vite` web server on separate port `3000`, with backend proxy to `http://localhost:2095`. You can change it in `frontend/vite.config.mts`.
 
-To build fronend:
+To build frontend:
 ```shell
 cd frontend
 npm run build
@@ -133,7 +133,7 @@ npm run build
 
 ### - Backend
 Backend codes are in `backend` folder in the root of repository.
-> Please build fronend once before!
+> Please build frontend once before!
 
 To build backend:
 ```shell
@@ -161,6 +161,7 @@ To run backend (from root folder of repository):
 - Vietnamese
 - Chinese (Simplified)
 - Chinese (Traditional)
+- Russian
 
 ## Features
 
@@ -179,10 +180,18 @@ To run backend (from root folder of repository):
 
 ## Recommended OS
 
+- Ubuntu 20.04+
+- Debian 11+
 - CentOS 8+
-- Ubuntu 20+
-- Debian 10+
 - Fedora 36+
+- Arch Linux
+- Parch Linux
+- Manjaro
+- Armbian
+- AlmaLinux 9+
+- Rocky Linux 9+
+- Oracle Linux 8+
+- OpenSUSE Tubleweed
 
 ## Environment Variables
 

backend/api/api.go

@@ -3,6 +3,7 @@ package api
 import (
 	"s-ui/logger"
 	"s-ui/service"
+	"s-ui/singbox"
 	"s-ui/util"
 	"strconv"
 	"strings"
@@ -20,6 +21,7 @@ type APIHandler struct {
 	service.PanelService
 	service.StatsService
 	service.ServerService
+	singbox.Controller
 }
 
 func NewAPIHandler(g *gin.RouterGroup) {
@@ -57,14 +59,7 @@ func (a *APIHandler) postHandler(c *gin.Context) {
 			logger.Infof("Unable to get session's max age from DB")
 		}
 
-		if sessionMaxAge > 0 {
+		err = SetLoginUser(c, loginUser, sessionMaxAge)
-			err = SetMaxAge(c, sessionMaxAge*60)
-			if err != nil {
-				logger.Infof("Unable to set session's max age")
-			}
-		}
-
-		err = SetLoginUser(c, loginUser)
 		if err == nil {
 			logger.Info("user ", loginUser, " login success")
 		} else {
@@ -96,6 +91,9 @@ func (a *APIHandler) postHandler(c *gin.Context) {
 	case "restartApp":
 		err = a.PanelService.RestartPanel(3)
 		jsonMsg(c, "restartApp", err)
+	case "restartSb":
+		err = a.Controller.Restart()
+		jsonMsg(c, "restartSb", err)
 	case "linkConvert":
 		link := c.Request.FormValue("link")
 		result, _, err := util.GetOutbound(link, 0)

backend/api/session.go

@@ -4,7 +4,7 @@ import (
 	"encoding/gob"
 	"s-ui/database/model"
 
-	sessions "github.com/Calidity/gin-sessions"
+	"github.com/gin-contrib/sessions"
 	"github.com/gin-gonic/gin"
 )
 
@@ -16,17 +16,26 @@ func init() {
 	gob.Register(model.User{})
 }
 
-func SetLoginUser(c *gin.Context, userName string) error {
+func SetLoginUser(c *gin.Context, userName string, maxAge int) error {
+	options := sessions.Options{
+		Path:   "/",
+		Secure: false,
+	}
+	if maxAge > 0 {
+		options.MaxAge = maxAge * 60
+	}
+
 	s := sessions.Default(c)
 	s.Set(loginUser, userName)
+	s.Options(options)
+
 	return s.Save()
 }
 
-func SetMaxAge(c *gin.Context, maxAge int) error {
+func SetMaxAge(c *gin.Context) error {
 	s := sessions.Default(c)
 	s.Options(sessions.Options{
 		Path: "/",
-		MaxAge: maxAge,
 	})
 	return s.Save()
 }

backend/cmd/migration.go

@@ -6,10 +6,10 @@ import (
 	"log"
 	"os"
 	"s-ui/config"
-	"s-ui/database"
 	"s-ui/database/model"
 	"strings"
 
+	"gorm.io/driver/sqlite"
 	"gorm.io/gorm"
 )
 
@@ -21,11 +21,10 @@ func migrateDb() {
 		return
 	}
 
-	err = database.OpenDB(path)
+	db, err := gorm.Open(sqlite.Open(path))
 	if err != nil {
 		log.Fatal(err)
 	}
-	db := database.GetDB()
 	tx := db.Begin()
 	defer func() {
 		if err == nil {

backend/config/config.go

@@ -79,3 +79,12 @@ func GetDefaultConfig() string {
 func GetEnvApi() string {
 	return os.Getenv("SINGBOX_API")
 }
+
+func IsSystemd() bool {
+	pid := os.Getppid()
+	cmdline, err := os.ReadFile(fmt.Sprintf("/proc/%d/comm", pid))
+	if err != nil {
+		return false
+	}
+	return string(cmdline) == "systemd\n"
+}

backend/config/version

@@ -1 +1 @@
-1.0.0
+1.1.0

backend/database/model/model.go

@@ -41,7 +41,8 @@ type Client struct {
 	Expiry   int64           `json:"expiry" form:"expiry"`
 	Down     int64           `json:"down" form:"down"`
 	Up       int64           `json:"up" form:"up"`
-	Desc     string          `json:"desc" from:"desc"`
+	Desc     string          `json:"desc" form:"desc"`
+	Group    string          `json:"group" form:"group"`
 }
 
 type Stats struct {

backend/go.mod

@@ -1,64 +1,68 @@
 module s-ui
 
-go 1.22.0
+go 1.23.2
 
 require (
-	github.com/gin-contrib/gzip v0.0.6
+	github.com/gin-contrib/gzip v1.0.1
-	github.com/gin-gonic/gin v1.9.1
+	github.com/gin-gonic/gin v1.10.0
 	github.com/op/go-logging v0.0.0-20160315200505-970db520ece7
-	github.com/v2fly/v2ray-core/v5 v5.13.0
+	github.com/robfig/cron/v3 v3.0.1
-	gorm.io/driver/sqlite v1.5.5
+	github.com/shirou/gopsutil/v3 v3.24.5
-	gorm.io/gorm v1.25.7
+	github.com/v2fly/v2ray-core/v5 v5.17.1
+	google.golang.org/grpc v1.67.1
+	gorm.io/driver/sqlite v1.5.6
+	gorm.io/gorm v1.25.12
 )
 
 require (
-	github.com/adrg/xdg v0.4.0 // indirect
+	github.com/adrg/xdg v0.5.0 // indirect
-	github.com/bytedance/sonic v1.11.1 // indirect
+	github.com/bytedance/sonic v1.12.3 // indirect
-	github.com/chenzhuoyu/base64x v0.0.0-20230717121745-296ad89f973d // indirect
+	github.com/bytedance/sonic/loader v0.2.1 // indirect
-	github.com/chenzhuoyu/iasm v0.9.1 // indirect
+	github.com/cloudwego/base64x v0.1.4 // indirect
-	github.com/gabriel-vasile/mimetype v1.4.3 // indirect
+	github.com/cloudwego/iasm v0.2.0 // indirect
+	github.com/gabriel-vasile/mimetype v1.4.6 // indirect
+	github.com/gin-contrib/sessions v1.0.1
+	github.com/gin-contrib/sse v0.1.0 // indirect
 	github.com/go-ole/go-ole v1.3.0 // indirect
 	github.com/go-playground/locales v0.14.1 // indirect
 	github.com/go-playground/universal-translator v0.18.1 // indirect
-	github.com/goccy/go-json v0.10.2 // indirect
+	github.com/go-playground/validator/v10 v10.22.1 // indirect
-	github.com/golang/protobuf v1.5.3 // indirect
+	github.com/goccy/go-json v0.10.3 // indirect
+	github.com/golang/protobuf v1.5.4 // indirect
+	github.com/google/pprof v0.0.0-20231101202521-4ca4178f5c7a // indirect
 	github.com/gorilla/context v1.1.2 // indirect
 	github.com/gorilla/securecookie v1.1.2 // indirect
-	github.com/gorilla/sessions v1.2.2 // indirect
+	github.com/gorilla/sessions v1.4.0 // indirect
+	github.com/jinzhu/inflection v1.0.0 // indirect
+	github.com/jinzhu/now v1.1.5 // indirect
 	github.com/json-iterator/go v1.1.12 // indirect
-	github.com/klauspost/cpuid/v2 v2.2.7 // indirect
+	github.com/klauspost/cpuid/v2 v2.2.8 // indirect
+	github.com/kr/text v0.2.0 // indirect
 	github.com/leodido/go-urn v1.4.0 // indirect
-	github.com/lufia/plan9stats v0.0.0-20240226150601-1dcf7310316a // indirect
+	github.com/lufia/plan9stats v0.0.0-20240909124753-873cd0166683 // indirect
 	github.com/mattn/go-isatty v0.0.20 // indirect
+	github.com/mattn/go-sqlite3 v2.0.3+incompatible // indirect
 	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
 	github.com/modern-go/reflect2 v1.0.2 // indirect
-	github.com/pires/go-proxyproto v0.7.0 // indirect
+	github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e // indirect
+	github.com/pelletier/go-toml/v2 v2.2.3 // indirect
+	github.com/pires/go-proxyproto v0.8.0 // indirect
 	github.com/power-devops/perfstat v0.0.0-20240221224432-82ca36839d55 // indirect
 	github.com/shoenig/go-m1cpu v0.1.6 // indirect
-	github.com/tklauser/go-sysconf v0.3.13 // indirect
+	github.com/tklauser/go-sysconf v0.3.14 // indirect
-	github.com/tklauser/numcpus v0.7.0 // indirect
+	github.com/tklauser/numcpus v0.9.0 // indirect
 	github.com/twitchyliquid64/golang-asm v0.15.1 // indirect
 	github.com/ugorji/go/codec v1.2.12 // indirect
 	github.com/yusufpapurcu/wmi v1.2.4 // indirect
-	golang.org/x/arch v0.7.0 // indirect
+	go4.org/netipx v0.0.0-20231129151722-fdeea329fbba // indirect
-	golang.org/x/crypto v0.21.0 // indirect
+	golang.org/x/arch v0.11.0 // indirect
-	golang.org/x/net v0.23.0 // indirect
+	golang.org/x/crypto v0.28.0 // indirect
-	golang.org/x/sys v0.18.0 // indirect
+	golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56 // indirect
-	golang.org/x/text v0.14.0 // indirect
+	golang.org/x/net v0.30.0 // indirect
-	google.golang.org/genproto/googleapis/rpc v0.0.0-20240221002015-b0ce06bbee7c // indirect
+	golang.org/x/sys v0.26.0 // indirect
-	google.golang.org/protobuf v1.33.0 // indirect
+	golang.org/x/text v0.19.0 // indirect
+	google.golang.org/genproto/googleapis/rpc v0.0.0-20241015192408-796eee8c2d53 // indirect
+	google.golang.org/protobuf v1.35.1 // indirect
+	gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 )
-
-require (
-	github.com/Calidity/gin-sessions v1.3.1
-	github.com/gin-contrib/sse v0.1.0 // indirect
-	github.com/go-playground/validator/v10 v10.18.0 // indirect
-	github.com/jinzhu/inflection v1.0.0 // indirect
-	github.com/jinzhu/now v1.1.5 // indirect
-	github.com/mattn/go-sqlite3 v2.0.3+incompatible // indirect
-	github.com/pelletier/go-toml/v2 v2.1.1 // indirect
-	github.com/robfig/cron/v3 v3.0.1
-	github.com/shirou/gopsutil/v3 v3.24.1
-	google.golang.org/grpc v1.62.0
-)

backend/go.sum

@@ -1,30 +1,26 @@
-github.com/Calidity/gin-sessions v1.3.1 h1:nF3dCBWa7TZ4j26iYLwGRmzZy9YODhWoOS3fmi+snyE=
+github.com/adrg/xdg v0.5.0 h1:dDaZvhMXatArP1NPHhnfaQUqWBLBsmx1h1HXQdMoFCY=
-github.com/Calidity/gin-sessions v1.3.1/go.mod h1:I0+QE6qkO50TeN/n6If6novvxHk4Isvr23U8EdvPdns=
+github.com/adrg/xdg v0.5.0/go.mod h1:dDdY4M4DF9Rjy4kHPeNL+ilVF+p2lK8IdM9/rTSGcI4=
-github.com/adrg/xdg v0.4.0 h1:RzRqFcjH4nE5C6oTAxhBtoE2IRyjBSa62SCbyPidvls=
-github.com/adrg/xdg v0.4.0/go.mod h1:N6ag73EX4wyxeaoeHctc1mas01KZgsj5tYiAIwqJE/E=
 github.com/aead/cmac v0.0.0-20160719120800-7af84192f0b1 h1:+JkXLHME8vLJafGhOH4aoV2Iu8bR55nU6iKMVfYVLjY=
 github.com/aead/cmac v0.0.0-20160719120800-7af84192f0b1/go.mod h1:nuudZmJhzWtx2212z+pkuy7B6nkBqa+xwNXZHL1j8cg=
 github.com/ajg/form v1.5.1 h1:t9c7v8JUKu/XxOGBU0yjNpaMloxGEJhUkqFRq0ibGeU=
 github.com/ajg/form v1.5.1/go.mod h1:uL1WgH+h2mgNtvBq0339dVnzXdBETtL2LeUXaIv25UY=
-github.com/andybalholm/brotli v1.0.5 h1:8uQZIdzKmjc/iuPu7O2ioW48L81FgatrcpfFmiq/cCs=
+github.com/andybalholm/brotli v1.0.6 h1:Yf9fFpf49Zrxb9NlQaluyE92/+X7UVHlhMNJN2sxfOI=
-github.com/andybalholm/brotli v1.0.5/go.mod h1:fO7iG3H7G2nSZ7m0zPUDn85XEX2GTukHGRSepvi9Eig=
+github.com/andybalholm/brotli v1.0.6/go.mod h1:fO7iG3H7G2nSZ7m0zPUDn85XEX2GTukHGRSepvi9Eig=
 github.com/boljen/go-bitmap v0.0.0-20151001105940-23cd2fb0ce7d h1:zsO4lp+bjv5XvPTF58Vq+qgmZEYZttJK+CWtSZhKenI=
 github.com/boljen/go-bitmap v0.0.0-20151001105940-23cd2fb0ce7d/go.mod h1:f1iKL6ZhUWvbk7PdWVmOaak10o86cqMUYEmn1CZNGEI=
-github.com/bufbuild/protocompile v0.6.0 h1:Uu7WiSQ6Yj9DbkdnOe7U4mNKp58y9WDMKDn28/ZlunY=
+github.com/bufbuild/protocompile v0.10.0 h1:+jW/wnLMLxaCEG8AX9lD0bQ5v9h1RUiMKOBOT5ll9dM=
-github.com/bufbuild/protocompile v0.6.0/go.mod h1:YNP35qEYoYGme7QMtz5SBCoN4kL4g12jTtjuzRNdjpE=
+github.com/bufbuild/protocompile v0.10.0/go.mod h1:G9qQIQo0xZ6Uyj6CMNz0saGmx2so+KONo8/KrELABiY=
-github.com/bytedance/sonic v1.5.0/go.mod h1:ED5hyg4y6t3/9Ku1R6dU/4KyJ48DZ4jPhfY1O2AihPM=
+github.com/bytedance/sonic v1.12.3 h1:W2MGa7RCU1QTeYRTPE3+88mVC0yXmsRQRChiyVocVjU=
-github.com/bytedance/sonic v1.10.0-rc/go.mod h1:ElCzW+ufi8qKqNW0FY314xriJhyJhuoJ3gFZdAHF7NM=
+github.com/bytedance/sonic v1.12.3/go.mod h1:B8Gt/XvtZ3Fqj+iSKMypzymZxw/FVwgIGKzMzT9r/rk=
-github.com/bytedance/sonic v1.11.1 h1:JC0+6c9FoWYYxakaoa+c5QTtJeiSZNeByOBhXtAFSn4=
+github.com/bytedance/sonic/loader v0.1.1/go.mod h1:ncP89zfokxS5LZrJxl5z0UJcsk4M4yY2JpfqGeCtNLU=
-github.com/bytedance/sonic v1.11.1/go.mod h1:iZcSUejdk5aukTND/Eu/ivjQuEL0Cu9/rf50Hi0u/g4=
+github.com/bytedance/sonic/loader v0.2.1 h1:1GgorWTqf12TA8mma4DDSbaQigE2wOgQo7iCjjJv3+E=
-github.com/chenzhuoyu/base64x v0.0.0-20211019084208-fb5309c8db06/go.mod h1:DH46F32mSOjUmXrMHnKwZdA8wcEefY7UVqBKYGjpdQY=
+github.com/bytedance/sonic/loader v0.2.1/go.mod h1:ncP89zfokxS5LZrJxl5z0UJcsk4M4yY2JpfqGeCtNLU=
-github.com/chenzhuoyu/base64x v0.0.0-20221115062448-fe3a3abad311/go.mod h1:b583jCggY9gE99b6G5LEC39OIiVsWj+R97kbl5odCEk=
+github.com/cloudflare/circl v1.3.7 h1:qlCDlTPz2n9fu58M0Nh1J/JzcFpfgkFHHX3O35r5vcU=
-github.com/chenzhuoyu/base64x v0.0.0-20230717121745-296ad89f973d h1:77cEq6EriyTZ0g/qfRdp61a3Uu/AWrgIq2s0ClJV1g0=
+github.com/cloudflare/circl v1.3.7/go.mod h1:sRTcRWXGLrKw6yIGJ+l7amYJFfAXbZG0kBSc8r4zxgA=
-github.com/chenzhuoyu/base64x v0.0.0-20230717121745-296ad89f973d/go.mod h1:8EPpVsBuRksnlj1mLy4AWzRNQYxauNi62uWcE3to6eA=
+github.com/cloudwego/base64x v0.1.4 h1:jwCgWpFanWmN8xoIUHa2rtzmkd5J2plF/dnLS6Xd/0Y=
-github.com/chenzhuoyu/iasm v0.9.0/go.mod h1:Xjy2NpN3h7aUqeqM+woSuuvxmIe6+DDsiNLIrkAmYog=
+github.com/cloudwego/base64x v0.1.4/go.mod h1:0zlkT4Wn5C6NdauXdJRhSKRlJvmclQ1hhJgA0rcu/8w=
-github.com/chenzhuoyu/iasm v0.9.1 h1:tUHQJXo3NhBqw6s33wkGn9SP3bvrWLdlVIJ3hQBL7P0=
+github.com/cloudwego/iasm v0.2.0 h1:1KNIy1I1H9hNNFEEH3DVnI4UujN+1zjpuk6gwHLTssg=
-github.com/chenzhuoyu/iasm v0.9.1/go.mod h1:Xjy2NpN3h7aUqeqM+woSuuvxmIe6+DDsiNLIrkAmYog=
+github.com/cloudwego/iasm v0.2.0/go.mod h1:8rXZaNYT2n95jn+zTI1sDr+IgcD2GVs0nlbbQPiEFhY=
-github.com/cloudflare/circl v1.3.3 h1:fE/Qz0QdIGqeWfnwq0RE0R7MI51s0M2E4Ga9kq5AEMs=
-github.com/cloudflare/circl v1.3.3/go.mod h1:5XYMA4rFBvNIrhs50XuiBJ15vF2pZn4nnUKZrLbUZFA=
 github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
@@ -33,51 +29,43 @@ github.com/dgryski/go-metro v0.0.0-20211217172704-adc40b04c140 h1:y7y0Oa6UawqTFP
 github.com/dgryski/go-metro v0.0.0-20211217172704-adc40b04c140/go.mod h1:c9O8+fpSOX1DM8cPNSkX/qsBWdkD4yd2dpciOWQjpBw=
 github.com/ebfe/bcrypt_pbkdf v0.0.0-20140212075826-3c8d2dcb253a h1:YtdtTUN1iH97s+6PUjLnaiKSQj4oG1/EZ3N9bx6g4kU=
 github.com/ebfe/bcrypt_pbkdf v0.0.0-20140212075826-3c8d2dcb253a/go.mod h1:/CZpbhAusDOobpcb9yubw46kdYjq0zRC0Wpg9a9zFQM=
-github.com/gabriel-vasile/mimetype v1.4.3 h1:in2uUcidCuFcDKtdcBxlR0rJ1+fsokWf+uqxgUFjbI0=
+github.com/gabriel-vasile/mimetype v1.4.6 h1:3+PzJTKLkvgjeTbts6msPJt4DixhT4YtFNf1gtGe3zc=
-github.com/gabriel-vasile/mimetype v1.4.3/go.mod h1:d8uq/6HKRL6CGdk+aubisF/M5GcPfT7nKyLpA0lbSSk=
+github.com/gabriel-vasile/mimetype v1.4.6/go.mod h1:JX1qVKqZd40hUPpAfiNTe0Sne7hdfKSbOqqmkq8GCXc=
-github.com/gaukas/godicttls v0.0.4 h1:NlRaXb3J6hAnTmWdsEKb9bcSBD6BvcIjdGdeb0zfXbk=
+github.com/gin-contrib/gzip v1.0.1 h1:HQ8ENHODeLY7a4g1Au/46Z92bdGFl74OhxcZble9WJE=
-github.com/gaukas/godicttls v0.0.4/go.mod h1:l6EenT4TLWgTdwslVb4sEMOCf7Bv0JAK67deKr9/NCI=
+github.com/gin-contrib/gzip v1.0.1/go.mod h1:njt428fdUNRvjuJf16tZMYZ2Yl+WQB53X5wmhDwXvC4=
-github.com/gin-contrib/gzip v0.0.6 h1:NjcunTcGAj5CO1gn4N8jHOSIeRFHIbn51z6K+xaN4d4=
+github.com/gin-contrib/sessions v1.0.1 h1:3hsJyNs7v7N8OtelFmYXFrulAf6zSR7nW/putcPEHxI=
-github.com/gin-contrib/gzip v0.0.6/go.mod h1:QOJlmV2xmayAjkNS2Y8NQsMneuRShOU/kjovCXNuzzk=
+github.com/gin-contrib/sessions v1.0.1/go.mod h1:ouxSFM24/OgIud5MJYQJLpy6AwxQ5EYO9yLhbtObGkM=
 github.com/gin-contrib/sse v0.1.0 h1:Y/yl/+YNO8GZSjAhjMsSuLt29uWRFHdHYUb5lYOV9qE=
 github.com/gin-contrib/sse v0.1.0/go.mod h1:RHrZQHXnP2xjPF+u1gW/2HnVO7nvIa9PG3Gm+fLHvGI=
-github.com/gin-gonic/gin v1.8.1/go.mod h1:ji8BvRH1azfM+SYow9zQ6SZMvR8qOMZHmsCuWR9tTTk=
+github.com/gin-gonic/gin v1.10.0 h1:nTuyha1TYqgedzytsKYqna+DfLos46nTv2ygFy86HFU=
-github.com/gin-gonic/gin v1.9.1 h1:4idEAncQnU5cB7BeOkPtxjfCSye0AAm1R0RVIqJ+Jmg=
+github.com/gin-gonic/gin v1.10.0/go.mod h1:4PMNQiOhvDRa013RKVbsiNwoyezlm2rm0uX/T7kzp5Y=
-github.com/gin-gonic/gin v1.9.1/go.mod h1:hPrL7YrpYKXt5YId3A/Tnip5kqbEAP+KLuI3SUcPTeU=
+github.com/go-chi/chi/v5 v5.1.0 h1:acVI1TYaD+hhedDJ3r54HyA6sExp3HfXq7QWEEY/xMw=
-github.com/go-chi/chi/v5 v5.0.10 h1:rLz5avzKpjqxrYwXNfmjkrYYXOyLJd37pz53UFHC6vk=
+github.com/go-chi/chi/v5 v5.1.0/go.mod h1:DslCQbL2OYiznFReuXYUmQ2hGd1aDpCnlMNITLSKoi8=
-github.com/go-chi/chi/v5 v5.0.10/go.mod h1:DslCQbL2OYiznFReuXYUmQ2hGd1aDpCnlMNITLSKoi8=
 github.com/go-chi/render v1.0.3 h1:AsXqd2a1/INaIfUSKq3G5uA8weYx20FOsM7uSoCyyt4=
 github.com/go-chi/render v1.0.3/go.mod h1:/gr3hVkmYR0YlEy3LxCuVRFzEu9Ruok+gFqbIofjao0=
 github.com/go-ole/go-ole v1.2.6/go.mod h1:pprOEPIfldk/42T2oK7lQ4v4JSDwmV0As9GaiUsvbm0=
 github.com/go-ole/go-ole v1.3.0 h1:Dt6ye7+vXGIKZ7Xtk4s6/xVdGDQynvom7xCFEdWr6uE=
 github.com/go-ole/go-ole v1.3.0/go.mod h1:5LS6F96DhAwUc7C+1HLexzMXY1xGRSryjyPPKW6zv78=
-github.com/go-playground/assert/v2 v2.0.1/go.mod h1:VDjEfimB/XKnb+ZQfWdccd7VUvScMdVu0Titje2rxJ4=
 github.com/go-playground/assert/v2 v2.2.0 h1:JvknZsQTYeFEAhQwI4qEt9cyV5ONwRHC+lYKSsYSR8s=
 github.com/go-playground/assert/v2 v2.2.0/go.mod h1:VDjEfimB/XKnb+ZQfWdccd7VUvScMdVu0Titje2rxJ4=
-github.com/go-playground/locales v0.14.0/go.mod h1:sawfccIbzZTqEDETgFXqTho0QybSa7l++s0DH+LDiLs=
 github.com/go-playground/locales v0.14.1 h1:EWaQ/wswjilfKLTECiXz7Rh+3BjFhfDFKv/oXslEjJA=
 github.com/go-playground/locales v0.14.1/go.mod h1:hxrqLVvrK65+Rwrd5Fc6F2O76J/NuW9t0sjnWqG1slY=
-github.com/go-playground/universal-translator v0.18.0/go.mod h1:UvRDBj+xPUEGrFYl+lu/H90nyDXpg0fqeB/AQUGNTVA=
 github.com/go-playground/universal-translator v0.18.1 h1:Bcnm0ZwsGyWbCzImXv+pAJnYK9S473LQFuzCbDbfSFY=
 github.com/go-playground/universal-translator v0.18.1/go.mod h1:xekY+UJKNuX9WP91TpwSH2VMlDf28Uj24BCp08ZFTUY=
-github.com/go-playground/validator/v10 v10.10.0/go.mod h1:74x4gJWsvQexRdW8Pn3dXSGrTK4nAUsbPlLADvpJkos=
+github.com/go-playground/validator/v10 v10.22.1 h1:40JcKH+bBNGFczGuoBYgX4I6m/i27HYW8P9FDk5PbgA=
-github.com/go-playground/validator/v10 v10.18.0 h1:BvolUXjp4zuvkZ5YN5t7ebzbhlUtPsPm2S9NAZ5nl9U=
+github.com/go-playground/validator/v10 v10.22.1/go.mod h1:dbuPbCMFw/DrkbEynArYaCwl3amGuJotoKCe95atGMM=
-github.com/go-playground/validator/v10 v10.18.0/go.mod h1:dbuPbCMFw/DrkbEynArYaCwl3amGuJotoKCe95atGMM=
 github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 h1:tfuBGBXKqDEevZMzYi5KSi8KkcZtzBcTgAUUtapy0OI=
 github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572/go.mod h1:9Pwr4B2jHnOSGXyyzV8ROjYa2ojvAY6HCGYYfMoC3Ls=
-github.com/goccy/go-json v0.9.7/go.mod h1:6MelG93GURQebXPDq3khkgXZkazVtN9CRI+MGFi0w8I=
+github.com/goccy/go-json v0.10.3 h1:KZ5WoDbxAIgm2HNbYckL0se1fHD6rz5j4ywS6ebzDqA=
-github.com/goccy/go-json v0.10.2 h1:CrxCmQqYDkv1z7lO7Wbh2HN93uovUHgrECaO5ZrCXAU=
+github.com/goccy/go-json v0.10.3/go.mod h1:oq7eo15ShAhp70Anwd5lgX2pLfOS3QCiwU/PULtXL6M=
-github.com/goccy/go-json v0.10.2/go.mod h1:6MelG93GURQebXPDq3khkgXZkazVtN9CRI+MGFi0w8I=
+github.com/golang-collections/go-datastructures v0.0.0-20150211160725-59788d5eb259 h1:ZHJ7+IGpuOXtVf6Zk/a3WuHQgkC+vXwaqfUBDFwahtI=
+github.com/golang-collections/go-datastructures v0.0.0-20150211160725-59788d5eb259/go.mod h1:9Qcha0gTWLw//0VNka1Cbnjvg3pNKGFdAm7E9sBabxE=
 github.com/golang/mock v1.6.0 h1:ErTB+efbowRARo13NNdxyJji2egdxLGQhRaY+DUumQc=
 github.com/golang/mock v1.6.0/go.mod h1:p6yTPP+5HYm5mzsMV8JkE6ZKdX+/wYM6Hr+LicevLPs=
-github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk=
+github.com/golang/protobuf v1.5.4 h1:i7eJL8qZTpSEXOPTxNKhASYpMn+8e5Q6AdndVa1dWek=
-github.com/golang/protobuf v1.5.3 h1:KhyjKVUg7Usr/dYsdSqoFveMYd5ko72D+zANwlG1mmg=
+github.com/golang/protobuf v1.5.4/go.mod h1:lnTiLA8Wa4RWRcIUkrtSVa5nRhsEGBg48fD6rSs7xps=
-github.com/golang/protobuf v1.5.3/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY=
 github.com/google/btree v1.1.2 h1:xf4v41cLI2Z6FxbKm+8Bu+m8ifhj15JuZ9sa0jZCMUU=
 github.com/google/btree v1.1.2/go.mod h1:qOPhT0dTNdNzV6Z/lhRX0YXUafgPLFUh+gZMl761Gm4=
-github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
-github.com/google/go-cmp v0.5.6/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
-github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
 github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
 github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
 github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
@@ -85,49 +73,42 @@ github.com/google/gofuzz v1.2.0 h1:xRy4A+RhZaiKjJ1bPfwQ8sedCA+YS2YcCHW6ec7JMi0=
 github.com/google/gofuzz v1.2.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
 github.com/google/gopacket v1.1.19 h1:ves8RnFZPGiFnTS0uPQStjwru6uO6h+nlr9j6fL7kF8=
 github.com/google/gopacket v1.1.19/go.mod h1:iJ8V8n6KS+z2U1A8pUwu8bW5SyEMkXJB8Yo/Vo+TKTo=
-github.com/google/pprof v0.0.0-20230602150820-91b7bce49751 h1:hR7/MlvK23p6+lIw9SN1TigNLn9ZnF3W4SYRKq2gAHs=
+github.com/google/pprof v0.0.0-20231101202521-4ca4178f5c7a h1:fEBsGL/sjAuJrgah5XqmmYsTLzJp/TO9Lhy39gkverk=
-github.com/google/pprof v0.0.0-20230602150820-91b7bce49751/go.mod h1:Jh3hGz2jkYak8qXPD19ryItVnUgpgeqzdkY/D0EaeuA=
+github.com/google/pprof v0.0.0-20231101202521-4ca4178f5c7a/go.mod h1:czg5+yv1E0ZGTi6S6vVK1mke0fV+FaUhNGcd6VRS9Ik=
 github.com/gorilla/context v1.1.2 h1:WRkNAv2uoa03QNIc1A6u4O7DAGMUVoopZhkiXWA2V1o=
 github.com/gorilla/context v1.1.2/go.mod h1:KDPwT9i/MeWHiLl90fuTgrt4/wPcv75vFAZLaOOcbxM=
 github.com/gorilla/securecookie v1.1.2 h1:YCIWL56dvtr73r6715mJs5ZvhtnY73hBvEF8kXD8ePA=
 github.com/gorilla/securecookie v1.1.2/go.mod h1:NfCASbcHqRSY+3a8tlWJwsQap2VX5pwzwo4h3eOamfo=
-github.com/gorilla/sessions v1.2.2 h1:lqzMYz6bOfvn2WriPUjNByzeXIlVzURcPmgMczkmTjY=
+github.com/gorilla/sessions v1.4.0 h1:kpIYOp/oi6MG/p5PgxApU8srsSw9tuFbt46Lt7auzqQ=
-github.com/gorilla/sessions v1.2.2/go.mod h1:ePLdVu+jbEgHH+KWw8I1z2wqd0BAdAQh/8LRvBeoNcQ=
+github.com/gorilla/sessions v1.4.0/go.mod h1:FLWm50oby91+hl7p/wRxDth9bWSuk0qVL2emc7lT5ik=
-github.com/gorilla/websocket v1.5.1 h1:gmztn0JnHVt9JZquRuzLw3g4wouNVzKL15iLr/zn/QY=
+github.com/gorilla/websocket v1.5.3 h1:saDtZ6Pbx/0u+bgYQ3q96pZgCzfhKXGPqt7kZ72aNNg=
-github.com/gorilla/websocket v1.5.1/go.mod h1:x3kM2JMyaluk02fnUJpQuwD2dCS5NDG2ZHL0uE0tcaY=
+github.com/gorilla/websocket v1.5.3/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
-github.com/jhump/protoreflect v1.15.3 h1:6SFRuqU45u9hIZPJAoZ8c28T3nK64BNdp9w6jFonzls=
+github.com/jhump/protoreflect v1.16.0 h1:54fZg+49widqXYQ0b+usAFHbMkBGR4PpXrsHc8+TBDg=
-github.com/jhump/protoreflect v1.15.3/go.mod h1:4ORHmSBmlCW8fh3xHmJMGyul1zNqZK4Elxc8qKP+p1k=
+github.com/jhump/protoreflect v1.16.0/go.mod h1:oYPd7nPvcBw/5wlDfm/AVmU9zH9BgqGCI469pGxfj/8=
 github.com/jinzhu/inflection v1.0.0 h1:K317FqzuhWc8YvSVlFMCCUb36O/S9MCKRDI7QkRKD/E=
 github.com/jinzhu/inflection v1.0.0/go.mod h1:h+uFLlag+Qp1Va5pdKtLDYj+kHp5pxUVkryuEj+Srlc=
 github.com/jinzhu/now v1.1.5 h1:/o9tlHleP7gOFmsnYNz3RGnqzefHA47wQpKrrdTIwXQ=
 github.com/jinzhu/now v1.1.5/go.mod h1:d3SSVoowX0Lcu0IBviAWJpolVfI5UJVZZ7cO71lE/z8=
 github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM=
 github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo=
-github.com/klauspost/compress v1.16.7 h1:2mk3MPGNzKyxErAw8YaohYh69+pa4sIQSC0fPGCFR9I=
+github.com/klauspost/compress v1.17.7 h1:ehO88t2UGzQK66LMdE8tibEd1ErmzZjNEqWkjLAKQQg=
-github.com/klauspost/compress v1.16.7/go.mod h1:ntbaceVETuRiXiv4DpjP66DpAtAGkEQskQzEyD//IeE=
+github.com/klauspost/compress v1.17.7/go.mod h1:Di0epgTjJY877eYKx5yC51cX2A2Vl2ibi7bDH9ttBbw=
 github.com/klauspost/cpuid/v2 v2.0.9/go.mod h1:FInQzS24/EEf25PyTYn52gqo7WaD8xa0213Md/qVLRg=
-github.com/klauspost/cpuid/v2 v2.2.7 h1:ZWSB3igEs+d0qvnxR/ZBzXVmxkgt8DdzP6m9pfuVLDM=
+github.com/klauspost/cpuid/v2 v2.2.8 h1:+StwCXwm9PdpiEkPyzBXIy+M9KUb4ODm0Zarf1kS5BM=
-github.com/klauspost/cpuid/v2 v2.2.7/go.mod h1:Lcz8mBdAVJIBVzewtcLocK12l3Y+JytZYpaMropDUws=
+github.com/klauspost/cpuid/v2 v2.2.8/go.mod h1:Lcz8mBdAVJIBVzewtcLocK12l3Y+JytZYpaMropDUws=
 github.com/klauspost/reedsolomon v1.11.7 h1:9uaHU0slncktTEEg4+7Vl7q7XUNMBUOK4R9gnKhMjAU=
 github.com/klauspost/reedsolomon v1.11.7/go.mod h1:4bXRN+cVzMdml6ti7qLouuYi32KHJ5MGv0Qd8a47h6A=
 github.com/knz/go-libedit v1.10.1/go.mod h1:MZTVkCWyz0oBc7JOWP3wNAzd002ZbM/5hgShxwh4x8M=
-github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
-github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI=
-github.com/kr/pretty v0.3.0 h1:WgNl7dwNpEZ6jJ9k1snq4pZsg7DOEN8hP9Xw0Tsjwk0=
-github.com/kr/pretty v0.3.0/go.mod h1:640gp4NfQd8pI5XOwp5fnNeVWj67G7CFk/SaSQn7NBk=
 github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
 github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
 github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
 github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
-github.com/leodido/go-urn v1.2.1/go.mod h1:zt4jvISO2HfUBqxjfIshjdMTYS56ZS/qv49ictyFfxY=
 github.com/leodido/go-urn v1.4.0 h1:WT9HwE9SGECu3lg4d/dIA+jxlljEa1/ffXKmRjqdmIQ=
 github.com/leodido/go-urn v1.4.0/go.mod h1:bvxc+MVxLKB4z00jd1z+Dvzr47oO32F/QSNjSBOlFxI=
-github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0/go.mod h1:zJYVVT2jmtg6P3p1VtQj7WsuWi/y4VnjVBn7F8KPB3I=
+github.com/lufia/plan9stats v0.0.0-20240909124753-873cd0166683 h1:7UMa6KCCMjZEMDtTVdcGu0B1GmmC7QJKiCCjyTAWQy0=
-github.com/lufia/plan9stats v0.0.0-20240226150601-1dcf7310316a h1:3Bm7EwfUQUvhNeKIkUct/gl9eod1TcXuj8stxvi/GoI=
+github.com/lufia/plan9stats v0.0.0-20240909124753-873cd0166683/go.mod h1:ilwx/Dta8jXAgpFYFvSWEMwxmbWXyiUHkd5FwyKhb5k=
-github.com/lufia/plan9stats v0.0.0-20240226150601-1dcf7310316a/go.mod h1:ilwx/Dta8jXAgpFYFvSWEMwxmbWXyiUHkd5FwyKhb5k=
 github.com/lunixbochs/struc v0.0.0-20200707160740-784aaebc1d40 h1:EnfXoSqDfSNJv0VBNqY/88RNnhSGYkrHaO0mmFGbVsc=
 github.com/lunixbochs/struc v0.0.0-20200707160740-784aaebc1d40/go.mod h1:vy1vK6wD6j7xX6O6hXe621WabdtNkou2h7uRtTfRMyg=
-github.com/mattn/go-isatty v0.0.14/go.mod h1:7GGIvUiUoEMVVmxf/4nioHXj79iQHKdU27kJ6hsGG94=
 github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWEY=
 github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y=
 github.com/mattn/go-sqlite3 v2.0.3+incompatible h1:gXHsfypPkaMZrKbD5209QV9jbUTJKjyR5WD3HYQSd+U=
@@ -141,6 +122,8 @@ github.com/mustafaturan/bus v1.0.2 h1:2x3ErwZ0uUPwwZ5ZZoknEQprdaxr68Yl3mY8jDye1W
 github.com/mustafaturan/bus v1.0.2/go.mod h1:h7gfehm8TThv4Dcaa+wDQG7r7j6p74v+7ftr0Rq9i1Q=
 github.com/mustafaturan/monoton v1.0.0 h1:8SCej+JiNn0lyps7V+Jzc1CRAkDR4EZPWrTupQ61YCQ=
 github.com/mustafaturan/monoton v1.0.0/go.mod h1:FOnE7NV3s3EWPXb8/7+/OSdiMBbdlkV0Lz8p1dc+vy8=
+github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e h1:fD57ERR4JtEqsWbfPhv4DMiApHyliiK5xCTNVSPiaAs=
+github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno=
 github.com/onsi/ginkgo/v2 v2.10.0 h1:sfUl4qgLdvkChZrWCYndY2EAu9BRIw1YphNAzy1VNWs=
 github.com/onsi/ginkgo/v2 v2.10.0/go.mod h1:UDQOh5wbQUlMnkLfVaIUMtQ1Vus92oM+P2JX1aulgcE=
 github.com/op/go-logging v0.0.0-20160315200505-970db520ece7 h1:lDH9UUVJtmYCjyT0CI4q8xvlXPxeZ0gYCVvWbmPlp88=
@@ -149,46 +132,38 @@ github.com/patrickmn/go-cache v2.1.0+incompatible h1:HRMgzkcYKYpi3C8ajMPV8OFXaaR
 github.com/patrickmn/go-cache v2.1.0+incompatible/go.mod h1:3Qf8kWWT7OJRJbdiICTKqZju1ZixQ/KpMGzzAfe6+WQ=
 github.com/pelletier/go-toml v1.9.5 h1:4yBQzkHv+7BHq2PQUZF3Mx0IYxG7LsP222s7Agd3ve8=
 github.com/pelletier/go-toml v1.9.5/go.mod h1:u1nR/EPcESfeI/szUZKdtJ0xRNbUoANCkoOuaOx1Y+c=
-github.com/pelletier/go-toml/v2 v2.0.1/go.mod h1:r9LEWfGN8R5k0VXJ+0BkIe7MYkRdwZOjgMj2KwnJFUo=
+github.com/pelletier/go-toml/v2 v2.2.3 h1:YmeHyLY8mFWbdkNWwpr+qIL2bEqT0o95WSdkNHvL12M=
-github.com/pelletier/go-toml/v2 v2.1.1 h1:LWAJwfNvjQZCFIDKWYQaM62NcYeYViCmWIwmOStowAI=
+github.com/pelletier/go-toml/v2 v2.2.3/go.mod h1:MfCQTFTvCcUyyvvwm1+G6H/jORL20Xlb6rzQu9GuUkc=
-github.com/pelletier/go-toml/v2 v2.1.1/go.mod h1:tJU2Z3ZkXwnxa4DPO899bsyIoywizdUvyaeZurnPPDc=
+github.com/pion/dtls/v2 v2.2.12 h1:KP7H5/c1EiVAAKUmXyCzPiQe5+bCJrpOeKg/L05dunk=
-github.com/pion/dtls/v2 v2.2.7 h1:cSUBsETxepsCSFSxC3mc/aDo14qQLMSL+O6IjG28yV8=
+github.com/pion/dtls/v2 v2.2.12/go.mod h1:d9SYc9fch0CqK90mRk1dC7AkzzpwJj6u2GU3u+9pqFE=
-github.com/pion/dtls/v2 v2.2.7/go.mod h1:8WiMkebSHFD0T+dIU+UeBaoV7kDhOW5oDCzZ7WZ/F9s=
 github.com/pion/logging v0.2.2 h1:M9+AIj/+pxNsDfAT64+MAVgJO0rsyLnoJKCqf//DoeY=
 github.com/pion/logging v0.2.2/go.mod h1:k0/tDVsRCX2Mb2ZEmTqNa7CWsQPc+YYCB7Q+5pahoms=
 github.com/pion/randutil v0.1.0 h1:CFG1UdESneORglEsnimhUjf33Rwjubwj6xfiOXBa3mA=
 github.com/pion/randutil v0.1.0/go.mod h1:XcJrSMMbbMRhASFVOlj/5hQial/Y8oH/HVo7TBZq+j8=
 github.com/pion/sctp v1.8.7 h1:JnABvFakZueGAn4KU/4PSKg+GWbF6QWbKTWZOSGJjXw=
 github.com/pion/sctp v1.8.7/go.mod h1:g1Ul+ARqZq5JEmoFy87Q/4CePtKnTJ1QCL9dBBdN6AU=
-github.com/pion/transport/v2 v2.2.4 h1:41JJK6DZQYSeVLxILA2+F4ZkKb4Xd/tFJZRFZQ9QAlo=
+github.com/pion/transport/v2 v2.2.10 h1:ucLBLE8nuxiHfvkFKnkDQRYWYfp8ejf4YBOPfaQpw6Q=
-github.com/pion/transport/v2 v2.2.4/go.mod h1:q2U/tf9FEfnSBGSW6w5Qp5PFWRLRj3NjLhCCgpRK4p0=
+github.com/pion/transport/v2 v2.2.10/go.mod h1:sq1kSLWs+cHW9E+2fJP95QudkzbK7wscs8yYgQToO5E=
-github.com/pires/go-proxyproto v0.7.0 h1:IukmRewDQFWC7kfnb66CSomk2q/seBuilHBYFwyq0Hs=
+github.com/pires/go-proxyproto v0.8.0 h1:5unRmEAPbHXHuLjDg01CxJWf91cw3lKHc/0xzKpXEe0=
-github.com/pires/go-proxyproto v0.7.0/go.mod h1:Vz/1JPY/OACxWGQNIRY2BeyDmpoaWmEP40O9LbuiFR4=
+github.com/pires/go-proxyproto v0.8.0/go.mod h1:iknsfgnH8EkjrMeMyvfKByp9TiBZCKZM0jx2xmKqnVY=
-github.com/pkg/diff v0.0.0-20210226163009-20ebb0f2a09e/go.mod h1:pJLUxLENpZxwdsKMEsNbx1VGcRFpLqf3715MtcvvzbA=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
-github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c/go.mod h1:OmDBASR4679mdNQnz2pUhc2G8CO2JrUAVFDRBDP/hJE=
 github.com/power-devops/perfstat v0.0.0-20240221224432-82ca36839d55 h1:o4JXh1EVt9k/+g42oCprj/FisM4qX9L3sZB3upGN2ZU=
 github.com/power-devops/perfstat v0.0.0-20240221224432-82ca36839d55/go.mod h1:OmDBASR4679mdNQnz2pUhc2G8CO2JrUAVFDRBDP/hJE=
-github.com/quic-go/qtls-go1-20 v0.4.1 h1:D33340mCNDAIKBqXuAvexTNMUByrYmFYVfKfDN5nfFs=
+github.com/quic-go/quic-go v0.46.0 h1:uuwLClEEyk1DNvchH8uCByQVjo3yKL9opKulExNDs7Y=
-github.com/quic-go/qtls-go1-20 v0.4.1/go.mod h1:X9Nh97ZL80Z+bX/gUXMbipO6OxdiDi58b/fMC9mAL+k=
+github.com/quic-go/quic-go v0.46.0/go.mod h1:1dLehS7TIR64+vxGR70GDcatWTOtMX2PUtnKsjbTurI=
-github.com/quic-go/quic-go v0.40.0 h1:GYd1iznlKm7dpHD7pOVpUvItgMPo/jrMgDWZhMCecqw=
+github.com/refraction-networking/utls v1.6.7 h1:zVJ7sP1dJx/WtVuITug3qYUq034cDq9B2MR1K67ULZM=
-github.com/quic-go/quic-go v0.40.0/go.mod h1:PeN7kuVJ4xZbxSv/4OX6S1USOX8MJvydwpTx31vx60c=
+github.com/refraction-networking/utls v1.6.7/go.mod h1:BC3O4vQzye5hqpmDTWUqi4P5DDhzJfkV1tdqtawQIH0=
-github.com/refraction-networking/utls v1.5.4 h1:9k6EO2b8TaOGsQ7Pl7p9w6PUhx18/ZCeT0WNTZ7Uw4o=
-github.com/refraction-networking/utls v1.5.4/go.mod h1:SPuDbBmgLGp8s+HLNc83FuavwZCFoMmExj+ltUHiHUw=
 github.com/riobard/go-bloom v0.0.0-20200614022211-cdc8013cb5b3 h1:f/FNXud6gA3MNr8meMVVGxhp+QBTqY91tM8HjEuMjGg=
 github.com/riobard/go-bloom v0.0.0-20200614022211-cdc8013cb5b3/go.mod h1:HgjTstvQsPGkxUsCd2KWxErBblirPizecHcpD3ffK+s=
 github.com/robfig/cron/v3 v3.0.1 h1:WdRxkvbJztn8LMz/QEvLN5sBU+xKpSqwwUO1Pjr4qDs=
 github.com/robfig/cron/v3 v3.0.1/go.mod h1:eQICP3HwyT7UooqI/z+Ov+PtYAWygg1TEWWzGIFLtro=
-github.com/rogpeppe/go-internal v1.6.1/go.mod h1:xXDCJY+GAPziupqXw64V24skbSoqbTEfhy4qGm1nDQc=
-github.com/rogpeppe/go-internal v1.8.0 h1:FCbCCtXNOY3UtUuHUYaghJg4y7Fd14rXifAYUAtL9R8=
-github.com/rogpeppe/go-internal v1.8.0/go.mod h1:WmiCO8CzOY8rg0OYDC4/i/2WRWAB6poM+XZ2dLUbcbE=
 github.com/secure-io/siv-go v0.0.0-20180922214919-5ff40651e2c4 h1:zOjq+1/uLzn/Xo40stbvjIY/yehG0+mfmlsiEmc0xmQ=
 github.com/secure-io/siv-go v0.0.0-20180922214919-5ff40651e2c4/go.mod h1:aI+8yClBW+1uovkHw6HM01YXnYB8vohtB9C83wzx34E=
 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/shirou/gopsutil/v3 v3.24.1 h1:R3t6ondCEvmARp3wxODhXMTLC/klMa87h2PHUw5m7QI=
+github.com/shirou/gopsutil/v3 v3.24.5 h1:i0t8kL+kQTvpAYToeuiVk3TgDeKOFioZO3Ztz/iZ9pI=
-github.com/shirou/gopsutil/v3 v3.24.1/go.mod h1:UU7a2MSBQa+kW1uuDq8DeEBS8kmrnQwsv2b5O513rwU=
+github.com/shirou/gopsutil/v3 v3.24.5/go.mod h1:bsoOS1aStSs9ErQ1WWfxllSeS1K5D+U30r2NfcubMVk=
 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=
@@ -197,23 +172,18 @@ github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+
 github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw=
 github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo=
 github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
-github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
 github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
-github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk=
+github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg=
-github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=
+github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
-github.com/tklauser/go-sysconf v0.3.12/go.mod h1:Ho14jnntGE1fpdOqQEEaiKRpvIavV0hSfmBq8nJbHYI=
+github.com/tklauser/go-sysconf v0.3.14 h1:g5vzr9iPFFz24v2KZXs/pvpvh8/V9Fw6vQK5ZZb78yU=
-github.com/tklauser/go-sysconf v0.3.13 h1:GBUpcahXSpR2xN01jhkNAbTLRk2Yzgggk8IM08lq3r4=
+github.com/tklauser/go-sysconf v0.3.14/go.mod h1:1ym4lWMLUOhuBOPGtRcJm7tEGX4SCYNEEEtghGG/8uY=
-github.com/tklauser/go-sysconf v0.3.13/go.mod h1:zwleP4Q4OehZHGn4CYZDipCgg9usW5IJePewFCGVEa0=
+github.com/tklauser/numcpus v0.9.0 h1:lmyCHtANi8aRUgkckBgoDk1nHCux3n2cgkJLXdQGPDo=
-github.com/tklauser/numcpus v0.6.1/go.mod h1:1XfjsgE2zo8GVw7POkMbHENHzVg3GzmoZ9fESEdAacY=
+github.com/tklauser/numcpus v0.9.0/go.mod h1:SN6Nq1O3VychhC1npsWostA+oW+VOQTxZrS604NSRyI=
-github.com/tklauser/numcpus v0.7.0 h1:yjuerZP127QG9m5Zh/mSO4wqurYil27tHrqwRoRjpr4=
-github.com/tklauser/numcpus v0.7.0/go.mod h1:bb6dMVcj8A42tSE7i32fsIUCbQNllK5iDguyOZRUzAY=
 github.com/twitchyliquid64/golang-asm v0.15.1 h1:SU5vSMR7hnwNxj24w34ZyCi/FmDZTkS4MhqMhdFk5YI=
 github.com/twitchyliquid64/golang-asm v0.15.1/go.mod h1:a1lVb/DtPvCB8fslRZhAngC2+aY1QWCk3Cedj/Gdt08=
-github.com/ugorji/go v1.2.7/go.mod h1:nF9osbDWLy6bDVv/Rtoh6QgnvNDpmCalQV5urGCCS6M=
-github.com/ugorji/go/codec v1.2.7/go.mod h1:WGN1fab3R1fzQlVQTkfxVtIBhWDRqOviHU95kRgeqEY=
 github.com/ugorji/go/codec v1.2.12 h1:9LC83zGrHhuUA9l16C9AHXAqEV/2wBQ4nkvumAE65EE=
 github.com/ugorji/go/codec v1.2.12/go.mod h1:UNopzCgEMSXjBc6AOMqYvWC1ktqTAfzJZUZgYf6w6lg=
 github.com/v2fly/BrowserBridge v0.0.0-20210430233438-0570fc1d7d08 h1:4Yh46CVE3k/lPq6hUbEdbB1u1anRBXLewm3k+L0iOMc=
@@ -222,90 +192,65 @@ github.com/v2fly/VSign v0.0.0-20201108000810-e2adc24bf848 h1:p1UzXK6VAutXFFQMnre
 github.com/v2fly/VSign v0.0.0-20201108000810-e2adc24bf848/go.mod h1:p80Bv154ZtrGpXMN15slDCqc9UGmfBuUzheDFBYaW/M=
 github.com/v2fly/ss-bloomring v0.0.0-20210312155135-28617310f63e h1:5QefA066A1tF8gHIiADmOVOV5LS43gt3ONnlEl3xkwI=
 github.com/v2fly/ss-bloomring v0.0.0-20210312155135-28617310f63e/go.mod h1:5t19P9LBIrNamL6AcMQOncg/r10y3Pc01AbHeMhwlpU=
-github.com/v2fly/v2ray-core/v5 v5.13.0 h1:BDJfi3Ftx1NpQlZZPpeWJe3RDqRNyIVBs+YGG4RRMDU=
+github.com/v2fly/v2ray-core/v5 v5.17.1 h1:IIMMtmRdaG5HTYNn6VX1xKULknJl7nhkSFnmoTb5TDQ=
-github.com/v2fly/v2ray-core/v5 v5.13.0/go.mod h1:Bc3gmQWLr8UR7xBSCYI9FbfKuVvqA9lbkeBTWNRRAS4=
+github.com/v2fly/v2ray-core/v5 v5.17.1/go.mod h1:IhDN0rhXJnNcs9jUuC5sILTGCT2L+4yr0+tfD8ZVuL8=
 github.com/vincent-petithory/dataurl v1.0.0 h1:cXw+kPto8NLuJtlMsI152irrVw9fRDX8AbShPRpg2CI=
 github.com/vincent-petithory/dataurl v1.0.0/go.mod h1:FHafX5vmDzyP+1CQATJn7WFKc9CvnvxyvZy6I1MrG/U=
 github.com/xiaokangwang/VLite v0.0.0-20220418190619-cff95160a432 h1:I/ATawgO2RerCq9ACwL0wBB8xNXZdE3J+93MCEHReRs=
 github.com/xiaokangwang/VLite v0.0.0-20220418190619-cff95160a432/go.mod h1:QN7Go2ftTVfx0aCTh9RXHV8pkpi0FtmbwQw40dy61wQ=
 github.com/xtaci/smux v1.5.24 h1:77emW9dtnOxxOQ5ltR+8BbsX1kzcOxQ5gB+aaV9hXOY=
 github.com/xtaci/smux v1.5.24/go.mod h1:OMlQbT5vcgl2gb49mFkYo6SMf+zP3rcjcwQz7ZU7IGY=
-github.com/yusufpapurcu/wmi v1.2.3/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQmPyzfmi0=
 github.com/yusufpapurcu/wmi v1.2.4 h1:zFUKzehAFReQwLys1b/iSMl+JQGSCSjtVqQn9bBrPo0=
 github.com/yusufpapurcu/wmi v1.2.4/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQmPyzfmi0=
 go.starlark.net v0.0.0-20230612165344-9532f5667272 h1:2/wtqS591wZyD2OsClsVBKRPEvBsQt/Js+fsCiYhwu8=
 go.starlark.net v0.0.0-20230612165344-9532f5667272/go.mod h1:jxU+3+j+71eXOW14274+SmmuW82qJzl6iZSeqEtTGds=
-go.uber.org/mock v0.3.0 h1:3mUxI1No2/60yUYax92Pt8eNOEecx2D3lcXZh2NEZJo=
+go.uber.org/mock v0.4.0 h1:VcM4ZOtdbR4f6VXfiOpwpVJDL6lCReaZ6mw31wqh7KU=
-go.uber.org/mock v0.3.0/go.mod h1:a6FSlNadKUHUa9IP5Vyt1zh4fC7uAwxMutEAscFbkZc=
+go.uber.org/mock v0.4.0/go.mod h1:a6FSlNadKUHUa9IP5Vyt1zh4fC7uAwxMutEAscFbkZc=
-go4.org/netipx v0.0.0-20230303233057-f1b76eb4bb35 h1:nJAwRlGWZZDOD+6wni9KVUNHMpHko/OnRwsrCYeAzPo=
+go4.org/netipx v0.0.0-20231129151722-fdeea329fbba h1:0b9z3AuHCjxk0x/opv64kcgZLBseWJUpBw5I82+2U4M=
-go4.org/netipx v0.0.0-20230303233057-f1b76eb4bb35/go.mod h1:TQvodOM+hJTioNQJilmLXu08JNb8i+ccq418+KWu1/Y=
+go4.org/netipx v0.0.0-20231129151722-fdeea329fbba/go.mod h1:PLyyIXexvUFg3Owu6p/WfdlivPbZJsZdgWZlrGope/Y=
-golang.org/x/arch v0.0.0-20210923205945-b76863e36670/go.mod h1:5om86z9Hs0C8fWVUuoMHwpExlXzs5Tkyp9hOrfG7pp8=
+golang.org/x/arch v0.11.0 h1:KXV8WWKCXm6tRpLirl2szsO5j/oOODwZf4hATmGVNs4=
-golang.org/x/arch v0.7.0 h1:pskyeJh/3AmoQ8CPE95vxHLqp1G1GfGNXTmcl9NEKTc=
+golang.org/x/arch v0.11.0/go.mod h1:FEVrYAQjsQXMVJ1nsMoVVXPZg6p2JE2mx8psSWTDQys=
-golang.org/x/arch v0.7.0/go.mod h1:FEVrYAQjsQXMVJ1nsMoVVXPZg6p2JE2mx8psSWTDQys=
+golang.org/x/crypto v0.28.0 h1:GBDwsMXVQi34v5CCYUm2jkJvu4cbtru2U4TN2PSyQnw=
-golang.org/x/crypto v0.0.0-20210711020723-a769d52b0f97/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
+golang.org/x/crypto v0.28.0/go.mod h1:rmgy+3RHxRZMyY0jjAJShp2zgEdOqj2AO7U0pYmeQ7U=
-golang.org/x/crypto v0.21.0 h1:X31++rzVUdKhX5sWmSOFZxx8UW/ldWx55cbf08iNAMA=
+golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56 h1:2dVuKD2vS7b0QIHQbpyTISPd0LeHDbnYEryqj5Q1ug8=
-golang.org/x/crypto v0.21.0/go.mod h1:0BP7YvVV9gBbVKyeTG0Gyn+gZm94bibOW5BjDEYAOMs=
+golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56/go.mod h1:M4RDyNAINzryxdtnbRXRL/OHtkFuWGRjvuhBJpk2IlY=
-golang.org/x/exp v0.0.0-20230725093048-515e97ebf090 h1:Di6/M8l0O2lCLc6VVRWhgCiApHV8MnQurBnFSHsQtNY=
+golang.org/x/mod v0.19.0 h1:fEdghXQSo20giMthA7cd28ZC+jts4amQ3YMXiP5oMQ8=
-golang.org/x/exp v0.0.0-20230725093048-515e97ebf090/go.mod h1:FXUEEKJgO7OQYeo8N01OfiKP8RXMtf6e8aTskBGqWdc=
+golang.org/x/mod v0.19.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c=
-golang.org/x/mod v0.13.0 h1:I/DsJXRlw/8l/0c24sM9yb0T4z9liZTduXvdAWYiysY=
+golang.org/x/net v0.30.0 h1:AcW1SDZMkb8IpzCdQUaIq2sP4sZ4zw+55h6ynffypl4=
-golang.org/x/mod v0.13.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c=
+golang.org/x/net v0.30.0/go.mod h1:2wGyMJ5iFasEhkwi13ChkO/t1ECNC4X4eBKkVFyYFlU=
-golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
+golang.org/x/sync v0.8.0 h1:3NFvSEYkUoMifnESzZl15y791HH1qU2xm6eCJU5ZPXQ=
-golang.org/x/net v0.23.0 h1:7EYJ93RZ9vYSZAIb2x3lnuvqO5zneoD6IvWjuhfxjTs=
+golang.org/x/sync v0.8.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
-golang.org/x/net v0.23.0/go.mod h1:JKghWKKOSdJwpW2GEx0Ja7fmaKnMsbu+MWVZTokSYmg=
-golang.org/x/sync v0.6.0 h1:5BMeUDZ7vkXGfEr1x9B4bRcTH4lpkTkpdh0T/J+qjbQ=
-golang.org/x/sync v0.6.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
 golang.org/x/sys v0.0.0-20190916202348-b4ddaad3f8a3/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20201204225414-ed752295db88/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20210806184541-e5e7981a1069/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20211025201205-69cdffdb9359/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.1.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.26.0 h1:KHjCJyddX0LoSTb3J+vWpupP9p0oznkqVk/IfjymZbo=
-golang.org/x/sys v0.11.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.26.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
-golang.org/x/sys v0.16.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
+golang.org/x/text v0.19.0 h1:kTxAhCbGbxhK0IwgSKiMO5awPoDQ0RpfiVYBfK860YM=
-golang.org/x/sys v0.18.0 h1:DBdB3niSjOA/O0blCZBqDefyWNYveAYMNF1Wum0DYQ4=
+golang.org/x/text v0.19.0/go.mod h1:BuEKDfySbSR4drPmRPG/7iBdf8hvFMuRexcpahXilzY=
-golang.org/x/sys v0.18.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
+golang.org/x/time v0.5.0 h1:o7cqy6amK/52YcAKIPlM3a+Fpj35zvRj2TP+e1xFSfk=
-golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
+golang.org/x/time v0.5.0/go.mod h1:3BpzKBy/shNhVucY/MWOyx10tF3SFh9QdLuxbVysPQM=
-golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
+golang.org/x/tools v0.23.0 h1:SGsXPZ+2l4JsgaCKkx+FQ9YZ5XEtA1GZYuoDjenLjvg=
-golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
+golang.org/x/tools v0.23.0/go.mod h1:pnu6ufv6vQkll6szChhK3C3L/ruaIv5eBeztNG8wtsI=
-golang.org/x/text v0.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ=
+google.golang.org/genproto/googleapis/rpc v0.0.0-20241015192408-796eee8c2d53 h1:X58yt85/IXCx0Y3ZwN6sEIKZzQtDEYaBWrDvErdXrRE=
-golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
+google.golang.org/genproto/googleapis/rpc v0.0.0-20241015192408-796eee8c2d53/go.mod h1:GX3210XPVPUjJbTUbvwI8f2IpZDMZuPJWDzDuebbviI=
-golang.org/x/time v0.3.0 h1:rg5rLMjNzMS1RkNLzCG38eapWhnYLFYXDXj2gOlr8j4=
+google.golang.org/grpc v1.67.1 h1:zWnc1Vrcno+lHZCOofnIMvycFcc0QRGIzm9dhnDX68E=
-golang.org/x/time v0.3.0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
+google.golang.org/grpc v1.67.1/go.mod h1:1gLDyUQU7CTLJI90u3nXZ9ekeghjeM7pTDZlqFNg2AA=
-golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
+google.golang.org/protobuf v1.35.1 h1:m3LfL6/Ca+fqnjnlqQXNpFPABW1UD7mjh8KO2mKFytA=
-golang.org/x/tools v0.14.0 h1:jvNa2pY0M4r62jkRQ6RwEZZyPcymeL9XZMLBbV7U2nc=
+google.golang.org/protobuf v1.35.1/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE=
-golang.org/x/tools v0.14.0/go.mod h1:uYBEerGOWcJyEORxN+Ek8+TT266gXkNlHdJBwexUsBg=
-golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
-google.golang.org/genproto/googleapis/rpc v0.0.0-20240221002015-b0ce06bbee7c h1:NUsgEN92SQQqzfA+YtqYNqYmB3DMMYLlIwUZAQFVFbo=
-google.golang.org/genproto/googleapis/rpc v0.0.0-20240221002015-b0ce06bbee7c/go.mod h1:H4O17MA/PE9BsGx3w+a+W2VOLLD1Qf7oJneAoU6WktY=
-google.golang.org/grpc v1.62.0 h1:HQKZ/fa1bXkX1oFOvSjmZEUL8wLSaZTjCcLAlmZRtdk=
-google.golang.org/grpc v1.62.0/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE=
-google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw=
-google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
-google.golang.org/protobuf v1.28.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=
-google.golang.org/protobuf v1.33.0 h1:uNO2rsAINq/JlFpSdYEKIZ0uKD/R9cpdv0T+yoGwGmI=
-google.golang.org/protobuf v1.33.0/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
-gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f h1:BLraFXnmrev5lT+xlilqcH8XK9/i0At2xKjWk4p6zsU=
-gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=
+gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
-gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q=
-gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI=
-gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
 gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
-gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
 gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
-gorm.io/driver/sqlite v1.5.5 h1:7MDMtUZhV065SilG62E0MquljeArQZNfJnjd9i9gx3E=
+gorm.io/driver/sqlite v1.5.6 h1:fO/X46qn5NUEEOZtnjJRWRzZMe8nqJiQ9E+0hi+hKQE=
-gorm.io/driver/sqlite v1.5.5/go.mod h1:6NgQ7sQWAIFsPrJJl1lSNSu2TABh0ZZ/zm5fosATavE=
+gorm.io/driver/sqlite v1.5.6/go.mod h1:U+J8craQU6Fzkcvu8oLeAQmi50TkwPEhHDEjQZXDah4=
-gorm.io/gorm v1.25.7 h1:VsD6acwRjz2zFxGO50gPO6AkNs7KKnvfzUjHQhZDz/A=
+gorm.io/gorm v1.25.12 h1:I0u8i2hWQItBq1WfE0o2+WuL9+8L21K9e2HHSTE/0f8=
-gorm.io/gorm v1.25.7/go.mod h1:hbnx/Oo0ChWMn1BIhpy1oYozzpM15i4YPuHDmfYtwg8=
+gorm.io/gorm v1.25.12/go.mod h1:xh7N7RHfYlNc5EmcI/El95gXusucDrQnHXe0+CgWcLQ=
 gvisor.dev/gvisor v0.0.0-20231020174304-b8a429915ff1 h1:qDCwdCWECGnwQSQC01Dpnp09fRHxJs9PbktotUqG+hs=
 gvisor.dev/gvisor v0.0.0-20231020174304-b8a429915ff1/go.mod h1:8hmigyCdYtw5xJGfQDJzSH5Ju8XEIDBnpyi8+O6GRt8=
-lukechampine.com/blake3 v1.2.1 h1:YuqqRuaqsGV71BV/nm9xlI0MKUv4QC54jQnBChWbGnI=
+lukechampine.com/blake3 v1.3.0 h1:sJ3XhFINmHSrYCgl958hscfIa3bw8x4DqMP3u1YvoYE=
-lukechampine.com/blake3 v1.2.1/go.mod h1:0OFRp7fBtAylGVCO40o87sbupkyIGgbpv1+M1k1LM6k=
+lukechampine.com/blake3 v1.3.0/go.mod h1:0OFRp7fBtAylGVCO40o87sbupkyIGgbpv1+M1k1LM6k=
 nullprogram.com/x/optparse v1.0.0/go.mod h1:KdyPE+Igbe0jQUrVfMqDMeJQIJZEuyV7pjYmp6pbG50=
-rsc.io/pdf v0.1.1/go.mod h1:n8OzWcQ6Sp37PL01nO98y4iUCRdTGarVfzxY20ICaU4=

backend/logger/logger.go

@@ -3,35 +3,33 @@ package logger
 import (
 	"fmt"
 	"os"
+	"s-ui/config"
 	"time"
 
 	"github.com/op/go-logging"
 )
 
-var logger *logging.Logger
+var (
-var logBuffer []struct {
+	logger    *logging.Logger
+	logBuffer []struct {
 		time  string
 		level logging.Level
 		log   string
 	}
-
+)
-func init() {
-	InitLogger(logging.INFO)
-}
 
 func InitLogger(level logging.Level) {
 	newLogger := logging.MustGetLogger("s-ui")
 	var err error
 	var backend logging.Backend
 	var format logging.Formatter
-	ppid := os.Getppid()
 
 	backend, err = logging.NewSyslogBackend("")
 	if err != nil {
-		println(err)
+		println("Unable to use syslog: " + err.Error())
 		backend = logging.NewLogBackend(os.Stderr, "", 0)
 	}
-	if ppid > 0 && err != nil {
+	if config.IsSystemd() && err != nil {
 		format = logging.MustStringFormatter(`%{time:2006/01/02 15:04:05} %{level} - %{message}`)
 	} else {
 		format = logging.MustStringFormatter(`%{level} - %{message}`)

backend/middleware/domainValidator.go

@@ -1,6 +1,7 @@
 package middleware
 
 import (
+	"net"
 	"net/http"
 	"strings"
 
@@ -9,7 +10,10 @@ import (
 
 func DomainValidator(domain string) gin.HandlerFunc {
 	return func(c *gin.Context) {
-		host := strings.Split(c.Request.Host, ":")[0]
+		host := c.Request.Host
+		if colonIndex := strings.LastIndex(host, ":"); colonIndex != -1 {
+			host, _, _ = net.SplitHostPort(c.Request.Host)
+		}
 
 		if host != domain {
 			c.AbortWithStatus(http.StatusForbidden)

backend/service/config.go

@@ -14,6 +14,7 @@ import (
 
 var ApiAddr string
 var LastUpdate int64
+var IsSystemd bool
 
 type ConfigService struct {
 	ClientService
@@ -38,6 +39,7 @@ func NewConfigService() *ConfigService {
 }
 
 func (s *ConfigService) InitConfig() error {
+	IsSystemd = config.IsSystemd()
 	configPath := config.GetBinFolderPath()
 	data, err := os.ReadFile(configPath + "/config.json")
 	if err != nil {

backend/service/server.go

@@ -141,21 +141,26 @@ func (s *ServerService) GetSystemInfo() map[string]interface{} {
 
 func (s *ServerService) GetLogs(service string, count string, level string) []string {
 	c, _ := strconv.Atoi(count)
+
+	if service == "s-ui" {
+		return logger.GetLogs(c, level)
+	}
 	var lines []string
-	if service == "sing-box" {
+	var cmdArgs []string
-		cmdArgs := []string{"journalctl", "-u", service, "--no-pager", "-n", count, "-p", level}
+	if IsSystemd {
+		cmdArgs = []string{"journalctl", "-u", service, "--no-pager", "-n", count, "-p", level}
+	} else {
+		cmdArgs = []string{"tail", "/logs/" + service + ".log", "-n", count}
+	}
 	// 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!"}
+		return []string{"Failed to get logs!", err.Error()}
 	}
 	lines = strings.Split(out.String(), "\n")
-	} else {
-		lines = logger.GetLogs(c, level)
-	}
 
 	return lines
 }

backend/singbox/v2rayApi.go

@@ -10,6 +10,7 @@ import (
 
 	statsService "github.com/v2fly/v2ray-core/v5/app/stats/command"
 	"google.golang.org/grpc"
+	"google.golang.org/grpc/credentials/insecure"
 )
 
 type V2rayAPI struct {
@@ -22,7 +23,7 @@ func (v *V2rayAPI) Init(ApiAddr string) (err error) {
 	if len(ApiAddr) == 0 {
 		return common.NewError("The api address is wrong: ", ApiAddr)
 	}
-	v.grpcClient, err = grpc.Dial(ApiAddr, grpc.WithInsecure())
+	v.grpcClient, err = grpc.NewClient(ApiAddr, grpc.WithTransportCredentials(insecure.NewCredentials()))
 	if err != nil {
 		return err
 	}

backend/sub/jsonService.go

@@ -14,7 +14,10 @@ const defaultJson = `
   "inbounds": [
     {
       "type": "tun",
-      "inet4_address": "172.19.0.1/30",
+      "address": [
+				"172.19.0.1/30",
+				"fdfe:dcba:9876::1/126"
+			],
       "mtu": 9000,
       "auto_route": true,
       "strict_route": false,
@@ -150,6 +153,24 @@ func (j *JsonService) getOutbounds(clientConfig json.RawMessage, inDatas *[]mode
 				newOut["server"], _ = addr["server"].(string)
 				port, _ := addr["server_port"].(float64)
 				newOut["server_port"] = int(port)
+
+				// Override TLS
+				newTls, overrideTls := addr["tls"].(bool)
+				if overrideTls {
+					tlsIf := map[string]interface{}{}
+					if newTls {
+						tlsIf["enabled"] = true
+						newSNI, overrideSNI := addr["server_name"].(string)
+						if overrideSNI {
+							tlsIf["server_name"] = newSNI
+						}
+						newInsecure, overrideInsecure := addr["insecure"].(bool)
+						if overrideInsecure {
+							tlsIf["insecure"] = newInsecure
+						}
+					}
+					newOut["tls"] = tlsIf
+				}
 				remark, _ := addr["remark"].(string)
 				newTag := fmt.Sprintf("%d.%s%s", index+1, tag, remark)
 				outTags = append(outTags, newTag)
@@ -228,8 +249,11 @@ func (j *JsonService) addOthers(jsonConfig *map[string]interface{}) error {
 	if _, ok := othersJson["dns"]; ok {
 		(*jsonConfig)["dns"] = othersJson["dns"]
 	}
+	if _, ok := othersJson["inbounds"]; ok {
+		(*jsonConfig)["inbounds"] = othersJson["inbounds"]
+	}
 	if _, ok := othersJson["experimental"]; ok {
-		(*jsonConfig)["experimental"] = othersJson["lexperimentalog"]
+		(*jsonConfig)["experimental"] = othersJson["experimental"]
 	}
 	if _, ok := othersJson["rule_set"]; ok {
 		route["rule_set"] = othersJson["rule_set"]

backend/sub/linkService.go

@@ -42,6 +42,9 @@ func (s *LinkService) GetLinks(linkJson *json.RawMessage, types string, clientIn
 }
 
 func (s *LinkService) addClientInfo(uri string, clientInfo string) string {
+	if len(clientInfo) == 0 {
+		return uri
+	}
 	protocol := strings.Split(uri, "://")
 	if len(protocol) < 2 {
 		return uri

backend/web/web.go

@@ -18,9 +18,9 @@ import (
 	"strconv"
 	"strings"
 
-	sessions "github.com/Calidity/gin-sessions"
-	"github.com/Calidity/gin-sessions/cookie"
 	"github.com/gin-contrib/gzip"
+	"github.com/gin-contrib/sessions"
+	"github.com/gin-contrib/sessions/cookie"
 	"github.com/gin-gonic/gin"
 )
 

core/Dockerfile

@@ -1,8 +1,8 @@
-FROM --platform=$BUILDPLATFORM golang:1.22-alpine AS singbox-builder
+FROM --platform=$BUILDPLATFORM golang:1.23-alpine AS singbox-builder
 LABEL maintainer="Alireza <alireza7@gmail.com>"
 WORKDIR /app
 ARG TARGETOS TARGETARCH
-ARG SINGBOX_VER=v1.9.3
+ARG SINGBOX_VER=v1.10.1
 ARG SINGBOX_TAGS="with_quic,with_grpc,with_wireguard,with_ech,with_utls,with_reality_server,with_acme,with_v2ray_api,with_clash_api,with_gvisor"
 ARG GOPROXY=""
 ENV GOPROXY ${GOPROXY}

core/runSingbox.sh

@@ -20,7 +20,17 @@ terminateSingbox()
   fi
 }
 
+reloadSingbox()
+{
+  if kill -0 $tokill > /dev/null 2>&1; then
+    kill -HUP $tokill
+  else
+    runSingbox
+  fi
+}
+
 trap terminateSingbox SIGINT SIGTERM SIGKILL
+trap reloadSingbox SIGHUP
 
 runSingbox
 
@@ -37,8 +47,7 @@ do
                 terminateSingbox
                 ;;
             "restart")
-                terminateSingbox
+                reloadSingbox
-                runSingbox
                 ;;
         esac
     fi
@@ -47,7 +56,7 @@ do
     if ! kill -0 $tokill > /dev/null 2>&1; then
         if [ "$signal" != "stop" ]; then
             echo "Sing-Box with PID $tokill crashed. Breaking the loop..."
-            break
+            exit 1
         fi
     fi
 done

docker-compose.yml

@@ -6,8 +6,9 @@ services:
     hostname: "S-UI docker"
     volumes:
       - "singbox:/app/bin"
-      - "$PWD/db:/app/db"
+      - "./db:/app/db"
-      - "$PWD/cert:/app/cert"
+      - "./cert:/app/cert"
+      - "logs:/logs"
     environment:
       SINGBOX_API: "sing-box:1080"
       SUI_DB_FOLDER: "db"
@@ -18,14 +19,23 @@ services:
       - "2096:2096"
     networks:
       - s-ui
-    entrypoint: "./sui migrate && ./sui"
+    links:
+      - syslog
+    logging:
+      driver: syslog
+      options:
+        tag: "s-ui"
+        syslog-address: "udp://127.0.0.1:1514"
+    entrypoint: "./entrypoint.sh"
+    depends_on:
+      - syslog
 
   sing-box:
     image: alireza7/s-ui-singbox
     container_name: sing-box
     volumes:
       - "singbox:/app/"
-      - "$PWD/cert:/cert"
+      - "./cert:/cert"
     networks:
       - s-ui
     ports:
@@ -34,12 +44,39 @@ services:
       - "2443:2443"
       - "3443:3443"
     restart: unless-stopped
+    links:
+      - syslog
+    logging:
+      driver: syslog
+      options:
+        tag: "sing-box"
+        syslog-address: "udp://127.0.0.1:1514"
     depends_on:
       - s-ui
+      - syslog
+
+  syslog:
+    image: rsyslog/syslog_appliance_alpine
+    container_name: syslog
+    volumes:
+      - "logs:/logs"
+    networks:
+      - s-ui
+    ports:
+      - "127.0.0.1:1514:1514/udp"
+    restart: unless-stopped
+    environment:
+      - RSYSLOG_CONF_GLOBAL_CONF=template(name="RemoteLogs" type="string" string="/logs/%programname%.log")
+      - RSYSLOG_CONF_INPUT_UDP="input(type=\"imudp\" port=\"1514\" ruleset=\"remote\")"
+      - RSYSLOG_CONF_RULESET_REMOTE="ruleset(name=\"remote\") { action(type=\"omfile\" dynaFile=\"RemoteLogs\") }"
+    command: >
+      sh -c 'touch /config/container_config'
 
 networks:
   s-ui:
     driver: bridge
 
 volumes:
+  logs:
   singbox:
+  

entrypoint.sh

@@ -0,0 +1,4 @@
+#!/bin/sh
+
+./sui migrate
+./sui

frontend/package.json

@@ -1,6 +1,6 @@
 {
   "name": "frontend",
-  "version": "1.0.0",
+  "version": "1.1.0",
   "private": true,
   "scripts": {
     "dev": "vite --host",
@@ -10,7 +10,7 @@
   },
   "dependencies": {
     "@mdi/font": "7.4.47",
-    "axios": "^1.7.2",
+    "axios": "^1.7.4",
     "chart.js": "^4.4.3",
     "clipboard": "^2.0.11",
     "core-js": "^3.37.1",
@@ -32,10 +32,10 @@
     "@vitejs/plugin-vue": "^5.0.5",
     "eslint-plugin-vue": "^9.26.0",
     "material-design-icons-iconfont": "^6.7.0",
-    "sass": "^1.77.6",
+    "sass": "1.77.6",
     "typescript": "^5.5.2",
     "unplugin-fonts": "^1.1.1",
-    "vite": "^5.3.2",
+    "vite": "^5.4.6",
     "vite-plugin-vuetify": "^2.0.3",
     "vue-tsc": "^2.0.22"
   }

frontend/src/components/Listen.vue

@@ -1,6 +1,6 @@
 <template>
   <v-card :subtitle="$t('objects.listen')">
-    <v-row>
+    <v-row v-if="inbound.type != 'tun'">
       <v-col cols="12" sm="6" md="4">
         <v-text-field
         :label="$t('in.addr')"
@@ -78,7 +78,7 @@
           </v-select>
       </v-col>
     </v-row>
-    <v-card-actions class="pt-0">
+    <v-card-actions class="pt-0" v-if="inbound.type != 'tun'">
       <v-spacer></v-spacer>
       <v-menu v-model="menu" :close-on-content-click="false" location="start">
         <template v-slot:activator="{ props }">

frontend/src/components/Main.vue

@@ -5,7 +5,7 @@
   :logType="logModal.logType"
   @close="closeLogs"
   />
-  <v-container class="fill-height">
+  <v-container class="fill-height" :loading="loading">
     <v-responsive :class="reloadItems.length>0 ? 'fill-height text-center' : 'align-center'" >
       <v-row class="d-flex align-center justify-center">
         <v-col cols="auto">
@@ -116,6 +116,12 @@
                       </v-tooltip>
                       <v-icon icon="mdi-list-box-outline" :color="tilesData.sbd?.running ? 'success': 'error'" />
                     </v-chip>
+                    <v-chip density="compact" color="transparent" v-if="tilesData.sbd?.running && !loading" style="cursor: pointer;" @click="restartSingbox()">
+                      <v-tooltip activator="parent" location="top">
+                        {{ $t('actions.restartSb') }}
+                      </v-tooltip>
+                      <v-icon icon="mdi-restart" color="warning" />
+                    </v-chip>
                   </v-col>
                   <v-col cols="4">{{ $t('main.info.memory') }}</v-col>
                   <v-col cols="8">
@@ -168,6 +174,7 @@ import { computed, onBeforeUnmount, onMounted, ref } from 'vue'
 import { i18n } from '@/locales'
 import LogVue from '@/layouts/modals/Logs.vue'
 
+const loading = ref(false)
 const menu = ref(false)
 const menuItems = [
   { title: i18n.global.t('main.gauges'), value: [
@@ -249,4 +256,10 @@ const closeLogs = () => {
   logModal.value.logType = "s-ui"
   logModal.value.visible = false
 }
+
+const restartSingbox = async () => {
+  loading.value = true
+  await HttpUtils.post('api/restartSb',{})
+  loading.value = false
+}
 </script>

frontend/src/components/Multiplex.vue

@@ -85,6 +85,7 @@ export default {
   },
   computed: {
     mux(): oMultiplex {
+      if (!Object.hasOwn(this.$props.data,"multiplex")) this.$props.data.multiplex = {}
       return <oMultiplex> this.$props.data.multiplex
     },
     muxEnable: {

frontend/src/components/Rule.vue

@@ -116,7 +116,7 @@
       </v-col>
       <v-col cols="12" sm="6" v-if="rule.source_ip_cidr != undefined">
         <v-text-field
-        :label="$t('rule.srcIp') + ' ' + $t('commaSeparated')"
+        :label="$t('rule.srcCidr') + ' ' + $t('commaSeparated')"
         hide-details
         v-model="source_ip_cidr"></v-text-field>
       </v-col>

frontend/src/components/SubJsonExt.vue

@@ -62,6 +62,48 @@
         ></v-select>
       </v-col>
     </v-row>
+    <template v-if="enableInb">
+      <v-row>
+        <v-col cols="12" sm="6" md="3">
+          <v-combobox
+            v-model="inbounds[0].address"
+            :items="defaultInb[0].address"
+            chips
+            multiple
+            hide-details
+            :label="$t('in.addr')"
+          ></v-combobox>
+        </v-col>
+        <v-col cols="12" sm="6" md="3" lg="2">
+          <v-text-field
+            type="number"
+            v-model.number="inbounds[0].mtu"
+            hide-details
+            label="MTU"
+          ></v-text-field>
+        </v-col>
+      </v-row>
+      <v-row>
+        <v-col cols="12" sm="6" md="3">
+          <v-combobox
+            v-model="inbounds[0].exclude_package"
+            :items="['ir.mci.ecareapp','com.myirancell']"
+            chips
+            multiple
+            hide-details
+            :label="$t('setting.excludePkg')"
+          ></v-combobox>
+        </v-col>
+        <v-col cols="12" sm="6" md="3" lg="2">
+          <v-switch
+            v-model="platformProxy"
+            hide-details
+            color="primary"
+            label="Platform HTTP proxy"
+          ></v-switch>
+        </v-col>
+      </v-row>
+    </template>
     <v-card-actions>
       <v-spacer></v-spacer>
       <v-menu v-model="menu" :close-on-content-click="false" location="start">
@@ -76,6 +118,9 @@
             <v-list-item>
               <v-switch v-model="enableDns" color="primary" label="DNS" hide-details></v-switch>
             </v-list-item>
+            <v-list-item>
+              <v-switch v-model="enableInb" color="primary" :label="$t('objects.inbound')" hide-details></v-switch>
+            </v-list-item>
             <v-list-item>
               <v-switch v-model="enableExp" color="primary" label="Experimental" hide-details></v-switch>
             </v-list-item>
@@ -98,6 +143,36 @@ export default {
         "level": "info",
         "timestamp": true
       },
+      defaultInb: [
+        {
+          "type": "tun",
+          "address": [
+            "172.19.0.1/30",
+            "fdfe:dcba:9876::1/126"
+          ],
+          "mtu": 9000,
+          "auto_route": true,
+          "strict_route": false,
+          "sniff": true,
+          "endpoint_independent_nat": false,
+          "stack": "system",
+          "exclude_package": [],
+          "platform": {
+            "http_proxy": {
+              "enabled": true,
+              "server": "127.0.0.1",
+              "server_port": 2080
+            }
+          }
+        },
+        {
+          "type": "mixed",
+          "listen": "127.0.0.1",
+          "listen_port": 2080,
+          "sniff": true,
+          "users": []
+        }
+      ],
       defaultExp: {
         "clash_api": {
           "external_controller": "127.0.0.1:9090",
@@ -247,12 +322,16 @@ export default {
           this.subJsonExt.rules.unshift({ protocol: "dns", outbound: "dns-out" })
         } else {
           delete this.subJsonExt.dns
-          const ruleDnsIndex = this.subJsonExt?.rules?.findIndex((r:any) => r.protocol = "dns" && r.outbound == "dns-out")
+          const ruleDnsIndex = this.subJsonExt?.rules?.findIndex((r:any) => r.protocol == "dns" && r.outbound == "dns-out")
           if (ruleDnsIndex >= 0) this.subJsonExt.rules.splice(ruleDnsIndex,1)
           if (this.rules.length == 0) delete this.subJsonExt.rules
         }
       }
     },
+    enableInb: {
+      get() :boolean { return this.subJsonExt?.inbounds != undefined },
+      set(v:boolean) { v ? this.subJsonExt.inbounds = this.defaultInb.slice() : delete this.subJsonExt.inbounds }
+    },
     enableExp: {
       get() :boolean { return this.subJsonExt?.experimental != undefined },
       set(v:boolean) { v ? this.subJsonExt.experimental = this.defaultExp : delete this.subJsonExt.experimental }
@@ -298,6 +377,11 @@ export default {
         this.updateRuleSets()
       }
     },
+    inbounds():any[] { return this.subJsonExt?.inbounds?? undefined },
+    platformProxy: {
+      get() :boolean { return this.inbounds[0]?.platform != undefined },
+      set(v:boolean) { this.subJsonExt.inbounds[0].platform = v ? this.defaultInb[0].platform : undefined }
+    },
     rules():any { return this.subJsonExt?.rules?? undefined },
     ruleToDirect: {
       get() :string[] {

frontend/src/components/protocols/ShadowTls.vue

@@ -31,7 +31,7 @@
         type="number"
         min="0"
         hide-details
-        v-model="server_port">
+        v-model.number="server_port">
         </v-text-field>
       </v-col>
     </v-row>
@@ -78,7 +78,7 @@
           type="number"
           min="0"
           hide-details
-          v-model="value.server_port">
+          v-model.number="value.server_port">
           </v-text-field>
         </v-col>
       </v-row>
@@ -114,22 +114,22 @@ export default {
       set(newValue: any) {
         switch (newValue) {
         case 1:
-          this.Inbound.password = undefined
+          delete this.Inbound.password
-          this.Inbound.users = undefined
+          delete this.Inbound.users
-          this.Inbound.handshake_for_server_name = undefined
+          delete this.Inbound.handshake_for_server_name
           break;
         case 2:
           if (!this.Inbound.password) {
             this.Inbound.password = ""
           }
-          this.Inbound.users = undefined
+          delete this.Inbound.users
           if (!this.Inbound.handshake_for_server_name) {
             this.Inbound.handshake_for_server_name = {}
           }
           break;
         case 3:
-          this.Inbound.password = undefined
+          delete this.Inbound.password
-          if (Object.hasOwn(this.Inbound, 'users')) {
+          if (!Object.hasOwn(this.Inbound, 'users')) {
             this.Inbound.users = []
           }
           if (!this.Inbound.handshake_for_server_name) {

frontend/src/components/protocols/Shadowsocks.vue

@@ -6,12 +6,10 @@
           hide-details
           :label="$t('in.ssMethod')"
           :items="ssMethods"
+          @update:model-value="changeMethod($event)"
           v-model="data.method">
         </v-select>
       </v-col>
-      <v-col cols="12" sm="6" md="4">
-        <v-text-field v-model="data.password" :label="$t('types.pw')" hide-details></v-text-field>
-      </v-col>
       <v-col cols="12" sm="6" md="4">
         <Network :data="data" />
       </v-col>
@@ -19,12 +17,24 @@
         <UoT :data="data" />
       </v-col>
     </v-row>
+    <v-row v-if="data.method.startsWith('2022')">
+      <v-col cols="12" sm="8">
+        <v-text-field
+          v-model="data.password"
+          :label="$t('types.pw')"
+          hide-details
+          append-inner-icon="mdi-refresh"
+          @click:append-inner="changeMethod(data.method)">
+        </v-text-field>
+      </v-col>
+    </v-row>
   </v-card>
 </template>
 
 <script lang="ts">
 import Network from '@/components/Network.vue'
 import UoT from '@/components/UoT.vue';
+import RandomUtil from '@/plugins/randomUtil';
 
 export default {
   props: ['direction','data'],
@@ -43,6 +53,15 @@ export default {
       ]
     }
   },
+  methods: {
+    changeMethod(ssMethod :string) {
+      if (ssMethod.startsWith('2022')) {
+        this.$props.data.password = ssMethod == "2022-blake3-aes-128-gcm" ? RandomUtil.randomShadowsocksPassword(16) : RandomUtil.randomShadowsocksPassword(32)
+      } else {
+        this.$props.data.password = ''
+      }
+    }
+  },
   components: { Network, UoT }
 }
 </script>

frontend/src/components/protocols/Tun.vue

@@ -0,0 +1,62 @@
+<template>
+  <v-card subtitle="Tun">
+    <v-row>
+      <v-col cols="12" sm="8">
+        <v-text-field v-model="addrs" :label="$t('types.tun.addr') + ' ' + $t('commaSeparated')" hide-details></v-text-field>
+      </v-col>
+    </v-row>
+    <v-row>
+      <v-col cols="12" sm="6" md="4">
+        <v-text-field v-model="data.interface_name" :label="$t('types.tun.ifName')" hide-details></v-text-field>
+      </v-col>
+      <v-col cols="12" sm="6" md="4">
+        <v-text-field type="number" v-model.number="data.mtu" label="MTU" hide-details></v-text-field>
+      </v-col>
+    </v-row>
+    <v-row>
+      <v-col cols="12" sm="6" md="4">
+        <v-text-field
+          type="number"
+          v-model.number="udpTimeout"
+          label="UDP timeout"
+          min="1"
+          :suffix="$t('date.m')"
+          hide-details>
+        </v-text-field>
+      </v-col>
+      <v-col cols="12" sm="6" md="4">
+        <v-select
+          v-model="data.stack"
+          label="Stack"
+          :items="['system','gvisor','mixed']"
+          hide-details
+        ></v-select>
+      </v-col>
+      <v-col cols="12" sm="6" md="4">
+        <v-switch v-model="data.endpoint_independent_nat" color="primary" label="Independent NAT" hide-details></v-switch>
+      </v-col>
+    </v-row>
+  </v-card>
+</template>
+
+<script lang="ts">
+
+export default {
+  props: ['data'],
+  data() {
+    return {
+      menu: false
+    }
+  },
+  computed: {
+    addrs: {
+      get() { return this.$props.data.address?.join(',') },
+      set(v:string) { this.$props.data.address = v.length > 0 ? v.split(',') : undefined }
+    },
+    udpTimeout: {
+      get() { return this.$props.data.udp_timeout ? parseInt(this.$props.data.udp_timeout.replace('m','')) : 5 },
+      set(v:number) { this.$props.data.udp_timeout = v > 0 ? v + 'm' : '5m' }
+    }
+  },
+}
+</script>

frontend/src/components/tls/OutTLS.vue

@@ -222,8 +222,8 @@ export default {
   data() {
     return {
       menu: false,
-      usePath: 0,
+      usePath: this.$props.outbound?.tls?.certificate? 1:0,
-      useEchPath: 0,
+      useEchPath: this.$props.outbound?.tls.ech?.config? 1:0,
       defaults: defaultOutTls,
       alpn: [
         { title: "H3", value: 'h3' },

frontend/src/layouts/default/AppBar.vue

@@ -2,7 +2,7 @@
   <v-app-bar :elevation="5">
     <v-icon v-if="isMobile" icon="mdi-menu" @click="$emit('toggleDrawer')" />
     <span v-else style="width: 24px"></span>
-    <v-app-bar-title :text="$t(<string>$router.currentRoute.value.name)" class="align-center text-center " />
+    <v-app-bar-title :text="$t(<string>route.name)" class="align-center text-center " />
     <v-btn prepend-icon="mdi-content-save" v-if="stateChange" :text="$t('actions.save')" @click="saveChanges"></v-btn>
     <v-icon icon="mdi-theme-light-dark" @click="toggleTheme()" style="margin: 0 10px;"></v-icon>
   </v-app-bar>
@@ -13,9 +13,11 @@ import { computed, ref } from "vue"
 import { useTheme } from "vuetify"
 import { FindDiff } from "@/plugins/utils"
 import Data from "@/store/modules/data"
+import { useRoute } from "vue-router";
 
 defineProps(['isMobile'])
 
+const route = useRoute();
 const theme = useTheme()
 const darkMode = ref(localStorage.getItem('theme') == "dark")
 

frontend/src/layouts/modals/Client.vue

@@ -21,6 +21,9 @@
                 <v-col cols="12" sm="6" md="4">
                   <v-switch color="primary" v-model="client.enable" :label="$t('enable')" hide-details></v-switch>
                 </v-col>
+                <v-col cols="12" sm="6" md="4">
+                  <v-combobox v-model="client.group" :items="groups" :label="$t('client.group')" hide-details></v-combobox>
+                </v-col>
               </v-row>
               <v-row>
                 <v-col cols="12" sm="6" md="4">
@@ -186,7 +189,7 @@ import DatePick from '@/components/DateTime.vue'
 import { HumanReadable } from '@/plugins/utils'
 
 export default {
-  props: ['visible', 'data', 'index', 'inboundTags', 'stats'],
+  props: ['visible', 'data', 'index', 'inboundTags', 'groups', 'stats'],
   emits: ['close', 'save'],
   data() {
     return {

frontend/src/layouts/modals/ClientBulk.vue

@@ -0,0 +1,199 @@
+<template>
+  <v-dialog transition="dialog-bottom-transition" width="800">
+    <v-card class="rounded-lg">
+      <v-card-title>
+        {{ $t('bulk.add') }}
+      </v-card-title>
+      <v-divider></v-divider>
+      <v-card-text style="padding: 0 16px; overflow-y: scroll;">
+        <v-container style="padding: 0;">
+          <v-row>
+            <v-col cols="12" sm="6" md="4">
+              <v-text-field v-model.number="count" type="number" min="1" max="100" :label="$t('count')" hide-details></v-text-field>
+            </v-col>
+          </v-row>
+          <v-row>
+            <v-col cols="12" sm="8">
+              <v-combobox
+                chips
+                multiple
+                v-model="bulkData.name"
+                :items="patterns"
+                :label="$t('client.name')"
+                hide-details>
+              </v-combobox>
+            </v-col>
+          </v-row>
+          <v-row>
+            <v-col cols="12" sm="8">
+              <v-combobox
+                chips
+                multiple
+                v-model="bulkData.desc"
+                :items="patterns"
+                :label="$t('client.desc')"
+                hide-details>
+              </v-combobox>
+            </v-col>
+          </v-row>
+          <v-row>
+            <v-col cols="12" sm="6" md="4">
+              <v-combobox v-model="bulkData.group" :items="groups" :label="$t('client.group')" hide-details></v-combobox>
+            </v-col>
+            <v-col cols="12" sm="6" md="4">
+              <v-text-field v-model.number="bulkData.Volume" type="number" min="0" :label="$t('stats.volume')" suffix="GiB" hide-details></v-text-field>
+            </v-col>
+            <v-col cols="12" sm="6" md="4">
+              <DatePick :expiry="bulkData.expiry" @submit="setDate" />
+            </v-col>
+          </v-row>
+          <v-row>
+            <v-col>
+              <v-combobox
+                v-model="bulkData.clientInbounds"
+                :items="inboundTags"
+                :label="$t('client.inboundTags')"
+                multiple
+                chips
+                hide-details
+              ></v-combobox>
+            </v-col>
+          </v-row>
+          <v-row>
+            <v-col cols="auto">
+              <v-switch v-model="bulkData.clientStats" color="primary" :label="$t('stats.enable')" hide-details></v-switch>
+            </v-col>
+          </v-row>
+        </v-container>
+      </v-card-text>
+      <v-card-actions>
+        <v-spacer></v-spacer>
+        <v-btn
+          color="blue-darken-1"
+          variant="outlined"
+          @click="closeModal"
+        >
+          {{ $t('actions.close') }}
+        </v-btn>
+        <v-btn
+          color="blue-darken-1"
+          variant="tonal"
+          :loading="loading"
+          @click="saveChanges"
+        >
+          {{ $t('actions.save') }}
+        </v-btn>
+      </v-card-actions>
+    </v-card>
+  </v-dialog>
+</template>
+
+<script lang="ts">
+import DatePick from '@/components/DateTime.vue'
+import { push } from 'notivue'
+import RandomUtil from '@/plugins/randomUtil'
+import { Client, createClient, randomConfigs } from '@/types/clients'
+import { i18n } from '@/locales';
+
+export default {
+  props: ['visible', 'inboundTags', 'groups'],
+  emits: ['close', 'save'],
+  data() {
+    return {
+      count: 1,
+      clients: <Client[]>[],
+      bulkData: {
+        name: <any[]>[],
+        desc: <any[]>[],
+        group: '',
+        clientInbounds: [],
+        expiry: 0,
+        Volume: 0,
+        clientStats: false,
+      },
+      patterns: [
+        { title: i18n.global.t("bulk.random"), value: "random" },
+        { title: i18n.global.t("bulk.order"), value: "order" },
+      ],
+      loading: false,
+    }
+  },
+  methods: {
+    resetData() {
+      this.count = 1,
+      this.clients = [],
+      this.bulkData = {
+        name: [this.patterns[1], "-", this.patterns[0]],
+        desc: [],
+        group: '',
+        clientInbounds: [],
+        expiry: 0,
+        Volume: 0,
+        clientStats: false,
+      }
+    },
+    closeModal() {
+      this.$emit('close')
+    },
+    saveChanges() {
+      if (this.bulkData.name.findIndex(n => typeof(n) == 'object') == -1) {
+        push.error(i18n.global.t('error.dplData'))
+        return
+      }
+      this.loading = true
+      for(let i=0;i<this.count;i++){
+        const name = this.genByPattern(this.bulkData.name, i)
+        this.clients.push(createClient({
+          enable: true,
+          name: name,
+          config: randomConfigs(name),
+          inbounds: this.bulkData.clientInbounds,
+          links: [],
+          volume: this.bulkData.Volume*(1024 ** 3),
+          expiry: this.bulkData.expiry,
+          up: 0,
+          down: 0,
+          desc: this.genByPattern(this.bulkData.desc, i),
+          group: this.bulkData.group
+        }))
+      }
+      this.$emit('save', this.clients, this.bulkData.clientInbounds, this.bulkData.clientStats)
+      this.resetData() // reset to default
+      this.loading = false
+    },
+    genByPattern(pattern: any[], order :number){
+      if (pattern.length == 0) return RandomUtil.randomSeq(8)
+      let result = ''
+      pattern.forEach(p => {
+        switch(typeof p){
+          case 'object':
+            switch(p.value){
+              case "random":
+                result += RandomUtil.randomSeq(8)
+                break
+              case "order":
+                result += order+1
+            }
+            break
+          default:
+            result += p
+        }
+      })
+      return result
+    },
+    setDate(v:number){
+      this.bulkData.expiry = v
+    }
+  },
+  computed: {},
+  watch: {
+    visible(newValue) {
+      if (newValue) {
+        this.resetData()
+      }
+    },
+  },
+  components: { DatePick },
+}
+
+</script>

frontend/src/layouts/modals/Inbound.vue

@@ -41,6 +41,7 @@
               <Naive v-if="inbound.type == inTypes.Naive" :inbound="inbound" />
               <ShadowTls v-if="inbound.type == inTypes.ShadowTLS" direction="in" :data="inbound" :outTags="outTags" />
               <Tuic v-if="inbound.type == inTypes.TUIC" direction="in" :data="inbound" />
+              <Tun v-if="inbound.type == inTypes.Tun" :data="inbound" />
               <TProxy v-if="inbound.type == inTypes.TProxy" :inbound="inbound" />
               <Transport v-if="Object.hasOwn(inbound,'transport')" :data="inbound" />
               <Users v-if="HasOptionalUser.includes(inbound.type)" :inbound="inbound" />
@@ -50,6 +51,7 @@
             </v-window-item>
             <v-window-item value="c">
               <OutJsonVue :inData="inData" :type="inbound.type" />
+              <Multiplex v-if="Object.hasOwn(inbound,'multiplex')" direction="out" :data="inData.outJson" />
               <v-card>
                 <v-card-subtitle>{{ $t('in.multiDomain') }}
                   <v-icon @click="add_addr" icon="mdi-plus"></v-icon>
@@ -100,6 +102,7 @@ import Hysteria2 from '@/components/protocols/Hysteria2.vue'
 import Naive from '@/components/protocols/Naive.vue'
 import ShadowTls from '@/components/protocols/ShadowTls.vue'
 import Tuic from '@/components/protocols/Tuic.vue'
+import Tun from '@/components/protocols/Tun.vue'
 import InTls from '@/components/tls/InTLS.vue'
 import TProxy from '@/components/protocols/TProxy.vue'
 import Multiplex from '@/components/Multiplex.vue'
@@ -163,16 +166,21 @@ export default {
       this.side = "s"
     },
     changeType() {
-      // Tag change only in add outbound
+      if (!this.inbound.listen_port) this.inbound.listen_port = RandomUtil.randomIntRange(10000, 60000)
+      // Tag change only in add inbound
       const tag = this.$props.index != -1 ? this.inbound.tag : this.inbound.type + "-" + this.inbound.listen_port
       // Use previous data
-      const prevConfig = { tag: tag ,listen: this.inbound.listen, listen_port: this.inbound.listen_port }
+      const prevConfig = { tag: tag ,listen: this.inbound.listen?? "::", listen_port: this.inbound.listen_port }
-      this.inbound = createInbound(this.inbound.type, prevConfig)
+      this.inbound = createInbound(this.inbound.type, this.inbound.type != this.inTypes.Tun ? prevConfig : { tag: tag })
       if (this.HasInData.includes(this.inbound.type)){
-        this.inData = <InData>{id: 0, tag: this.inbound.tag, addrs: [], outJson: {}}
+        if (this.inData.id == -1) this.inData.id = 0
+        this.inData.addrs = []
+        this.inData.outJson = {}
+        this.inData.tag = tag
       } else {
         this.inData = <InData>{id: -1}
       }
+      this.tls_id.value = 0
       this.side = "s"
     },
     add_addr() {
@@ -197,7 +205,7 @@ export default {
   },
   components: {
     Listen, InTls, Hysteria2, Naive, Direct, Shadowsocks,
-    Users, Hysteria, ShadowTls, TProxy, Multiplex, Tuic, Transport,
+    Users, Hysteria, ShadowTls, TProxy, Multiplex, Tuic, Tun, Transport,
     AddrVue, OutJsonVue
   }
 }

frontend/src/locales/en.ts

@@ -103,6 +103,7 @@ export default {
     disable: "Disable",
     close: "Close",
     restartApp: "Restart App",
+    restartSb: "Restart Singbox",
   },
   login: {
     title: "Login",
@@ -153,10 +154,12 @@ export default {
     directDns: "Direct DNS",
     toDirectDns: "Route to Direct DNS",
     jsonSubOptions: "Other Options",
+    excludePkg: "Exclude Packages",
   },
   client: {
     name: "Name",
     desc: "Description",
+    group: "Group",
     inboundTags: "Inbound Tags",
     basics: "Basics",
     config: "Config",
@@ -164,6 +167,11 @@ export default {
     external: "External Link",
     sub: "External Subscription",
   },
+  bulk: {
+    add: "Add Bulk",
+    order: "Order",
+    random: "Random",
+  },
   types: {
     un: "Username",
     pw: "Password",
@@ -199,6 +207,10 @@ export default {
       authTimeout: "Authentication Timeout",
       hb: "Heartbeat",
     },
+    tun: {
+      addr: "Addresses",
+      ifName: "Interface Name",
+    },
     vless: {
       flow: "Flow",
       udpEnc: "UDP Packet Encoding",

frontend/src/locales/fa.ts

@@ -102,6 +102,7 @@ export default {
     disable: "غیرفعال",
     close: "بستن",
     restartApp: "ریستارت پنل",
+    restartSb: "ریستارت سینگ‌باکس",
   },
   login: {
     title: "ورود",
@@ -152,10 +153,12 @@ export default {
     directDns: "DNS مستقیم",
     toDirectDns: "هدایت به DNS مستقیم",
     jsonSubOptions: "گزینه‌های دیگر",
+    excludePkg: "نرم‌افزارهای استثنا",
   },
   client: {
     name: "نام",
     desc: "شرح",
+    group: "گروه",
     inboundTags: "برچسب‌های ورودی",
     basics: "پایه",
     config: "تنظیم",
@@ -163,6 +166,11 @@ export default {
     external: "لینک‌ خارجی",
     sub: "سابسکریپشن خارجی",
   },
+  bulk: {
+    add: "ایجاد انبوه",
+    order: "ترتیب",
+    random: "تصادفی",
+  },
   types: {
     un: "نام کاربری",
     pw: "رمز",
@@ -198,6 +206,10 @@ export default {
       authTimeout: "مهلت احراز هویت",
       hb: "ضربان قلب",
     },
+    tun: {
+      addr: "آدرس‌ها",
+      ifName: "نام اینترفیس",
+    },
     vless: {
       flow: "جریان",
       udpEnc: "کدگذاری بسته UDP",
@@ -301,7 +313,7 @@ export default {
     privateIp: "آدرس های IP نامعتبر",
     port: "پورت‌ها",
     portRange: "محدوده‌های پورت",
-    srcIp: "محدوده‌های آدرس IP مبدا",
+    srcCidr: "محدوده‌های آدرس IP مبدا",
     srcPrivateIp: "آدرس‌های IP مبدا نامعتبر",
     srcPort: "پورت‌های مبدا",
     srcPortRange: "محدوده پورتهای منبع",

frontend/src/locales/index.ts

@@ -4,6 +4,7 @@ import fa from './fa'
 import vi from './vi'
 import zhcn from './zhcn'
 import zhtw from './zhtw'
+import ru from './ru'
 
 export const i18n = createI18n({
   legacy: false,
@@ -14,7 +15,8 @@ export const i18n = createI18n({
     fa: fa,
     vi: vi,
     zhHans: zhcn,
-    zhHant: zhtw
+    zhHant: zhtw,
+    ru: ru
   },
 })
 
@@ -24,4 +26,5 @@ export const languages = [
   { title: 'Tiếng Việt', value: 'vi' },
   { title: '简体中文', value: 'zhHans' },
   { title: '繁體中文', value: 'zhHant' },
+  { title: 'Русский', value: 'ru' },
 ]

frontend/src/locales/ru.ts

@@ -0,0 +1,422 @@
+export default {
+  message: "Добро пожаловать",
+  success: "успех",
+  failed: "ошибка",
+  enable: "Включить",
+  disable: "Отключить",
+  none: "Никакие",
+  all: "Все",
+  filter: "Фильтр",
+  loading: "Загрузка...",
+  confirm: "Вы уверены?",
+  yes: "да",
+  no: "нет",
+  unlimited: "бесконечный",
+  remained: "Осталось",
+  type: "Тип",
+  protocol: "Протокол",
+  submit: "Отправить",
+  reset: "Сбросить",
+  now: "Сейчас",
+  network: "Сеть",
+  copyToClipboard: "Копировать в буфер обмена",
+  noData: "Нет данных!",
+  invalidLogin: "Неверный логин!",
+  online: "В сети",
+  version: "Версия",
+  email: "Электронная почта",
+  commaSeparated: "(разделено запятыми)",
+  count: "Количество",
+  template: "Шаблон",
+  error: {
+    dplData: "Дублирующие данные",
+    core: "Ошибка Sing-Box",
+  },
+  pages: {
+    login: "Вход",
+    home: "Главная",
+    inbounds: "Входящие",
+    outbounds: "Исходящие",
+    clients: "Клиенты",
+    rules: "Правила",
+    tls: "Настройки TLS",
+    basics: "Основы",
+    admins: "Администраторы",
+    settings: "Настройки",
+  },
+  main: {
+    tiles: "Плитки",
+    gauges: "Датчики",
+    charts: "Графики",
+    infos: "Информация",
+    gauge: {
+      cpu: "Загрузка ЦП",
+      mem: "Загрузка ОЗУ",
+    },
+    chart: {
+      cpu: "Мониторинг ЦП",
+      mem: "Мониторинг ОЗУ",
+      net: "Сетевой трафик",
+      pnet: "Сетевые пакеты",
+    },
+    info: {
+      sys: "Информация о системе",
+      sbd: "Информация о Sing-Box",
+      host: "Хост",
+      cpu: "ЦП",
+      core: "Ядро",
+      uptime: "Время работы",
+      threads: "Потоки",
+      memory: "Память",
+      running: "Работает"
+    }
+  },
+  objects: {
+    inbound: "Входящий",
+    client: "Клиент",
+    outbound: "Исходящий",
+    rule: "Правило",
+    user: "Пользователь",
+    tag: "Тег",
+    listen: "Прослушивание",
+    dial: "Звонок",
+    tls: "TLS",
+    multiplex: "Мультиплекс",
+    transport: "Транспорт",
+    method: "Метод",
+    headers: "Заголовки",
+    key: "Ключ",
+    value: "Значение",
+  },
+  actions: {
+    action: "Действие",
+    add: "Добавить",
+    new: "Новый",
+    edit: "Редактировать",
+    del: "Удалить",
+    clone: "Клонировать",
+    save: "Сохранить",
+    update: "Обновить",
+    submit: "Отправить",
+    set: "Установить",
+    generate: "Генерировать",
+    disable: "Отключить",
+    close: "Закрыть",
+    restartApp: "Перезапустить приложение",
+    restartSb: "Перезапустить Singbox",
+  },
+  login: {
+    title: "Вход",
+    username: "Имя пользователя",
+    unRules: "Имя пользователя не может быть пустым",
+    password: "Пароль",
+    pwRules: "Пароль не может быть пустым",
+  },
+  menu: {
+    logout: "Выйти",
+  },
+  admin: {
+    changeCred: "Изменить учетные данные",
+    oldPass: "Текущий пароль",
+    newUname: "Новое имя пользователя",
+    newPass: "Новый пароль",
+    lastLogin: "Последний вход",
+    date: "Дата",
+    time: "Время",
+    changes: "Изменения",
+    actor: "Исполнитель",
+    key: "Ключ",
+    action: "Действие",
+  },
+  setting: {
+    interface: "Интерфейс",
+    sub: "Подписка",
+    addr: "Адрес",
+    port: "Порт",
+    webPath: "Базовый URI",
+    domain: "Домен",
+    sslKey: "Путь к SSL ключу",
+    sslCert: "Путь к SSL сертификату",
+    webUri: "URI панели",
+    sessionAge: "Максимальная длительность сессии",
+    trafficAge: "Максимальная длительность трафика",
+    timeLoc: "Часовой пояс",
+    subEncode: "Включить кодирование",
+    subInfo: "Включить информацию о клиенте",
+    path: "Путь по умолчанию",
+    update: "Время автоматического обновления",
+    subUri: "URI подписки",
+    jsonSub: "JSON подписка",
+    toDirect: "Маршрутизация на Direct",
+    toBlock: "Маршрутизация на Block",
+    timestamp: "Метка времени",
+    globalDns: "Глобальный DNS",
+    directDns: "Прямой DNS",
+    toDirectDns: "Маршрутизация на Direct DNS",
+    jsonSubOptions: "Другие параметры",
+    excludePkg: "Исключить пакеты",
+  },
+  client: {
+    name: "Имя",
+    desc: "Описание",
+    group: "Группа",
+    inboundTags: "Теги входящих",
+    basics: "Основы",
+    config: "Конфигурация",
+    links: "Ссылки",
+    external: "Внешняя ссылка",
+    sub: "Внешняя подписка",
+  },
+  bulk: {
+    add: "Добавить пакетно",
+    order: "Порядок",
+    random: "Случайный",
+  },
+  types: {
+    un: "Имя пользователя",
+    pw: "Пароль",
+    direct: {
+      overrideAddr: "Переопределить адрес",
+      overridePort: "Переопределить порт",
+    },
+    hy: {
+      obfs: "Обфусцированный пароль",
+      auth: "Пароль аутентификации",
+      hyOptions: "Параметры Hysteria",
+      hy2Options: "Параметры Hysteria2",
+      ignoreBw: "Игнорировать пропускную способность клиента",
+    },
+    shdwTls: {
+      hs: "Сервер рукопожатий",
+      addHS: "Добавить сервер рукопожатий",
+    },
+    ssh: {
+      passphrase: "Парольная фраза",
+      hostKey: "Ключи хоста",
+      algorithm: "Алгоритмы ключей",
+      clientVer: "Версия клиента",
+      options: "Параметры SSH",
+    },
+    tor: {
+      execPath: "Путь к исполняемому файлу",
+      dataDir: "Каталог данных",
+      extArgs: "Дополнительные аргументы",
+    },
+    tuic: {
+      congControl: "Контроль перегрузок",
+      authTimeout: "Таймаут аутентификации",
+      hb: "Сердцебиение",
+    },
+    tun: {
+      addr: "Адреса",
+      ifName: "Имя интерфейса",
+    },
+    vless: {
+      flow: "Поток",
+      udpEnc: "Кодирование UDP пакетов",
+    },
+    vmess: {
+      security: "Безопасность",
+      globalPadding: "Глобальная подкладка",
+      authLen: "Длина шифрования",
+    },
+    wg: {
+      privKey: "Приватный ключ",
+      pubKey: "Публичный ключ пира",
+      psk: "Предварительно разделенный ключ",
+      localIp: "Локальные IP",
+      worker: "Работники",
+      ifName: "Имя интерфейса",
+      sysIf: "Системный интерфейс",
+      gso: "Отключение сегментации",
+      options: "Параметры Wireguard",
+      multiPeer: "Множественный пир",
+      allowedIp: "Разрешенные IP",
+      peer: "Пир",
+      peers: "Пиры",
+    },
+    lb: {
+      defaultOut: "Исходящий по умолчанию",
+      interruptConn: "Прервать существующие соединения",
+      testUrl: "Тестовый URL",
+      interval: "Интервал",
+      tolerance: "Толерантность",
+      urlTestOptions: "Параметры теста URL"
+    }
+  },
+  in: {
+    addr: "Адрес",
+    port: "Порт",
+    clients: "Включить клиентов",
+    ssMethod: "Метод",
+    sSide: "Сторона сервера",
+    cSide: "Сторона клиента",
+    multiDomain: "Мультидомен",
+    remark: "Примечание",
+    mdOption: "Параметры мультидомена",
+  },
+  listen: {
+    sniffing: "Обнаружение",
+    sniffingTimeout: "Таймаут обнаружения",
+    sniffingOverride: "Переопределение назначения",
+    options: "Параметры прослушивания",
+    tcpOptions: "Параметры TCP",
+    udpOptions: "Параметры UDP",
+    detour: "Обход",
+    detourText: "Переадресация на входящий",
+    domainStrategy: "Стратегия домена",
+  },
+  dial: {
+    bindIf: "Привязка к сетевому интерфейсу",
+    bindIp4: "Привязка к IPv4",
+    bindIp6: "Привязка к IPv6",
+    reuseAddr: "Повторное использование адреса слушателя",
+    connTimeout: "Таймаут подключения",
+    fbTimeout: "Таймаут возврата",
+    options: "Параметры вызова",
+    detourText: "Переадресация на исходящий",
+  },
+  transport: {
+    enable: "Включить транспорт",
+    host: "Хост",
+    hosts: "Хосты",
+    path: "Путь",
+    httpMethod: "Метод запроса",
+    idleTimeout: "Таймаут бездействия",
+    pingTimeout: "Таймаут пинга",
+    grpcServiceName: "Имя службы",
+    grpcPws: "Разрешить без потока",
+  },
+  mux: {
+    enable: "Включить мультиплекс",
+    maxConn: "Максимальное количество соединений",
+    minStr: "Минимальное количество потоков",
+    maxStr: "Максимальное количество потоков",
+    padding: "Только подкладка",
+    enableBrutal: "Включить Brutal",
+  },
+  out: {
+    addr: "Адрес сервера",
+    port: "Порт сервера",
+  },
+  rule: {
+    add: "Добавить правило",
+    simple: "Простое",
+    logical: "Логическое",
+    mode: "Режим",
+    invert: "Инвертировать",
+    ipVer: "Версия IP",
+    domain: "Домены",
+    domainSufix: "Суффиксы доменов",
+    domainKw: "Ключевые слова домена",
+    domainRgx: "Регулярные выражения домена",
+    ip: "CIDR IP",
+    privateIp: "Недействительные диапазоны IP",
+    port: "Порты",
+    portRange: "Диапазоны портов",
+    srcCidr: "CIDR исходного IP",
+    srcPrivateIp: "Недействительные исходные IP",
+    srcPort: "Исходные порты",
+    srcPortRange: "Диапазоны исходных портов",
+    ruleset: "Наборы правил",
+    rulesetMatchSrc: "Набор правил для соответствия источника IPcidr",
+    options: "Параметры правила",
+    domainRules: "Домен/IP",
+    srcIpRules: "Источник IP",
+    srcPortRules: "Источник порта",
+  },
+  ruleset: {
+    add: "Добавить набор правил",
+    format: "Формат данных",
+    interval: "Интервалы обновления",
+    remote: "Удаленный",
+    local: "Локальный",
+  },
+  basic: {
+    log: {
+      title: "Журналы",
+      level: "Уровень",
+      output: "Вывод",
+      timestamp: "Включить метку времени",
+    },
+    dns: {
+      final: "Итоговый",
+      server: "Сервер",
+      firstServer: "Первый сервер",
+      addrResolver: "Разрешение адреса",
+    },
+    routing: {
+      title: "Маршрутизация",
+      defaultOut: "Исходящий по умолчанию",
+      defaultIf: "Сетевой интерфейс по умолчанию",
+      defaultRm: "Маршрут по умолчанию",
+      autoBind: "Автопривязка сетевого интерфейса",
+    },
+    exp: {
+      storeFakeIp: "Хранить поддельный IP",
+    },
+  },
+  tls: {
+    enable: "Включить TLS",
+    usePath: "Использовать путь",
+    useText: "Использовать текст",
+    certPath: "Путь к файлу сертификата",
+    keyPath: "Путь к файлу ключа",
+    cert: "Сертификат",
+    key: "Ключ",
+    options: "Параметры TLS",
+    minVer: "Минимальная версия",
+    maxVer: "Максимальная версия",
+    cs: "Наборы шифров",
+    privKey: "Приватный ключ",
+    pubKey: "Публичный ключ",
+    disableSni: "Отключить SNI",
+    insecure: "Разрешить небезопасное",
+    acme: {
+      options: "Параметры ACME",
+      dataDir: "Каталог данных",
+      defaultDomain: "Домен по умолчанию",
+      disableChallenges: "Отключить вызовы",
+      httpChallenge: "Отключить HTTP вызов",
+      tlsChallenge: "Отключить TLS вызов",
+      altPorts: "Альтернативные порты",
+      altHport: "Альтернативный HTTP порт",
+      altTport: "Альтернативный TLS порт",
+      caProvider: "Поставщик CA",
+      customCa: "Пользовательский поставщик CA",
+      extAcc: "Внешний аккаунт",
+      dns01: "DNS01 вызов",
+      dns01Provider: "Поставщик DNS01 вызова",
+    },
+  },
+  stats: {
+    upload: "Загрузка",
+    download: "Скачивание",
+    volume: "Объем",
+    usage: "Использование",
+    enable: "Включить статистику",
+    graphTitle: "График трафика",
+    B: "Б",
+    KB: "КБ",
+    MB: "МБ",
+    GB: "ГБ",
+    TB: "ТБ",
+    PB: "ПБ",
+    p: "п",
+    Kp: "Кп",
+    Mp: "Мп",
+    Gb: "Гб",
+    bps: "б/с",
+    Kbps: "Кб/с",
+    Mbps: "Мб/с",
+  },
+  date: {
+    expiry: "Срок действия",
+    expired: "Истек",
+    d: "д",
+    h: "ч",
+    m: "м",
+    s: "с",
+    ms: "мс",
+  },
+}

frontend/src/locales/vi.ts

@@ -103,6 +103,7 @@ export default {
     disable: "Vô hiệu hóa",
     close: "Đóng",
     restartApp: "Khởi động lại ứng dụng",
+    restartSb: "Khởi động lại Singbox",
   },
   login: {
     title: "Đăng nhập",
@@ -153,10 +154,12 @@ export default {
     directDns: "DNS Trực tiếp",
     toDirectDns: "Chuyển hướng tới DNS Trực tiếp",
     jsonSubOptions: "Tùy chọn Khác",
+    excludePkg: "Loại trừ Gói",
   },
   client: {
     name: "Tên",
     desc: "Mô tả",
+    group: "Nhóm",
     inboundTags: "Thẻ đầu vào",
     basics: "Cơ bản",
     config: "Cấu hình",
@@ -164,6 +167,11 @@ export default {
     external: "Liên kết bên ngoài",
     sub: "Đăng ký bên ngoài",
   },
+  bulk: {
+    add: "Thêm Hàng loạt",
+    order: "Sắp xếp",
+    random: "Ngẫu nhiên",
+  },
   types: {
     un: "Tên người dùng",
     pw: "Mật khẩu",
@@ -199,6 +207,10 @@ export default {
       authTimeout: "Thời gian chờ Xác thực",
       hb: "Nhịp tim",
     },
+    tun: {
+      addr: "Địa chỉ",
+      ifName: "Tên Giao diện",
+    },
     vless: {
       flow: "Luồng",
       udpEnc: "Mã hóa Gói UDP",

frontend/src/locales/zhcn.ts

@@ -103,6 +103,7 @@ export default {
     disable: "禁用",
     close: "关闭",
     restartApp: "重启面板",
+    restartSb: "重启 Singbox",
   },
   login: {
     title: "登录",
@@ -153,10 +154,12 @@ export default {
     directDns: "直连 DNS",
     toDirectDns: "路由到直连 DNS",
     jsonSubOptions: "其他选项",
+    excludePkg: "排除包",
   },
   client: {
     name: "名称",
     desc: "描述",
+    group: "组",
     inboundTags: "入站标签",
     basics: "基础",
     config: "配置",
@@ -164,6 +167,11 @@ export default {
     external: "外部链接",
     sub: "外部订阅",
   },
+  bulk: {
+    add: "批量添加",
+    order: "排序",
+    random: "随机",
+  },
   types: {
     un: "用户名",
     pw: "密码",
@@ -199,6 +207,10 @@ export default {
       authTimeout: "认证超时",
       hb: "心跳包",
     },
+    tun: {
+      addr: "地址",
+      ifName: "接口名称",
+    },
     vless: {
       flow: "流控",
       udpEnc: "UDP 数据包编码",

frontend/src/locales/zhtw.ts

@@ -104,6 +104,7 @@ export default {
     disable: "禁用",
     close: "關閉",
     restartApp: "重啟面板",
+    restartSb: "重啟 Singbox",
   },
   login: {
     title: "登錄",
@@ -154,10 +155,12 @@ export default {
     directDns: "直連 DNS",
     toDirectDns: "路由到直連 DNS",
     jsonSubOptions: "其他選項",
+    excludePkg: "排除包",
   },
   client: {
     name: "名稱",
     desc: "描述",
+    group: "組",
     inboundTags: "入站標簽",
     basics: "基礎",
     config: "配置",
@@ -165,6 +168,11 @@ export default {
     external: "外部鏈接",
     sub: "外部訂閱",
   },
+  bulk: {
+    add: "批量添加",
+    order: "排序",
+    random: "隨機",
+  },
   types: {
     un: "用戶名",
     pw: "密碼",
@@ -200,6 +208,10 @@ export default {
       authTimeout: "身份驗證超時",
       hb: "心跳",
     },
+    tun: {
+      addr: "地址",
+      ifName: "介面名稱",
+    },
     vless: {
       flow: "流量",
       udpEnc: "UDP 封包編碼",

frontend/src/plugins/api.ts

@@ -1,4 +1,4 @@
-import axios from 'axios';
+import axios from 'axios'
 
 axios.defaults.headers.post['Content-Type'] = 'application/x-www-form-urlencoded; charset=UTF-8'
 axios.defaults.headers.common['X-Requested-With'] = 'XMLHttpRequest'
@@ -50,7 +50,7 @@ axios.interceptors.response.use(
         }
         return Promise.reject(error)
     }
-);
+)
 
 const api = axios.create()
 

frontend/src/plugins/httputil.ts

@@ -57,7 +57,7 @@ function _respToMsg(resp: any): Msg {
 }
 
 function isMsg(obj: any): obj is Msg {
-  return 'success' in obj && 'msg' in obj && 'obj' in obj
+  return Object.hasOwn(obj,'success') && Object.hasOwn(obj,'msg') && Object.hasOwn(obj, 'obj')
 }
   
 const HttpUtils = {
@@ -85,4 +85,4 @@ const HttpUtils = {
   },
 }
 
-export default HttpUtils;
+export default HttpUtils

frontend/src/plugins/link.ts

@@ -1,6 +1,7 @@
 import { Hysteria, Hysteria2, InTypes, Inbound, Naive, Shadowsocks, TUIC, Trojan, VLESS, VMess } from "@/types/inbounds"
 import { HTTP, WebSocket, gRPC, HTTPUpgrade, Transport, TrspTypes } from "@/types/transport"
 import RandomUtil from "./randomUtil"
+import { Client } from "@/types/clients"
 
 export interface Link {
   type: "local" | "external" | "sub"
@@ -9,12 +10,12 @@ export interface Link {
 }
 
 function utf8ToBase64(utf8String: string): string {
-  const encodedUtf8 = encodeURIComponent(utf8String).replace(/%([0-9A-F]{2})/g, (_, p1) => String.fromCharCode(parseInt(p1, 16)));
+  const encodedUtf8 = encodeURIComponent(utf8String).replace(/%([0-9A-F]{2})/g, (_, p1) => String.fromCharCode(parseInt(p1, 16)))
-  return btoa(encodedUtf8);
+  return btoa(encodedUtf8)
 }
 
 export namespace LinkUtil {
-  export function linkGenerator(user: string, inbound: Inbound, tlsClient: any = {}, addrs: any[] = []): string[] {
+  export function linkGenerator(user: Client, inbound: Inbound, tlsClient: any = {}, addrs: any[] = []): string[] {
     switch(inbound.type){
       case InTypes.Shadowsocks:
         return shadowsocksLink(user,<Shadowsocks>inbound, addrs)
@@ -36,8 +37,8 @@ export namespace LinkUtil {
     return []
   }
 
-  function shadowsocksLink(user: string, inbound: Shadowsocks, addrs: any[]): string[] {
+  function shadowsocksLink(user: Client, inbound: Shadowsocks, addrs: any[]): string[] {
-    const userPass = inbound.users?.find(i => i.name == user)?.password
+    const userPass = inbound.method == "2022-blake3-aes-128-gcm" ? user.config.shadowsocks16?.password : user.config.shadowsocks?.password
     const password = [userPass]
     if (inbound.method.startsWith('2022')) password.push(inbound.password)
     const params = {
@@ -70,8 +71,8 @@ export namespace LinkUtil {
     return links
   }
 
-  function hysteriaLink(user: string, inbound: Hysteria, addrs: any[], tlsClient: any): string[] {
+  function hysteriaLink(user: Client, inbound: Hysteria, addrs: any[], tlsClient: any): string[] {
-    const auth = inbound.users.find(i => i.name == user)?.auth_str
+    const auth = user.config.hysteria.auth_str
     const params = {
       upmbps: inbound.up_mbps?? null,
       downmbps: inbound.down_mbps?? null,
@@ -118,8 +119,8 @@ export namespace LinkUtil {
     return links
   }
 
-  function hysteria2Link(user: string, inbound: Hysteria2, addrs: any[], tlsClient: any): string[] {
+  function hysteria2Link(user: Client, inbound: Hysteria2, addrs: any[], tlsClient: any): string[] {
-    const password = inbound.users.find(i => i.name == user)?.password
+    const password = user.config.hysteria2.password
     const params = {
       upmbps: inbound.up_mbps?? null,
       downmbps: inbound.down_mbps?? null,
@@ -166,8 +167,8 @@ export namespace LinkUtil {
     return links
   }
 
-  function naiveLink(user: string, inbound: Naive, addrs: any[], tlsClient: any): string[] {
+  function naiveLink(user: Client, inbound: Naive, addrs: any[], tlsClient: any): string[] {
-    const password = inbound.users.find(i => i.username == user)?.password
+    const password = user.config.naive.password
 
     let links = <string[]>[]
     if (addrs.length == 0) {
@@ -208,8 +209,8 @@ export namespace LinkUtil {
     return links
   }
 
-  function tuicLink(user: string, inbound: TUIC, addrs: any[], tlsClient: any): string[] {
+  function tuicLink(user: Client, inbound: TUIC, addrs: any[], tlsClient: any): string[] {
-    const u = inbound.users.find(i => i.name == user)
+    const u = user.config.tuic
     const params = {
       sni: inbound.tls.server_name?? null,
       alpn: inbound.tls.alpn?.join(',')?? null,
@@ -286,8 +287,8 @@ export namespace LinkUtil {
     return params
   }
 
-  function vlessLink(user: string, inbound: VLESS, addrs: any[], tlsClient: any): string[] {
+  function vlessLink(user: Client, inbound: VLESS, addrs: any[], tlsClient: any): string[] {
-    const u = inbound.users.find(i => i.name == user)
+    const u = user.config.vless
     const transport = <Transport>inbound.transport
 
     const tParams = getTransportParams(transport)
@@ -348,8 +349,8 @@ export namespace LinkUtil {
     return links
   }
 
-  function trojanLink(user: string, inbound: Trojan, addrs: any[], tlsClient: any): string[] {
+  function trojanLink(user: Client, inbound: Trojan, addrs: any[], tlsClient: any): string[] {
-    const u = inbound.users.find(i => i.name == user)
+    const u = user.config.trojan
     const transport = <Transport>inbound.transport
 
     const tParams = getTransportParams(transport)
@@ -410,8 +411,8 @@ export namespace LinkUtil {
     return links
   }
 
-  function vmessLink(user: string, inbound: VMess, addrs: any[], tlsClient: any): string[] {
+  function vmessLink(user: Client, inbound: VMess, addrs: any[], tlsClient: any): string[] {
-    const u = inbound.users.find(i => i.name == user)
+    const u = user.config.vmess
     const transport = <Transport>inbound.transport
 
     const tParams = getTransportParams(transport)
@@ -455,7 +456,7 @@ export namespace LinkUtil {
         if (a.insecure) {
           newParams.allowInsecure = 1
         }
-        newParams.ps = encodeURIComponent(a.remark ? inbound.tag + a.remark : inbound.tag)
+        newParams.ps = inbound.tag + (a.remark??'')
         links.push('vmess://' + utf8ToBase64(JSON.stringify(newParams, null, 2)))
       })
     }

frontend/src/plugins/outJson.ts

@@ -1,6 +1,7 @@
 import { Hysteria, Hysteria2, Inbound, InTypes, Shadowsocks, Trojan, TUIC, VLESS, VMess, ShadowTLS } from "@/types/inbounds"
 import { iTls } from "@/types/inTls"
 import { oTls } from "@/types/outTls"
+import RandomUtil from "./randomUtil"
 
 export function fillData(out: any, inbound: Inbound, tlsClient: any) {
   if (Object.hasOwn(inbound, 'tls')) {
@@ -52,11 +53,14 @@ function addTls(out: any, tls: iTls, tlsClient: oTls){
   if(tls.min_version) out.tls.min_version = tls.min_version
   if(tls.max_version) out.tls.max_version = tls.max_version
   if(tls.cipher_suites) out.tls.cipher_suites = tls.cipher_suites
+  if(tls.reality?.enabled){
+    out.tls.reality.enabled = true
+    out.tls.reality.short_id = tls.reality.short_id[RandomUtil.randomInt(tls.reality.short_id.length)]
+  }
 }
 
 function shadowsocksOut(out: any, inbound: Shadowsocks) {
   out.method = inbound.method
-  out.multiplex = inbound.multiplex
 }
 
 function shadowTlsOut(out: any, inbound: ShadowTLS) {
@@ -89,16 +93,13 @@ function tuicOut(out: any, inbound: TUIC) {
 }
 
 function vlessOut(out: any, inbound: VLESS) {
-  out.multiplex = inbound.multiplex
   out.transport = inbound.transport
 }
 
 function trojanOut(out: any, inbound: Trojan) {
-  out.multiplex = inbound.multiplex
   out.transport = inbound.transport
 }
 
 function vmessOut(out: any, inbound: VMess) {
-  out.multiplex = inbound.multiplex
   out.transport = inbound.transport
 }

frontend/src/plugins/randomUtil.ts

@@ -36,8 +36,8 @@ const RandomUtil = {
   },
   randomShortId(): string[] {
     let shortIds = new Array(24).fill('')
-    for (var ii = 0; ii < 24; ii++) {
+    for (var ii = 1; ii < 24; ii++) {
-        for (var jj = 0; jj < this.randomInt(8); jj++){
+      for (var jj = 0; jj <= this.randomInt(7); jj++){
           let randomNum = this.randomInt(256)
           shortIds[ii] += ('0' + randomNum.toString(16)).slice(-2)
       }

frontend/src/plugins/vuetify.ts

@@ -9,7 +9,7 @@ import '@mdi/font/css/materialdesignicons.css'
 import 'vuetify/styles'
 
 import colors from 'vuetify/util/colors'
-import { fa, en, vi, zhHans, zhHant } from 'vuetify/locale'
+import { fa, en, vi, zhHans, zhHant, ru } from 'vuetify/locale'
 
 // Composables
 import { createVuetify } from 'vuetify'
@@ -53,6 +53,6 @@ export default createVuetify({
   locale: {
     locale: localStorage.getItem("locale") ?? 'en',
     fallback: 'en',
-    messages: { en, fa, vi, zhHans, zhHant },
+    messages: { en, fa, vi, zhHans, zhHant, ru },
   },
 })

frontend/src/types/clients.ts

@@ -13,6 +13,7 @@ export interface Client {
   up: number
   down: number
   desc: string
+  group: string
 }
 
 const defaultClient: Client = {
@@ -26,6 +27,7 @@ const defaultClient: Client = {
   up: 0,
   down: 0,
   desc: "",
+  group: "",
 }
 
 type Config = {
@@ -54,7 +56,8 @@ export function updateConfigs(configs: Config, newUserName: string): Config {
 
 export function randomConfigs(user: string): Config {
   const mixedPassword = RandomUtil.randomSeq(10)
-  const ssPassword = RandomUtil.randomShadowsocksPassword(32)
+  const ssPassword16 = RandomUtil.randomShadowsocksPassword(16)
+  const ssPassword32 = RandomUtil.randomShadowsocksPassword(32)
   const uuid = RandomUtil.randomUUID()
   return {
     mixed: {
@@ -71,11 +74,15 @@ export function randomConfigs(user: string): Config {
     },
     shadowsocks: {
       name: user,
-      password: ssPassword,
+      password: ssPassword32,
+    },
+    shadowsocks16: {
+      name: user,
+      password: ssPassword16,
     },
     shadowtls: {
       name: user,
-      password: ssPassword,
+      password: ssPassword32,
     },
     vmess: {
       name: user,
@@ -114,5 +121,9 @@ export function randomConfigs(user: string): Config {
 export function createClient<T extends Client>(json?: Partial<T>): Client {
   defaultClient.name = RandomUtil.randomSeq(8)
   const defaultObject: Client = { ...defaultClient, ...(json || {}) }
+
+  // Add missing config
+  defaultObject.config = { ...randomConfigs(defaultObject.name), ...defaultObject.config }
+  
   return defaultObject
 }

frontend/src/types/inbounds.ts

@@ -17,7 +17,7 @@ export const InTypes = {
   TUIC: 'tuic',
   Hysteria2: 'hysteria2',
   VLESS: 'vless',
-  // Tun: 'tun',
+  Tun: 'tun',
   Redirect: 'redirect',
   TProxy: 'tproxy',
 }
@@ -165,7 +165,31 @@ export interface Hysteria2 extends InboundBasics {
   brutal_debug?: boolean
 }
 export interface Tun extends InboundBasics {
-  [otherProperties: string]: any
+  interface_name?: string
+  address?: string[]
+  mtu?: number
+  endpoint_independent_nat?: boolean
+  udp_timeout?: string
+  stack?: string
+  auto_route?: boolean
+  // gso?: boolean
+  // strict_route?: boolean
+  // iproute2_table_index?: number
+  // iproute2_rule_index?: number
+  // auto_redirect?: boolean
+  // auto_redirect_input_mark?: string
+  // auto_redirect_output_mark?: string
+  // route_address?: string[]
+  // route_exclude_address?: string[]
+  // include_interface?: string[]
+  // exclude_interface?: string[]
+  // include_uid?: string[]
+  // include_uid_range?: string[]
+  // exclude_uid?: number[]
+  // exclude_uid_range?: string[]
+  // include_android_user?: number[]
+  // include_package?: string[]
+  // exclude_package?: string[]
 }
 export interface Redirect extends InboundBasics {}
 export interface TProxy extends InboundBasics {
@@ -187,7 +211,7 @@ type InterfaceMap = {
   tuic: TUIC
   hysteria2: Hysteria2
   vless: VLESS
-  // tun: Tun
+  tun: Tun
   redirect: Redirect
   tproxy: TProxy
 }
@@ -228,7 +252,7 @@ const defaultValues: Record<InType, Inbound> = {
   tuic: <TUIC>{ type: InTypes.TUIC, users: <TuicUser[]>[], congestion_control: "cubic", tls: { enabled: true } },
   hysteria2: <Hysteria2>{ type: InTypes.Hysteria2, users: <NamePass[]>[], tls: { enabled: true } },
   vless: <VLESS>{ type: InTypes.VLESS, users: <VlessUser[]>[], tls: {}, multiplex: {}, transport: {} },
-  // tun: <Tun>{ type: InTypes.Tun },
+  tun: <Tun>{ type: InTypes.Tun, mtu: 9000, stack: 'system', udp_timeout: '5m', auto_route: false },
   redirect: <Redirect>{ type: InTypes.Redirect },
   tproxy: <TProxy>{ type: InTypes.TProxy },
 }

frontend/src/views/Clients.vue

@@ -5,11 +5,20 @@
     :visible="modal.visible"
     :index="modal.index"
     :data="modal.data"
+    :groups="groups"
     :stats="modal.stats"
     :inboundTags="inboundTags"
     @close="closeModal"
     @save="saveModal"
   />
+  <ClientBulk 
+    v-model="addBulkModal"
+    :visible="addBulkModal"
+    :groups="groups"
+    :inboundTags="inboundTags"
+    @close="closeBulk"
+    @save="saveBulk"
+  />
   <QrCode
     v-model="qrcode.visible"
     :visible="qrcode.visible"
@@ -28,19 +37,108 @@
       <v-btn color="primary" @click="showModal(-1)">{{ $t('actions.add') }}</v-btn>
     </v-col>
     <v-col cols="auto">
+      <v-menu v-model="actionMenu" :close-on-content-click="false" location="bottom center">
+        <template v-slot:activator="{ props }">
+          <v-btn v-bind="props" hide-details variant="text" icon>
+            <v-icon icon="mdi-tools" color="primary" />
+          </v-btn>
+        </template>
+        <v-list density="compact" nav>
+          <v-list-item link @click="addBulk">
+            <template v-slot:prepend>
+              <v-icon icon="mdi-account-multiple-plus"></v-icon>
+            </template>
+            <v-list-item-title v-text="$t('bulk.add')"></v-list-item-title>
+          </v-list-item>
+        </v-list>
+      </v-menu>
+    </v-col>
+    <v-col cols="auto">
+      <v-menu v-model="filterMenu" :close-on-content-click="false" location="bottom center">
+        <template v-slot:activator="{ props }">
+          <v-btn v-bind="props" hide-details variant="text" icon>
+            <v-icon :icon="filterSettings.enabled ? 'mdi-filter-check-outline' : 'mdi-filter-menu-outline'" :color="filterSettings.enabled ? 'primary' : ''" />
+          </v-btn>
+        </template>
+        <v-card>
+          <v-container>
+            <v-row>
+              <v-col>
                 <v-select
-      hide-details
                 variant="underlined"
                 density="compact"
-      :label="$t('filter')"
+                :label="$t('type')"
                 :items="filterItems"
-      v-model="filter">
+                v-model="filterSettings.state">
                 </v-select>
               </v-col>
             </v-row>
             <v-row>
-    <template v-for="(item, index) in clients" :key="item.id">
+              <v-col>
-      <v-col cols="12" sm="4" md="3" lg="2" :style="checkFilter(item)? '' : 'opacity: .2'">
+                <v-select
+                variant="underlined"
+                density="compact"
+                :label="$t('client.group')"
+                :items="[ {title: $t('all'), value: '-'}, ...groups.map(g => ({ title: g.length>0 ? g : $t('none'), value: g}))]"
+                v-model="filterSettings.group">
+                </v-select>
+              </v-col>
+            </v-row>
+            <v-row>
+              <v-col>
+                <v-text-field
+                variant="underlined"
+                density="compact"
+                :label="$t('client.name')"
+                v-model="filterSettings.text">
+                </v-text-field>
+              </v-col>
+            </v-row>
+          </v-container>
+          <v-card-actions>
+            <v-card-actions>
+              <v-spacer></v-spacer>
+              <v-btn
+                color="blue-darken-1"
+                variant="outlined"
+                @click="clearFilter"
+              >
+                {{ $t('actions.del') }}
+              </v-btn>
+              <v-btn
+                color="blue-darken-1"
+                variant="tonal"
+                @click="doFilter"
+              >
+                {{ $t('actions.update') }}
+              </v-btn>
+            </v-card-actions>
+          </v-card-actions>
+        </v-card>
+      </v-menu>
+    </v-col>
+    <v-col cols="auto">
+      <v-btn hide-details variant="text" icon @click="toggleClientView">
+      <v-icon :icon="tableView ? 'mdi-table-eye' : 'mdi-table-eye-off'" :color="tableView ? 'primary' : ''"></v-icon>
+      </v-btn>
+    </v-col>
+  </v-row>
+  <template v-for="group in groups" v-if="!tableView">
+    <v-row>
+      <v-col class="v-card-subtitle">
+        {{ group.length>0 ? group : $t('none') }}
+        <v-badge :content="(filterSettings.enabled ? filterSettings.filteredClients : clients).filter(c => c.group == group).length" inline color="info" />
+        <v-icon
+          :icon="openedGroups.includes(group) ? 'mdi-arrow-collapse-up' : 'mdi-arrow-collapse-down'"
+          size="small"
+          variant="text"
+          @click="toggleGroupOpen(group)"
+        ></v-icon>
+      </v-col>
+    </v-row>
+    <v-row v-if="openedGroups.includes(group)">
+    <template v-for="item in (filterSettings.enabled ? filterSettings.filteredClients : clients).filter(c => c.group == group)" :key="item.id">
+      <v-col cols="12" sm="4" md="3" lg="2">
         <v-card rounded="xl" elevation="5" min-width="200">
           <v-card-title>
             <v-row>
@@ -48,7 +146,7 @@
               <v-spacer></v-spacer>
               <v-col cols="auto">
                 <v-switch color="primary"
-                v-model="clients[index].enable"
+                v-model="item.enable"
                 @update:model-value="buildInboundsUsers(item.inbounds)"
                 hideDetails density="compact" />
               </v-col>
@@ -97,7 +195,7 @@
             <v-row>
               <v-col>{{ $t('online') }}</v-col>
               <v-col dir="ltr">
-                <template v-if="onlines[index]">
+                <template v-if="isOnline(item.name).value">
                   <v-chip density="comfortable" size="small" color="success" variant="flat">{{ $t('online') }}</v-chip>
                 </template>
                 <template v-else>-</template>
@@ -106,16 +204,16 @@
           </v-card-text>
           <v-divider></v-divider>
           <v-card-actions style="padding: 0;">
-            <v-btn icon="mdi-account-edit" @click="showModal(index)">
+            <v-btn icon="mdi-account-edit" @click="showModal(item.id)">
               <v-icon />
-              <v-tooltip activator="parent" location="top" :text="$t('actions.edit')"></v-tooltip>
+              <v-tooltip activator="parent" location="top" :text="$t('actions.edit') + item.id"></v-tooltip>
             </v-btn>
-            <v-btn style="margin-inline-start:0;" icon="mdi-account-minus" color="warning" @click="delOverlay[index] = true">
+            <v-btn style="margin-inline-start:0;" icon="mdi-account-minus" color="warning" @click="delOverlay[clients.findIndex(c => c.id == item.id)] = true">
               <v-icon />
               <v-tooltip activator="parent" location="top" :text="$t('actions.del')"></v-tooltip>
             </v-btn>
             <v-overlay
-              v-model="delOverlay[index]"
+              v-model="delOverlay[clients.findIndex(c => c.id == item.id)]"
               contained
               class="align-center justify-center"
             >
@@ -123,12 +221,12 @@
                 <v-divider></v-divider>
                 <v-card-text>{{ $t('confirm') }}</v-card-text>
                 <v-card-actions>
-                  <v-btn color="error" variant="outlined" @click="delClient(index)">{{ $t('yes') }}</v-btn>
+                  <v-btn color="error" variant="outlined" @click="delClient(item.id)">{{ $t('yes') }}</v-btn>
-                  <v-btn color="success" variant="outlined" @click="delOverlay[index] = false">{{ $t('no') }}</v-btn>
+                  <v-btn color="success" variant="outlined" @click="delOverlay[clients.findIndex(c => c.id == item.id)] = false">{{ $t('no') }}</v-btn>
                 </v-card-actions>
               </v-card>
             </v-overlay>
-            <v-btn icon="mdi-qrcode" @click="showQrCode(index)">
+            <v-btn icon="mdi-qrcode" @click="showQrCode(item.id)">
               <v-icon />
               <v-tooltip activator="parent" location="top" text="QR-Code"></v-tooltip>
             </v-btn>
@@ -142,9 +240,111 @@
     </template>
     </v-row>
   </template>
+  <v-row v-else>
+    <v-col cols="12">
+      <v-data-table
+        :headers="headers"
+        :items="filterSettings.enabled ? filterSettings.filteredClients : clients"
+        :hide-default-footer="filterSettings.enabled ? filterSettings.filteredClients.length<=10 : clients.length<=10"
+        hide-no-data
+        fixed-header
+        :group-by="groupBy"
+        item-value="name"
+        :mobile="smAndDown"
+        mobile-breakpoint="sm"
+        width="100%"
+        class="elevation-3 rounded"
+        >
+        <template v-slot:group-header="{ item, columns, toggleGroup, isGroupOpen }">
+          <tr>
+            <td :colspan="columns.length" @click="toggleGroup(item)" style="min-height: fit-content; text-align: center;">
+              <v-icon :icon="isGroupOpen(item) ? '$expand' : '$next'"></v-icon>
+              {{ item.value.length>0 ? item.value : $t('none') }}
+              <v-badge :content="(filterSettings.enabled ? filterSettings.filteredClients : clients).filter(c => c.group == item.value).length" inline color="success" />
+            </td>
+          </tr>
+        </template>
+        <template v-slot:item.volume="{ item }">
+          <div class="text-start">
+            <v-chip
+              size="small"
+              label
+            >{{ item.volume == 0 ? $t('unlimited') : HumanReadable.sizeFormat(item.volume) }}</v-chip>
+          </div>
+        </template>
+        <template v-slot:item.expiry="{ item }">
+          <div class="text-start">
+            <v-chip
+              size="small"
+              label
+            >{{ item.expiry == 0 ? $t('unlimited') : HumanReadable.remainedDays(item.expiry)?? $t('date.expired') }}</v-chip>
+          </div>
+        </template>
+        <template v-slot:item.online="{ item }">
+          <div class="text-start">
+            <template v-if="isOnline(item.name).value">
+              <v-chip density="comfortable" size="small" color="success" variant="flat">{{ $t('online') }}</v-chip>
+            </template>
+            <template v-else>-</template>
+          </div>
+        </template>
+        <template v-slot:item.actions="{ item }">
+        <v-icon
+          class="me-2"
+          @click="showModal(item.id)"
+        >
+          mdi-pencil
+        </v-icon>
+        <v-menu
+          v-model="delOverlay[clients.findIndex(c => c.id == item.id)]"
+          :close-on-content-click="false"
+          location="top center"
+        >
+          <template v-slot:activator="{ props }">
+            <v-icon
+              class="me-2"
+              color="error"
+              v-bind="props"
+            >
+              mdi-delete
+            </v-icon>
+          </template>
+          <v-card :title="$t('actions.del')" rounded="lg">
+            <v-divider></v-divider>
+            <v-card-text>{{ $t('confirm') }}</v-card-text>
+            <v-card-actions>
+              <v-btn color="error" variant="outlined" @click="delClient(item.id)">{{ $t('yes') }}</v-btn>
+              <v-btn color="success" variant="outlined" @click="delOverlay[clients.findIndex(c => c.id == item.id)] = false">{{ $t('no') }}</v-btn>
+            </v-card-actions>
+          </v-card>
+        </v-menu>
+        <v-icon
+          class="me-2"
+          @click="showQrCode(item.id)"
+        >
+          mdi-qrcode
+        </v-icon>
+        <v-icon icon="mdi-chart-line" @click="showStats(item.name)" v-if="v2rayStats.users.includes(item.name)">
+          <v-tooltip activator="parent" location="top" :text="$t('stats.graphTitle')"></v-tooltip>
+        </v-icon>
+      </template>
+      </v-data-table>
+    </v-col>
+  </v-row>
+</template>
+<style>
+.v-data-table__tr--mobile td {
+  height: fit-content;
+  min-height: 36px !important;
+}
+.v-data-table__tr--mobile td div {
+  width:max-content;
+}
+</style>
 <script lang="ts" setup>
 import Data from '@/store/modules/data'
 import ClientModal from '@/layouts/modals/Client.vue'
+import ClientBulk from '@/layouts/modals/ClientBulk.vue'
 import QrCode from '@/layouts/modals/QrCode.vue'
 import Stats from '@/layouts/modals/Stats.vue'
 import { Client, createClient } from '@/types/clients'
@@ -155,13 +355,16 @@ import { Link, LinkUtil } from '@/plugins/link'
 import { HumanReadable } from '@/plugins/utils'
 import { i18n } from '@/locales'
 import { push } from 'notivue'
+import { useDisplay } from 'vuetify'
+
+const { smAndDown } = useDisplay()
 
 const clients = computed((): any[] => {
   return Data().clients
 })
 
-const onlines = computed(() => {
+const isOnline = (cname: string) => computed(() => {
-  return Data().onlines.user ? clients.value.map(c => Data().onlines.user.includes(c.name)) : []
+  return Data().onlines?.user ? Data().onlines.user.includes(cname) : false
 })
 
 const appConfig = computed((): Config => {
@@ -181,7 +384,27 @@ const inboundTags = computed((): string[] => {
   return inbounds.value?.filter(i => i.tag != "" && Object.hasOwn(i,'users')).map(i => i.tag)
 })
 
-const filter = ref("")
+const groups = computed((): string[] => {
+  if (!clients.value) return []
+  if (filterSettings?.value.enabled) return Array.from(new Set(filterSettings.value.filteredClients?.map(c => c.group)))
+  return Array.from(new Set(clients.value?.map(c => c.group)))
+})
+
+const actionMenu = ref(false)
+const filterMenu = ref(false)
+const filterSettings = ref({
+  enabled: false,
+  state: '',
+  group: '-',
+  text: '',
+  filteredClients: <any[]>[]
+})
+const tableView = ref(localStorage.getItem('clientView') == 'table')
+
+const toggleClientView = () => {
+  localStorage.setItem('clientView',tableView.value ? 'tile' : 'table')
+  tableView.value = !tableView.value
+}
 
 const filterItems = [
   { title: i18n.global.t('none'), value: '' },
@@ -190,18 +413,20 @@ const filterItems = [
   { title: i18n.global.t('online'), value: 'online' },
 ]
 
-const checkFilter = (c:any) :boolean => {
+const headers = [
-  switch (filter.value) {
+  { title: i18n.global.t('client.name'), key: 'name' },
-    case "disable":
+  { title: i18n.global.t('client.desc'), key: 'desc', sortable: false },
-      return !c.enable
+  { title: i18n.global.t('actions.action'), key: 'actions', sortable: false},
-    case "expired":
+  { title: i18n.global.t('stats.volume'), key: 'volume' },
-      return HumanReadable.remainedDays(c.expiry) == null
+  { title: i18n.global.t('date.expiry'), key: 'expiry' },
-    case "online":
+  { title: i18n.global.t('online'), key: 'online' },
-      return Data().onlines?.user?.includes(c.name)
+  { key: 'data-table-group', width: 0 },
-    default:
+]
-      return true
+const groupBy = [
-  }
+  {
+    key: 'group'
   }
+]
 
 const modal = ref({
   visible: false,
@@ -212,7 +437,8 @@ const modal = ref({
 
 const delOverlay = ref(new Array<boolean>(clients.value.length).fill(false))
 
-const showModal = (index: number) => {
+const showModal = (id: number) => {
+  const index = id == -1 ? -1 : clients.value.findIndex(c => c.id == id)
   modal.value.index = index
   modal.value.data = index == -1 ? '' : JSON.stringify(clients.value[index])
   modal.value.stats = index == -1 ? false : v2rayStats.value.users.includes(clients.value[index].name)
@@ -299,7 +525,7 @@ const updateLinks = (c:Client):Link[] => {
     const tlsConfig = <any>Data().tlsConfigs?.findLast((t:any) => t.inbounds.includes(i.tag))
     const cData = <any>Data().inData?.findLast((d:any) => d.tag == i.tag)
     const addrs = cData ? <any[]>cData.addrs : []
-    const uris = LinkUtil.linkGenerator(c.name,i, tlsConfig?.client?? {}, addrs)
+    const uris = LinkUtil.linkGenerator(c,i, tlsConfig?.client?? {}, addrs)
     if (uris.length>0){
       uris.forEach(uri => {
         newLinks.push(<Link>{ type: 'local', remark: i.tag, uri: uri })
@@ -311,8 +537,8 @@ const updateLinks = (c:Client):Link[] => {
 
   return links
 }
-const delClient = (clientIndex: number) => {
+const delClient = (id: number) => {
-  const id = clients.value[clientIndex].id
+  const clientIndex = clients.value.findIndex(c => c.id === id)
   const oldData = createClient(clients.value[clientIndex])
 
   // Delete stats if exists and will be orphaned
@@ -333,8 +559,9 @@ const qrcode = ref({
   index: 0,
 })
 
-const showQrCode = (index: number) => {
+const showQrCode = (id: number) => {
-  qrcode.value.index = index
+  const clientIndex = clients.value.findIndex(c => c.id === id)
+  qrcode.value.index = clientIndex
   qrcode.value.visible = true
 }
 const closeQrCode = () => {
@@ -354,4 +581,69 @@ const showStats = (tag: string) => {
 const closeStats = () => {
   stats.value.visible = false
 }
+
+var openedGroups = ref(<string[]>[""])
+
+const toggleGroupOpen = (g: string) => {
+  const index = openedGroups.value.findIndex(og => og == g)
+  index == -1 ? openedGroups.value.push(g) : openedGroups.value.splice(index,1)
+}
+
+const doFilter = () => {
+  let filteredClients = clients.value.slice()
+  if (filterSettings.value.group != '-') {
+    filteredClients = filteredClients.filter(c => c.group == filterSettings.value.group)
+  }
+  if (filterSettings.value.text.length>0) {
+    const txt = filterSettings.value.text
+    filteredClients = filteredClients.filter(c => c.name.search(txt) != -1 || c.desc.search(txt) != -1)
+  }
+  switch (filterSettings.value.state) {
+    case "disable":
+      filteredClients = filteredClients.filter(c => c.enable == false)
+      break
+    case "expired":
+      filteredClients = filteredClients.filter(c => HumanReadable.remainedDays(c.expiry) == null)
+      break
+    case "online":
+      filteredClients = filteredClients.filter(c => Data().onlines?.user?.includes(c.name))
+      break
+  }
+  filterSettings.value.filteredClients = filteredClients
+  filterSettings.value.enabled = true
+  filterMenu.value = false
+}
+
+const clearFilter = () => {
+  filterSettings.value = {
+    enabled: false,
+    state: '',
+    group: '-',
+    text: '',
+    filteredClients: <any[]>[]
+  }
+  filterMenu.value = false
+}
+
+const addBulkModal = ref(false)
+
+const addBulk = () => {
+  addBulkModal.value = true
+  actionMenu.value = false
+}
+
+const closeBulk = () => {
+  addBulkModal.value = false
+}
+
+const saveBulk = (bulkClients: Client[], clientInbounds: string[], clientStats: boolean) => {
+  bulkClients.forEach((c,c_index) => {
+    bulkClients[c_index].links = updateLinks(c)
+  })
+  clients.value.push(...bulkClients)
+  buildInboundsUsers(clientInbounds)
+  // Stats
+  if (clientStats) v2rayStats.value.users.push(...bulkClients.map(bc => bc.name))
+  closeBulk()
+}
 </script>

frontend/src/views/Inbounds.vue

@@ -254,28 +254,26 @@ const saveModal = (data:Inbound, stats: boolean, tls_id: number, cData: any) =>
   modal.value.visible = false
 }
 const updateLinks = (i: any) => {
-  if(i.users && i.users.length>0){
+  if(i.users){
-    i.users.forEach((u:any) => {
+    const uClients = clients.value.filter(c => c.inbounds.includes(i.tag))
-      const client = clients.value.find(c => u.username? c.name == u.username : c.name == u.name)
+    uClients.forEach((u:Client) => {
-      if (client){
+      const clientInbounds = <Inbound[]>inbounds.value.filter(inb => u.inbounds.includes(inb.tag))
-        const clientInbounds = <Inbound[]>inbounds.value.filter(inb => client?.inbounds.includes(inb.tag))
       const newLinks = <Link[]>[]
       clientInbounds.forEach(i =>{
         const tlsClient = tlsConfigs?.value.findLast((t:any) => t.inbounds.includes(i.tag))?.client?? {}
         const cData = <any>Data().inData?.findLast((d:any) => d.tag == i.tag)
         const addrs = cData ? <any[]>cData.addrs : []
-          const uris = LinkUtil.linkGenerator(client.name,i, tlsClient, addrs)
+        const uris = LinkUtil.linkGenerator(u,i, tlsClient, addrs)
         if (uris.length>0){
           uris.forEach(uri => {
             newLinks.push(<Link>{ type: 'local', remark: i.tag, uri: uri })
           })
         }
       })
-        let links = client.links && client.links.length>0? client.links : <Link[]>[]
+      let links = u.links && u.links.length>0? u.links : <Link[]>[]
       links = [...newLinks, ...links.filter(l => l.type != 'local')]
 
-        client.links = links
+      u.links = links
-      }
     })
   }
 }
@@ -313,6 +311,10 @@ const delInbound = (index: number) => {
   }
   if (index < Data().oldData.config.inbounds.length){
     Data().delInbound(index)
+  } else {
+    // Delete new inbound's inData if exists
+    const inDataIndex = Data().inData.findIndex((d:any) => d.tag == tag)
+    if (inDataIndex != -1) Data().inData.splice(inDataIndex, 1)
   }
   delOverlay.value[index] = false
 }

frontend/src/views/Rules.vue

@@ -27,21 +27,15 @@
     </v-col>
   </v-row>
   <v-row>
-    <v-col cols="12">{{ $t('rule.ruleset') }}</v-col>
+    <v-col class="v-card-subtitle" cols="12">{{ $t('rule.ruleset') }}</v-col>
     <v-col cols="12" sm="4" md="3" lg="2" v-for="(item, index) in <any[]>rulesets" :key="item.tag">
-      <v-card rounded="xl" elevation="5" min-width="200" :title="index+1">
+      <v-card rounded="xl" elevation="5" min-width="200" :title="item.tag">
         <v-card-subtitle style="margin-top: -20px;">
           <v-row>
             <v-col>{{ $t('ruleset.' + item.type) }}</v-col>
           </v-row>
         </v-card-subtitle>
         <v-card-text>
-          <v-row>
-            <v-col>{{ $t('objects.tag') }}</v-col>
-            <v-col dir="ltr">
-              {{ item.tag }}
-            </v-col>
-          </v-row>
           <v-row>
             <v-col>{{ $t('ruleset.format') }}</v-col>
             <v-col dir="ltr">
@@ -84,8 +78,14 @@
     </v-col>
   </v-row>
   <v-row>
-    <v-col cols="12">{{ $t('pages.rules') }}</v-col>
+    <v-col class="v-card-subtitle" cols="12">{{ $t('pages.rules') }}</v-col>
-    <v-col cols="12" sm="4" md="3" lg="2" v-for="(item, index) in <any[]>rules">
+    <v-col cols="12" sm="4" md="3" lg="2" v-for="(item, index) in <any[]>rules"
+        :key="item.id"
+        :draggable="true"
+        @dragstart="onDragStart(index)"
+        @dragover.prevent
+        @drop="onDrop(index)"
+      >
       <v-card rounded="xl" elevation="5" min-width="200" :title="index+1">
         <v-card-subtitle style="margin-top: -20px;">
           <v-row>
@@ -263,4 +263,20 @@ const delRuleset = (index: number) => {
   rulesets.value.splice(index,1)
   delRulesetOverlay.value[index] = false
 }
+
+const draggedItemIndex = ref(null);
+
+const onDragStart = (index: any) => {
+  draggedItemIndex.value = index;
+};
+
+const onDrop = (index: any) => {
+  if (draggedItemIndex.value !== null) {
+    // Swap the dragged item with the dropped one
+    const draggedItem = rules.value[draggedItemIndex.value];
+    rules.value.splice(draggedItemIndex.value, 1);
+    rules.value.splice(index, 0, draggedItem);
+    draggedItemIndex.value = null;
+  }
+};
 </script>

frontend/src/views/Tls.vue

@@ -85,10 +85,11 @@
 import TlsVue from '@/layouts/modals/Tls.vue'
 import Data from '@/store/modules/data'
 import { computed, ref } from 'vue'
-import { Config } from '@/types/config';
+import { Config } from '@/types/config'
-import { Inbound } from '@/types/inbounds';
+import { Inbound } from '@/types/inbounds'
-import { Client } from '@/types/clients';
+import { Client } from '@/types/clients'
-import { Link, LinkUtil } from '@/plugins/link';
+import { Link, LinkUtil } from '@/plugins/link'
+import { fillData } from '@/plugins/outJson'
 
 const tlsConfigs = computed((): any[] => {
   return Data().tlsConfigs
@@ -98,6 +99,10 @@ const inbounds = computed((): any[] => {
   return <any[]>(<Config>Data().config)?.inbounds
 })
 
+const inData = computed((): any[] => {
+  return <any[]> Data().inData
+})
+
 const clients = computed((): any[] => {
   return <Client[]>Data().clients
 })
@@ -135,6 +140,7 @@ const saveModal = (data:any) => {
     tlsConfigs.value[modal.value.index] = data
     inbounds?.value.filter(i => tlsConfigs.value[modal.value.index].inbounds.includes(i.tag)).forEach(i =>{
       if (i.tls != undefined) i.tls = data.server
+      updateInData(i,data.client)
       updateLinks(i,data.client)
     })
   }
@@ -150,10 +156,9 @@ const delTls = (index: number) => {
 }
 
 const updateLinks = (i:any,tlsClient:any) => {
-  if(i.users && i.users.length>0){
+  if(i.users){
-    i.users.forEach((u:any) => {
+    const uClients = clients.value.filter(c => c.inbounds.includes(i.tag))
-      const client = clients.value.find(c => u.username? c.name == u.username : c.name == u.name)
+    uClients.forEach((client:any) => {
-      if (client){
       const clientInbounds = <Inbound[]>inbounds.value.filter(inb => client?.inbounds.includes(inb.tag))
       const newLinks = <Link[]>[]
       clientInbounds.forEach(i =>{
@@ -170,8 +175,14 @@ const updateLinks = (i:any,tlsClient:any) => {
       links = [...newLinks, ...links.filter((l:Link) => l.type != 'local')]
 
       client.links = links
-      }
     })
   }
 }
+
+const updateInData = (i:any, c:any) => {
+  const inDataIndex = inData.value.findIndex(d => d.tag == i.tag)
+  if (inDataIndex != -1) {
+    fillData(inData.value[inDataIndex].outJson, i, c)
+  }
+}
 </script>

install.sh

@@ -29,6 +29,9 @@ arch() {
     i*86 | x86) echo '386' ;;
     armv8* | armv8 | arm64 | aarch64) echo 'arm64' ;;
     armv7* | armv7 | arm) echo 'armv7' ;;
+    armv6* | armv6) echo 'armv6' ;;
+    armv5* | armv5) echo 'armv5' ;;
+    s390x) echo 's390x' ;;
     *) echo -e "${green}Unsupported CPU architecture! ${plain}" && rm -f install.sh && exit 1 ;;
     esac
 }
@@ -38,39 +41,79 @@ echo "arch: $(arch)"
 os_version=""
 os_version=$(grep -i version_id /etc/os-release | cut -d \" -f2 | cut -d . -f1)
 
-if [[ "${release}" == "centos" ]]; then
+if [[ "${release}" == "arch" ]]; then
+    echo "Your OS is Arch Linux"
+elif [[ "${release}" == "parch" ]]; then
+    echo "Your OS is Parch linux"
+elif [[ "${release}" == "manjaro" ]]; then
+    echo "Your OS is Manjaro"
+elif [[ "${release}" == "armbian" ]]; then
+    echo "Your OS is Armbian"
+elif [[ "${release}" == "opensuse-tumbleweed" ]]; then
+    echo "Your OS is OpenSUSE Tumbleweed"
+elif [[ "${release}" == "centos" ]]; then
     if [[ ${os_version} -lt 8 ]]; then
         echo -e "${red} Please use CentOS 8 or higher ${plain}\n" && exit 1
     fi
 elif [[ "${release}" == "ubuntu" ]]; then
     if [[ ${os_version} -lt 20 ]]; then
-        echo -e "${red}please use Ubuntu 20 or higher version! ${plain}\n" && exit 1
+        echo -e "${red} Please use Ubuntu 20 or higher version!${plain}\n" && exit 1
     fi
-
 elif [[ "${release}" == "fedora" ]]; then
     if [[ ${os_version} -lt 36 ]]; then
-        echo -e "${red}please use Fedora 36 or higher version! ${plain}\n" && exit 1
+        echo -e "${red} Please use Fedora 36 or higher version!${plain}\n" && exit 1
     fi
-
 elif [[ "${release}" == "debian" ]]; then
-    if [[ ${os_version} -lt 10 ]]; then
+    if [[ ${os_version} -lt 11 ]]; then
-        echo -e "${red} Please use Debian 10 or higher ${plain}\n" && exit 1
+        echo -e "${red} Please use Debian 11 or higher ${plain}\n" && exit 1
+    fi
+elif [[ "${release}" == "almalinux" ]]; then
+    if [[ ${os_version} -lt 9 ]]; then
+        echo -e "${red} Please use AlmaLinux 9 or higher ${plain}\n" && exit 1
+    fi
+elif [[ "${release}" == "rocky" ]]; then
+    if [[ ${os_version} -lt 9 ]]; then
+        echo -e "${red} Please use Rocky Linux 9 or higher ${plain}\n" && exit 1
+    fi
+elif [[ "${release}" == "oracle" ]]; then
+    if [[ ${os_version} -lt 8 ]]; then
+        echo -e "${red} Please use Oracle Linux 8 or higher ${plain}\n" && exit 1
     fi
 else
-    echo -e "${red}Failed to check the OS version, please contact the author!${plain}" && exit 1
+    echo -e "${red}Your operating system is not supported by this script.${plain}\n"
+    echo "Please ensure you are using one of the following supported operating systems:"
+    echo "- Ubuntu 20.04+"
+    echo "- Debian 11+"
+    echo "- CentOS 8+"
+    echo "- Fedora 36+"
+    echo "- Arch Linux"
+    echo "- Parch Linux"
+    echo "- Manjaro"
+    echo "- Armbian"
+    echo "- AlmaLinux 9+"
+    echo "- Rocky Linux 9+"
+    echo "- Oracle Linux 8+"
+    echo "- OpenSUSE Tumbleweed"
+    exit 1
 fi
 
 
 install_base() {
     case "${release}" in
-    centos)
+    centos | almalinux | rocky | oracle)
         yum -y update && yum install -y -q wget curl tar tzdata
         ;;
     fedora)
         dnf -y update && dnf install -y -q wget curl tar tzdata
         ;;
+    arch | manjaro | parch)
+        pacman -Syu && pacman -Syu --noconfirm wget curl tar tzdata
+        ;;
+    opensuse-tumbleweed)
+        zypper refresh && zypper -q install -y wget curl tar timezone
+        ;;
     *)
-        apt-get update && apt install -y -q wget curl tar tzdata
+        apt-get update && apt-get install -y -q wget curl tar tzdata
         ;;
     esac
 }

s-ui.sh

@@ -39,24 +39,61 @@ echo "The OS release is: $release"
 os_version=""
 os_version=$(grep -i version_id /etc/os-release | cut -d \" -f2 | cut -d . -f1)
 
-if [[ "${release}" == "centos" ]]; then
+if [[ "${release}" == "arch" ]]; then
+    echo "Your OS is Arch Linux"
+elif [[ "${release}" == "parch" ]]; then
+    echo "Your OS is Parch linux"
+elif [[ "${release}" == "manjaro" ]]; then
+    echo "Your OS is Manjaro"
+elif [[ "${release}" == "armbian" ]]; then
+    echo "Your OS is Armbian"
+elif [[ "${release}" == "opensuse-tumbleweed" ]]; then
+    echo "Your OS is OpenSUSE Tumbleweed"
+elif [[ "${release}" == "centos" ]]; then
     if [[ ${os_version} -lt 8 ]]; then
         echo -e "${red} Please use CentOS 8 or higher ${plain}\n" && exit 1
     fi
 elif [[ "${release}" == "ubuntu" ]]; then
     if [[ ${os_version} -lt 20 ]]; then
-        echo -e "${red}please use Ubuntu 20 or higher version! ${plain}\n" && exit 1
+        echo -e "${red} Please use Ubuntu 20 or higher version!${plain}\n" && exit 1
     fi
-
 elif [[ "${release}" == "fedora" ]]; then
     if [[ ${os_version} -lt 36 ]]; then
-        echo -e "${red}please use Fedora 36 or higher version! ${plain}\n" && exit 1
+        echo -e "${red} Please use Fedora 36 or higher version!${plain}\n" && exit 1
     fi
-
 elif [[ "${release}" == "debian" ]]; then
-    if [[ ${os_version} -lt 10 ]]; then
+    if [[ ${os_version} -lt 11 ]]; then
-        echo -e "${red} Please use Debian 10 or higher ${plain}\n" && exit 1
+        echo -e "${red} Please use Debian 11 or higher ${plain}\n" && exit 1
     fi
+elif [[ "${release}" == "almalinux" ]]; then
+    if [[ ${os_version} -lt 9 ]]; then
+        echo -e "${red} Please use AlmaLinux 9 or higher ${plain}\n" && exit 1
+    fi
+elif [[ "${release}" == "rocky" ]]; then
+    if [[ ${os_version} -lt 9 ]]; then
+        echo -e "${red} Please use Rocky Linux 9 or higher ${plain}\n" && exit 1
+    fi
+elif [[ "${release}" == "oracle" ]]; then
+    if [[ ${os_version} -lt 8 ]]; then
+        echo -e "${red} Please use Oracle Linux 8 or higher ${plain}\n" && exit 1
+    fi
+else
+    echo -e "${red}Your operating system is not supported by this script.${plain}\n"
+    echo "Please ensure you are using one of the following supported operating systems:"
+    echo "- Ubuntu 20.04+"
+    echo "- Debian 11+"
+    echo "- CentOS 8+"
+    echo "- Fedora 36+"
+    echo "- Arch Linux"
+    echo "- Parch Linux"
+    echo "- Manjaro"
+    echo "- Armbian"
+    echo "- AlmaLinux 9+"
+    echo "- Rocky Linux 9+"
+    echo "- Oracle Linux 8+"
+    echo "- OpenSUSE Tumbleweed"
+    exit 1
+
 fi
 
 confirm() {
@@ -147,6 +184,7 @@ uninstall() {
     systemctl stop sing-box
     systemctl disable sing-box
     rm /etc/systemd/system/s-ui.service -f
+    rm /etc/systemd/system/sing-box.service -f
     systemctl daemon-reload
     systemctl reset-failed
     rm /etc/s-ui/ -rf
@@ -398,9 +436,9 @@ show_status() {
 show_enable_status() {
     check_enabled $1
     if [[ $? == 0 ]]; then
-        echo -e "Start automatically: ${green}Yes${plain}"
+        echo -e "Start ${1} automatically: ${green}Yes${plain}"
     else
-        echo -e "Start automatically: ${red}No${plain}"
+        echo -e "Start ${1} automatically: ${red}No${plain}"
     fi
 }
 
@@ -471,15 +509,18 @@ enable_bbr() {
 
     # Check the OS and install necessary packages
     case "${release}" in
-    ubuntu | debian)
+    ubuntu | debian | armbian)
         apt-get update && apt-get install -yqq --no-install-recommends ca-certificates
         ;;
-    centos | almalinux | rocky)
+    centos | almalinux | rocky | oracle)
         yum -y update && yum -y install ca-certificates
         ;;
     fedora)
         dnf -y update && dnf -y install ca-certificates
         ;;
+    arch | manjaro | parch)
+        pacman -Sy --noconfirm ca-certificates
+        ;;
     *)
         echo -e "${red}Unsupported operating system. Please check the script and install the necessary packages manually.${plain}\n"
         exit 1
@@ -547,15 +588,22 @@ ssl_cert_issue() {
     fi
     # install socat second
     case "${release}" in
-        ubuntu|debian)
+    ubuntu | debian | armbian)
-            apt update && apt install socat -y ;;
+        apt update && apt install socat -y
-        centos)
+        ;;
-            yum -y update && yum -y install socat ;;
+    centos | almalinux | rocky | oracle)
+        yum -y update && yum -y install socat
+        ;;
     fedora)
-            dnf -y update && dnf -y install socat ;;
+        dnf -y update && dnf -y install socat
+        ;;
+    arch | manjaro | parch)
+        pacman -Sy --noconfirm socat
+        ;;
     *)
         echo -e "${red}Unsupported operating system. Please check the script and install the necessary packages manually.${plain}\n"
-            exit 1 ;;
+        exit 1
+        ;;
     esac
     if [ $? -ne 0 ]; then
         LOGE "install socat failed, please check logs"