v0.0.2

.github/FUNDING.yml

@@ -1 +0,0 @@
-github: alireza0

.github/workflows/docker-core.yml

@@ -1,57 +0,0 @@
-name: Sing-box Docker Image CI
-on:
-  workflow_dispatch:
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-
-    steps:
-    - uses: actions/checkout@v4
-
-    - name: Get latest release
-      id: get_release
-      run: |
-        latest_release=$(curl -Ls "https://api.github.com/repos/sagernet/sing-box/releases/latest" | grep '"tag_name":' | sed -E 's/.*"([^"]+)".*/\1/')
-        echo "latest_release: $latest_release"
-        echo "latest_release=$latest_release" >> $GITHUB_OUTPUT
-   
-    - name: Docker meta
-      id: meta
-      uses: docker/metadata-action@v5
-      with:
-        images: |
-          alireza7/s-ui-singbox
-          ghcr.io/alireza0/s-ui-singbox
-        tags: |
-          type=sha
-          type=pep440,pattern=${{ steps.get_release.outputs.latest_release }}
-
-    - name: Set up QEMU
-      uses: docker/setup-qemu-action@v3
-
-    - name: Set up Docker Buildx
-      uses: docker/setup-buildx-action@v3
-
-    - name: Login to Docker Hub
-      uses: docker/login-action@v3
-      with:
-        username: ${{ secrets.DOCKER_HUB_USERNAME }}
-        password: ${{ secrets.DOCKER_HUB_TOKEN }}
-
-    - name: Login to GHCR
-      uses: docker/login-action@v3
-      with:
-        registry: ghcr.io
-        username: ${{ github.repository_owner }}
-        password: ${{ secrets.GITHUB_TOKEN }}
-
-    - name: Build and push
-      uses: docker/build-push-action@v6
-      with:
-        context: core/
-        push: true
-        build-args: SINGBOX_VER=${{ steps.get_release.outputs.latest_release }}
-        platforms: linux/amd64,linux/arm64/v8,linux/arm/v7,linux/386
-        tags: ${{ steps.meta.outputs.tags }}
-        labels: ${{ steps.meta.outputs.labels }}

.github/workflows/docker.yml

@@ -11,6 +11,8 @@ jobs:
 
     steps:
     - uses: actions/checkout@v4
+      with:
+        submodules: true
    
     - name: Docker meta
       id: meta
@@ -44,10 +46,10 @@ jobs:
         password: ${{ secrets.GITHUB_TOKEN }}
 
     - name: Build and push
-      uses: docker/build-push-action@v6
+      uses: docker/build-push-action@v5
       with:
         context: .
         push: true
-        platforms: linux/amd64,linux/arm64/v8,linux/arm/v7,linux/386
+        platforms: linux/amd64,linux/arm64/v8
         tags: ${{ steps.meta.outputs.tags }}
         labels: ${{ steps.meta.outputs.labels }}

.github/workflows/release.yml

@@ -69,12 +69,9 @@ jobs:
           fi
 
           #### Build Sing-Box
-          export VERSION=v1.9.3
+          git clone -b v1.8.7 https://github.com/SagerNet/sing-box
-          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 \
+          go build -tags with_v2ray_api,with_clash_api,with_grpc,with_quic,with_ech -o sing-box ./cmd/sing-box
-          -v -trimpath -ldflags "-X 'github.com/sagernet/sing-box/constant.Version=${VERSION}' -s -w -buildid=" \
-          -o sing-box ./cmd/sing-box
           cd ..
 
           ### Build s-ui
@@ -88,7 +85,7 @@ jobs:
           cp sing-box.service s-ui/
           mkdir s-ui/bin
           cp sing-box/sing-box s-ui/bin/
-          cp core/runSingbox.sh s-ui/bin/
+          cp runSingbox.sh s-ui/bin/
           
       - name: Package
         run: tar -zcvf s-ui-linux-${{ matrix.platform }}.tar.gz s-ui

Dockerfile

@@ -1,4 +1,4 @@
-FROM --platform=$BUILDPLATFORM node:alpine as front-builder
+FROM node:alpine as front-builder
 WORKDIR /app
 COPY frontend/ ./
 RUN npm install && npm run build
@@ -8,13 +8,12 @@ WORKDIR /app
 ARG TARGETARCH
 ENV CGO_CFLAGS="-D_LARGEFILE64_SOURCE"
 ENV CGO_ENABLED=1
-ENV GOARCH=$TARGETARCH
+RUN apk --no-cache --update add build-base gcc wget unzip
-RUN apk update && apk --no-cache --update add build-base gcc wget unzip
 COPY backend/ ./
 COPY --from=front-builder  /app/dist/ /app/web/html/
-RUN go build -ldflags="-w -s" -o sui main.go
+RUN go build -o sui main.go
 
-FROM --platform=$TARGETPLATFORM alpine
+FROM alpine
 LABEL org.opencontainers.image.authors="alireza7@gmail.com"
 ENV TZ=Asia/Tehran
 WORKDIR /app

README.md

@@ -2,8 +2,7 @@
 **An Advanced Web Panel • Built on SagerNet/Sing-Box**
 
 ![](https://img.shields.io/github/v/release/alireza0/s-ui.svg)
-![S-UI Docker pull](https://img.shields.io/docker/pulls/alireza7/s-ui.svg)
+![](https://img.shields.io/docker/pulls/alireza7/s-ui.svg)
-![S-UI-Singbox Docker pull](https://img.shields.io/docker/pulls/alireza7/s-ui-singbox.svg)
 [![Downloads](https://img.shields.io/github/downloads/alireza0/s-ui/total.svg)](https://img.shields.io/github/downloads/alireza0/s-ui/total.svg)
 [![License](https://img.shields.io/badge/license-GPL%20V3-blue.svg?longCache=true)](https://www.gnu.org/licenses/gpl-3.0.en.html)
 
@@ -23,15 +22,13 @@
 | Multi-Client/Inbound                   | :heavy_check_mark: |
 | Advanced Traffic Routing Interface     | :heavy_check_mark: |
 | Client & Traffic & System Status       | :heavy_check_mark: |
-| Subscription Service (link/json + info)| :heavy_check_mark: |
+| Subscription Service (link + info)     | :heavy_check_mark: |
 | Dark/Light Theme                       | :heavy_check_mark: |
 
 
 ## Default Installation Informarion
 - Panel Port: 2095
-- Panel Path: /app/
 - Subscription Port: 2096
-- Subscription Path: /sub/
 - User/Passowrd: admin
 
 ## Install & Upgrade to Latest Version
@@ -76,20 +73,10 @@ curl -fsSL https://get.docker.com | sh
 
 **Step 2:** Install S-UI
 
-> Docker compose method
-
-```shell
-mkdir s-ui && cd s-ui
-wget -q https://raw.githubusercontent.com/alireza0/s-ui/main/docker-compose.yml
-docker compose up -d
-```
-
-> Use docker for s-ui only
-
 ```shell
 mkdir s-ui && cd s-ui
 docker run -itd \
-    -p 2095:2095 -p 2096:2096 -p 443:443 -p 80:80 \
+    -p 2095:2095 -p 443:443 -p 80:80 \
     -v $PWD/db/:/usr/local/s-ui/db/ \
     -v $PWD/cert/:/root/cert/ \
     --name s-ui --restart=unless-stopped \
@@ -104,63 +91,10 @@ docker build -t s-ui .
 
 </details>
 
-## Manual run + contribution
-
-<details>
-   <summary>Click for details</summary>
-
-### Build and run whole project
-```shell
-./runSUI.sh
-```
-
-### - Frontend
-
-Frontend codes are in `frontend` folder in the root of repository.
-
-To run it localy for instant developement you can use (apply automatic changes on file save):
-```shell
-cd frontend
-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:
-```shell
-cd frontend
-npm run build
-```
-
-### - Backend
-Backend codes are in `backend` folder in the root of repository.
-> Please build fronend once before!
-
-To build backend:
-```shell
-cd backend
-
-# remove old frontend compiled files
-rm -fr web/html/*
-# apply new frontend compiled files
-cp -R ../frontend/dist/ web/html/
-# build
-go build -o ../sui main.go
-```
-
-To run backend (from root folder of repository):
-```shell
-./sui
-```
-
-</details>
-
 ## Languages
 
 - English
 - Farsi
-- Vietnamese
-- Chinese (Simplified)
-- Chinese (Traditional)
 
 ## Features
 
@@ -219,4 +153,5 @@ certbot certonly --standalone --register-unsafely-without-email --non-interactiv
 </details>
 
 ## Stargazers over Time
+
 [![Stargazers over time](https://starchart.cc/alireza0/s-ui.svg)](https://starchart.cc/alireza0/s-ui)

backend/api/api.go

@@ -1,9 +1,9 @@
 package api
 
 import (
+	"fmt"
 	"s-ui/logger"
 	"s-ui/service"
-	"s-ui/util"
 	"strconv"
 	"strings"
 
@@ -15,8 +15,6 @@ type APIHandler struct {
 	service.UserService
 	service.ConfigService
 	service.ClientService
-	service.TlsService
-	service.InDataService
 	service.PanelService
 	service.StatsService
 	service.ServerService
@@ -96,10 +94,6 @@ func (a *APIHandler) postHandler(c *gin.Context) {
 	case "restartApp":
 		err = a.PanelService.RestartPanel(3)
 		jsonMsg(c, "restartApp", err)
-	case "linkConvert":
-		link := c.Request.FormValue("link")
-		result, _, err := util.GetOutbound(link, 0)
-		jsonObj(c, result, err)
 	default:
 		jsonMsg(c, "API call", nil)
 	}
@@ -157,45 +151,19 @@ func (a *APIHandler) getHandler(c *gin.Context) {
 	case "onlines":
 		onlines, err := a.StatsService.GetOnlines()
 		jsonObj(c, onlines, err)
-	case "logs":
-		service := c.Query("s")
-		count := c.Query("c")
-		level := c.Query("l")
-		logs := a.ServerService.GetLogs(service, count, level)
-		jsonObj(c, logs, nil)
-	case "changes":
-		actor := c.Query("a")
-		chngKey := c.Query("k")
-		count := c.Query("c")
-		changes := a.ConfigService.GetChanges(actor, chngKey, count)
-		jsonObj(c, changes, nil)
-	case "keypairs":
-		kType := c.Query("k")
-		options := c.Query("o")
-		keypair := a.ServerService.GenKeypair(kType, options)
-		jsonObj(c, keypair, nil)
 	default:
 		jsonMsg(c, "API call", nil)
 	}
 }
 
-func (a *APIHandler) loadData(c *gin.Context) (interface{}, error) {
+func (a *APIHandler) loadData(c *gin.Context) (string, error) {
-	data := make(map[string]interface{}, 0)
+	var data string
 	lu := c.Query("lu")
-	isUpdated, err := a.ConfigService.CheckChanges(lu)
+	isUpdated, err := a.ConfigService.CheckChnages(lu)
 	if err != nil {
 		return "", err
 	}
 	onlines, err := a.StatsService.GetOnlines()
-
-	sysInfo := a.ServerService.GetSingboxInfo()
-	if sysInfo["running"] == false {
-		logs := a.ServerService.GetLogs("sing-box", "1", "debug")
-		if len(logs) > 0 {
-			data["lastLog"] = logs[0]
-		}
-	}
-
 	if err != nil {
 		return "", err
 	}
@@ -208,26 +176,13 @@ func (a *APIHandler) loadData(c *gin.Context) (interface{}, error) {
 		if err != nil {
 			return "", err
 		}
-		tlsConfigs, err := a.TlsService.GetAll()
-		if err != nil {
-			return "", err
-		}
-		inData, err := a.InDataService.GetAll()
-		if err != nil {
-			return "", err
-		}
 		subURI, err := a.SettingService.GetFinalSubURI(strings.Split(c.Request.Host, ":")[0])
 		if err != nil {
 			return "", err
 		}
-		data["config"] = *config
+		data = fmt.Sprintf(`{"config": %s,"clients": %s,"subURI": "%s", "onlines": %s}`, string(*config), clients, subURI, onlines)
-		data["clients"] = clients
-		data["tls"] = tlsConfigs
-		data["inData"] = inData
-		data["subURI"] = subURI
-		data["onlines"] = onlines
 	} else {
-		data["onlines"] = onlines
+		data = fmt.Sprintf(`{"onlines": %s}`, onlines)
 	}
 
 	return data, nil

backend/app/app.go

@@ -51,13 +51,7 @@ func (a *APP) Start() error {
 	if err != nil {
 		return err
 	}
-
+	err = a.cronJob.Start(loc)
-	trafficAge, err := a.SettingService.GetTrafficAge()
-	if err != nil {
-		return err
-	}
-
-	err = a.cronJob.Start(loc, trafficAge)
 	if err != nil {
 		return err
 	}

backend/cmd/cmd.go

@@ -40,7 +40,6 @@ func ParseCmd() {
 		fmt.Println()
 		fmt.Println("Commands:")
 		fmt.Println("    admin          set/reset/show first admin credentials")
-		fmt.Println("    migrate        migrate form older version")
 		fmt.Println("    setting        set/reset/show settings")
 		fmt.Println()
 		adminCmd.Usage()
@@ -71,9 +70,6 @@ func ParseCmd() {
 			showAdmin()
 		}
 
-	case "migrate":
-		migrateDb()
-
 	case "setting":
 		err := settingCmd.Parse(os.Args[2:])
 		if err != nil {

backend/cmd/migration.go

@@ -1,105 +0,0 @@
-package cmd
-
-import (
-	"encoding/json"
-	"fmt"
-	"log"
-	"os"
-	"s-ui/config"
-	"s-ui/database"
-	"s-ui/database/model"
-	"strings"
-
-	"gorm.io/gorm"
-)
-
-func migrateDb() {
-	// void running on first install
-	path := config.GetDBPath()
-	_, err := os.Stat(path)
-	if err != nil {
-		return
-	}
-
-	err = database.OpenDB(path)
-	if err != nil {
-		log.Fatal(err)
-	}
-	db := database.GetDB()
-	tx := db.Begin()
-	defer func() {
-		if err == nil {
-			tx.Commit()
-		} else {
-			tx.Rollback()
-		}
-	}()
-	fmt.Println("Start migrating database...")
-	err = migrateClientSchema(tx)
-	if err != nil {
-		log.Fatal(err)
-	}
-	err = changesObj(tx)
-	if err != nil {
-		log.Fatal(err)
-	}
-	fmt.Println("Migration done!")
-}
-
-func migrateClientSchema(db *gorm.DB) error {
-	rows, err := db.Raw("PRAGMA table_info(clients)").Rows()
-	if err != nil {
-		fmt.Println(err)
-		return err
-	}
-	defer rows.Close()
-
-	for rows.Next() {
-		var (
-			cid       int
-			cname     string
-			ctype     string
-			notnull   int
-			dfltValue interface{}
-			pk        int
-		)
-
-		rows.Scan(&cid, &cname, &ctype, &notnull, &dfltValue, &pk)
-		if cname == "config" || cname == "inbounds" || cname == "links" {
-			if ctype == "text" {
-				fmt.Printf("Column %s has type TEXT\n", cname)
-				oldData := make([]struct {
-					Id   uint
-					Data string
-				}, 0)
-				db.Model(model.Client{}).Select("id", cname+" as data").Scan(&oldData)
-				for _, data := range oldData {
-					var newData []byte
-					switch cname {
-					case "inbounds":
-						inbounds := strings.Split(data.Data, ",")
-						newData, _ = json.MarshalIndent(inbounds, " ", "  ")
-					case "config":
-						jsonData := map[string]interface{}{}
-						json.Unmarshal([]byte(data.Data), &jsonData)
-						newData, _ = json.MarshalIndent(jsonData, " ", "  ")
-					case "links":
-						jsonData := make([]interface{}, 0)
-						json.Unmarshal([]byte(data.Data), &jsonData)
-						newData, _ = json.MarshalIndent(jsonData, " ", "  ")
-					}
-					err = db.Model(model.Client{}).Where("id = ?", data.Id).UpdateColumn(cname, newData).Error
-					if err != nil {
-						return err
-					}
-				}
-			}
-		}
-	}
-	db.AutoMigrate(model.Client{})
-	return nil
-}
-
-func changesObj(db *gorm.DB) error {
-	return db.Exec("UPDATE changes SET obj = CAST('\"' || CAST(obj AS TEXT) || '\"' AS BLOB) WHERE actor = ? and obj not like ?", "DepleteJob", "\"%\"").Error
-}

backend/config/config.go

@@ -69,10 +69,6 @@ func GetDBPath() string {
 }
 
 func GetDefaultConfig() string {
-	apiEnv := GetEnvApi()
-	if len(apiEnv) > 0 {
-		return strings.Replace(defaultConfig, "127.0.0.1:1080", apiEnv, 1)
-	}
 	return defaultConfig
 }
 

backend/config/version

@@ -1 +1 @@
-1.0.0
+0.0.2

backend/cronjob/cronJob.go

@@ -14,7 +14,7 @@ func NewCronJob() *CronJob {
 	return &CronJob{}
 }
 
-func (c *CronJob) Start(loc *time.Location, trafficAge int) error {
+func (c *CronJob) Start(loc *time.Location) error {
 	c.cron = cron.New(cron.WithLocation(loc), cron.WithSeconds())
 	c.cron.Start()
 
@@ -24,7 +24,7 @@ func (c *CronJob) Start(loc *time.Location, trafficAge int) error {
 		// Start expiry job
 		c.cron.AddJob("@every 1m", NewDepleteJob())
 		// Start deleting old stats
-		c.cron.AddJob("@daily", NewDelStatsJob(trafficAge))
+		c.cron.AddJob("@daily", NewDelStatsJob())
 	}()
 
 	return nil

backend/cronjob/delStatsJob.go

@@ -7,20 +7,16 @@ import (
 
 type DelStatsJob struct {
 	service.StatsService
-	trafficAge int
 }
 
-func NewDelStatsJob(ta int) *DelStatsJob {
+func NewDelStatsJob() *DelStatsJob {
-	return &DelStatsJob{
+	return &DelStatsJob{}
-		trafficAge: ta,
-	}
 }
 
 func (s *DelStatsJob) Run() {
-	err := s.StatsService.DelOldStats(s.trafficAge)
+	err := s.StatsService.DelOldStats(30)
 	if err != nil {
 		logger.Warning("Deleting old statistics failed: ", err)
 		return
 	}
-	logger.Debug("Stats older than ", s.trafficAge, " days were deleted")
 }

backend/database/db.go

@@ -29,7 +29,7 @@ func initUser() error {
 	return nil
 }
 
-func OpenDB(dbPath string) error {
+func InitDB(dbPath string) error {
 	dir := path.Dir(dbPath)
 	err := os.MkdirAll(dir, 01740)
 	if err != nil {
@@ -48,19 +48,12 @@ func OpenDB(dbPath string) error {
 		Logger: gormLogger,
 	}
 	db, err = gorm.Open(sqlite.Open(dbPath), c)
-	return err
-}
-
-func InitDB(dbPath string) error {
-	err := OpenDB(dbPath)
 	if err != nil {
 		return err
 	}
 
 	err = db.AutoMigrate(
 		&model.Setting{},
-		&model.Tls{},
-		&model.InboundData{},
 		&model.User{},
 		&model.Stats{},
 		&model.Client{},

backend/database/model/model.go

@@ -8,21 +8,6 @@ type Setting struct {
 	Value string `json:"value" form:"value"`
 }
 
-type Tls struct {
-	Id       uint            `json:"id" form:"id" gorm:"primaryKey;autoIncrement"`
-	Name     string          `json:"name" form:"name"`
-	Inbounds json.RawMessage `json:"inbounds" form:"inbounds"`
-	Server   json.RawMessage `json:"server" form:"server"`
-	Client   json.RawMessage `json:"client" form:"client"`
-}
-
-type InboundData struct {
-	Id      uint            `json:"id" form:"id" gorm:"primaryKey;autoIncrement"`
-	Tag     string          `json:"tag" form:"tag"`
-	Addrs   json.RawMessage `json:"addrs" form:"addrs"`
-	OutJson json.RawMessage `json:"outJson" form:"outJson"`
-}
-
 type User struct {
 	Id         uint   `json:"id" form:"id" gorm:"primaryKey;autoIncrement"`
 	Username   string `json:"username" form:"username"`
@@ -34,14 +19,13 @@ type Client struct {
 	Id       uint   `json:"id" form:"id" gorm:"primaryKey;autoIncrement"`
 	Enable   bool   `json:"enable" form:"enable"`
 	Name     string `json:"name" form:"name"`
-	Config   json.RawMessage `json:"config" form:"config"`
+	Config   string `json:"config" form:"config"`
-	Inbounds json.RawMessage `json:"inbounds" form:"inbounds"`
+	Inbounds string `json:"inbounds" form:"inbounds"`
-	Links    json.RawMessage `json:"links" form:"links"`
+	Links    string `json:"links" form:"links"`
 	Volume   int64  `json:"volume" form:"volume"`
 	Expiry   int64  `json:"expiry" form:"expiry"`
 	Down     int64  `json:"down" form:"down"`
 	Up       int64  `json:"up" form:"up"`
-	Desc     string          `json:"desc" from:"desc"`
 }
 
 type Stats struct {

backend/go.mod

@@ -41,12 +41,12 @@ require (
 	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
-	golang.org/x/crypto v0.21.0 // indirect
+	golang.org/x/crypto v0.20.0 // indirect
-	golang.org/x/net v0.23.0 // indirect
+	golang.org/x/net v0.21.0 // indirect
-	golang.org/x/sys v0.18.0 // indirect
+	golang.org/x/sys v0.17.0 // indirect
 	golang.org/x/text v0.14.0 // indirect
 	google.golang.org/genproto/googleapis/rpc v0.0.0-20240221002015-b0ce06bbee7c // indirect
-	google.golang.org/protobuf v1.33.0 // indirect
+	google.golang.org/protobuf v1.32.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 )
 

backend/go.sum

@@ -243,15 +243,15 @@ golang.org/x/arch v0.0.0-20210923205945-b76863e36670/go.mod h1:5om86z9Hs0C8fWVUu
 golang.org/x/arch v0.7.0 h1:pskyeJh/3AmoQ8CPE95vxHLqp1G1GfGNXTmcl9NEKTc=
 golang.org/x/arch v0.7.0/go.mod h1:FEVrYAQjsQXMVJ1nsMoVVXPZg6p2JE2mx8psSWTDQys=
 golang.org/x/crypto v0.0.0-20210711020723-a769d52b0f97/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
-golang.org/x/crypto v0.21.0 h1:X31++rzVUdKhX5sWmSOFZxx8UW/ldWx55cbf08iNAMA=
+golang.org/x/crypto v0.20.0 h1:jmAMJJZXr5KiCw05dfYK9QnqaqKLYXijU23lsEdcQqg=
-golang.org/x/crypto v0.21.0/go.mod h1:0BP7YvVV9gBbVKyeTG0Gyn+gZm94bibOW5BjDEYAOMs=
+golang.org/x/crypto v0.20.0/go.mod h1:Xwo95rrVNIoSMx9wa1JroENMToLWn3RNVrTBpLHgZPQ=
 golang.org/x/exp v0.0.0-20230725093048-515e97ebf090 h1:Di6/M8l0O2lCLc6VVRWhgCiApHV8MnQurBnFSHsQtNY=
 golang.org/x/exp v0.0.0-20230725093048-515e97ebf090/go.mod h1:FXUEEKJgO7OQYeo8N01OfiKP8RXMtf6e8aTskBGqWdc=
 golang.org/x/mod v0.13.0 h1:I/DsJXRlw/8l/0c24sM9yb0T4z9liZTduXvdAWYiysY=
 golang.org/x/mod v0.13.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c=
 golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
-golang.org/x/net v0.23.0 h1:7EYJ93RZ9vYSZAIb2x3lnuvqO5zneoD6IvWjuhfxjTs=
+golang.org/x/net v0.21.0 h1:AQyQV4dYCvJ7vGmJyKki9+PBdyvhkSd8EIx/qb0AYv4=
-golang.org/x/net v0.23.0/go.mod h1:JKghWKKOSdJwpW2GEx0Ja7fmaKnMsbu+MWVZTokSYmg=
+golang.org/x/net v0.21.0/go.mod h1:bIjVDfnllIU7BJ2DNgfnXvpSvtn8VRwhlsaeUTyUS44=
 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=
@@ -267,8 +267,8 @@ golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.11.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.16.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
-golang.org/x/sys v0.18.0 h1:DBdB3niSjOA/O0blCZBqDefyWNYveAYMNF1Wum0DYQ4=
+golang.org/x/sys v0.17.0 h1:25cE3gD+tdBA7lp7QfhuV+rJiE9YXTcS3VG1SqssI/Y=
-golang.org/x/sys v0.18.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
+golang.org/x/sys v0.17.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
 golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
@@ -287,8 +287,8 @@ google.golang.org/grpc v1.62.0/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJai
 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.32.0 h1:pPC6BG5ex8PDFnkbrGU3EixyhKcQ2aDuBS36lqK/C7I=
-google.golang.org/protobuf v1.33.0/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos=
+google.golang.org/protobuf v1.32.0/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=

backend/service/client.go

@@ -5,6 +5,7 @@ import (
 	"s-ui/database"
 	"s-ui/database/model"
 	"s-ui/logger"
+	"strings"
 	"time"
 
 	"gorm.io/gorm"
@@ -13,14 +14,18 @@ import (
 type ClientService struct {
 }
 
-func (s *ClientService) GetAll() ([]model.Client, error) {
+func (s *ClientService) GetAll() (string, error) {
 	db := database.GetDB()
 	clients := []model.Client{}
 	err := db.Model(model.Client{}).Scan(&clients).Error
 	if err != nil {
-		return nil, err
+		return "", err
 	}
-	return clients, nil
+	data, err := json.Marshal(clients)
+	if err != nil {
+		return "", err
+	}
+	return string(data), nil
 }
 
 func (s *ClientService) Save(tx *gorm.DB, changes []model.Changes) error {
@@ -57,20 +62,18 @@ func (s *ClientService) DepleteClients() ([]string, []string, error) {
 		return nil, nil, err
 	}
 
-	dt := time.Now().Unix()
 	var users, inbounds []string
 	for _, client := range clients {
 		logger.Debug("Client ", client.Name, " is going to be disabled")
 		users = append(users, client.Name)
-		var userInbounds []string
+		userInbounds := strings.Split(client.Inbounds, ",")
-		json.Unmarshal(client.Inbounds, &userInbounds)
 		inbounds = append(inbounds, userInbounds...)
 		changes = append(changes, model.Changes{
-			DateTime: dt,
+			DateTime: time.Now().Unix(),
 			Actor:    "DepleteJob",
 			Key:      "clients",
 			Action:   "disable",
-			Obj:      json.RawMessage("\"" + client.Name + "\""),
+			Obj:      json.RawMessage(client.Name),
 		})
 	}
 
@@ -84,7 +87,6 @@ func (s *ClientService) DepleteClients() ([]string, []string, error) {
 		if err != nil {
 			return nil, nil, err
 		}
-		LastUpdate = dt
 	}
 
 	return users, inbounds, nil

backend/service/config.go

@@ -6,19 +6,14 @@ import (
 	"s-ui/config"
 	"s-ui/database"
 	"s-ui/database/model"
-	"s-ui/logger"
 	"s-ui/singbox"
-	"strconv"
 	"time"
 )
 
 var ApiAddr string
-var LastUpdate int64
 
 type ConfigService struct {
 	ClientService
-	TlsService
-	InDataService
 	singbox.Controller
 	SettingService
 }
@@ -56,50 +51,27 @@ func (s *ConfigService) InitConfig() error {
 			return err
 		}
 	}
-	var singboxConfig SingBoxConfig
+	return s.RefreshApiAddr(&data)
-	err = json.Unmarshal(data, &singboxConfig)
-	if err != nil {
-		return err
 }
 
-	return s.RefreshApiAddr(&singboxConfig)
+func (s *ConfigService) GetConfig() (*[]byte, error) {
-}
-
-func (s *ConfigService) GetConfig() (*SingBoxConfig, error) {
 	configPath := config.GetBinFolderPath()
 	data, err := os.ReadFile(configPath + "/config.json")
 	if err != nil {
 		return nil, err
 	}
-	singboxConfig := SingBoxConfig{}
+	return &data, nil
-	err = json.Unmarshal(data, &singboxConfig)
-	if err != nil {
-		return nil, err
-	}
-	return &singboxConfig, nil
 }
 
 func (s *ConfigService) SaveChanges(changes map[string]string, loginUser string) error {
 	var err error
-	var clientChanges, tlsChanges, inChanges, settingChanges, configChanges []model.Changes
+	var clientChanges, settingChanges, configChanges []model.Changes
 	if _, ok := changes["clients"]; ok {
 		err = json.Unmarshal([]byte(changes["clients"]), &clientChanges)
 		if err != nil {
 			return err
 		}
 	}
-	if _, ok := changes["tls"]; ok {
-		err = json.Unmarshal([]byte(changes["tls"]), &tlsChanges)
-		if err != nil {
-			return err
-		}
-	}
-	if _, ok := changes["inData"]; ok {
-		err = json.Unmarshal([]byte(changes["inData"]), &inChanges)
-		if err != nil {
-			return err
-		}
-	}
 	if _, ok := changes["settings"]; ok {
 		err = json.Unmarshal([]byte(changes["settings"]), &settingChanges)
 		if err != nil {
@@ -129,18 +101,6 @@ func (s *ConfigService) SaveChanges(changes map[string]string, loginUser string)
 			return err
 		}
 	}
-	if len(tlsChanges) > 0 {
-		err = s.TlsService.Save(tx, tlsChanges)
-		if err != nil {
-			return err
-		}
-	}
-	if len(inChanges) > 0 {
-		err = s.InDataService.Save(tx, inChanges)
-		if err != nil {
-			return err
-		}
-	}
 	if len(settingChanges) > 0 {
 		err = s.SettingService.Save(tx, settingChanges)
 		if err != nil {
@@ -152,7 +112,11 @@ func (s *ConfigService) SaveChanges(changes map[string]string, loginUser string)
 		if err != nil {
 			return err
 		}
-		newConfig := *singboxConfig
+		newConfig := SingBoxConfig{}
+		err = json.Unmarshal(*singboxConfig, &newConfig)
+		if err != nil {
+			return err
+		}
 		for _, change := range configChanges {
 			rawObject := change.Obj
 			switch change.Key {
@@ -182,15 +146,18 @@ func (s *ConfigService) SaveChanges(changes map[string]string, loginUser string)
 			case "outbounds":
 				if change.Action == "edit" {
 					newConfig.Outbounds[change.Index] = rawObject
-				} else if change.Action == "del" {
-					newConfig.Outbounds = append(newConfig.Outbounds[:change.Index], newConfig.Outbounds[change.Index+1:]...)
 				} else {
 					newConfig.Outbounds = append(newConfig.Outbounds, rawObject)
 				}
 			}
 		}
 
-		err = s.Save(&newConfig)
+		// Save to config.json
+		data, err := json.MarshalIndent(newConfig, "", "  ")
+		if err != nil {
+			return err
+		}
+		err = s.Save(&data)
 		if err != nil {
 			return err
 		}
@@ -198,11 +165,7 @@ func (s *ConfigService) SaveChanges(changes map[string]string, loginUser string)
 
 	// Log changes
 	dt := time.Now().Unix()
-	allChanges := append(clientChanges, settingChanges...)
+	allChanges := append(append(clientChanges, settingChanges...), configChanges...)
-	allChanges = append(allChanges, configChanges...)
-	allChanges = append(allChanges, tlsChanges...)
-	allChanges = append(allChanges, inChanges...)
-	if len(allChanges) > 0 {
 	for index := range allChanges {
 		allChanges[index].DateTime = dt
 		allChanges[index].Actor = loginUser
@@ -211,32 +174,21 @@ func (s *ConfigService) SaveChanges(changes map[string]string, loginUser string)
 	if err != nil {
 		return err
 	}
-	}
-
-	LastUpdate = dt
 
 	return nil
 }
 
-func (s *ConfigService) CheckChanges(lu string) (bool, error) {
+func (s *ConfigService) CheckChnages(lu string) (bool, error) {
 	if lu == "" {
 		return true, nil
 	}
-	if LastUpdate == 0 {
 	db := database.GetDB()
 	var count int64
 	err := db.Model(model.Changes{}).Where("date_time > " + lu).Count(&count).Error
-		if err == nil {
-			LastUpdate = time.Now().Unix()
-		}
 	return count > 0, err
-	} else {
-		intLu, err := strconv.ParseInt(lu, 10, 64)
-		return LastUpdate > intLu, err
-	}
 }
 
-func (s *ConfigService) Save(singboxConfig *SingBoxConfig) error {
+func (s *ConfigService) Save(data *[]byte) error {
 	configPath := config.GetBinFolderPath()
 	_, err := os.Stat(configPath + "/config.json")
 	if os.IsNotExist(err) {
@@ -248,36 +200,35 @@ func (s *ConfigService) Save(singboxConfig *SingBoxConfig) error {
 		return err
 	}
 
-	data, err := json.MarshalIndent(singboxConfig, " ", "  ")
+	err = os.WriteFile(configPath+"/config.json", *data, 0764)
 	if err != nil {
 		return err
 	}
 
-	err = os.WriteFile(configPath+"/config.json", data, 0764)
+	s.RefreshApiAddr(data)
-	if err != nil {
-		return err
-	}
-
-	s.RefreshApiAddr(singboxConfig)
 	s.Controller.Restart()
 
 	return nil
 }
 
-func (s *ConfigService) RefreshApiAddr(singboxConfig *SingBoxConfig) error {
+func (s *ConfigService) RefreshApiAddr(data *[]byte) error {
 	Env_API := config.GetEnvApi()
 	if len(Env_API) > 0 {
 		ApiAddr = Env_API
 	} else {
 		var err error
-		if singboxConfig == nil {
+		if data == nil {
-			singboxConfig, err = s.GetConfig()
+			data, err = s.GetConfig()
 			if err != nil {
 				return err
 			}
-
 		}
 
+		singboxConfig := SingBoxConfig{}
+		err = json.Unmarshal(*data, &singboxConfig)
+		if err != nil {
+			return err
+		}
 		var experimental struct {
 			V2rayApi struct {
 				Listen string      `json:"listen"`
@@ -304,7 +255,12 @@ func (s *ConfigService) DepleteClients() error {
 	if err != nil {
 		return err
 	}
-	for inbound_index, inbound := range singboxConfig.Inbounds {
+	newConfig := SingBoxConfig{}
+	err = json.Unmarshal(*singboxConfig, &newConfig)
+	if err != nil {
+		return err
+	}
+	for inbound_index, inbound := range newConfig.Inbounds {
 		var inboundJson map[string]interface{}
 		json.Unmarshal(inbound, &inboundJson)
 		if s.contains(inbounds, inboundJson["tag"].(string)) {
@@ -343,10 +299,13 @@ func (s *ConfigService) DepleteClients() error {
 		if err != nil {
 			return err
 		}
-		singboxConfig.Inbounds[inbound_index] = modifiedInbound
+		newConfig.Inbounds[inbound_index] = modifiedInbound
 	}
-
+	modifiedConfig, err := json.MarshalIndent(newConfig, "", "  ")
-	err = s.Save(singboxConfig)
+	if err != nil {
+		return err
+	}
+	err = s.Save(&modifiedConfig)
 	if err != nil {
 		return err
 	}
@@ -361,21 +320,3 @@ func (s *ConfigService) contains(slice []string, item string) bool {
 	}
 	return false
 }
-
-func (s *ConfigService) GetChanges(actor string, chngKey string, count string) []model.Changes {
-	c, _ := strconv.Atoi(count)
-	whereString := "`id`>0"
-	if len(actor) > 0 {
-		whereString += " and `actor`='" + actor + "'"
-	}
-	if len(chngKey) > 0 {
-		whereString += " and `key`='" + chngKey + "'"
-	}
-	db := database.GetDB()
-	var chngs []model.Changes
-	err := db.Model(model.Changes{}).Where(whereString).Order("`id` desc").Limit(c).Scan(&chngs).Error
-	if err != nil {
-		logger.Warning(err)
-	}
-	return chngs
-}

backend/service/inData.go

@@ -1,46 +0,0 @@
-package service
-
-import (
-	"encoding/json"
-	"s-ui/database"
-	"s-ui/database/model"
-
-	"gorm.io/gorm"
-)
-
-type InDataService struct {
-}
-
-func (s *InDataService) GetAll() ([]model.InboundData, error) {
-	db := database.GetDB()
-	inData := []model.InboundData{}
-	err := db.Model(model.InboundData{}).Scan(&inData).Error
-	if err != nil {
-		return nil, err
-	}
-
-	return inData, nil
-}
-
-func (s *InDataService) Save(tx *gorm.DB, changes []model.Changes) error {
-	var err error
-	for _, change := range changes {
-		inData := model.InboundData{}
-		err = json.Unmarshal(change.Obj, &inData)
-		if err != nil {
-			return err
-		}
-		switch change.Action {
-		case "new":
-			err = tx.Create(&inData).Error
-		case "del":
-			err = tx.Where("id = ?", change.Index).Delete(model.InboundData{}).Error
-		default:
-			err = tx.Save(inData).Error
-		}
-		if err != nil {
-			return err
-		}
-	}
-	return err
-}

backend/service/server.go

@@ -1,13 +1,10 @@
 package service
 
 import (
-	"bytes"
 	"os"
-	"os/exec"
 	"runtime"
 	"s-ui/config"
 	"s-ui/logger"
-	"strconv"
 	"strings"
 
 	"github.com/shirou/gopsutil/v3/cpu"
@@ -92,12 +89,12 @@ func (s *ServerService) GetNetInfo() map[string]interface{} {
 
 func (s *ServerService) GetSingboxInfo() map[string]interface{} {
 	info := make(map[string]interface{}, 0)
-	sysStats, err := s.SingBoxService.GetSysStats()
+	if s.SingBoxService.IsRunning() {
-	if err == nil {
 		info["running"] = true
+		sysStats, _ := s.SingBoxService.GetSysStats()
 		info["stats"] = sysStats
 	} else {
-		info["running"] = s.SingBoxService.IsRunning()
+		info["running"] = false
 	}
 	return info
 }
@@ -138,44 +135,3 @@ func (s *ServerService) GetSystemInfo() map[string]interface{} {
 
 	return info
 }
-
-func (s *ServerService) GetLogs(service string, count string, level string) []string {
-	c, _ := strconv.Atoi(count)
-	var lines []string
-	if service == "sing-box" {
-		cmdArgs := []string{"journalctl", "-u", service, "--no-pager", "-n", count, "-p", level}
-		// Run the command
-		cmd := exec.Command(cmdArgs[0], cmdArgs[1:]...)
-		var out bytes.Buffer
-		cmd.Stdout = &out
-		err := cmd.Run()
-		if err != nil {
-			return []string{"Failed to run journalctl command!"}
-		}
-		lines = strings.Split(out.String(), "\n")
-	} else {
-		lines = logger.GetLogs(c, level)
-	}
-
-	return lines
-}
-
-func (s *ServerService) GenKeypair(keyType string, options string) []string {
-	if len(keyType) == 0 {
-		return []string{"No keypair to generate"}
-	}
-	sbExec := s.GetBinaryPath()
-	cmdArgs := []string{"generate", keyType + "-keypair"}
-	if keyType == "tls" || keyType == "ech" {
-		cmdArgs = append(cmdArgs, options)
-	}
-	// Run the command
-	cmd := exec.Command(sbExec, cmdArgs...)
-	var out bytes.Buffer
-	cmd.Stdout = &out
-	err := cmd.Run()
-	if err != nil {
-		return []string{"Failed to generate keypair"}
-	}
-	return strings.Split(out.String(), "\n")
-}

backend/service/setting.go

@@ -18,13 +18,12 @@ var defaultValueMap = map[string]string{
 	"webListen":     "",
 	"webDomain":     "",
 	"webPort":       "2095",
-	"secret":        common.Random(32),
+	"webSecret":     common.Random(32),
 	"webCertFile":   "",
 	"webKeyFile":    "",
 	"webPath":       "/app/",
 	"webURI":        "",
 	"sessionMaxAge": "0",
-	"trafficAge":    "30",
 	"timeLocation":  "Asia/Tehran",
 	"subListen":     "",
 	"subPort":       "2096",
@@ -36,7 +35,6 @@ var defaultValueMap = map[string]string{
 	"subEncode":     "true",
 	"subShowInfo":   "false",
 	"subURI":        "",
-	"subJsonExt":    "",
 }
 
 type SettingService struct {
@@ -66,7 +64,7 @@ func (s *SettingService) GetAllSetting() (*map[string]string, error) {
 	}
 
 	// Due to security principles
-	delete(allSetting, "secret")
+	delete(allSetting, "webSecret")
 
 	return &allSetting, nil
 }
@@ -128,9 +126,9 @@ func (s *SettingService) getBool(key string) (bool, error) {
 	return strconv.ParseBool(str)
 }
 
-// func (s *SettingService) setBool(key string, value bool) error {
+func (s *SettingService) setBool(key string, value bool) error {
-// 	return s.setString(key, strconv.FormatBool(value))
+	return s.setString(key, strconv.FormatBool(value))
-// }
+}
 
 func (s *SettingService) getInt(key string) (int, error) {
 	str, err := s.getString(key)
@@ -192,11 +190,11 @@ func (s *SettingService) SetWebPath(webPath string) error {
 }
 
 func (s *SettingService) GetSecret() ([]byte, error) {
-	secret, err := s.getString("secret")
+	secret, err := s.getString("webSecret")
-	if secret == defaultValueMap["secret"] {
+	if secret == defaultValueMap["webSecret"] {
-		err := s.saveSetting("secret", secret)
+		err := s.saveSetting("webSecret", secret)
 		if err != nil {
-			logger.Warning("save secret failed:", err)
+			logger.Warning("save webSecret failed:", err)
 		}
 	}
 	return []byte(secret), err
@@ -206,10 +204,6 @@ func (s *SettingService) GetSessionMaxAge() (int, error) {
 	return s.getInt("sessionMaxAge")
 }
 
-func (s *SettingService) GetTrafficAge() (int, error) {
-	return s.getInt("trafficAge")
-}
-
 func (s *SettingService) GetTimeLocation() (*time.Location, error) {
 	l, err := s.getString("timeLocation")
 	if err != nil {
@@ -319,10 +313,10 @@ func (s *SettingService) Save(tx *gorm.DB, changes []model.Changes) error {
 		json.Unmarshal(change.Obj, &obj)
 
 		// Secure file existance check
-		if obj != "" && (key == "webCertFile" ||
+		if key == "webCertFile" ||
 			key == "webKeyFile" ||
 			key == "subCertFile" ||
-			key == "subKeyFile") {
+			key == "subKeyFile" {
 			err = s.fileExists(obj)
 			if err != nil {
 				return common.NewError(" -> ", obj, " is not exists")
@@ -348,10 +342,6 @@ func (s *SettingService) Save(tx *gorm.DB, changes []model.Changes) error {
 	return err
 }
 
-func (s *SettingService) GetSubJsonExt() (string, error) {
-	return s.getString("subJsonExt")
-}
-
 func (s *SettingService) fileExists(path string) error {
 	_, err := os.Stat(path)
 	return err

backend/service/sinxbox.go

@@ -26,10 +26,7 @@ func (s *SingBoxService) GetStats() error {
 }
 
 func (s *SingBoxService) GetSysStats() (*map[string]interface{}, error) {
-	err := s.V2rayAPI.Init(ApiAddr)
+	s.V2rayAPI.Init(ApiAddr)
-	if err != nil {
-		return nil, err
-	}
 	defer s.V2rayAPI.Close()
 	resp, err := s.V2rayAPI.GetSysStats()
 	if err != nil {

backend/service/stats.go

@@ -1,6 +1,7 @@
 package service
 
 import (
+	"encoding/json"
 	"s-ui/database"
 	"s-ui/database/model"
 	"time"
@@ -85,8 +86,12 @@ func (s *StatsService) GetStats(resorce string, tag string, limit int) ([]model.
 	return result, nil
 }
 
-func (s *StatsService) GetOnlines() (onlines, error) {
+func (s *StatsService) GetOnlines() (string, error) {
-	return *onlineResources, nil
+	onlines, err := json.Marshal(onlineResources)
+	if err != nil {
+		return "", err
+	}
+	return string(onlines), nil
 }
 func (s *StatsService) DelOldStats(days int) error {
 	oldTime := time.Now().AddDate(0, 0, -(days)).Unix()

backend/service/tls.go

@@ -1,46 +0,0 @@
-package service
-
-import (
-	"encoding/json"
-	"s-ui/database"
-	"s-ui/database/model"
-
-	"gorm.io/gorm"
-)
-
-type TlsService struct {
-}
-
-func (s *TlsService) GetAll() ([]model.Tls, error) {
-	db := database.GetDB()
-	tlsConfig := []model.Tls{}
-	err := db.Model(model.Tls{}).Scan(&tlsConfig).Error
-	if err != nil {
-		return nil, err
-	}
-
-	return tlsConfig, nil
-}
-
-func (s *TlsService) Save(tx *gorm.DB, changes []model.Changes) error {
-	var err error
-	for _, change := range changes {
-		tlsConfig := model.Tls{}
-		err = json.Unmarshal(change.Obj, &tlsConfig)
-		if err != nil {
-			return err
-		}
-		switch change.Action {
-		case "new":
-			err = tx.Create(&tlsConfig).Error
-		case "del":
-			err = tx.Where("id = ?", change.Index).Delete(model.Tls{}).Error
-		default:
-			err = tx.Save(tlsConfig).Error
-		}
-		if err != nil {
-			return err
-		}
-	}
-	return err
-}

backend/sub/jsonService.go

@@ -1,243 +0,0 @@
-package sub
-
-import (
-	"encoding/json"
-	"fmt"
-	"s-ui/database"
-	"s-ui/database/model"
-	"s-ui/service"
-	"s-ui/util"
-)
-
-const defaultJson = `
-{
-  "inbounds": [
-    {
-      "type": "tun",
-      "inet4_address": "172.19.0.1/30",
-      "mtu": 9000,
-      "auto_route": true,
-      "strict_route": false,
-      "sniff": true,
-      "endpoint_independent_nat": false,
-      "stack": "system",
-      "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": []
-    }
-  ]
-}
-`
-
-type JsonService struct {
-	service.SettingService
-	LinkService
-}
-
-func (j *JsonService) GetJson(subId string, format string) (*string, error) {
-	var jsonConfig map[string]interface{}
-
-	client, inDatas, err := j.getData(subId)
-	if err != nil {
-		return nil, err
-	}
-
-	outbounds, outTags, err := j.getOutbounds(client.Config, inDatas)
-	if err != nil {
-		return nil, err
-	}
-
-	links := j.LinkService.GetLinks(&client.Links, "external", "")
-	for index, link := range links {
-		json, tag, err := util.GetOutbound(link, index)
-		if err == nil && len(tag) > 0 {
-			*outbounds = append(*outbounds, *json)
-			*outTags = append(*outTags, tag)
-		}
-	}
-
-	j.addDefaultOutbounds(outbounds, outTags)
-
-	err = json.Unmarshal([]byte(defaultJson), &jsonConfig)
-	if err != nil {
-		return nil, err
-	}
-
-	jsonConfig["outbounds"] = outbounds
-
-	// Add other objects from settings
-	j.addOthers(&jsonConfig)
-
-	result, _ := json.MarshalIndent(jsonConfig, " ", "  ")
-	resultStr := string(result)
-	return &resultStr, nil
-}
-
-func (j *JsonService) getData(subId string) (*model.Client, *[]model.InboundData, error) {
-	db := database.GetDB()
-	client := &model.Client{}
-	err := db.Model(model.Client{}).Where("enable = true and name = ?", subId).First(client).Error
-	if err != nil {
-		return nil, nil, err
-	}
-	var inbounds []string
-	err = json.Unmarshal(client.Inbounds, &inbounds)
-	if err != nil {
-		return nil, nil, err
-	}
-	inDatas := &[]model.InboundData{}
-	err = db.Model(model.InboundData{}).Where("tag in ?", inbounds).Find(&inDatas).Error
-	if err != nil {
-		return nil, nil, err
-	}
-	return client, inDatas, nil
-}
-
-func (j *JsonService) getOutbounds(clientConfig json.RawMessage, inDatas *[]model.InboundData) (*[]map[string]interface{}, *[]string, error) {
-	var outbounds []map[string]interface{}
-	var configs map[string]interface{}
-	var outTags []string
-
-	err := json.Unmarshal(clientConfig, &configs)
-	if err != nil {
-		return nil, nil, err
-	}
-	for _, inData := range *inDatas {
-		if len(inData.OutJson) < 5 {
-			continue
-		}
-		var outbound map[string]interface{}
-		err = json.Unmarshal(inData.OutJson, &outbound)
-		if err != nil {
-			return nil, nil, err
-		}
-		protocol, _ := outbound["type"].(string)
-		config, _ := configs[protocol].(map[string]interface{})
-		for key, value := range config {
-			if key != "alterId" && key != "name" && key != "username" {
-				outbound[key] = value
-			}
-		}
-
-		var addrs []map[string]interface{}
-		err = json.Unmarshal(inData.Addrs, &addrs)
-		if err != nil {
-			return nil, nil, err
-		}
-		tag := outbound["tag"].(string)
-		if len(addrs) == 0 {
-			outTags = append(outTags, tag)
-			outbounds = append(outbounds, outbound)
-		} else {
-			for index, addr := range addrs {
-				// Copy original config
-				newOut := make(map[string]interface{}, len(outbound))
-				for key, value := range outbound {
-					newOut[key] = value
-				}
-				// Change and push copied config
-				newOut["server"], _ = addr["server"].(string)
-				port, _ := addr["server_port"].(float64)
-				newOut["server_port"] = int(port)
-				remark, _ := addr["remark"].(string)
-				newTag := fmt.Sprintf("%d.%s%s", index+1, tag, remark)
-				outTags = append(outTags, newTag)
-				newOut["tag"] = newTag
-				outbounds = append(outbounds, newOut)
-			}
-		}
-	}
-	return &outbounds, &outTags, nil
-}
-
-func (j *JsonService) addDefaultOutbounds(outbounds *[]map[string]interface{}, outTags *[]string) {
-	outbound := []map[string]interface{}{
-		{
-			"outbounds": append([]string{"auto", "direct"}, *outTags...),
-			"tag":       "proxy",
-			"type":      "selector",
-		},
-		{
-			"tag":       "auto",
-			"type":      "urltest",
-			"outbounds": outTags,
-			"url":       "http://www.gstatic.com/generate_204",
-			"interval":  "10m",
-			"tolerance": 50,
-		},
-		{
-			"type": "direct",
-			"tag":  "direct",
-		},
-		{
-			"type": "dns",
-			"tag":  "dns-out",
-		},
-		{
-			"type": "block",
-			"tag":  "block",
-		},
-	}
-	*outbounds = append(outbound, *outbounds...)
-}
-
-func (j *JsonService) addOthers(jsonConfig *map[string]interface{}) error {
-	rules := []interface{}{
-		map[string]interface{}{
-			"clash_mode": "Direct",
-			"outbound":   "direct",
-		},
-		map[string]interface{}{
-			"clash_mode": "Global",
-			"outbound":   "proxy",
-		},
-	}
-	route := map[string]interface{}{
-		"auto_detect_interface": true,
-		"final":                 "proxy",
-		"rules":                 rules,
-	}
-
-	othersStr, err := j.SettingService.GetSubJsonExt()
-	if err != nil {
-		return err
-	}
-	if len(othersStr) == 0 {
-		(*jsonConfig)["route"] = route
-		return nil
-	}
-	var othersJson map[string]interface{}
-	err = json.Unmarshal([]byte(othersStr), &othersJson)
-	if err != nil {
-		return err
-	}
-	if _, ok := othersJson["log"]; ok {
-		(*jsonConfig)["log"] = othersJson["log"]
-	}
-	if _, ok := othersJson["dns"]; ok {
-		(*jsonConfig)["dns"] = othersJson["dns"]
-	}
-	if _, ok := othersJson["experimental"]; ok {
-		(*jsonConfig)["experimental"] = othersJson["lexperimentalog"]
-	}
-	if _, ok := othersJson["rule_set"]; ok {
-		route["rule_set"] = othersJson["rule_set"]
-	}
-	if settingRules, ok := othersJson["rules"].([]interface{}); ok {
-		route["rules"] = append(rules, settingRules...)
-	}
-	(*jsonConfig)["route"] = route
-
-	return nil
-}

backend/sub/linkService.go

@@ -1,100 +0,0 @@
-package sub
-
-import (
-	"crypto/tls"
-	"encoding/json"
-	"io"
-	"net/http"
-	"s-ui/logger"
-	"s-ui/util"
-	"strings"
-)
-
-type Link struct {
-	Type   string `json:"type"`
-	Remark string `json:"remark"`
-	Uri    string `json:"uri"`
-}
-
-type LinkService struct {
-}
-
-func (s *LinkService) GetLinks(linkJson *json.RawMessage, types string, clientInfo string) []string {
-	links := []Link{}
-	var result []string
-	err := json.Unmarshal(*linkJson, &links)
-	if err != nil {
-		return nil
-	}
-	for _, link := range links {
-		switch link.Type {
-		case "external":
-			result = append(result, link.Uri)
-		case "sub":
-			result = append(result, s.getExternalSub(link.Uri)...)
-		case "local":
-			if types == "all" {
-				result = append(result, s.addClientInfo(link.Uri, clientInfo))
-			}
-		}
-	}
-	return result
-}
-
-func (s *LinkService) addClientInfo(uri string, clientInfo string) string {
-	protocol := strings.Split(uri, "://")
-	if len(protocol) < 2 {
-		return uri
-	}
-	switch protocol[0] {
-	case "vmess":
-		var vmessJson map[string]interface{}
-		config, err := util.B64StrToByte(protocol[1])
-		if err != nil {
-			logger.Warning("sub: Error decoding vmess content:", err)
-			return uri
-		}
-		err = json.Unmarshal(config, &vmessJson)
-		if err != nil {
-			logger.Warning("sub: Error decoding vmess content:", err)
-			return uri
-		}
-		vmessJson["ps"] = vmessJson["ps"].(string) + clientInfo
-		result, err := json.MarshalIndent(vmessJson, "", "  ")
-		if err != nil {
-			logger.Warning("sub: Error decoding vmess + clientInfo content:", err)
-			return uri
-		}
-		return "vmess://" + util.ByteToB64Str(result)
-	default:
-		return uri + clientInfo
-	}
-}
-
-func (s *LinkService) getExternalSub(url string) []string {
-	tr := &http.Transport{
-		TLSClientConfig: &tls.Config{InsecureSkipVerify: true},
-	}
-
-	client := &http.Client{Transport: tr}
-
-	// Make the HTTP request
-	response, err := client.Get(url)
-	if err != nil {
-		logger.Warning("sub: Error making HTTP request:", err)
-		return nil
-	}
-	defer response.Body.Close()
-
-	// Read the response body
-	body, err := io.ReadAll(response.Body)
-	if err != nil {
-		logger.Warning("sub: Error reading response body:", err)
-		return nil
-	}
-
-	// Convert if the content is Base64 encoded
-	links := util.StrOrBase64Encoded(string(body))
-	return strings.Split(links, "\n")
-
-}

backend/sub/subHandler.go

@@ -10,7 +10,6 @@ import (
 type SubHandler struct {
 	service.SettingService
 	SubService
-	JsonService
 }
 
 func NewSubHandler(g *gin.RouterGroup) {
@@ -24,16 +23,6 @@ func (s *SubHandler) initRouter(g *gin.RouterGroup) {
 
 func (s *SubHandler) subs(c *gin.Context) {
 	subId := c.Param("subid")
-	format, isFormat := c.GetQuery("format")
-	if isFormat {
-		result, err := s.JsonService.GetJson(subId, format)
-		if err != nil || result == nil {
-			logger.Error(err)
-			c.String(400, "Error!")
-		} else {
-			c.String(200, *result)
-		}
-	} else {
 	result, headers, err := s.SubService.GetSubs(subId)
 	if err != nil || result == nil {
 		logger.Error(err)
@@ -48,4 +37,3 @@ func (s *SubHandler) subs(c *gin.Context) {
 		c.String(200, *result)
 	}
 }
-}

backend/sub/subService.go

@@ -1,10 +1,15 @@
 package sub
 
 import (
+	"crypto/tls"
 	"encoding/base64"
+	"encoding/json"
 	"fmt"
+	"io"
+	"net/http"
 	"s-ui/database"
 	"s-ui/database/model"
+	"s-ui/logger"
 	"s-ui/service"
 	"strings"
 	"time"
@@ -12,7 +17,12 @@ import (
 
 type SubService struct {
 	service.SettingService
-	LinkService
+}
+
+type Link struct {
+	Type   string `json:"type"`
+	Remark string `json:"remark"`
+	Uri    string `json:"uri"`
 }
 
 func (s *SubService) GetSubs(subId string) (*string, []string, error) {
@@ -25,14 +35,29 @@ func (s *SubService) GetSubs(subId string) (*string, []string, error) {
 		return nil, nil, err
 	}
 
+	links := []Link{}
+	err = json.Unmarshal([]byte(client.Links), &links)
+	if err != nil {
+		return nil, nil, err
+	}
+
 	clientInfo := ""
 	subShowInfo, _ := s.SettingService.GetSubShowInfo()
 	if subShowInfo {
 		clientInfo = s.getClientInfo(client)
 	}
 
-	linksArray := s.LinkService.GetLinks(&client.Links, "all", clientInfo)
+	var result string
-	result := strings.Join(linksArray, "\n")
+	for _, link := range links {
+		switch link.Type {
+		case "external":
+			result += fmt.Sprintln(link.Uri)
+		case "sub":
+			result += s.getExternalSub(link.Uri)
+		case "local":
+			result += fmt.Sprintln(s.addClientInfo(link.Uri, clientInfo))
+		}
+	}
 
 	var headers []string
 	updateInterval, _ := s.SettingService.GetSubUpdates()
@@ -65,6 +90,80 @@ func (s *SubService) getClientInfo(c *model.Client) string {
 	}
 }
 
+func (s *SubService) addClientInfo(uri string, clientInfo string) string {
+	protocol := strings.Split(uri, "://")
+	if len(protocol) < 2 {
+		return uri
+	}
+	switch protocol[0] {
+	case "vmess":
+		var vmessJson map[string]interface{}
+		config, err := base64.StdEncoding.DecodeString(protocol[1])
+		if err != nil {
+			logger.Warning("sub: Error decoding vmess content:", err)
+			return uri
+		}
+		err = json.Unmarshal(config, &vmessJson)
+		if err != nil {
+			logger.Warning("sub: Error decoding vmess content:", err)
+			return uri
+		}
+		vmessJson["ps"] = vmessJson["ps"].(string) + clientInfo
+		result, err := json.MarshalIndent(vmessJson, "", "  ")
+		if err != nil {
+			logger.Warning("sub: Error decoding vmess + clientInfo content:", err)
+			return uri
+		}
+		return "vmess://" + base64.StdEncoding.EncodeToString(result)
+	default:
+		return uri + clientInfo
+	}
+}
+
+func (s *SubService) getExternalSub(url string) string {
+	tr := &http.Transport{
+		TLSClientConfig: &tls.Config{InsecureSkipVerify: true},
+	}
+
+	client := &http.Client{Transport: tr}
+
+	// Make the HTTP request
+	response, err := client.Get(url)
+	if err != nil {
+		logger.Warning("sub: Error making HTTP request:", err)
+		return ""
+	}
+	defer response.Body.Close()
+
+	// Read the response body
+	body, err := io.ReadAll(response.Body)
+	if err != nil {
+		logger.Warning("sub: Error reading response body:", err)
+		return ""
+	}
+
+	// Check if the content is Base64 encoded
+	isBase64 := s.isBase64Encoded(string(body))
+	if isBase64 {
+		// Decode Base64 content
+		decodedText, err := base64.StdEncoding.DecodeString(string(body))
+		if err != nil {
+			logger.Warning("sub: Error decoding Base64 content:", err)
+			return ""
+		}
+
+		return string(decodedText)
+	} else {
+		return string(body)
+	}
+}
+
+// Function to check if a string is Base64 encoded
+func (s *SubService) isBase64Encoded(str string) bool {
+	_, err := base64.StdEncoding.DecodeString(str)
+	return err == nil
+}
+
 func (s *SubService) formatTraffic(trafficBytes int64) string {
 	if trafficBytes < 1024 {
 		return fmt.Sprintf("%.2fB", float64(trafficBytes)/float64(1))

backend/util/base64.go

@@ -1,20 +0,0 @@
-package util
-
-import "encoding/base64"
-
-// Function to return decoded bytes if a string is Base64 encoded
-func StrOrBase64Encoded(str string) string {
-	decoded, err := base64.StdEncoding.DecodeString(str)
-	if err == nil {
-		return string(decoded)
-	}
-	return str
-}
-
-func B64StrToByte(str string) ([]byte, error) {
-	return base64.StdEncoding.DecodeString(str)
-}
-
-func ByteToB64Str(b []byte) string {
-	return base64.StdEncoding.EncodeToString(b)
-}

backend/util/common/random.go

@@ -1,26 +1,13 @@
 package common
 
-import (
+import "math/rand"
-	"math/rand"
-	"time"
-)
 
-var (
+var allSeq [62]rune
-	allSeq []rune
-	rnd    = rand.New(rand.NewSource(time.Now().UnixNano()))
-)
-
-func init() {
-	chars := "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789"
-	for _, char := range chars {
-		allSeq = append(allSeq, char)
-	}
-}
 
 func Random(n int) string {
 	runes := make([]rune, n)
 	for i := 0; i < n; i++ {
-		runes[i] = allSeq[rnd.Intn(len(allSeq))]
+		runes[i] = allSeq[rand.Intn(len(allSeq))]
 	}
 	return string(runes)
 }

backend/util/linkToJson.go

@@ -1,473 +0,0 @@
-package util
-
-import (
-	"encoding/json"
-	"fmt"
-	"net"
-	"net/url"
-	"s-ui/util/common"
-	"strconv"
-	"strings"
-)
-
-func GetOutbound(uri string, i int) (*map[string]interface{}, string, error) {
-	u, err := url.Parse(uri)
-	if err == nil {
-		switch u.Scheme {
-		case "vmess":
-			return vmess(u.Host, i)
-		case "vless":
-			return vless(u, i)
-		case "trojan":
-			return trojan(u, i)
-		case "hy", "hysteria":
-			return hy(u, i)
-		case "hy2", "hysteria2":
-			return hy2(u, i)
-		case "tuic":
-			return tuic(u, i)
-		case "ss", "shadowsocks":
-			return ss(u, i)
-		}
-	}
-	return nil, "", common.NewError("Unsupported link format")
-}
-
-func vmess(data string, i int) (*map[string]interface{}, string, error) {
-	dataByte, err := B64StrToByte(data)
-	if err != nil {
-		return nil, "", err
-	}
-	var dataJson map[string]interface{}
-	err = json.Unmarshal(dataByte, &dataJson)
-	if err != nil {
-		return nil, "", err
-	}
-	transport := map[string]interface{}{}
-	tp_net, _ := dataJson["net"].(string)
-	tp_type, _ := dataJson["type"].(string)
-	tp_host, _ := dataJson["host"].(string)
-	tp_path, _ := dataJson["path"].(string)
-	switch strings.ToLower(tp_net) {
-	case "tcp", "":
-		if tp_type == "http" {
-			transport["type"] = tp_type
-			if len(tp_host) > 0 {
-				transport["host"] = strings.Split(tp_host, ",")
-			}
-			transport["path"] = tp_path
-		}
-	case "http", "h2":
-		transport["type"] = "http"
-		if len(tp_host) > 0 {
-			transport["host"] = strings.Split(tp_host, ",")
-		}
-		transport["path"] = tp_path
-	case "ws":
-		transport["type"] = tp_net
-		transport["path"] = tp_path
-		transport["early_data_header_name"] = "Sec-WebSocket-Protocol"
-		if len(tp_host) > 0 {
-			transport["headers"] = map[string]interface{}{
-				"Host": tp_host,
-			}
-		}
-	case "quic":
-		transport["type"] = tp_net
-	case "grpc":
-		transport["type"] = tp_net
-		transport["service_name"] = tp_path
-	case "httpupgrade":
-		transport["type"] = tp_net
-		transport["path"] = tp_path
-		transport["host"] = tp_host
-	default:
-		return nil, "", common.NewError("Invalid vmess")
-	}
-	tls := map[string]interface{}{}
-	vmess_tls, _ := dataJson["tls"].(string)
-	if vmess_tls == "tls" {
-		tls["enabled"] = true
-		tls_sni, _ := dataJson["sni"].(string)
-		tls_alpn, _ := dataJson["alpn"].(string)
-		_, tls_insecure := dataJson["allowInsecure"]
-		tls_fp, _ := dataJson["fp"].(string)
-		if len(tls_sni) > 0 {
-			tls["server_name"] = tls_sni
-		}
-		if len(tls_alpn) > 0 {
-			tls["alpn"] = strings.Split(tls_alpn, ",")
-		}
-		if tls_insecure {
-			tls["insecure"] = true
-		}
-		if len(tls_fp) > 0 {
-			tls["utls"] = map[string]interface{}{
-				"enabled":     true,
-				"fingerprint": tls_fp,
-			}
-		}
-	}
-	tag, _ := dataJson["ps"].(string)
-	if i > 0 {
-		tag = fmt.Sprintf("%d.%s", i, tag)
-	}
-	alter_id, ok := dataJson["aid"].(int)
-	if !ok {
-		alter_id = 0
-	}
-	vmess := map[string]interface{}{
-		"type":        "vmess",
-		"tag":         tag,
-		"server":      dataJson["add"],
-		"server_port": dataJson["port"],
-		"uuid":        dataJson["id"],
-		"security":    "auto",
-		"alter_id":    alter_id,
-		"tls":         tls,
-		"transport":   transport,
-	}
-	return &vmess, tag, err
-}
-
-func vless(u *url.URL, i int) (*map[string]interface{}, string, error) {
-	query, _ := url.ParseQuery(u.RawQuery)
-	security := query.Get("security")
-	host, portStr, _ := net.SplitHostPort(u.Host)
-	port := 80
-	if len(portStr) > 0 {
-		port, _ = strconv.Atoi(portStr)
-	} else {
-		if security == "tls" || security == "reality" {
-			port = 443
-		}
-	}
-	tp_type := query.Get("type")
-	tag := u.Fragment
-	if i > 0 {
-		tag = fmt.Sprintf("%d.%s", i, u.Fragment)
-	}
-	vless := map[string]interface{}{
-		"type":        "vless",
-		"tag":         tag,
-		"server":      host,
-		"server_port": port,
-		"uuid":        u.User.Username(),
-		"flow":        query.Get("flow"),
-		"tls":         getTls(security, &query),
-		"transport":   getTransport(tp_type, &query),
-	}
-	return &vless, tag, nil
-}
-
-func trojan(u *url.URL, i int) (*map[string]interface{}, string, error) {
-	query, _ := url.ParseQuery(u.RawQuery)
-	security := query.Get("security")
-	host, portStr, _ := net.SplitHostPort(u.Host)
-	port := 80
-	if len(portStr) > 0 {
-		port, _ = strconv.Atoi(portStr)
-	} else {
-		if security == "tls" || security == "reality" {
-			port = 443
-		}
-	}
-	tp_type := query.Get("type")
-	tag := u.Fragment
-	if i > 0 {
-		tag = fmt.Sprintf("%d.%s", i, u.Fragment)
-	}
-	trojan := map[string]interface{}{
-		"type":        "trojan",
-		"tag":         tag,
-		"server":      host,
-		"server_port": port,
-		"password":    u.User.Username(),
-		"tls":         getTls(security, &query),
-		"transport":   getTransport(tp_type, &query),
-	}
-	return &trojan, tag, nil
-}
-
-func hy(u *url.URL, i int) (*map[string]interface{}, string, error) {
-	query, _ := url.ParseQuery(u.RawQuery)
-	host, portStr, _ := net.SplitHostPort(u.Host)
-	port := 443
-	if len(portStr) > 0 {
-		port, _ = strconv.Atoi(portStr)
-	}
-
-	tls := map[string]interface{}{
-		"enabled":     true,
-		"server_name": query.Get("peer"),
-	}
-	alpn := query.Get("alpn")
-	insecure := query.Get("insecure")
-	if len(alpn) > 0 {
-		tls["alpn"] = strings.Split(alpn, ",")
-	}
-	if insecure == "1" || insecure == "true" {
-		tls["insecure"] = true
-	}
-
-	tag := u.Fragment
-	if i > 0 {
-		tag = fmt.Sprintf("%d.%s", i, u.Fragment)
-	}
-	hy := map[string]interface{}{
-		"type":        "hysteria",
-		"tag":         tag,
-		"server":      host,
-		"server_port": port,
-		"obfs":        query.Get("obfsParam"),
-		"auth_str":    query.Get("auth"),
-		"tls":         tls,
-	}
-	down, _ := strconv.Atoi(query.Get("downmbps"))
-	up, _ := strconv.Atoi(query.Get("upmbps"))
-	recv_window_conn, _ := strconv.Atoi(query.Get("recv_window_conn"))
-	recv_window, _ := strconv.Atoi(query.Get("recv_window"))
-	if down > 0 {
-		hy["down_mbps"] = down
-	}
-	if up > 0 {
-		hy["up_mbps"] = up
-	}
-	if recv_window_conn > 0 {
-		hy["recv_window_conn"] = recv_window_conn
-	}
-	if recv_window > 0 {
-		hy["recv_window"] = recv_window
-	}
-	return &hy, tag, nil
-}
-
-func hy2(u *url.URL, i int) (*map[string]interface{}, string, error) {
-	query, _ := url.ParseQuery(u.RawQuery)
-	host, portStr, _ := net.SplitHostPort(u.Host)
-	port := 443
-	if len(portStr) > 0 {
-		port, _ = strconv.Atoi(portStr)
-	}
-
-	tls := map[string]interface{}{
-		"enabled":     true,
-		"server_name": query.Get("sni"),
-	}
-	alpn := query.Get("alpn")
-	insecure := query.Get("insecure")
-	if len(alpn) > 0 {
-		tls["alpn"] = strings.Split(alpn, ",")
-	}
-	if insecure == "1" || insecure == "true" {
-		tls["insecure"] = true
-	}
-
-	tag := u.Fragment
-	if i > 0 {
-		tag = fmt.Sprintf("%d.%s", i, u.Fragment)
-	}
-	hy2 := map[string]interface{}{
-		"type":        "hysteria2",
-		"tag":         tag,
-		"server":      host,
-		"server_port": port,
-		"password":    u.User.Username(),
-		"tls":         tls,
-	}
-	down, _ := strconv.Atoi(query.Get("downmbps"))
-	up, _ := strconv.Atoi(query.Get("upmbps"))
-	obfs := query.Get("obfs")
-	if down > 0 {
-		hy2["down_mbps"] = down
-	}
-	if up > 0 {
-		hy2["up_mbps"] = up
-	}
-	if obfs == "salamander" {
-		hy2["obfs"] = map[string]interface{}{
-			"type":     "salamander",
-			"password": query.Get("obfs-password"),
-		}
-	}
-	return &hy2, tag, nil
-}
-
-func tuic(u *url.URL, i int) (*map[string]interface{}, string, error) {
-	query, _ := url.ParseQuery(u.RawQuery)
-	host, portStr, _ := net.SplitHostPort(u.Host)
-	port := 443
-	if len(portStr) > 0 {
-		port, _ = strconv.Atoi(portStr)
-	}
-
-	tls := map[string]interface{}{
-		"enabled":     true,
-		"server_name": query.Get("sni"),
-	}
-	alpn := query.Get("alpn")
-	insecure := query.Get("allow_insecure")
-	disable_sni := query.Get("disable_sni")
-	if len(alpn) > 0 {
-		tls["alpn"] = strings.Split(alpn, ",")
-	}
-	if insecure == "1" || insecure == "true" {
-		tls["insecure"] = true
-	}
-	if disable_sni == "1" || disable_sni == "true" {
-		tls["disable_sni"] = true
-	}
-
-	tag := u.Fragment
-	if i > 0 {
-		tag = fmt.Sprintf("%d.%s", i, u.Fragment)
-	}
-	password, _ := u.User.Password()
-	tuic := map[string]interface{}{
-		"type":               "tuic",
-		"tag":                tag,
-		"server":             host,
-		"server_port":        port,
-		"uuid":               u.User.Username(),
-		"password":           password,
-		"congestion_control": query.Get("congestion_control"),
-		"udp_relay_mode":     query.Get("udp_relay_mode"),
-		"tls":                tls,
-	}
-	return &tuic, tag, nil
-}
-
-func ss(u *url.URL, i int) (*map[string]interface{}, string, error) {
-	query, _ := url.ParseQuery(u.RawQuery)
-	host, portStr, _ := net.SplitHostPort(u.Host)
-	port := 443
-	if len(portStr) > 0 {
-		port, _ = strconv.Atoi(portStr)
-	}
-	method := u.User.Username()
-	password, ok := u.User.Password()
-	if !ok {
-		decrypted := StrOrBase64Encoded(method)
-		decrypted_arr := strings.Split(decrypted, ":")
-		if len(decrypted_arr) > 1 {
-			method = decrypted_arr[0]
-			password = strings.Join(decrypted_arr[1:], ":")
-		} else {
-			return nil, "", common.NewError("Unsupported shadowsocks")
-		}
-	}
-
-	tag := u.Fragment
-	if i > 0 {
-		tag = fmt.Sprintf("%d.%s", i, u.Fragment)
-	}
-	ss := map[string]interface{}{
-		"type":        "shadowsocks",
-		"tag":         tag,
-		"server":      host,
-		"server_port": port,
-		"method":      method,
-		"password":    password,
-	}
-
-	v2ray_type := query.Get("type")
-	if len(v2ray_type) > 0 {
-		pl_arr := []string{}
-		host_header := query.Get("host")
-		if query.Get("security") == "tls" {
-			pl_arr = append(pl_arr, "tls")
-		}
-		if v2ray_type == "quic" {
-			pl_arr = append(pl_arr, "mode=quic")
-		}
-		if len(host_header) > 0 {
-			pl_arr = append(pl_arr, "host="+host_header)
-		}
-		ss["plugin"] = "v2ray-plugin"
-		ss["plugin_opts"] = strings.Join(pl_arr, ";")
-	}
-	plugin := query.Get("plugin")
-	if len(plugin) > 0 {
-		pl_arr := strings.Split(plugin, ";")
-		if len(pl_arr) > 0 {
-			ss["plugin"] = pl_arr[0]
-			ss["plugin_opts"] = strings.Join(pl_arr[1:], ";")
-		}
-	}
-	return &ss, tag, nil
-}
-
-func getTransport(tp_type string, q *url.Values) *map[string]interface{} {
-	transport := map[string]interface{}{}
-	tp_host := q.Get("host")
-	tp_path := q.Get("path")
-	switch strings.ToLower(tp_type) {
-	case "tcp", "":
-		if q.Get("headerType") == "http" {
-			transport["type"] = "http"
-			if len(tp_host) > 0 {
-				transport["host"] = strings.Split(tp_host, ",")
-			}
-			transport["path"] = tp_path
-		}
-	case "http", "h2":
-		transport["type"] = "http"
-		if len(tp_host) > 0 {
-			transport["host"] = strings.Split(tp_host, ",")
-		}
-		transport["path"] = tp_path
-	case "ws":
-		transport["type"] = "ws"
-		transport["path"] = tp_path
-		if len(tp_host) > 0 {
-			transport["headers"] = map[string]interface{}{
-				"Host": tp_host,
-			}
-		}
-	case "quic":
-		transport["type"] = "quic"
-	case "grpc":
-		transport["type"] = "grpc"
-		transport["service_name"] = q.Get("serviceName")
-	case "httpupgrade":
-		transport["type"] = "httpupgrade"
-		transport["path"] = tp_path
-		transport["host"] = tp_host
-	}
-	return &transport
-}
-
-func getTls(security string, q *url.Values) *map[string]interface{} {
-	tls := map[string]interface{}{}
-	tls_fp := q.Get("fp")
-	tls_sni := q.Get("sni")
-	tls_insecure := q.Get("allowInsecure")
-	tls_alpn := q.Get("alpn")
-	switch security {
-	case "tls":
-		tls["enabled"] = true
-	case "reality":
-		tls["enabled"] = true
-		tls["reality"] = map[string]interface{}{
-			"enabled":    true,
-			"public_key": q.Get("pbk"),
-			"short_id":   q.Get("sid"),
-		}
-	}
-	if len(tls_sni) > 0 {
-		tls["server_name"] = tls_sni
-	}
-	if len(tls_alpn) > 0 {
-		tls["alpn"] = strings.Split(tls_alpn, ",")
-	}
-	if tls_insecure == "1" || tls_insecure == "true" {
-		tls["insecure"] = true
-	}
-	if len(tls_fp) > 0 {
-		tls["utls"] = map[string]interface{}{
-			"enabled":     true,
-			"fingerprint": tls_fp,
-		}
-	}
-	return &tls
-}

core/Dockerfile

@@ -1,28 +0,0 @@
-FROM --platform=$BUILDPLATFORM golang:1.22-alpine AS singbox-builder
-LABEL maintainer="Alireza <alireza7@gmail.com>"
-WORKDIR /app
-ARG TARGETOS TARGETARCH
-ARG SINGBOX_VER=v1.9.3
-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}
-ENV CGO_ENABLED=0
-ENV GOOS=$TARGETOS
-ENV GOARCH=$TARGETARCH
-RUN apk --no-cache --update add build-base gcc wget unzip git
-RUN set -ex \
-    && git clone --depth 1 --branch $SINGBOX_VER https://github.com/SagerNet/sing-box.git \
-    && cd sing-box \
-    && go build -v -trimpath -tags \
-        $SINGBOX_TAGS \
-        -ldflags "-X \"github.com/sagernet/sing-box/constant.Version=$SINGBOX_VER\" -s -w -buildid=" \
-        ./cmd/sing-box
-
-FROM --platform=$TARGETPLATFORM alpine
-LABEL maintainer="Alireza <alireza7@gmail.com>"
-ENV TZ=Asia/Tehran
-WORKDIR /app
-RUN apk add  --no-cache --update ca-certificates tzdata bash
-COPY --from=singbox-builder /app/sing-box/sing-box .
-COPY runSingbox.sh .
-ENTRYPOINT [ "./runSingbox.sh" ]

docker-compose.yml

@@ -1,45 +0,0 @@
----
-services:
-  s-ui:
-    image: alireza7/s-ui
-    container_name: s-ui
-    hostname: "S-UI docker"
-    volumes:
-      - "singbox:/app/bin"
-      - "$PWD/db:/app/db"
-      - "$PWD/cert:/app/cert"
-    environment:
-      SINGBOX_API: "sing-box:1080"
-      SUI_DB_FOLDER: "db"
-    tty: true
-    restart: unless-stopped
-    ports:
-      - "2095:2095"
-      - "2096:2096"
-    networks:
-      - s-ui
-    entrypoint: "./sui migrate && ./sui"
-
-  sing-box:
-    image: alireza7/s-ui-singbox
-    container_name: sing-box
-    volumes:
-      - "singbox:/app/"
-      - "$PWD/cert:/cert"
-    networks:
-      - s-ui
-    ports:
-      - "443:443"
-      - "1443:1443"
-      - "2443:2443"
-      - "3443:3443"
-    restart: unless-stopped
-    depends_on:
-      - s-ui
-
-networks:
-  s-ui:
-    driver: bridge
-
-volumes:
-  singbox:

frontend/package.json

@@ -1,42 +1,42 @@
 {
   "name": "frontend",
-  "version": "1.0.0",
+  "version": "0.0.0",
   "private": true,
   "scripts": {
-    "dev": "vite --host",
+    "dev": "vite",
     "build": "vue-tsc --noEmit && vite build",
     "preview": "vite preview",
     "lint": "eslint . --fix --ignore-path .gitignore"
   },
   "dependencies": {
-    "@mdi/font": "7.4.47",
+    "@mdi/font": "7.0.96",
-    "axios": "^1.7.2",
+    "axios": "^1.6.5",
-    "chart.js": "^4.4.3",
+    "chart.js": "^4.4.1",
     "clipboard": "^2.0.11",
-    "core-js": "^3.37.1",
+    "core-js": "^3.29.0",
-    "moment": "^2.30.1",
-    "notivue": "^2.4.4",
     "pinia": "^2.1.7",
     "qrcode.vue": "^3.4.1",
-    "roboto-fontface": "^0.10.0",
+    "roboto-fontface": "*",
-    "vue": "^3.4.31",
+    "vue": "^3.2.0",
-    "vue-chartjs": "^5.3.1",
+    "vue-chartjs": "^5.3.0",
-    "vue-i18n": "^9.13.1",
+    "vue-i18n": "^9.8.0",
-    "vue-router": "^4.4.0",
+    "vue-router": "^4.0.0",
     "vue3-persian-datetime-picker": "^1.2.2",
-    "vuetify": "^3.6.10"
+    "vuetify": "^3.0.0"
   },
   "devDependencies": {
-    "@babel/types": "^7.24.7",
+    "@babel/types": "^7.21.4",
-    "@types/node": "^20.14.9",
+    "@types/node": "^18.15.0",
-    "@vitejs/plugin-vue": "^5.0.5",
+    "@vitejs/plugin-vue": "^4.0.0",
-    "eslint-plugin-vue": "^9.26.0",
+    "@vue/eslint-config-typescript": "^11.0.0",
+    "eslint": "^8.22.0",
+    "eslint-plugin-vue": "^9.3.0",
     "material-design-icons-iconfont": "^6.7.0",
-    "sass": "^1.77.6",
+    "sass": "^1.60.0",
-    "typescript": "^5.5.2",
+    "typescript": "^5.0.0",
-    "unplugin-fonts": "^1.1.1",
+    "unplugin-fonts": "^1.0.3",
-    "vite": "^5.3.2",
+    "vite": "^4.2.0",
-    "vite-plugin-vuetify": "^2.0.3",
+    "vite-plugin-vuetify": "^1.0.0",
-    "vue-tsc": "^2.0.22"
+    "vue-tsc": "^1.2.0"
   }
 }

frontend/src/components/Addr.vue

@@ -1,114 +0,0 @@
-<template>
-  <v-row>
-    <v-col cols="12" sm="6" md="4">
-      <v-text-field
-      :label="$t('out.addr')"
-      hide-details
-      required
-      v-model="addr.server">
-      </v-text-field>
-    </v-col>
-    <v-col cols="12" sm="6" md="4">
-      <v-text-field
-      :label="$t('out.port')"
-      hide-details
-      type="number"
-      required
-      v-model.number="addr.server_port"></v-text-field>
-    </v-col>
-    <v-col cols="12" sm="6" md="4" v-if="optionRemark">
-      <v-text-field
-      :label="$t('in.remark')"
-      hide-details
-      v-model="addr.remark">
-      </v-text-field>
-    </v-col>
-  </v-row>
-  <v-row>
-    <v-col cols="12" sm="6" md="4" v-if="optionTLS">
-      <v-switch
-      :label="$t('tls.enable')"
-      color="primary"
-      hide-details
-      @update:model-value="updateTls($event)"
-      v-model="addr.tls" />
-    </v-col>
-    <v-col cols="12" sm="6" md="4" v-if="optionSNI">
-      <v-text-field
-      label="SNI"
-      hide-details
-      v-model="addr.server_name">
-      </v-text-field>
-    </v-col>
-    <v-col cols="12" sm="6" md="4" v-if="optionInsecure">
-      <v-switch
-      :label="$t('tls.insecure')"
-      hide-details
-      color="primary"
-      v-model="addr.insecure" />
-    </v-col>
-  </v-row>
-  <v-row>
-    <v-spacer></v-spacer>
-    <v-col cols="auto" align="end" justify="center">
-      <v-menu v-model="menu" :close-on-content-click="false" location="start">
-        <template v-slot:activator="{ props }">
-          <v-btn v-bind="props" hide-details variant="tonal">{{ $t('in.mdOption') }}</v-btn>
-        </template>
-        <v-card>
-          <v-list>
-            <v-list-item>
-              <v-switch v-model="optionRemark" color="primary" :label="$t('in.remark')" hide-details></v-switch>
-            </v-list-item>
-            <v-list-item v-if="hasTls">
-              <v-switch v-model="optionTLS" color="primary" :label="$t('objects.tls')" hide-details></v-switch>
-            </v-list-item>
-            <v-list-item v-if="addr.tls">
-              <v-switch v-model="optionSNI" color="primary" label="SNI" hide-details></v-switch>
-            </v-list-item>
-            <v-list-item v-if="addr.tls">
-              <v-switch v-model="optionInsecure" color="primary" :label="$t('tls.insecure')" hide-details></v-switch>
-            </v-list-item>
-          </v-list>
-        </v-card>
-      </v-menu>
-    </v-col>
-  </v-row>
-</template>
-
-<script lang="ts">
-export default {
-  props: ['addr', 'hasTls'],
-  data() {
-    return {
-      menu: false
-    }
-  },
-  computed: {
-    optionTLS: {
-      get(): boolean { return this.$props.addr.tls != undefined },
-      set(v:boolean) { this.$props.addr.tls = v ? true : undefined; this.updateTls(v) }
-    },
-    optionSNI: {
-      get(): boolean { return this.$props.addr.server_name != undefined },
-      set(v:boolean) { this.$props.addr.server_name = v ? '' : undefined }
-    },
-    optionRemark: {
-      get(): boolean { return this.$props.addr.remark != undefined },
-      set(v:boolean) { this.$props.addr.remark = v ? '' : undefined }
-    },
-    optionInsecure: {
-      get(): boolean { return this.$props.addr.insecure != undefined },
-      set(v:boolean) { this.$props.addr.insecure = v ? false : undefined }
-    }
-  },
-  methods: {
-    updateTls(v:boolean) {
-      if (!v) {
-        delete this.$props.addr.insecure
-        delete this.$props.addr.server_name
-      }
-    }
-  }
-}
-</script>

frontend/src/components/DateTime.vue

@@ -10,7 +10,7 @@
   <DatePicker
     v-model="Input"
     @input="Input=$event"
-    :locale="locale"
+    :locale="$i18n.locale"
     element="expiry"
     compact-time
     type="datetime">
@@ -42,9 +42,6 @@
 <script lang="ts">
 import DatePicker from 'vue3-persian-datetime-picker'
 import { i18n } from '@/locales'
-import 'moment/locale/vi'
-import 'moment/locale/zh-cn'
-import 'moment/locale/zh-tw'
 
 export default {
   props: ['expiry'],
@@ -57,21 +54,10 @@ export default {
   },
   components: { DatePicker },
   computed: {
-    locale() {
-      const l = i18n.global.locale.value
-      switch (l) {
-        case "zhHans":
-          return "zh-cn"
-        case "zhHant":
-          return "zh-tw"
-        default:
-          return l
-      }
-    },
     dateFormatted() {
       if (this.expDate == 0) return i18n.global.t('unlimited')
       const date = new Date(this.expDate*1000)
-      return date.toLocaleString(this.locale)
+      return date.toLocaleString(i18n.global.locale.value)
     },
     expDate() {
       return parseInt(this.expiry?? 0)
@@ -113,18 +99,18 @@ export default {
 <style>
 .vpd-addon-list,
 .vpd-addon-list-item {
-  background-color: rgb(var(--v-theme-background)) !important;
+  background-color: rgb(var(--v-theme-background));
-  border-color: rgb(var(--v-theme-background)) !important;
+  border-color: rgb(var(--v-theme-background));
 }
 .vpd-content {
-  background-color: rgb(var(--v-theme-background)) !important;
+  background-color: rgb(var(--v-theme-background));
 }
 .vpd-addon-list-item.vpd-selected,
 .vpd-addon-list-item:hover {
-  background-color: rgb(var(--v-theme-primary)) !important;
+  background-color: rgb(var(--v-theme-primary));
 }
 .vpd-close-addon {
-  color: rgb(var(--v-theme-on-surface)) !important;
+  color: rgb(var(--v-theme-on-surface));
   background-color: transparent;
 }
 .vpd-controls {

frontend/src/components/Dial.vue

@@ -1,17 +1,15 @@
 <template>
-  <v-card :subtitle="$t('objects.dial')" style="background-color: inherit;">
+  <v-card subtitle="Dial" style="background-color: inherit;">
     <v-row>
       <v-col cols="12" sm="6" md="4" v-if="optionDetour">
-        <v-select
+        <v-text-field
+        label="Forward to Outbound tag"
         hide-details
-          :label="$t('dial.detourText')"
+        v-model="dial.detour"></v-text-field>
-          :items="outTags"
-          v-model="dial.detour">
-        </v-select>
       </v-col>
       <v-col cols="12" sm="6" md="4" v-if="optionBind">
         <v-text-field
-        :label="$t('dial.bindIf')"
+        label="Bind to Network Interface"
         hide-details
         v-model="dial.bind_interface"></v-text-field>
       </v-col>
@@ -19,13 +17,13 @@
     <v-row>
       <v-col cols="12" sm="6" md="4" v-if="optionIPV4">
         <v-text-field
-        :label="$t('dial.bindIp4')"
+        label="Bind to IPv4"
         hide-details
         v-model="dial.inet4_bind_address"></v-text-field>
       </v-col>
       <v-col cols="12" sm="6" md="4" v-if="optionIPV6">
         <v-text-field
-        :label="$t('dial.bindIp6')"
+        label="Bind to IPv6"
         hide-details
         v-model="dial.inet6_bind_address"></v-text-field>
       </v-col>
@@ -40,7 +38,7 @@
         v-model.number="routingMark"></v-text-field>
       </v-col>
       <v-col cols="12" sm="6" md="4" v-if="optionRA">
-        <v-switch v-model="dial.reuse_addr" color="primary" :label="$t('dial.reuseAddr')" hide-details></v-switch>
+        <v-switch v-model="dial.reuse_addr" color="primary" label="Reuse listener address" hide-details></v-switch>
       </v-col>
     </v-row>
     <v-row v-if="optionTCP">
@@ -57,11 +55,11 @@
       </v-col>
       <v-col cols="12" sm="6" md="4" v-if="optionCT">
         <v-text-field
-        :label="$t('dial.connTimeout')"
+        label="Connection Timeout"
         hide-details
         type="number"
         min="1"
-        :suffix="$t('date.s')"
+        suffix="s"
         v-model.number="connectTimeout"></v-text-field>
       </v-col>
     </v-row>
@@ -69,19 +67,22 @@
       <v-col cols="12" sm="6" md="4">
         <v-select
             hide-details
-            :label="$t('listen.domainStrategy')"
+            clearable
+            @click:clear="delete dial.domain_strategy"
+            width="100"
+            label="Domain to IP Strategy"
             :items="['prefer_ipv4','prefer_ipv6','ipv4_only','ipv6_only']"
             v-model="dial.domain_strategy">
           </v-select>
       </v-col>
       <v-col cols="12" sm="6" md="4">
         <v-text-field
-        :label="$t('dial.fbTimeout')"
+        label="Fallback Timeout"
         hide-details
         type="number"
         min="50"
         step="50"
-        :suffix="$t('date.ms')"
+        suffix="ms"
         v-model.number="fallbackDelay"></v-text-field>
       </v-col>
     </v-row>
@@ -89,39 +90,39 @@
       <v-spacer></v-spacer>
       <v-menu v-model="menu" :close-on-content-click="false" location="start">
         <template v-slot:activator="{ props }">
-          <v-btn v-bind="props" hide-details variant="tonal">{{ $t('dial.options') }}</v-btn>
+          <v-btn v-bind="props" hide-details>Dial Options</v-btn>
         </template>
         <v-card>
           <v-list>
             <v-list-item>
-              <v-switch v-model="optionDetour" color="primary" :label="$t('listen.detour')" hide-details></v-switch>
+              <v-switch v-model="optionDetour" color="primary" label="Detour" hide-details></v-switch>
             </v-list-item>
             <v-list-item>
-              <v-switch v-model="optionBind" color="primary" :label="$t('dial.bindIf')" hide-details></v-switch>
+              <v-switch v-model="optionBind" color="primary" label="Bind Interface" hide-details></v-switch>
             </v-list-item>
             <v-list-item>
-              <v-switch v-model="optionIPV4" color="primary" :label="$t('dial.bindIp4')" hide-details></v-switch>
+              <v-switch v-model="optionIPV4" color="primary" label="Bind to IPv4" hide-details></v-switch>
             </v-list-item>
             <v-list-item>
-              <v-switch v-model="optionIPV6" color="primary" :label="$t('dial.bindIp6')" hide-details></v-switch>
+              <v-switch v-model="optionIPV6" color="primary" label="Bind to IPv6" hide-details></v-switch>
             </v-list-item>
             <v-list-item>
               <v-switch v-model="optionRM" color="primary" label="Routing Mark" hide-details></v-switch>
             </v-list-item>
             <v-list-item>
-              <v-switch v-model="optionRA" color="primary" :label="$t('dial.reuseAddr')" hide-details></v-switch>
+              <v-switch v-model="optionRA" color="primary" label="Reuse Address" hide-details></v-switch>
             </v-list-item>
             <v-list-item>
-              <v-switch v-model="optionTCP" color="primary" :label="$t('listen.tcpOptions')" hide-details></v-switch>
+              <v-switch v-model="optionTCP" color="primary" label="TCP Options" hide-details></v-switch>
             </v-list-item>
             <v-list-item>
-              <v-switch v-model="optionUDP" color="primary" :label="$t('listen.udpOptions')" hide-details></v-switch>
+              <v-switch v-model="optionUDP" color="primary" label="UDP Options" hide-details></v-switch>
             </v-list-item>
             <v-list-item>
-              <v-switch v-model="optionCT" color="primary" :label="$t('dial.connTimeout')" hide-details></v-switch>
+              <v-switch v-model="optionCT" color="primary" label="Connection Timeout" hide-details></v-switch>
             </v-list-item>
             <v-list-item>
-              <v-switch v-model="optionDS" color="primary" :label="$t('listen.domainStrategy')" hide-details></v-switch>
+              <v-switch v-model="optionDS" color="primary" label="Domain Strategy" hide-details></v-switch>
             </v-list-item>
           </v-list>
         </v-card>
@@ -132,7 +133,7 @@
 
 <script lang="ts">
 export default {
-  props: ['dial', 'outTags'],
+  props: ['dial'],
   data() {
     return {
       menu: false
@@ -153,7 +154,7 @@ export default {
     },
     optionDetour: {
       get(): boolean { return this.$props.dial.detour != undefined },
-      set(v:boolean) { v ? this.$props.dial.detour = this.outTags[0]?? '' : delete this.$props.dial.detour }
+      set(v:boolean) { v ? this.$props.dial.detour = '' : delete this.$props.dial.detour }
     },
     optionBind: {
       get(): boolean { return this.$props.dial.bind_interface != undefined },

frontend/src/components/Headers.vue

@@ -1,99 +0,0 @@
-<template>
-  <v-card>
-    <v-card-subtitle>
-      {{ $t('objects.headers') }}
-      <v-icon @click="add_header" icon="mdi-plus"></v-icon>
-    </v-card-subtitle>
-    <v-row v-for="(header, index) in hdrs">
-      <v-col cols="12" sm="6" md="4">
-        <v-text-field
-          :label="$t('objects.key')"
-          hide-details
-          @input="update_key(index,$event.target.value)"
-          v-model="header.name">
-        </v-text-field>
-      </v-col>
-      <v-col cols="12" sm="6" md="4">
-        <v-text-field
-          :label="$t('objects.value')"
-          hide-details
-          @input="update_value(index,$event.target.value)"
-          append-icon="mdi-delete"
-          @click:append="del_header(index)"
-          v-model="header.value">
-        </v-text-field>
-      </v-col>
-    </v-row>
-  </v-card>
-</template>
-
-<script lang="ts">
-
-type Header = {
-  name: string
-  value: string
-}
-export default {
-  props: ['data'],
-  data() {
-    return {}
-  },
-  methods: {
-    add_header() {
-      this.hdrs = [...this.hdrs, {name: "Host", value: ""}]
-    },
-    del_header(i:number) {
-      let h = this.hdrs
-      h.splice(i,1)
-      this.hdrs = h
-    },
-    update_key(i:number,k:string) {
-      let h = this.hdrs
-      h[i].name = k
-      this.hdrs = h
-    },
-    update_value(i:number,v:string) {
-      let h = this.hdrs
-      h[i].value = v
-      this.hdrs = h
-    },
-  },
-  computed: {
-    hdrs: {
-      get() :Header[] {
-        let headers: Header[] = []
-        const h = this.$props.data.headers
-        if (h) {
-          Object.keys(h).forEach(key => {
-            if (Array.isArray(h[key])){
-              h[key].forEach((v:string) => headers.push({ name: key, value: v }))
-            } else {
-              headers.push({ name: key, value: h[key] })
-            }
-          })
-        }
-        return headers
-      },
-      set(v:Header[]) {
-        if (v.length>0) {
-          let headers:any = {}
-          v.forEach((h:Header) => {
-            if (headers[h.name]) {
-              if (Array.isArray(headers[h.name])) {
-                headers[h.name].push(h.value)
-              } else {
-                headers[h.name] = [headers[h.name], h.value]
-              }
-            } else {
-              headers[h.name] = h.value
-            }
-          })
-          this.$props.data.headers = headers
-        } else {
-          this.$props.data.headers = undefined
-        }
-      }
-    }
-  }
-}
-</script>

frontend/src/components/InMulitiplex.vue

@@ -0,0 +1,75 @@
+<template>
+  <v-card :subtitle="$t('in.multiplex')">
+    <v-row>
+      <v-col cols="12" sm="6" md="4">
+        <v-switch color="primary" label="Enable Multiplex" v-model="muxEnable" hide-details></v-switch>
+      </v-col>
+      <v-col cols="12" sm="6" md="4" v-if="mux.enabled">
+        <v-switch color="primary" label="Reject Non-Padded" v-model="mux.padding" hide-details></v-switch>
+      </v-col>
+      <v-col cols="12" sm="6" md="4" v-if="mux.enabled">
+        <v-switch color="primary" label="Enable Brutal" v-model="burtalEnable" hide-details></v-switch>
+      </v-col>
+    </v-row>
+    <v-row v-if="mux.brutal?.enabled">
+      <v-col cols="12" sm="6" md="4">
+        <v-text-field
+        label="Uplink Bandwidth"
+        hide-details
+        type="number"
+        suffix="Mbps"
+        v-model.number="up_mbps">
+        </v-text-field>
+      </v-col>
+      <v-col cols="12" sm="6" md="4">
+        <v-text-field
+        label="Downlink Bandwidth"
+        hide-details
+        type="number"
+        suffix="Mbps"
+        min="0"
+        v-model.number="down_mbps">
+        </v-text-field>
+      </v-col>
+    </v-row>
+  </v-card>
+</template>
+
+<script lang="ts">
+import { iMultiplex } from '@/types/inMultiplex'
+export default {
+  props: ['inbound'],
+  data() {
+    return {}
+  },
+  computed: {
+    mux(): iMultiplex {
+      return <iMultiplex> this.$props.inbound.multiplex
+    },
+    muxEnable: {
+      get(): boolean { return this.$props.inbound.multiplex ? this.mux.enabled : false },
+      set(newValue:boolean) { this.$props.inbound.multiplex = newValue ? { enabled: newValue } : {} }
+    },
+    burtalEnable: {
+      get(): boolean { return this.mux.brutal ? this.mux.brutal.enabled : false },
+      set(newValue:boolean) { this.mux.brutal = { enabled: newValue, up_mbps: 100, down_mbps: 100 } }
+    },
+    down_mbps: {
+      get() { return this.mux.brutal && this.mux.brutal.down_mbps ? this.mux.brutal.down_mbps : 0 },
+      set(newValue:any) { 
+        if (this.mux.brutal){
+          this.mux.brutal.down_mbps = newValue.length != 0 ? newValue : 0
+        }
+      }
+    },
+    up_mbps: {
+      get() { return this.mux.brutal && this.mux.brutal.up_mbps ? this.mux.brutal.up_mbps : 0 },
+      set(newValue:any) {
+        if (this.mux.brutal){
+          this.mux.brutal.up_mbps = newValue.length != 0 ? newValue : 0
+        }
+      }
+    },
+  }
+}
+</script>

frontend/src/components/InTLS.vue

@@ -1,20 +1,11 @@
 <template>
-  <v-card :subtitle="$t('objects.tls')">
+  <v-card :subtitle="$t('in.tls')">
-    <v-row>
+    <v-row v-if="tlsOptional">
-      <v-col cols="12" sm="6" md="4" v-if="tlsOptional">
+      <v-col cols="auto">
         <v-switch color="primary" :label="$t('tls.enable')" v-model="tlsEnable" hide-details></v-switch>
       </v-col>
-      <v-col cols="12" sm="6" md="4" v-if="tls.enabled">
-        <v-select
-          hide-details
-          :label="$t('template')"
-          :items="tlsItems"
-          @update:model-value="changeTlsItem($event)"
-          v-model="tlsId">
-        </v-select>
-      </v-col>
     </v-row>
-    <template v-if="tls.enabled && tlsId == 0">
+    <template v-if="tls.enabled">
       <v-row>
         <v-col cols="auto">
           <v-btn-toggle v-model="usePath"
@@ -86,7 +77,7 @@
         <v-col cols="12" sm="6" md="4" v-if="tls.min_version">
           <v-select
             hide-details
-            :label="$t('tls.minVer')"
+            label="Minimum Version"
             :items="tlsVersions"
             v-model="tls.min_version">
           </v-select>
@@ -94,7 +85,7 @@
         <v-col cols="12" sm="6" md="4" v-if="tls.max_version">
           <v-select
             hide-details
-            :label="$t('tls.maxVer')"
+            label="Maximum Version"
             :items="tlsVersions"
             v-model="tls.max_version">
           </v-select>
@@ -104,7 +95,7 @@
         <v-col cols="12" md="8" v-if="tls.cipher_suites != undefined">
           <v-select
             hide-details
-            :label="$t('tls.cs')"
+            label="Cipher Suites"
             multiple
             :items="cipher_suites"
             v-model="tls.cipher_suites">
@@ -112,11 +103,11 @@
         </v-col>
       </v-row>
     </template>
-    <v-card-actions v-if="tls.enabled && tlsId == 0">
+    <v-card-actions>
       <v-spacer></v-spacer>
       <v-menu v-model="menu" :close-on-content-click="false" location="start" v-if="tls.enabled">
           <template v-slot:activator="{ props }">
-          <v-btn v-bind="props" hide-details variant="tonal">{{ $t('tls.options') }}</v-btn>
+            <v-btn v-bind="props" hide-details>TLS Options</v-btn>
           </template>
           <v-card>
             <v-list>
@@ -127,13 +118,13 @@
                 <v-switch v-model="optionALPN" color="primary" label="ALPN" hide-details></v-switch>
               </v-list-item>
               <v-list-item>
-              <v-switch v-model="optionMinV" color="primary" :label="$t('tls.minVer')" hide-details></v-switch>
+                <v-switch v-model="optionMinV" color="primary" label="Min Version" hide-details></v-switch>
               </v-list-item>
               <v-list-item>
-              <v-switch v-model="optionMaxV" color="primary" :label="$t('tls.maxVer')" hide-details></v-switch>
+                <v-switch v-model="optionMaxV" color="primary" label="Max Version" hide-details></v-switch>
               </v-list-item>
               <v-list-item>
-              <v-switch v-model="optionCS" color="primary" :label="$t('tls.cs')" hide-details></v-switch>
+                <v-switch v-model="optionCS" color="primary" label="Cipher Suites" hide-details></v-switch>
               </v-list-item>
             </v-list>
           </v-card>
@@ -143,14 +134,13 @@
 </template>
 
 <script lang="ts">
-import { i18n } from '@/locales'
 import { iTls, defaultInTls } from '@/types/inTls'
 export default {
-  props: ['inbound', 'tlsConfigs', 'tls_id'],
+  props: ['inbound'],
   data() {
     return {
       menu: false,
-      usePath: this.$props.inbound.tls.key == undefined ? 0 : 1,
+      usePath: 0,
       defaults: defaultInTls,
       alpn: [
         { title: "H3", value: 'h3' },
@@ -159,6 +149,7 @@ export default {
       ],
       tlsVersions: [ '1.0', '1.1', '1.2', '1.3' ],
       cipher_suites: [
+        { title: "Automatic", value: "" },
         { title: "RSA-AES128-CBC-SHA", value: "TLS_RSA_WITH_AES_128_CBC_SHA" },
         { title: "RSA-AES256-CBC-SHA", value: "TLS_RSA_WITH_AES_256_CBC_SHA" },
         { title: "RSA-AES128-GCM-SHA256", value: "TLS_RSA_WITH_AES_128_GCM_SHA256" },
@@ -183,19 +174,9 @@ export default {
     tls(): iTls {
       return <iTls> this.$props.inbound.tls
     },
-    tlsItems(): any[] {
-      return [ { title: i18n.global.t('none'), value: 0 }, ...this.$props.tlsConfigs?.map((t:any) => { return { title: t.name, value: t.id } } )]
-    },
-    tlsId: {
-      get() { return this.tls_id.value?? 0 },
-      set(newValue: boolean) { this.$props.tls_id.value = newValue }
-    },
     tlsEnable: {
-      get() { return this.tls.enabled?? false },
+      get() { return Object.hasOwn(this.$props.inbound.tls, 'enabled') ? this.tls.enabled : false },
-      set(newValue: boolean) {
+      set(newValue: boolean) { this.$props.inbound.tls = newValue ? { enabled: true } : {} }
-        this.$props.inbound.tls = newValue ? { enabled: true } : {}
-        this.$props.tls_id.value = 0
-      }
     },
     tlsOptional(): boolean {
       return !['hysteria','hysteria2','tuic','naive'].includes(this.$props.inbound.type)
@@ -210,33 +191,23 @@ export default {
     },
     optionSNI: {
       get(): boolean { return this.tls.server_name != undefined },
-      set(v:boolean) { this.tls.server_name = v ? '' : undefined }
+      set(v:boolean) { this.$props.inbound.tls.server_name = v ? '' : undefined }
     },
     optionALPN: {
       get(): boolean { return this.tls.alpn != undefined },
-      set(v:boolean) { this.tls.alpn = v ? defaultInTls.alpn : undefined }
+      set(v:boolean) { this.$props.inbound.tls.alpn = v ? defaultInTls.alpn : undefined }
     },
     optionMinV: {
       get(): boolean { return this.tls.min_version != undefined },
-      set(v:boolean) { this.tls.min_version = v ? defaultInTls.min_version : undefined }
+      set(v:boolean) { this.$props.inbound.tls.min_version = v ? defaultInTls.min_version : undefined }
     },
     optionMaxV: {
       get(): boolean { return this.tls.max_version != undefined },
-      set(v:boolean) { this.tls.max_version = v ? defaultInTls.max_version : undefined }
+      set(v:boolean) { this.$props.inbound.tls.max_version = v ? defaultInTls.max_version : undefined }
     },
     optionCS: {
       get(): boolean { return this.tls.cipher_suites != undefined },
-      set(v:boolean) { this.tls.cipher_suites = v ? defaultInTls.cipher_suites : undefined }
+      set(v:boolean) { this.$props.inbound.tls.cipher_suites = v ? defaultInTls.cipher_suites : undefined }
-    }
-  },
-  methods: {
-    changeTlsItem(id: number){
-       if (id>0) {
-        const tlsConfig = this.$props.tlsConfigs?.findLast((t:any) => t.id == id)
-        if (tlsConfig) this.$props.inbound.tls = tlsConfig.server
-       } else {
-        this.$props.inbound.tls = { enabled: this.tls.enabled }
-       }
     }
   }
 }

frontend/src/components/Listen.vue

@@ -1,5 +1,5 @@
 <template>
-  <v-card :subtitle="$t('objects.listen')">
+  <v-card subtitle="Listen">
     <v-row>
       <v-col cols="12" sm="6" md="4">
         <v-text-field
@@ -20,29 +20,27 @@
     </v-row>
     <v-row>
       <v-col cols="12" sm="6" md="4" v-if="optionDetour">
-        <v-select
+        <v-text-field
-        :label="$t('listen.detourText')"
+        label="Forward to Inbound tag"
         hide-details
-        :items="inTags"
+        v-model="inbound.detour"></v-text-field>
-        v-model="inbound.detour">
-        </v-select>
       </v-col>
       <v-col cols="12" sm="6" md="4">
-        <v-switch v-model="inbound.sniff" color="primary" :label="$t('listen.sniffing')" hide-details></v-switch>
+        <v-switch v-model="inbound.sniff" color="primary" :label="$t('in.sniffing')" hide-details></v-switch>
       </v-col>
     </v-row>
     <v-row v-if="inbound.sniff">
       <v-col cols="12" sm="6" md="4">
-        <v-switch v-model="inbound.sniff_override_destination" color="primary" :label="$t('listen.sniffingOverride')" hide-details></v-switch>
+        <v-switch v-model="inbound.sniff_override_destination" color="primary" label="Override Sniffed Domain" hide-details></v-switch>
       </v-col>
       <v-col cols="12" sm="6" md="4">
         <v-text-field
-        :label="$t('listen.sniffingTimeout')"
+        label="Sniffing Timeout"
         hide-details
         type="number"
         min="50"
         step="50"
-        :suffix="$t('date.ms')"
+        suffix="ms"
         v-model.number="sniffTimeout"></v-text-field>
       </v-col>
     </v-row>
@@ -64,7 +62,7 @@
         hide-details
         type="number"
         min="1"
-        :suffix="$t('date.m')"
+        suffix="Min"
         v-model.number="udpTimeout"></v-text-field>
       </v-col>
     </v-row>
@@ -72,7 +70,8 @@
       <v-col cols="12" sm="6" md="4">
         <v-select
             hide-details
-            :label="$t('listen.domainStrategy')"
+            width="100"
+            label="Domain to IP Strategy"
             :items="['prefer_ipv4','prefer_ipv6','ipv4_only','ipv6_only']"
             v-model="inbound.domain_strategy">
           </v-select>
@@ -82,21 +81,21 @@
       <v-spacer></v-spacer>
       <v-menu v-model="menu" :close-on-content-click="false" location="start">
         <template v-slot:activator="{ props }">
-          <v-btn v-bind="props" hide-details variant="tonal">{{ $t('listen.options') }}</v-btn>
+          <v-btn v-bind="props" hide-details>Listen Options</v-btn>
         </template>
         <v-card>
           <v-list>
             <v-list-item>
-              <v-switch v-model="optionDetour" color="primary" :label="$t('listen.detour')" hide-details></v-switch>
+              <v-switch v-model="optionTCP" color="primary" label="TCP Options" hide-details></v-switch>
             </v-list-item>
             <v-list-item>
-              <v-switch v-model="optionTCP" color="primary" :label="$t('listen.tcpOptions')" hide-details></v-switch>
+              <v-switch v-model="optionUDP" color="primary" label="UDP Options" hide-details></v-switch>
             </v-list-item>
             <v-list-item>
-              <v-switch v-model="optionUDP" color="primary" :label="$t('listen.udpOptions')" hide-details></v-switch>
+              <v-switch v-model="optionDetour" color="primary" label="Detour" hide-details></v-switch>
             </v-list-item>
             <v-list-item>
-              <v-switch v-model="optionDS" color="primary" :label="$t('listen.domainStrategy')" hide-details></v-switch>
+              <v-switch v-model="optionDS" color="primary" label="Domain Strategy" hide-details></v-switch>
             </v-list-item>
           </v-list>
         </v-card>
@@ -107,7 +106,7 @@
 
 <script lang="ts">
 export default {
-  props: ['inbound', 'inTags'],
+  props: ['inbound'],
   data() {
     return {
       menu: false
@@ -139,12 +138,12 @@ export default {
       },
       set(v:boolean) {
         this.$props.inbound.udp_fragment = v ? false : undefined
-        this.$props.inbound.udp_timeout = v ? '5m' : undefined 
+        this.$props.inbound.udp_timeout = v ? false : undefined 
       }
     },
     optionDetour: {
       get(): boolean { return this.$props.inbound.detour != undefined },
-      set(v:boolean) { this.$props.inbound.detour = v ? this.inTags[0]?? '' : undefined }
+      set(v:boolean) { this.$props.inbound.detour = v ? '' : undefined }
     },
     optionDS: {
       get(): boolean { return this.$props.inbound.domain_strategy != undefined },

frontend/src/components/Main.vue

@@ -1,10 +1,4 @@
 <template>
-  <LogVue
-  v-model="logModal.visible"
-  :visible="logModal.visible"
-  :logType="logModal.logType"
-  @close="closeLogs"
-  />
   <v-container class="fill-height">
     <v-responsive :class="reloadItems.length>0 ? 'fill-height text-center' : 'align-center'" >
       <v-row class="d-flex align-center justify-center">
@@ -16,7 +10,7 @@
         <v-col cols="auto">
           <v-dialog v-model="menu" :close-on-content-click="false" transition="scale-transition" max-width="800">
             <template v-slot:activator="{ props }">
-              <v-btn v-bind="props" hide-details variant="tonal">{{ $t('main.tiles') }} <v-icon icon="mdi-star-plus" /></v-btn>
+              <v-btn v-bind="props" variant="tonal">{{ $t('main.tiles') }} <v-icon icon="mdi-star-plus" /></v-btn>
             </template>
             <v-card rounded="xl">
               <v-card-title>
@@ -51,7 +45,7 @@
       </v-row>
       <v-row>
         <v-col cols="12" sm="6" md="3" v-for="i in reloadItems" :key="i">
-          <v-card class="rounded-lg" variant="outlined" height="210px"
+          <v-card class="rounded-lg" variant="outlined" height="200px"
                   :title="menuItems.flatMap(cat => cat.value).find(m => m.value == i)?.title">
             <v-card-text style="padding: 0 16px;" align="center" justify="center">
               <Gauge :tilesData="tilesData" :type="i" v-if="i.charAt(0) == 'g'" />
@@ -86,19 +80,13 @@
                   </v-col>
                   <v-col cols="3">S-UI</v-col>
                   <v-col cols="9">
-                    <v-chip density="compact" color="blue">
+                    <v-chip density="compact" color="primary" variant="flat">
                       <v-tooltip activator="parent" location="top">
                         {{ $t('main.info.threads') }}: {{ tilesData.sys?.appThreads }}<br />
                         {{ $t('main.info.memory') }}: {{ HumanReadable.sizeFormat(tilesData.sys?.appMem) }}
                       </v-tooltip>
                       v{{ tilesData.sys?.appVersion }}
                     </v-chip>
-                    <v-chip density="compact" color="transparent" style="cursor: pointer;" @click="openLogs('s-ui')">
-                      <v-tooltip activator="parent" location="top">
-                        {{ $t('basic.log.title') + " - S-UI" }}
-                      </v-tooltip>
-                      <v-icon icon="mdi-list-box-outline" color="blue" />
-                    </v-chip>
                   </v-col>
                   <v-col cols="3">{{ $t('main.info.uptime') }}</v-col>
                   <v-col cols="9">{{ HumanReadable.formatSecond(tilesData.uptime) }}</v-col>
@@ -110,12 +98,6 @@
                   <v-col cols="8">
                     <v-chip density="compact" color="success" variant="flat" v-if="tilesData.sbd?.running">{{ $t('yes') }}</v-chip> 
                     <v-chip density="compact" color="error" variant="flat" v-else>{{ $t('no') }}</v-chip> 
-                    <v-chip density="compact" color="transparent" style="cursor: pointer;" @click="openLogs('sing-box')">
-                      <v-tooltip activator="parent" location="top">
-                        {{ $t('basic.log.title') + " - Sing-Box" }}
-                      </v-tooltip>
-                      <v-icon icon="mdi-list-box-outline" :color="tilesData.sbd?.running ? 'success': 'error'" />
-                    </v-chip>
                   </v-col>
                   <v-col cols="4">{{ $t('main.info.memory') }}</v-col>
                   <v-col cols="8">
@@ -166,7 +148,6 @@ import Gauge from '@/components/tiles/Gauge.vue'
 import History from '@/components/tiles/History.vue'
 import { computed, onBeforeUnmount, onMounted, ref } from 'vue'
 import { i18n } from '@/locales'
-import LogVue from '@/layouts/modals/Logs.vue'
 
 const menu = ref(false)
 const menuItems = [
@@ -234,19 +215,4 @@ onMounted(() => {
 onBeforeUnmount(() => {
   stopTimer()
 })
-
-const logModal = ref({
-  visible: false,
-  logType: "s-ui"
-})
-
-const openLogs = (logType: string) => {
-  logModal.value.logType = logType
-  logModal.value.visible = true
-}
-
-const closeLogs = () => {
-  logModal.value.logType = "s-ui"
-  logModal.value.visible = false
-}
 </script>

frontend/src/components/Multiplex.vue

@@ -1,128 +0,0 @@
-<template>
-  <v-card :subtitle="$t('objects.multiplex')">
-    <v-row>
-      <v-col cols="12" sm="6" md="4">
-        <v-switch color="primary" :label="$t('mux.enable')" v-model="muxEnable" hide-details></v-switch>
-      </v-col>
-      <template v-if="mux.enabled">
-        <template v-if="direction=='out'">
-          <v-col cols="12" sm="6" md="4">
-            <v-select
-              hide-details
-              :items="[ 'smux', 'yamux', 'h2mux']"
-              :label="$t('protocol')"
-              clearable
-              @click:clear="mux.protocol=undefined"
-              v-model="mux.protocol">
-            </v-select>
-          </v-col>
-          <v-col cols="12" sm="6" md="4">
-            <v-text-field
-            :label="$t('mux.maxConn')"
-            hide-details
-            type="number"
-            min=0
-            v-model.number="max_connections">
-            </v-text-field>
-          </v-col>
-          <v-col cols="12" sm="6" md="4">
-            <v-text-field
-            :label="$t('mux.minStr')"
-            hide-details
-            type="number"
-            min=0
-            v-model.number="min_streams">
-            </v-text-field>
-          </v-col>
-          <v-col cols="12" sm="6" md="4">
-            <v-text-field
-            :label="$t('mux.maxStr')"
-            hide-details
-            type="number"
-            :min="min_streams"
-            v-model.number="max_streams">
-            </v-text-field>
-          </v-col>
-        </template>
-        <v-col cols="12" sm="6" md="4">
-          <v-switch color="primary" :label="$t('mux.padding')" v-model="mux.padding" hide-details></v-switch>
-        </v-col>
-        <v-col cols="12" sm="6" md="4">
-          <v-switch color="primary" :label="$t('mux.enableBrutal')" v-model="burtalEnable" hide-details></v-switch>
-        </v-col>
-      </template>
-    </v-row>
-    <v-row v-if="mux.brutal?.enabled">
-      <v-col cols="12" sm="6" md="4">
-        <v-text-field
-        :label="$t('stats.upload')"
-        hide-details
-        type="number"
-        :suffix="$t('stats.Mbps')"
-        v-model.number="up_mbps">
-        </v-text-field>
-      </v-col>
-      <v-col cols="12" sm="6" md="4">
-        <v-text-field
-        :label="$t('stats.download')"
-        hide-details
-        type="number"
-        :suffix="$t('stats.Mbps')"
-        min="0"
-        v-model.number="down_mbps">
-        </v-text-field>
-      </v-col>
-    </v-row>
-  </v-card>
-</template>
-
-<script lang="ts">
-import { oMultiplex } from '@/types/multiplex'
-export default {
-  props: ['data', 'direction'],
-  data() {
-    return {}
-  },
-  computed: {
-    mux(): oMultiplex {
-      return <oMultiplex> this.$props.data.multiplex
-    },
-    muxEnable: {
-      get(): boolean { return this.mux ? this.mux.enabled : false },
-      set(newValue:boolean) { this.$props.data.multiplex = newValue ? { enabled: newValue } : {} }
-    },
-    max_connections: {
-      get(): number { return this.mux.max_connections ? this.mux.max_connections : 0 },
-      set(newValue:number) { this.mux.max_connections = newValue > 0 ? newValue : undefined }
-    },
-    min_streams: {
-      get(): number { return this.mux.min_streams ? this.mux.min_streams : 0 },
-      set(newValue:number) { this.mux.min_streams = newValue > 0 ? newValue : undefined }
-    },
-    max_streams: {
-      get(): number { return this.mux.max_streams ? this.mux.max_streams : 0 },
-      set(newValue:number) { this.mux.max_streams = newValue > 0 ? newValue : undefined }
-    },
-    burtalEnable: {
-      get(): boolean { return this.mux.brutal ? this.mux.brutal.enabled : false },
-      set(newValue:boolean) { this.mux.brutal = newValue ? { enabled: newValue, up_mbps: 100, down_mbps: 100 } : undefined }
-    },
-    down_mbps: {
-      get() { return this.mux.brutal && this.mux.brutal.down_mbps ? this.mux.brutal.down_mbps : 0 },
-      set(newValue:any) { 
-        if (this.mux.brutal){
-          this.mux.brutal.down_mbps = newValue.length != 0 ? newValue : 0
-        }
-      }
-    },
-    up_mbps: {
-      get() { return this.mux.brutal && this.mux.brutal.up_mbps ? this.mux.brutal.up_mbps : 0 },
-      set(newValue:any) {
-        if (this.mux.brutal){
-          this.mux.brutal.up_mbps = newValue.length != 0 ? newValue : 0
-        }
-      }
-    },
-  }
-}
-</script>

frontend/src/components/Network.vue

@@ -9,7 +9,7 @@
 
 <script lang="ts">
 export default {
-  props: ['data'],
+  props: ['inbound'],
   data() {
     return {
       networks: [
@@ -21,8 +21,8 @@ export default {
   },
   computed: {
     Network: {
-      get():string { return this.$props.data.network?? '' },
+      get():string { return this.$props.inbound.network?? '' },
-      set(v:string) { this.$props.data.network = v != '' ? v : undefined }
+      set(v:string) { this.$props.inbound.network = v != '' ? v : undefined }
     }
   }
 }

frontend/src/components/OutJson.vue

@@ -1,123 +0,0 @@
-<template>
-  <v-card :subtitle="type">
-    <v-row>
-      <v-col cols="12" sm="6" md="4" v-if="type == inTypes.SOCKS">
-        <v-select
-          hide-details
-          :items="['4','4a','5']"
-          :label="$t('version')"
-          v-model="inData.outJson.version">
-        </v-select>
-      </v-col>
-      <v-col cols="12" sm="6" md="4" v-if="needNetwork">
-        <Network :data="inData.outJson" />
-      </v-col>
-      <v-col cols="12" sm="6" md="4" v-if="needUot">
-        <UoT :data="inData.outJson" />
-      </v-col>
-      <v-col cols="12" sm="6" md="4" v-if="type == inTypes.HTTP">
-        <v-text-field
-        :label="$t('transport.path')"
-        hide-details
-        v-model="inData.outJson.path">
-        </v-text-field>
-      </v-col>
-      <v-col cols="12" sm="6" md="4" v-if="type == inTypes.VMess || type == inTypes.VLESS">
-        <v-select
-          hide-details
-          :label="$t('types.vless.udpEnc')"
-          :items="['none','packetaddr','xudp']"
-          v-model="packet_encoding">
-        </v-select>
-      </v-col>
-      <template v-if="type == inTypes.VMess">
-        <v-col cols="12" sm="6" md="4">
-          <v-select
-            hide-details
-            :label="$t('types.vmess.security')"
-            :items="vmessSecurities"
-            v-model="inData.outJson.security">
-          </v-select>
-        </v-col>
-        <v-col cols="12" sm="6" md="4">
-          <v-switch v-model="inData.outJson.global_padding" color="primary" :label="$t('types.vmess.globalPadding')" hide-details></v-switch>
-        </v-col>
-        <v-col cols="12" sm="6" md="4">
-          <v-switch v-model="inData.outJson.authenticated_length" color="primary" :label="$t('types.vmess.authLen')" hide-details></v-switch>
-        </v-col>
-      </template>
-      <v-col cols="12" sm="6" md="4" v-if="type == inTypes.Hysteria">
-        <v-text-field
-        label="Recv window"
-        hide-details
-        type="number"
-        min="0"
-        v-model.number="inData.outJson.recv_window">
-        </v-text-field>
-      </v-col>
-      <template v-if="type == inTypes.TUIC">
-        <v-col cols="12" sm="6" md="4">
-          <v-select
-            hide-details
-            label="UDP Relay Mode"
-            :items="['native', 'quic']"
-            clearable
-            @click:clear="delete inData.outJson.udp_relay_mode"
-            v-model="inData.outJson.udp_relay_mode">
-          </v-select>
-        </v-col>
-        <v-col cols="12" sm="6" md="4">
-          <v-switch color="primary" label="UDP Over Stream" v-model="inData.outJson.udp_over_stream" hide-details></v-switch>
-        </v-col>
-      </template>
-    </v-row>
-    <Headers :data="inData.outJson" v-if="type == inTypes.HTTP" />
-  </v-card>
-</template>
-
-<script lang="ts">
-import { InTypes } from '@/types/inbounds'
-import Network from './Network.vue'
-import UoT from './UoT.vue'
-import Headers from './Headers.vue'
-
-export default {
-  props: ['inData', 'type'],
-  data() {
-    return {
-      inTypes: InTypes,
-      vmessSecurities: [
-        "auto",
-        "none",
-        "zero",
-        "aes-128-gcm",
-        "aes-128-ctr",
-        "chacha20-poly1305",
-      ],
-      haveNetwork: [
-        InTypes.SOCKS,
-        InTypes.Shadowsocks,
-        InTypes.VMess,
-        InTypes.Trojan,
-        InTypes.Hysteria,
-        InTypes.VLESS,
-        InTypes.TUIC,
-        InTypes.Hysteria2,
-      ],
-      havUoT: [
-        InTypes.SOCKS,
-        InTypes.Shadowsocks,
-      ],
-    }
-  },
-  computed: {
-    needNetwork():boolean { return this.haveNetwork.includes(this.$props.type) },
-    needUot():boolean { return this.havUoT.includes(this.$props.type) },
-    packet_encoding: {
-      get() { return this.$props.inData.outJson.packet_encoding != undefined ? this.$props.inData.outJson.packet_encoding : 'none'; },
-      set(v:string) { this.$props.inData.outJson.packet_encoding = v != "none" ? v : undefined }
-    },
-  },
-  components: { Network, UoT, Headers }
-}
-</script>

frontend/src/components/Rule.vue

@@ -1,382 +0,0 @@
-<template>
-  <v-card style="background-color: inherit;">
-    <v-row>
-      <v-col cols="12" v-if="optionInbound">
-        <v-combobox
-          v-model="rule.inbound"
-          :items="inTags"
-          :label="$t('pages.inbounds')"
-          multiple
-          chips
-          hide-details
-        ></v-combobox>
-      </v-col>
-      <v-col cols="12" v-if="optionClient">
-        <v-combobox
-          v-model="rule.auth_user"
-          :items="clients"
-          :label="$t('pages.clients')"
-          multiple
-          chips
-          hide-details
-        ></v-combobox>
-      </v-col>
-      <v-col cols="12" sm="6" md="4" v-if="optionIPver">
-        <v-select
-          hide-details
-          :label="$t('rule.ipVer')"
-          :items="[4,6]"
-          v-model.number="rule.ip_version">
-        </v-select>
-      </v-col>
-      <v-col cols="12" sm="6" v-if="optionProtocol">
-        <v-combobox
-          v-model="rule.protocol"
-          :items="['http','tls', 'quic', 'stun', 'dns']"
-          :label="$t('protocol')"
-          multiple
-          chips
-          hide-details
-        ></v-combobox>
-      </v-col>
-    </v-row>
-    <v-row v-if="optionDomain">
-      <v-col cols="12" sm="6" md="4">
-        <v-select
-          hide-details
-          :items="domainKeys"
-          @update:model-value="updateDomainOption($event)"
-          v-model="domainOption">
-        </v-select>
-      </v-col>
-      <v-col cols="12" sm="6" v-if="rule.domain != undefined">
-        <v-text-field
-        :label="$t('rule.domain') + ' ' + $t('commaSeparated')"
-        hide-details
-        v-model="domain"></v-text-field>
-      </v-col>
-      <v-col cols="12" sm="6" v-if="rule.domain_suffix != undefined">
-        <v-text-field
-        :label="$t('rule.domainSufix') + ' ' + $t('commaSeparated')"
-        hide-details
-        v-model="domain_suffix"></v-text-field>
-      </v-col>
-      <v-col cols="12" sm="6" v-if="rule.domain_keyword != undefined">
-        <v-text-field
-        :label="$t('rule.domainKw') + ' ' + $t('commaSeparated')"
-        hide-details
-        v-model="domain_keyword"></v-text-field>
-      </v-col>
-      <v-col cols="12" sm="6" v-if="rule.domain_regex != undefined">
-        <v-text-field
-        :label="$t('rule.domainRgx') + ' ' + $t('commaSeparated')"
-        hide-details
-        v-model="domain_regex"></v-text-field>
-      </v-col>
-      <v-col cols="12" sm="6" v-if="rule.ip_cidr != undefined">
-        <v-text-field
-        :label="$t('rule.ip') + ' ' + $t('commaSeparated')"
-        hide-details
-        v-model="ip_cidr"></v-text-field>
-      </v-col>
-      <v-col cols="12" sm="6" v-if="rule.ip_is_private != undefined">
-        <v-switch v-model="rule.ip_is_private" color="primary" :label="$t('rule.privateIp')" hide-details></v-switch>
-      </v-col>
-    </v-row>
-    <v-row v-if="optionPort">
-      <v-col cols="12" sm="6" md="4">
-        <v-select
-          hide-details
-          :items="portKeys"
-          @update:model-value="updatePortOption($event)"
-          v-model="portOption">
-        </v-select>
-      </v-col>
-      <v-col cols="12" sm="6" v-if="rule.port != undefined">
-        <v-text-field
-        :label="$t('rule.port') + ' ' + $t('commaSeparated')"
-        hide-details
-        v-model="port"></v-text-field>
-      </v-col>
-      <v-col cols="12" sm="6" v-if="rule.port_range != undefined">
-        <v-text-field
-        :label="$t('rule.portRange') + ' ' + $t('commaSeparated')"
-        hide-details
-        v-model="port_range"></v-text-field>
-      </v-col>
-    </v-row>
-    <v-row v-if="optionSrcIP">
-      <v-col cols="12" sm="6" md="4">
-        <v-select
-          hide-details
-          :items="srcIPKeys"
-          @update:model-value="updateSrcIPOption($event)"
-          v-model="srcIPOption">
-        </v-select>
-      </v-col>
-      <v-col cols="12" sm="6" v-if="rule.source_ip_cidr != undefined">
-        <v-text-field
-        :label="$t('rule.srcIp') + ' ' + $t('commaSeparated')"
-        hide-details
-        v-model="source_ip_cidr"></v-text-field>
-      </v-col>
-      <v-col cols="12" sm="6" v-if="rule.source_ip_is_private != undefined">
-        <v-switch v-model="rule.source_ip_is_private" color="primary" :label="$t('rule.srcPrivateIp')" hide-details></v-switch>
-      </v-col>
-    </v-row>
-    <v-row v-if="optionSrcPort">
-      <v-col cols="12" sm="6" md="4">
-        <v-select
-          hide-details
-          :items="srcPortKeys"
-          @update:model-value="updateSrcPortOption($event)"
-          v-model="srcPortOption">
-        </v-select>
-      </v-col>
-      <v-col cols="12" sm="6" v-if="rule.source_port != undefined">
-        <v-text-field
-        :label="$t('rule.srcPort') + ' ' + $t('commaSeparated')"
-        hide-details
-        v-model="source_port"></v-text-field>
-      </v-col>
-      <v-col cols="12" sm="6" v-if="rule.source_port_range != undefined">
-        <v-text-field
-        :label="$t('rule.srcPortRange') + ' ' + $t('commaSeparated')"
-        hide-details
-        v-model="source_port_range"></v-text-field>
-      </v-col>
-    </v-row>
-    <v-row v-if="optionRuleSet">
-      <v-col cols="12" sm="6">
-        <v-combobox
-          v-model="rule.rule_set"
-          :items="rsTags"
-          :label="$t('rule.ruleset')"
-          multiple
-          chips
-          hide-details
-        ></v-combobox>
-      </v-col>
-      <v-col cols="12" sm="6">
-        <v-switch v-model="rule.rule_set_ipcidr_match_source" color="primary" :label="$t('rule.rulesetMatchSrc')" hide-details></v-switch>
-      </v-col>
-    </v-row>
-    <v-card-actions>
-      <v-spacer></v-spacer>
-      <v-menu v-model="menu" :close-on-content-click="false" location="start">
-        <template v-slot:activator="{ props }">
-          <v-btn v-bind="props" hide-details variant="tonal">{{ $t('rule.options') }}</v-btn>
-        </template>
-        <v-card>
-          <v-list>
-            <v-list-item>
-              <v-switch v-model="optionInbound" color="primary" :label="$t('pages.inbounds')" hide-details></v-switch>
-            </v-list-item>
-            <v-list-item>
-              <v-switch v-model="optionClient" color="primary" :label="$t('pages.clients')" hide-details></v-switch>
-            </v-list-item>
-            <v-list-item>
-              <v-switch v-model="optionIPver" color="primary" :label="$t('rule.ipVer')" hide-details></v-switch>
-            </v-list-item>
-            <v-list-item>
-              <v-switch v-model="optionProtocol" color="primary" :label="$t('protocol')" hide-details></v-switch>
-            </v-list-item>
-            <v-list-item>
-              <v-switch v-model="optionDomain" color="primary" :label="$t('rule.domainRules')" hide-details></v-switch>
-            </v-list-item>
-            <v-list-item>
-              <v-switch v-model="optionPort" color="primary" :label="$t('in.port')" hide-details></v-switch>
-            </v-list-item>
-            <v-list-item>
-              <v-switch v-model="optionSrcIP" color="primary" :label="$t('rule.srcIpRules')" hide-details></v-switch>
-            </v-list-item>
-            <v-list-item>
-              <v-switch v-model="optionSrcPort" color="primary" :label="$t('rule.srcPortRules')" hide-details></v-switch>
-            </v-list-item>
-            <v-list-item>
-              <v-switch v-model="optionRuleSet" color="primary" :label="$t('rule.ruleset')" hide-details></v-switch>
-            </v-list-item>
-          </v-list>
-        </v-card>
-      </v-menu>
-    </v-card-actions>
-  </v-card>
-</template>
-
-<script lang="ts">
-export default {
-  props: ['rule', 'clients', 'inTags', 'rsTags', 'deleteable'],
-  data() {
-    return {
-      menu: false,
-      domainKeys: ['domain', 'domain_suffix', 'domain_keyword', 'domain_regex', 'ip_cidr', 'ip_is_private'],
-      portKeys: ['port', 'port_range'],
-      srcIPKeys: ['source_ip_cidr', 'source_ip_is_private'],
-      srcPortKeys: ['source_port', 'source_port_range'],
-      domainOption: 'domain',
-      portOption: 'port',
-      srcIPOption: 'source_ip_cidr',
-      srcPortOption: 'source_port',
-    }
-  },
-  methods: {
-    updateDomainOption(option:string) {
-      this.domainKeys.forEach(k => delete this.$props.rule[k])
-      this.$props.rule[option] = option == 'ip_is_private' ? false : []
-    },
-    updatePortOption(option:string) {
-      this.portKeys.forEach(k => delete this.$props.rule[k])
-      this.$props.rule[option] = []
-    },
-    updateSrcIPOption(option:string) {
-      this.srcIPKeys.forEach(k => delete this.$props.rule[k])
-      this.$props.rule[option] = option == 'source_ip_is_private' ? false : []
-    },
-    updateSrcPortOption(option:string) {
-      this.srcPortKeys.forEach(k => delete this.$props.rule[k])
-      this.$props.rule[option] = []
-    },
-  },
-  computed: {
-    optionInbound: {
-      get() { return this.$props.rule.inbound != undefined },
-      set(v:boolean) { this.$props.rule.inbound = v ? [] : undefined }
-    },
-    optionClient: {
-      get() { return this.$props.rule.auth_user != undefined },
-      set(v:boolean) { this.$props.rule.auth_user = v ? [] : undefined }
-    },
-    optionIPver: {
-      get() { return this.$props.rule.ip_version != undefined },
-      set(v:boolean) { this.$props.rule.ip_version = v ? 4 : undefined }
-    },
-    optionProtocol: {
-      get() { return this.$props.rule.protocol != undefined },
-      set(v:boolean) { this.$props.rule.protocol = v ? ['http'] : undefined }
-    },
-    optionDomain: {
-      get() { return Object.keys(this.$props.rule).some(r => this.domainKeys.includes(r)) },
-      set(v:boolean) { 
-        if (v) {
-          this.$props.rule.domain = []
-        } else {
-          this.domainKeys.forEach(k => delete this.$props.rule[k])
-        }
-        this.domainOption = 'domain'
-      }
-    },
-    optionPort: {
-      get() { return Object.keys(this.$props.rule).some(r => this.portKeys.includes(r)) },
-      set(v:boolean) { 
-        if (v) {
-          this.$props.rule.port = []
-        } else {
-          this.portKeys.forEach(k => delete this.$props.rule[k])
-        }
-        this.portOption = 'port'
-      }
-    },
-    optionSrcIP: {
-      get() { return Object.keys(this.$props.rule).some(r => this.srcIPKeys.includes(r)) },
-      set(v:boolean) { 
-        if (v) {
-          this.$props.rule.source_ip_cidr = []
-        } else {
-          this.srcIPKeys.forEach(k => delete this.$props.rule[k])
-        }
-        this.srcIPOption = 'source_ip_cidr'
-      }
-    },
-    optionSrcPort: {
-      get() { return Object.keys(this.$props.rule).some(r => this.srcPortKeys.includes(r)) },
-      set(v:boolean) { 
-        if (v) {
-          this.$props.rule.source_port = []
-        } else {
-          this.srcPortKeys.forEach(k => delete this.$props.rule[k])
-        }
-        this.srcPortOption = 'source_port'
-      }
-    },
-    optionRuleSet: {
-      get() { return this.$props.rule.rule_set != undefined },
-      set(v:boolean) { 
-        if (v) {
-          this.$props.rule.rule_set = []
-          this.$props.rule.rule_set_ipcidr_match_source = false
-        } else {
-          delete this.$props.rule.rule_set
-          delete this.$props.rule.rule_set_ipcidr_match_source
-        }
-      }
-    },
-    domain: {
-      get() { return this.$props.rule.domain?.join(',') },
-      set(v:string) { this.$props.rule.domain = v.length>0 ? v.split(',') : [] }
-    },
-    domain_suffix: {
-      get() { return this.$props.rule.domain_suffix?.join(',') },
-      set(v:string) { this.$props.rule.domain_suffix = v.length>0 ? v.split(',') : [] }
-    },
-    domain_keyword: {
-      get() { return this.$props.rule.domain_keyword?.join(',') },
-      set(v:string) { this.$props.rule.domain_keyword = v.length>0 ? v.split(',') : [] }
-    },
-    domain_regex: {
-      get() { return this.$props.rule.domain_regex?.join(',') },
-      set(v:string) { this.$props.rule.domain_regex = v.length>0 ? v.split(',') : [] }
-    },
-    ip_cidr: {
-      get() { return this.$props.rule.ip_cidr?.join(',') },
-      set(v:string) { this.$props.rule.ip_cidr = v.length>0 ? v.split(',') : [] }
-    },
-    port: {
-      get() { return this.$props.rule.port?.join(',') },
-      set(v:string) {
-        if(!v.endsWith(',')) {
-          this.$props.rule.port = v.length > 0 ? v.split(',').map(str => parseInt(str, 10)) : []
-        }
-      }
-    },
-    port_range: {
-      get() { return this.$props.rule.port_range?.join(',') },
-      set(v:string) { this.$props.rule.port_range = v.length>0 ? v.split(',') : [] }
-    },
-    source_ip_cidr: {
-      get() { return this.$props.rule.source_ip_cidr?.join(',') },
-      set(v:string) { this.$props.rule.source_ip_cidr = v.length>0 ? v.split(',') : [] }
-    },
-    source_port: {
-      get() { return this.$props.rule.source_port?.join(',') },
-      set(v:string) {
-        if(!v.endsWith(',')) {
-          this.$props.rule.source_port = v.length > 0 ? v.split(',').map(str => parseInt(str, 10)) : []
-        }
-      }
-    },
-    source_port_range: {
-      get() { return this.$props.rule.source_port_range?.join(',') },
-      set(v:string) { this.$props.rule.source_port_range = v.length>0 ? v.split(',') : [] }
-    },
-  },
-  mounted() {
-    const ruleKeys = Object.keys(this.$props.rule)
-    if (this.optionDomain) {
-      const enabledOption = this.domainKeys.filter(k => ruleKeys.includes(k))
-      this.domainOption = enabledOption.length>0 ? enabledOption[0] : 'domain'
-    }
-    if (this.optionPort) {
-      const enabledOption = this.portKeys.filter(k => ruleKeys.includes(k))
-      this.portOption = enabledOption.length>0 ? enabledOption[0] : 'port'
-    }
-    if (this.optionSrcIP) {
-      const enabledOption = this.srcIPKeys.filter(k => ruleKeys.includes(k))
-      this.srcIPOption = enabledOption.length>0 ? enabledOption[0] : 'source_ip_cidr'
-    }
-    if (this.optionSrcPort) {
-      const enabledOption = this.srcPortKeys.filter(k => ruleKeys.includes(k))
-      this.srcPortOption = enabledOption.length>0 ? enabledOption[0] : 'source_port'
-    }
-  }
-}
-</script>

frontend/src/components/SubJsonExt.vue

@@ -1,368 +0,0 @@
-<template>
-  <v-card>
-    <v-row>
-      <v-col cols="12" sm="6" md="3">
-        <v-select
-          v-model="ruleToDirect"
-          :items="geoList"
-          :label="$t('setting.toDirect')"
-          multiple
-          chips
-          hide-details
-        ></v-select>
-      </v-col>
-      <v-col cols="12" sm="6" md="3">
-        <v-select
-          v-model="ruleToBlock"
-          :items="geoList"
-          :label="$t('setting.toBlock')"
-          multiple
-          chips
-          hide-details
-        ></v-select>
-      </v-col>
-    </v-row>
-    <v-row  v-if="enableLog">
-      <v-col cols="12" sm="6" md="3" lg="2">
-        <v-select
-          hide-details
-          :label="$t('basic.log.level')"
-          :items="levels"
-          v-model="subJsonExt.log.level">
-        </v-select>
-      </v-col>
-      <v-col cols="12" sm="6" md="3" lg="2">
-        <v-switch v-model="subJsonExt.log.timestamp" color="primary" :label="$t('setting.timestamp')" hide-details />
-      </v-col>
-    </v-row>
-    <v-row v-if="enableDns">
-      <v-col cols="12" sm="6" md="3" lg="2">
-        <v-text-field
-          v-model="proxyDns"
-          hide-details
-          :label="$t('setting.globalDns')"
-        ></v-text-field>
-      </v-col>
-      <v-col cols="12" sm="6" md="3" lg="2">
-        <v-text-field
-          v-model="directDns"
-          hide-details
-          clearable
-          :label="$t('setting.directDns')"
-        ></v-text-field>
-      </v-col>
-      <v-col cols="12" sm="6" md="3" v-if="directDns.length>0">
-        <v-select
-          v-model="dnsToDirect"
-          :items="geositeList"
-          :label="$t('setting.toDirectDns')"
-          multiple
-          chips
-          hide-details
-        ></v-select>
-      </v-col>
-    </v-row>
-    <v-card-actions>
-      <v-spacer></v-spacer>
-      <v-menu v-model="menu" :close-on-content-click="false" location="start">
-        <template v-slot:activator="{ props }">
-          <v-btn v-bind="props" hide-details variant="tonal">{{ $t('setting.jsonSubOptions') }}</v-btn>
-        </template>
-        <v-card>
-          <v-list>
-            <v-list-item>
-              <v-switch v-model="enableLog" color="primary" :label="$t('basic.log.title')" hide-details></v-switch>
-            </v-list-item>
-            <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="enableExp" color="primary" label="Experimental" hide-details></v-switch>
-            </v-list-item>
-          </v-list>
-        </v-card>
-      </v-menu>
-    </v-card-actions>
-  </v-card>
-</template>
-
-<script lang="ts">
-export default {
-  props: ['settings'],
-  data() {
-    return {
-      menu: false,
-      subJsonExt: <any>{},
-      levels: ["trace", "debug", "info", "warn", "error", "fatal", "panic"],
-      defaultLog: {
-        "level": "info",
-        "timestamp": true
-      },
-      defaultExp: {
-        "clash_api": {
-          "external_controller": "127.0.0.1:9090",
-          "external_ui": "ui",
-          "secret": "",
-          "external_ui_download_url": "https://mirror.ghproxy.com/https://github.com/MetaCubeX/Yacd-meta/archive/gh-pages.zip",
-          "external_ui_download_detour": "direct",
-          "default_mode": "rule"
-        },
-        "cache_file": {
-          "enabled": true,
-          "store_fakeip": false
-        }
-      },
-      defaultDns: {
-        "servers": [
-          {
-            "address": "tcp://8.8.8.8",
-            "detour": "proxy",
-            "address_resolver": "local-dns",
-            "tag": "proxy-dns"
-          },
-          {
-            "tag": "local-dns",
-            "address": "local",
-            "detour": "direct"
-          },
-          {
-            "address": "rcode://success",
-            "tag": "block"
-          }
-        ],
-        "rules": [
-          {
-            "clash_mode": "Global",
-            "source_ip_cidr": [
-              "172.19.0.0/30"
-            ],
-            "server": "proxy-dns"
-          },
-          {
-            "source_ip_cidr": [
-              "172.19.0.0/30"
-            ],
-            "server": "proxy-dns"
-          }
-        ],
-        "final": "local-dns",
-        "strategy": "prefer_ipv4"
-      },
-      geositeList: [
-        { title: "Private", value: "geosite-private" },
-        { title: "Ads", value: "geosite-ads" },
-        { title: "🇮🇷 Iran", value: "geosite-ir" },
-        { title: "🇨🇳 China", value: "geosite-cn" },
-        { title: "🇻🇳 Vietnam", value: "geosite-vn" },
-      ],
-      geoList: [
-        { title: "Site-Private", value: "geoip-private" },
-        { title: "IP-Private", value: "geosite-private" },
-        { title: "Site-Ads", value: "geosite-ads" },
-        { title: "🇮🇷 Site-Iran", value: "geosite-ir" },
-        { title: "🇮🇷 IP-Iran", value: "geoip-ir" },
-        { title: "🇨🇳 Site-China", value: "geosite-cn" },
-        { title: "🇨🇳 IP-China", value: "geoip-cn" },
-        { title: "🇻🇳 Site-Vietnam", value: "geosite-vn" },
-        { title: "🇻🇳 IP-Vietnam", value: "geoip-vn" },
-      ],
-      geo: [
-        {
-          tag: "geosite-ads",
-          type: "remote",
-          format: "binary",
-          url: "https://testingcf.jsdelivr.net/gh/MetaCubeX/meta-rules-dat@sing/geo/geosite/category-ads-all.srs",
-          download_detour: "direct"
-        },
-        {
-          tag: "geosite-private",
-          type: "remote",
-          format: "binary",
-          url: "https://testingcf.jsdelivr.net/gh/MetaCubeX/meta-rules-dat@sing/geo/geosite/private.srs",
-          download_detour: "direct"
-        },
-        {
-          tag: "geosite-ir",
-          type: "remote",
-          format: "binary",
-          url: "https://testingcf.jsdelivr.net/gh/MetaCubeX/meta-rules-dat@sing/geo/geosite/category-ir.srs",
-          download_detour: "direct"
-        },
-        {
-          tag: "geosite-cn",
-          type: "remote",
-          format: "binary",
-          url: "https://testingcf.jsdelivr.net/gh/MetaCubeX/meta-rules-dat@sing/geo/geosite/cn.srs",
-          download_detour: "direct"
-        },
-        {
-          tag: "geosite-vn",
-          type: "remote",
-          format: "binary",
-          url: "https://github.com/Thaomtam/Geosite-vn/raw/rule-set/Geosite-vn.srs",
-          download_detour: "direct"
-        },
-        {
-          tag: "geoip-private",
-          type: "remote",
-          format: "binary",
-          url: "https://testingcf.jsdelivr.net/gh/MetaCubeX/meta-rules-dat@sing/geo/geoip/private.srs",
-          download_detour: "direct"
-        },
-        {
-          tag: "geoip-ir",
-          type: "remote",
-          format: "binary",
-          url: "https://testingcf.jsdelivr.net/gh/MetaCubeX/meta-rules-dat@sing/geo/geoip/ir.srs",
-          download_detour: "direct"
-        },
-        {
-          tag: "geoip-cn",
-          type: "remote",
-          format: "binary",
-          url: "https://testingcf.jsdelivr.net/gh/MetaCubeX/meta-rules-dat@sing/geo/geoip/cn.srs",
-          download_detour: "direct"
-        },
-        {
-          tag: "geoip-vn",
-          type: "remote",
-          format: "binary",
-          url: "https://testingcf.jsdelivr.net/gh/MetaCubeX/meta-rules-dat@sing/geo/geoip/vn.srs",
-          download_detour: "direct"
-        }
-      ],
-    }
-  },
-  computed: {
-    enableLog: {
-      get() :boolean { return this.subJsonExt?.log != undefined },
-      set(v:boolean) { v ? this.subJsonExt.log = this.defaultLog : delete this.subJsonExt.log }
-    },
-    enableDns: {
-      get() :boolean { return this.subJsonExt?.dns != undefined },
-      set(v:boolean) {
-        if (v) {
-          this.subJsonExt.dns = this.defaultDns
-          if (this.rules == undefined) this.subJsonExt.rules = []
-          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")
-          if (ruleDnsIndex >= 0) this.subJsonExt.rules.splice(ruleDnsIndex,1)
-          if (this.rules.length == 0) delete this.subJsonExt.rules
-        }
-      }
-    },
-    enableExp: {
-      get() :boolean { return this.subJsonExt?.experimental != undefined },
-      set(v:boolean) { v ? this.subJsonExt.experimental = this.defaultExp : delete this.subJsonExt.experimental }
-    },
-    dns():any { return this.subJsonExt?.dns?? undefined },
-    proxyDns: {
-      get() :string { return this.dns?.servers[0]?.address?? "" },
-      set(v:string) { this.dns.servers[0].address = v.length>0 ? v : "8.8.8.8" }
-    },
-    directDns: {
-      get() :string { return this.dns?.servers?.findLast((d:any) => d.tag == "direct-dns")?.address?? "" },
-      set(v:string) {
-        const sIndex = this.dns.servers.findIndex((d:any) => d.tag == "direct-dns")
-        if (v?.length>0) {
-          if (sIndex === -1) {
-            this.dns.servers.push({ tag: "direct-dns", address: v, detour: "direct" })
-            this.dns.rules.push({ clash_mode: "Direct", server: "direct-dns" })
-          } else {
-            this.dns.servers[sIndex].address = v
-          }
-        } else {
-          this.dns.servers.splice(sIndex,1)
-          this.dns.rules = this.dns.rules.filter((r:any) => r.server != "direct-dns")
-        }
-      },
-    },
-    dnsToDirect: {
-      get() :string[] {
-        const ruleIndex = this.dns?.rules?.findIndex((r:any) => r.server == "direct-dns" && Object.hasOwn(r,'rule_set'))
-        return ruleIndex >= 0 ? this.dns.rules[ruleIndex].rule_set : []
-      },
-      set(v:string[]) {
-        const ruleIndex = this.dns?.rules?.findIndex((r:any) => r.server == "direct-dns" && Object.hasOwn(r,'rule_set'))
-        if (v.length>0) {
-          if (ruleIndex >= 0){
-            this.dns.rules[ruleIndex].rule_set = v
-          } else {
-            this.dns.rules.push({ rule_set: v, server: "direct-dns" })
-          }
-        } else {
-          if (ruleIndex != -1) this.dns.rules.splice(ruleIndex,1)
-        }
-        this.updateRuleSets()
-      }
-    },
-    rules():any { return this.subJsonExt?.rules?? undefined },
-    ruleToDirect: {
-      get() :string[] {
-        const ruleIndex = this.rules?.findIndex((r:any) => r.outbound == "direct" && Object.hasOwn(r,'rule_set'))
-        return ruleIndex >= 0 ? this.rules[ruleIndex].rule_set : []
-      },
-      set(v:string[]) {
-        const ruleIndex = this.rules?.findIndex((r:any) => r.outbound == "direct" && Object.hasOwn(r,'rule_set'))
-        if (v.length>0) {
-          if (ruleIndex >= 0){
-            this.rules[ruleIndex].rule_set = v
-          } else {
-            if (this.rules == undefined) this.subJsonExt.rules = []
-            this.rules.push({ rule_set: v, outbound: "direct" })
-          }
-        } else {
-          if (ruleIndex != -1) this.rules.splice(ruleIndex,1)
-        }
-        this.updateRuleSets()
-      }
-    },
-    ruleToBlock: {
-      get() :string[] {
-        const ruleIndex = this.rules?.findIndex((r:any) => r.outbound == "block" && Object.hasOwn(r,'rule_set'))
-        return ruleIndex >= 0 ? this.rules[ruleIndex].rule_set : []
-      },
-      set(v:string[]) {
-        const ruleIndex = this.rules?.findIndex((r:any) => r.outbound == "block" && Object.hasOwn(r,'rule_set'))
-        if (v.length>0) {
-          if (ruleIndex >= 0){
-            this.rules[ruleIndex].rule_set = v
-          } else {
-            if (this.rules == undefined) this.subJsonExt.rules = []
-            this.rules.push({ rule_set: v, outbound: "block" })
-          }
-        } else {
-          if (ruleIndex != -1) this.rules.splice(ruleIndex,1)
-        }
-        this.updateRuleSets()
-      }
-    }
-  },
-  methods: {
-    updateRuleSets(){
-      let tags = <string[]>[]
-      if (this.dns?.rules?.length>0) this.dns.rules.forEach((r:any) => { if (r.rule_set) tags.push(...r.rule_set) })
-      if (this.rules?.length>0) this.rules.forEach((r:any) => { if (r.rule_set) tags.push(...r.rule_set) })
-      if (tags.length>0){
-        this.subJsonExt.rule_set = this.geo.filter((g:any) => tags.includes(g.tag))
-      } else {
-        delete this.subJsonExt.rule_set
-      }
-      if (this.rules.length == 0) delete this.subJsonExt.rules
-    }
-  },
-  mounted(){
-    this.subJsonExt = this.$props.settings?.subJsonExt?.length>0 ? JSON.parse(this.$props.settings.subJsonExt) : <any>{}
-  },
-  watch:{
-    subJsonExt:{
-      handler(v) {
-        this.$props.settings.subJsonExt = Object.keys(v).length>0 ? JSON.stringify(v, null, 2) : ""
-      },
-      deep: true
-    },
-  }
-}
-</script>

frontend/src/components/Transport.vue

@@ -1,5 +1,5 @@
 <template>
-    <v-card :subtitle="$t('objects.transport')">
+    <v-card :subtitle="$t('in.transport')">
     <v-row>
       <v-col cols="12" sm="6" md="4">
         <v-switch color="primary" :label="$t('transport.enable')" v-model="tpEnable" hide-details></v-switch>
@@ -7,6 +7,7 @@
       <v-col cols="12" sm="6" md="4" v-if="tpEnable">
         <v-select
           hide-details
+          width="100"
           :label="$t('type')"
           :items="Object.keys(trspTypes).map((key,index) => ({title: key, value: Object.values(trspTypes)[index]}))"
           v-model="transportType">
@@ -27,7 +28,7 @@ import WebSocket from './transports/WebSocket.vue'
 import GRPC from './transports/gRPC.vue'
 import HttpUpgrade from './transports/HttpUpgrade.vue'
 export default {
-  props: ['data'],
+  props: ['inbound'],
   data() {
     return {
       trspTypes: TrspTypes
@@ -35,15 +36,15 @@ export default {
   },
   computed: {
     Transport() {
-      return <Transport>this.$props.data.transport
+      return <Transport>this.$props.inbound.transport
     },
     tpEnable: {
-      get() { return Object.hasOwn(this.$props.data.transport, 'type') },
+      get() { return Object.hasOwn(this.$props.inbound.transport, 'type') },
-      set(newValue: boolean) { this.$props.data.transport = newValue ? { type: 'http' } : {} }
+      set(newValue: boolean) { this.$props.inbound.transport = newValue ? { type: 'http' } : {} }
     },
     transportType: {
       get() { return this.Transport.type },
-      set(newValue: string) { this.$props.data.transport = { type: newValue } }
+      set(newValue: string) { this.$props.inbound.transport = { type: newValue } }
     }
   },
   components: { Http, WebSocket, GRPC, HttpUpgrade }

frontend/src/components/UoT.vue

@@ -1,29 +0,0 @@
-<template>
-  <v-select
-    hide-details
-    label="UDP over TCP"
-    :items="versions"
-    v-model="udp_over_tcp">
-  </v-select>
-</template>
-
-<script lang="ts">
-export default {
-  props: ['data'],
-  data() {
-    return {
-      versions: [
-        { title: this.$t('disable'), value: 0 },
-        { title: "1", value: 1 },
-        { title: "2", value: 2 },
-      ],
-    }
-  },
-  computed: {
-    udp_over_tcp: {
-      get():number { return this.$props.data.udp_over_tcp?.version?? 0 },
-      set(v:number) { this.$props.data.udp_over_tcp = v > 0 ? { enabled: true, version: v } : undefined }
-    }
-  }
-}
-</script>

frontend/src/components/Users.vue

@@ -1,5 +1,5 @@
 <template>
-  <v-card :subtitle="$t('pages.clients')">
+  <v-card subtitle="Clients">
     <v-row>
       <v-col cols="12" sm="6" md="4">
         <v-switch 
@@ -16,7 +16,7 @@
 <script lang="ts">
 
 export default {
-  props: ['inbound'],
+  props: ['inbound', 'id'],
   data() {
     return {
       hasUser: false,

frontend/src/components/WgPeer.vue

@@ -1,59 +0,0 @@
-<template>
-  <v-row>
-    <v-col cols="12" sm="6" md="4">
-      <v-text-field
-      :label="$t('out.addr')"
-      hide-details
-      v-model="data.server">
-      </v-text-field>
-    </v-col>
-    <v-col cols="12" sm="6" md="4">
-      <v-text-field
-      :label="$t('out.port')"
-      type="number"
-      min="0"
-      hide-details
-      v-model="data.server_port">
-      </v-text-field>
-    </v-col>
-  </v-row>
-  <v-row>
-    <v-col cols="12" sm="6">
-      <v-text-field v-model="data.public_key" :label="$t('types.wg.pubKey')" hide-details></v-text-field>
-    </v-col>
-    <v-col cols="12" sm="6">
-      <v-text-field v-model="data.pre_shared_key" :label="$t('types.wg.psk')" hide-details></v-text-field>
-    </v-col>
-  </v-row>
-  <v-row>
-    <v-col cols="12" sm="6">
-      <v-text-field v-model="allowed_ips" :label="$t('types.wg.allowedIp') + ' ' + $t('commaSeparated')" hide-details></v-text-field>
-    </v-col>
-    <v-col cols="12" sm="6">
-      <v-text-field v-model="reserved" :label="'Reserved ' + $t('commaSeparated')" hide-details></v-text-field>
-    </v-col>
-  </v-row>
-</template>
-
-<script lang="ts">
-export default {
-  props: ['data'],
-  data() {
-    return {}
-  },
-  computed: {
-    allowed_ips: {
-      get() { return this.$props.data.allowed_ips?.join(',') },
-      set(v:string) { this.$props.data.allowed_ips = v.length > 0 ? v.split(',') : undefined }
-    },
-    reserved: {
-      get() { return this.$props.data.reserved?.join(',') },
-      set(v:string) {
-        if(!v.endsWith(',')) {
-          this.$props.data.reserved = v.length > 0 ? v.split(',').map(str => parseInt(str, 10)) : undefined
-        }
-      }
-    },
-  }
-}
-</script>

frontend/src/components/message.vue

@@ -1,38 +1,18 @@
 <template>
-  <Notivue v-slot="item">
+    <v-snackbar
-    <NotivueSwipe :item="item">
+    v-model="sb.showMsg"
-      <Notification
+    location="top"
-        :item="item"
+    :color="snackbar.color"
-        :theme="theme"
+    :timeout="snackbar.timeout">
-        :dir="direction"
+      {{ snackbar.message }}
-        :icons="outlinedIcons"
+    </v-snackbar>
-        :hideClose="true"
-        @click="item.clear"
-      />
-    </NotivueSwipe>
-  </Notivue>
 </template>
 
 <script lang="ts" setup>
-import { Notivue, Notification, NotivueSwipe, outlinedIcons, pastelTheme, darkTheme } from 'notivue'
+import { ref } from 'vue'
-import { computed } from 'vue'
+import Message from '@/store/modules/message'
-import { useTheme } from 'vuetify'
-import vuetify from '@/plugins/vuetify';
 
-const Theme = useTheme()
+const sb = Message()
 
-const theme = computed(() =>{
+const snackbar = ref(sb.snackbar)
-  return Theme.global.name.value == "light" ? pastelTheme : darkTheme
-})
-
-const direction = computed(() => {
-  return vuetify.locale.isRtl ? 'rtl' : 'ltr'
-})
 </script>
-
-<style>
-:root {
-  --nv-z: 10020;
-}
-
-</style>

frontend/src/components/protocols/Direct.vue

@@ -1,23 +1,23 @@
 <template>
   <v-card subtitle="Direct">
     <v-row>
-      <v-col cols="12" sm="6" md="4" v-if="direction == 'in'">
+      <v-col cols="12" sm="6" md="4">
-        <Network :data="data" />
+        <Network :inbound="inbound" />
       </v-col>
       <v-col cols="12" sm="6" md="4">
         <v-text-field
-        :label="$t('types.direct.overrideAddr')"
+        label="Override Address"
         hide-details
-        v-model="data.override_address">
+        v-model="inbound.override_address">
         </v-text-field>
       </v-col>
       <v-col cols="12" sm="6" md="4">
         <v-text-field
-        :label="$t('types.direct.overridePort')"
+        label="Override Port"
         type="number"
         min="0"
         hide-details
-        v-model.number="override_port">
+        v-model="override_port">
         </v-text-field>
       </v-col>
     </v-row>
@@ -28,14 +28,14 @@
 import Network from '@/components/Network.vue'
 
 export default {
-  props: ['direction','data'],
+    props: ['inbound'],
     data() {
         return {}
     },
     computed: {
         override_port: {
-        get() { return this.$props.data.override_port ? this.$props.data.override_port : ''; },
+            get() { return this.$props.inbound.override_port ? this.$props.inbound.override_port : ''; },
-        set(newValue: any) { this.$props.data.override_port = newValue.length == 0 || newValue == 0 ? undefined : parseInt(newValue); }
+            set(newValue: any) { this.$props.inbound.override_port = newValue.length == 0 || newValue == 0 ? undefined : parseInt(newValue); }
         },
     },
     components: { Network }

frontend/src/components/protocols/Http.vue

@@ -1,50 +0,0 @@
-<template>
-  <v-card subtitle="HTTP">
-    <v-row>
-      <v-col cols="12" sm="6" md="4">
-        <v-text-field
-        :label="$t('types.un')"
-        hide-details
-        v-model="username">
-        </v-text-field>
-      </v-col>
-      <v-col cols="12" sm="6" md="4">
-        <v-text-field
-        :label="$t('types.pw')"
-        hide-details
-        v-model="password">
-        </v-text-field>
-      </v-col>
-      <v-col cols="12" sm="6" md="4">
-        <v-text-field
-        :label="$t('transport.path')"
-        hide-details
-        v-model="data.path">
-        </v-text-field>
-      </v-col>
-    </v-row>
-    <Headers :data="data" />
-  </v-card>
-</template>
-
-<script lang="ts">
-import Headers from '@/components/Headers.vue';
-
-export default {
-  props: ['data'],
-  data() {
-    return {}
-  },
-  computed: {
-    username: {
-      get(): string { return this.data.username?.length > 0 ? this.data.username : '' },
-      set(v:string) { this.data.username = v.length > 0 ? v : undefined },
-    },
-    password: {
-      get(): string { return this.data.password?.length > 0 ? this.data.password : '' },
-      set(v:string) { this.data.password = v.length > 0 ? v : undefined },
-    },
-  },
-  components: { Headers }
-}
-</script>

frontend/src/components/protocols/Hysteria.vue

@@ -3,19 +3,19 @@
     <v-row>
       <v-col cols="12" sm="6" md="4">
         <v-text-field
-        :label="$t('stats.upload')"
+        label="Uplink Limit"
         hide-details
         type="number"
-        :suffix="$t('stats.Mbps')"
+        suffix="Mbps"
         v-model.number="up_mbps">
         </v-text-field>
       </v-col>
       <v-col cols="12" sm="6" md="4">
         <v-text-field
-        :label="$t('stats.download')"
+        label="Downlink Limit"
         hide-details
         type="number"
-        :suffix="$t('stats.Mbps')"
+        suffix="Mbps"
         min="0"
         v-model.number="down_mbps">
         </v-text-field>
@@ -24,136 +24,40 @@
     <v-row>
       <v-col cols="12" sm="6" md="4">
        <v-text-field
-       :label="$t('types.hy.obfs')"
+        label="obfs Password"
         hide-details
-        v-model="data.obfs">
+        v-model="inbound.obfs">
-        </v-text-field>
-      </v-col>
-      <v-col cols="12" sm="6" md="4" v-if="direction=='out'">
-        <v-text-field
-        :label="$t('types.hy.auth')"
-        hide-details
-        v-model="data.auth_str">
         </v-text-field>
       </v-col>
     </v-row>
-    <v-row>
-      <v-col cols="12" sm="6" md="4" v-if="direction=='out'">
-        <Network :data="data" />
-      </v-col>
-      <v-col cols="12" sm="6" md="4">
-        <v-switch v-model="data.disable_mtu_discovery" color="primary" label="Disable MTU discovery" hide-details></v-switch>
-      </v-col>
-    </v-row>
-    <v-row>
-      <v-col cols="12" sm="6" md="4" v-if="data.recv_window_conn != undefined">
-        <v-text-field
-        label="Recv window conn"
-        hide-details
-        type="number"
-        min="0"
-        v-model.number="data.recv_window_conn">
-        </v-text-field>
-      </v-col>
-      <v-col cols="12" sm="6" md="4" v-if="data.recv_window != undefined">
-        <v-text-field
-        label="Recv window"
-        hide-details
-        type="number"
-        min="0"
-        v-model.number="data.recv_window">
-        </v-text-field>
-      </v-col>
-      <v-col cols="12" sm="6" md="4" v-if="data.recv_window_client != undefined">
-        <v-text-field
-        label="Recv window client"
-        hide-details
-        type="number"
-        min="0"
-        v-model.number="data.recv_window_client">
-        </v-text-field>
-      </v-col>
-      <v-col cols="12" sm="6" md="4" v-if="data.max_conn_client != undefined">
-        <v-text-field
-        label="Max conn client"
-        hide-details
-        type="number"
-        min="0"
-        v-model.number="data.max_conn_client">
-        </v-text-field>
-      </v-col>
-    </v-row>
-    <v-card-actions>
-      <v-spacer></v-spacer>
-      <v-menu v-model="menu" :close-on-content-click="false" location="start">
-        <template v-slot:activator="{ props }">
-          <v-btn v-bind="props" hide-details variant="tonal">{{ $t('types.hy.hyOptions') }}</v-btn>
-        </template>
-        <v-card>
-          <v-list>
-            <v-list-item>
-              <v-switch v-model="optionRsvConn" color="primary" label="Recv window conn" hide-details></v-switch>
-            </v-list-item>
-            <v-list-item v-if="direction=='out'">
-              <v-switch v-model="optionRsvWin" color="primary" label="Recv window" hide-details></v-switch>
-            </v-list-item>
-            <v-list-item v-if="direction=='in'">
-              <v-switch v-model="optionRsvClnt" color="primary" label="Recv window client" hide-details></v-switch>
-            </v-list-item>
-            <v-list-item v-if="direction=='in'">
-              <v-switch v-model="optionMaxConn" color="primary" label="Max conn client" hide-details></v-switch>
-            </v-list-item>
-          </v-list>
-        </v-card>
-      </v-menu>
-    </v-card-actions>
   </v-card>
 </template>
 
 <script lang="ts">
-import Network from '@/components/Network.vue'
 
 export default {
-  props: ['direction','data'],
+  props: ['inbound'],
   data() {
     return {
-      menu: false,
     }
   },
   computed: {
-    optionRsvConn: {
-      get(): boolean { return this.$props.data.recv_window_conn != undefined },
-      set(v:boolean) { this.$props.data.recv_window_conn = v ? 15728640 : undefined }
-    },
-    optionRsvWin: {
-      get(): boolean { return this.$props.data.recv_window != undefined },
-      set(v:boolean) { this.$props.data.recv_window = v ? 67108864 : undefined }
-    },
-    optionRsvClnt: {
-      get(): boolean { return this.$props.data.recv_window_client != undefined },
-      set(v:boolean) { this.$props.data.recv_window_client = v ? 67108864 : undefined }
-    },
-    optionMaxConn: {
-      get(): boolean { return this.$props.data.max_conn_client != undefined },
-      set(v:boolean) { this.$props.data.max_conn_client = v ? 1024 : undefined }
-    },
     down_mbps: {
-      get() { return this.$props.data.down_mbps ? this.$props.data.down_mbps : 0 },
+      get() { return this.$props.inbound.down_mbps ? this.$props.inbound.down_mbps : 0 },
       set(newValue:any) {
         if (newValue.length != 0 ){
-          this.$props.data.down_mbps = newValue
+          this.$props.inbound.down_mbps = newValue
-          this.$props.data.down = "" + newValue + " Mbps"
+          this.$props.inbound.down = "" + newValue + " Mbps"
         } else {
-          this.$props.data.down_mbps = 0
+          this.$props.inbound.down_mbps = 0
-          this.$props.data.down = "0 Mbps"
+          this.$props.inbound.down = "0 Mbps"
         }
       }
     },
     up_mbps: {
-      get() { return this.$props.data.up_mbps ? this.$props.data.up_mbps : 0 },
+      get() { return this.$props.inbound.up_mbps ? this.$props.inbound.up_mbps : 0 },
-      set(newValue:number) { this.$props.data.up_mbps = newValue > 0 ? newValue : 0 }
+      set(newValue:number) { this.$props.inbound.up_mbps = newValue > 0 ? newValue : 0 }
     },
   },
-  components: { Network }
 }
 </script>

frontend/src/components/protocols/Hysteria2.vue

@@ -1,57 +1,43 @@
 <template>
   <v-card subtitle="Hysteria2">
-    <v-row v-if="direction == 'in'">
+    <v-row>
-      <v-col cols="12" sm="6" md="4" v-if="data.masquerade != undefined">
+      <v-col cols="12" sm="6" md="4">
         <v-text-field
-        label="HTTP3 server on auth fail"
+        label="Masquerade"
         hide-details
-        v-model="data.masquerade">
+        v-model="hysteria2.masquerade"></v-text-field>
-        </v-text-field>
       </v-col>
       <v-col cols="12" sm="6" md="4">
-        <v-switch v-model="data.ignore_client_bandwidth" color="primary" :label="$t('types.hy.ignoreBw')" hide-details></v-switch>
+        <v-switch v-model="hysteria2.ignore_client_bandwidth" color="primary" label="Ignore Client Bandwidth" hide-details></v-switch>
       </v-col>
     </v-row>
-    <v-row v-else>
+    <v-row v-if="!hysteria2.ignore_client_bandwidth">
       <v-col cols="12" sm="6" md="4">
         <v-text-field
-        :label="$t('types.pw')"
+        label="Uplink Limit"
-        hide-details
-        v-model="data.password">
-        </v-text-field>
-      </v-col>
-      <v-col cols="12" sm="6" md="4">
-        <Network :data="data" />
-      </v-col>
-    </v-row>
-    <v-row v-if="!data.ignore_client_bandwidth">
-      <v-col cols="12" sm="6" md="4">
-        <v-text-field
-        :label="$t('stats.upload')"
         hide-details
         type="number"
-        :suffix="$t('stats.Mbps')"
+        suffix="Mbps"
-        min="0"
         v-model.number="up_mbps">
         </v-text-field>
       </v-col>
       <v-col cols="12" sm="6" md="4">
         <v-text-field
-        :label="$t('stats.download')"
+        label="Downlink Limit"
         hide-details
         type="number"
-        :suffix="$t('stats.Mbps')"
+        suffix="Mbps"
         min="0"
         v-model.number="down_mbps">
         </v-text-field>
       </v-col>
     </v-row>
-    <v-row v-if="data.obfs != undefined">
+    <v-row v-if="hysteria2.obfs">
       <v-col cols="12" sm="6" md="4">
        <v-text-field
-        :label="$t('types.hy.obfs')"
+        label="obfs Password"
         hide-details
-        v-model="data.obfs.password">
+        v-model="hysteria2.obfs.password">
         </v-text-field>
       </v-col>
     </v-row>
@@ -59,15 +45,12 @@
       <v-spacer></v-spacer>
       <v-menu v-model="menu" :close-on-content-click="false" location="start">
         <template v-slot:activator="{ props }">
-          <v-btn v-bind="props" hide-details variant="tonal">{{ $t('types.hy.hy2Options') }}</v-btn>
+          <v-btn v-bind="props" hide-details>Options</v-btn>
         </template>
         <v-card>
           <v-list>
             <v-list-item>
-              <v-switch v-model="optionObfs" color="primary" :label="$t('types.hy.obfs')" hide-details></v-switch>
+              <v-switch v-model="optionObfs" color="primary" label="Obfs" hide-details></v-switch>
-            </v-list-item>
-            <v-list-item>
-              <v-switch v-model="optionMasq" color="primary" label="Masquerade" hide-details></v-switch>
             </v-list-item>
           </v-list>
         </v-card>
@@ -77,33 +60,32 @@
 </template>
 
 <script lang="ts">
-import Network from '@/components/Network.vue'
+import { Hysteria2, createInbound } from '@/types/inbounds'
 
 export default {
-  props: ['direction', 'data'],
+  props: ['inbound'],
   data() {
     return {
       menu: false,
+      hysteria2: <Hysteria2> createInbound("hysteria2",{ "tag": "" }),
     }
   },
   computed: {
     down_mbps: {
-      get() { return this.$props.data.down_mbps?? 0 },
+      get() { return this.hysteria2.down_mbps ? this.hysteria2.down_mbps : 0 },
-      set(newValue:number) { this.$props.data.down_mbps = newValue>0 ? newValue : undefined }
+      set(newValue:any) { this.hysteria2.down_mbps = newValue.length == 0 ?  undefined : this.hysteria2.down_mbps }
     },
     up_mbps: {
-      get() { return this.$props.data.up_mbps?? 0 },
+      get() { return this.hysteria2.up_mbps ? this.hysteria2.up_mbps : 0 },
-      set(newValue:number) { this.$props.data.up_mbps = newValue>0 ? newValue : undefined }
+      set(newValue:any) { this.hysteria2.up_mbps = newValue.length == 0 ?  undefined : this.hysteria2.up_mbps }
     },
     optionObfs: {
-      get(): boolean { return this.$props.data.obfs != undefined },
+      get(): boolean { return this.hysteria2.obfs != undefined },
-      set(v:boolean) { this.$props.data.obfs = v ? { type: "salamander", password: "" } : undefined }
+      set(v:boolean) { this.$props.inbound.obfs = v ? { type: "salamander", password: ""} : undefined }
-    },
-    optionMasq: {
-      get(): boolean { return this.$props.data.masquerade != undefined },
-      set(v:boolean) { this.$props.data.masquerade = v ? "" : undefined }
     }
   },
-  components: { Network }
+  mounted() {
+    this.hysteria2 = <Hysteria2> this.$props.inbound
+  }
 }
 </script>

frontend/src/components/protocols/Naive.vue

@@ -2,7 +2,7 @@
   <v-card subtitle="Naive">
     <v-row>
       <v-col cols="12" sm="6" md="4">
-        <Network :data="inbound" />
+        <Network :inbound="inbound" />
       </v-col>
     </v-row>
   </v-card>

frontend/src/components/protocols/OutShadowTls.vue

@@ -1,44 +0,0 @@
-<template>
-  <v-card subtitle="ShadowTls">
-    <v-row>
-      <v-col cols="12" sm="6" md="4">
-        <v-select
-          hide-details
-          :items="[1,2,3]"
-          :label="$t('version')"
-          v-model="version">
-        </v-select>
-      </v-col>
-      <v-col cols="12" sm="6" md="4" v-if="data.version > 1">
-        <v-text-field
-        :label="$t('types.pw')"
-        hide-details
-        v-model="data.password">
-        </v-text-field>
-      </v-col>
-    </v-row>
-  </v-card>
-</template>
-
-<script lang="ts">
-
-export default {
-  props: ['data'],
-  data() {
-    return {}
-  },
-  computed: {
-    version: {
-      get() { return this.$props.data.version ?? 3 },
-      set(v: number) {
-        this.$props.data.version = v
-        if (v==1) {
-          delete this.$props.data.password
-        } else if (this.$props.data.password === undefined ) {
-          this.$props.data.password = ""
-        }
-      }
-    },
-  }
-}
-</script>

frontend/src/components/protocols/Selector.vue

@@ -1,46 +0,0 @@
-<template>
-  <v-card subtitle="Selector">
-    <v-row>
-      <v-col cols="12" sm="6">
-        <v-combobox
-          v-model="data.outbounds"
-          :items="tags"
-          :label="$t('pages.outbounds')"
-          multiple
-          @update:model-value="updateDefault"
-          chips
-          hide-details
-        ></v-combobox>
-      </v-col>
-      <v-col cols="12" sm="6" md="4">
-        <v-combobox
-          v-model="data.default"
-          :items="data.outbounds"
-          :label="$t('types.lb.defaultOut')"
-          clearable
-          hide-details
-        ></v-combobox>
-      </v-col>
-      <v-col cols="12" sm="6">
-        <v-switch v-model="data.interrupt_exist_connections" color="primary" :label="$t('types.lb.interruptConn')" hide-details></v-switch>
-      </v-col>
-    </v-row>
-  </v-card>
-</template>
-
-<script lang="ts">
-
-export default {
-  props: ['data','tags'],
-  data() {
-    return {}
-  },
-  methods: {
-    updateDefault() {
-      if (!this.$props.data.outbounds?.includes(this.$props.data.default)) {
-        delete this.$props.data.default
-      }
-    }
-  },
-}
-</script>

frontend/src/components/protocols/ShadowTls.vue

@@ -5,29 +5,29 @@
         <v-select
           hide-details
           :items="[1,2,3]"
-          :label="$t('version')"
+          label="Version"
           v-model="version">
         </v-select>
       </v-col>
-      <v-col cols="12" sm="6" md="4" v-if="data.password != undefined">
+      <v-col cols="12" sm="6" md="4" v-if="inbound.password != undefined">
         <v-text-field
-        :label="$t('types.pw')"
+        label="Password"
         hide-details
-        v-model="data.password">
+        v-model="inbound.password">
         </v-text-field>
       </v-col>
     </v-row>
     <v-row>
       <v-col cols="12" sm="6" md="4">
         <v-text-field
-        :label="$t('types.shdwTls.hs')"
+        label="Handshake Server"
         hide-details
         v-model="Inbound.handshake.server">
         </v-text-field>
       </v-col>
       <v-col cols="12" sm="6" md="4">
         <v-text-field
-        :label="$t('out.port')"
+        label="Server Port"
         type="number"
         min="0"
         hide-details
@@ -35,11 +35,11 @@
         </v-text-field>
       </v-col>
     </v-row>
-    <Dial :dial="Inbound.handshake" :outTags="outTags" />
+    <Dial :dial="Inbound.handshake" />
     <v-row v-if="Inbound.handshake_for_server_name != undefined">
       <v-col cols="12" sm="6" md="4">
         <v-text-field
-        :label="$t('types.shdwTls.addHS')"
+        label="Add Hanshake Server"
         hide-details
         append-icon="mdi-plus"
         @click:append="addHandshakeServer()"
@@ -67,14 +67,14 @@
       <v-row>
         <v-col cols="12" sm="6" md="4">
           <v-text-field
-          :label="$t('types.shdwTls.hs')"
+          label="Handshake Server"
           hide-details
           v-model="value.server">
           </v-text-field>
         </v-col>
         <v-col cols="12" sm="6" md="4">
           <v-text-field
-          :label="$t('out.port')"
+          label="Server Port"
           type="number"
           min="0"
           hide-details
@@ -82,7 +82,7 @@
           </v-text-field>
         </v-col>
       </v-row>
-      <Dial :dial="value" :outTags="outTags" />
+      <Dial :dial="value" />
     </v-card>
   </v-card>
 </template>
@@ -92,7 +92,7 @@ import { ShadowTLS } from '@/types/inbounds'
 import Dial from '../Dial.vue'
 
 export default {
-  props: ['data', 'outTags'],
+    props: ['inbound'],
     data() {
         return {
           handshake_server: ''
@@ -100,7 +100,7 @@ export default {
     },
     methods: {
       addHandshakeServer() {
-      this.data.handshake_for_server_name[this.handshake_server] = {}
+        this.inbound.handshake_for_server_name[this.handshake_server] = {}
         // Clear the input field after adding the server
         this.handshake_server = ''
       }
@@ -141,7 +141,7 @@ export default {
             }
         },
         Inbound(): ShadowTLS {
-      return <ShadowTLS>this.$props.data;
+            return <ShadowTLS>this.$props.inbound;
         },
         server_port: {
             get() { return this.Inbound.handshake.server_port ? this.Inbound.handshake.server_port : 443; },

frontend/src/components/protocols/Shadowsocks.vue

@@ -4,19 +4,16 @@
       <v-col cols="12" sm="6" md="4">
         <v-select
           hide-details
-          :label="$t('in.ssMethod')"
+          label="Method"
           :items="ssMethods"
-          v-model="data.method">
+          v-model="inbound.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-text-field v-model="inbound.password" label="Password" hide-details></v-text-field>
       </v-col>
       <v-col cols="12" sm="6" md="4">
-        <Network :data="data" />
+        <Network :inbound="inbound" />
-      </v-col>
-      <v-col cols="12" sm="6" md="4" v-if="direction == 'out'">
-        <UoT :data="data" />
       </v-col>
     </v-row>
   </v-card>
@@ -24,10 +21,9 @@
 
 <script lang="ts">
 import Network from '@/components/Network.vue'
-import UoT from '@/components/UoT.vue';
 
 export default {
-  props: ['direction','data'],
+    props: ['inbound'],
     data() {
         return {
             ssMethods: [
@@ -43,6 +39,6 @@ export default {
             ]
         }
     },
-  components: { Network, UoT }
+    components: { Network }
 }
 </script>

frontend/src/components/protocols/Socks.vue

@@ -1,59 +0,0 @@
-<template>
-  <v-card subtitle="SOCKS">
-    <v-row>
-      <v-col cols="12" sm="6" md="4">
-        <v-text-field
-        :label="$t('types.un')"
-        hide-details
-        v-model="username">
-        </v-text-field>
-      </v-col>
-      <v-col cols="12" sm="6" md="4">
-        <v-text-field
-        :label="$t('types.pw')"
-        hide-details
-        v-model="password">
-        </v-text-field>
-      </v-col>
-    </v-row>
-    <v-row>
-      <v-col cols="12" sm="6" md="4">
-        <v-select
-          hide-details
-          :items="['4','4a','5']"
-          :label="$t('version')"
-          v-model="data.version">
-        </v-select>
-      </v-col>
-      <v-col cols="12" sm="6" md="4">
-        <Network :data="data" />
-      </v-col>
-      <v-col cols="12" sm="6" md="4">
-        <UoT :data="data" />
-      </v-col>
-    </v-row>
-  </v-card>
-</template>
-
-<script lang="ts">
-import Network from '@/components/Network.vue'
-import UoT from '@/components/UoT.vue';
-
-export default {
-  props: ['data'],
-  data() {
-    return {}
-  },
-  computed: {
-    username: {
-      get(): string { return this.data.username?.length > 0 ? this.data.username : '' },
-      set(v:string) { this.data.username = v.length > 0 ? v : undefined },
-    },
-    password: {
-      get(): string { return this.data.password?.length > 0 ? this.data.password : '' },
-      set(v:string) { this.data.password = v.length > 0 ? v : undefined },
-    },
-  },
-  components: { Network, UoT }
-}
-</script>

frontend/src/components/protocols/Ssh.vue

@@ -1,151 +0,0 @@
-<template>
-  <v-card subtitle="SSH">
-    <template v-if="optionKey">
-        <v-row>
-          <v-col cols="auto">
-            <v-btn-toggle v-model="usePath"
-            class="rounded-xl"
-            density="compact"
-            variant="outlined"
-            shaped
-            mandatory>
-              <v-btn
-                @click="data.private_key=undefined; data.private_key_path=''"
-              >{{ $t('tls.usePath') }}</v-btn>
-              <v-btn
-                @click="data.private_key_path=undefined; data.private_key=''"
-              >{{ $t('tls.useText') }}</v-btn>
-            </v-btn-toggle>
-          </v-col>
-        </v-row>
-        <v-row v-if="usePath == 0">
-          <v-col cols="12" sm="6">
-            <v-text-field
-              :label="$t('tls.keyPath')"
-              hide-details
-              v-model="data.private_key_path">
-            </v-text-field>
-          </v-col>
-        </v-row>
-        <v-row v-else>
-          <v-col cols="12" sm="6">
-            <v-textarea
-              :label="$t('tls.key')"
-              hide-details
-              v-model="data.private_key">
-            </v-textarea>
-          </v-col>
-        </v-row>
-        <v-row>
-          <v-col cols="12" sm="6">
-            <v-text-field
-              :label="$t('types.ssh.passphrase')"
-              hide-details
-              v-model="data.private_key_passphrase">
-            </v-text-field>
-          </v-col>
-        </v-row>
-      </template>
-      <template v-else>
-        <v-row>
-          <v-col cols="12" sm="6" md="4">
-            <v-text-field v-model="data.user" :label="$t('types.un')" hide-details></v-text-field>
-          </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-row>
-      </template>
-    <v-row v-if="optionHostKey">
-      <v-col cols="12" sm="6">
-        <v-textarea
-          :label="$t('types.ssh.hostKey')"
-          hide-details
-          v-model="host_key">
-        </v-textarea>
-      </v-col>
-    </v-row>
-    <v-row>
-      <v-col cols="12" sm="6" md="4" v-if="data.host_key_algorithms != undefined">
-        <v-text-field v-model="algorithms" :label="$t('types.ssh.algorithm') + ' ' + $t('commaSeparated')" hide-details></v-text-field>
-      </v-col>
-      <v-col cols="12" sm="6" md="4" v-if="data.client_version != undefined">
-        <v-text-field v-model="data.client_version" :label="$t('types.ssh.clientVer')" hide-details></v-text-field>
-      </v-col>
-    </v-row>
-    <v-card-actions>
-      <v-spacer></v-spacer>
-      <v-menu v-model="menu" :close-on-content-click="false" location="start">
-          <template v-slot:activator="{ props }">
-            <v-btn v-bind="props" hide-details variant="tonal">{{ $t('types.ssh.options') }}</v-btn>
-          </template>
-          <v-card>
-            <v-list>
-              <v-list-item>
-                <v-switch v-model="optionKey" color="primary" label="SSH Key" hide-details></v-switch>
-              </v-list-item>
-              <v-list-item>
-                <v-switch v-model="optionHostKey" color="primary" :label="$t('types.ssh.hostKey')" hide-details></v-switch>
-              </v-list-item>
-              <v-list-item>
-                <v-switch v-model="optionAlgorithms" color="primary" :label="$t('types.ssh.algorithm')" hide-details></v-switch>
-              </v-list-item>
-              <v-list-item>
-                <v-switch v-model="optionVer" color="primary" :label="$t('types.ssh.clientVer')" hide-details></v-switch>
-              </v-list-item>
-            </v-list>
-          </v-card>
-        </v-menu>
-    </v-card-actions>
-  </v-card>
-</template>
-
-<script lang="ts">
-
-export default {
-  props: ['data'],
-  data() {
-    return {
-      menu: false,
-      usePath: 0,
-    }
-  },
-  computed: {
-    optionKey: {
-      get(): boolean { return this.data.private_key != undefined || this.data.private_key_path != undefined },
-      set(v:boolean) {
-        this.usePath = 0
-        if (v) {
-          this.$props.data.private_key_path = ""
-          delete this.$props.data.user
-          delete this.$props.data.password
-        } else {
-          delete this.$props.data.private_key_path
-          delete this.$props.data.private_key
-          delete this.$props.data.private_key_passphrase
-        }
-      }
-    },
-    optionHostKey: {
-      get(): boolean { return this.data.host_key != undefined },
-      set(v:boolean) { this.data.host_key = v ? '' : undefined }
-    },
-    optionAlgorithms: {
-      get(): boolean { return this.data.host_key_algorithms != undefined },
-      set(v:boolean) { this.data.host_key_algorithms = v ? [] : undefined }
-    },
-    optionVer: {
-      get(): boolean { return this.data.client_version != undefined },
-      set(v:boolean) { this.data.client_version = v ? 'SSH-2.0-OpenSSH_7.4p1' : undefined }
-    },
-    host_key: {
-      get(): string { return this.$props.data.host_key ? this.$props.data.host_key.join('\n') : '' },
-      set(v:string) { this.$props.data.host_key = v.split('\n') }
-    },
-    algorithms: {
-      get() { return this.$props.data.host_key_algorithms ? this.$props.data.host_key_algorithms.join(',') : '' },
-      set(v:string) { this.$props.data.host_key_algorithms = v.length > 0 ? v.split(',') : undefined }
-    },
-  },
-}
-</script>

frontend/src/components/protocols/TProxy.vue

@@ -2,7 +2,7 @@
   <v-card subtitle="TProxy">
     <v-row>
       <v-col cols="12" sm="6" md="4">
-        <Network :data="inbound" />
+        <Network :inbound="inbound" />
       </v-col>
     </v-row>
   </v-card>

frontend/src/components/protocols/Tor.vue

@@ -1,33 +0,0 @@
-<template>
-  <v-card subtitle="Tor">
-    <v-row>
-      <v-col cols="12" sm="6" md="4">
-        <v-text-field v-model="data.executable_path" :label="$t('types.tor.execPath')" hide-details></v-text-field>
-      </v-col>
-      <v-col cols="12" sm="6" md="4">
-        <v-text-field v-model="data.data_directory" :label="$t('types.tor.dataDir')" hide-details></v-text-field>
-      </v-col>
-    </v-row>
-    <v-row>
-      <v-col cols="12" sm="6" md="4">
-        <v-text-field v-model="extra_args" :label="$t('types.tor.extArgs') + ' ' + $t('commaSeparated')" hide-details></v-text-field>
-      </v-col>
-    </v-row>
-  </v-card>
-</template>
-
-<script lang="ts">
-
-export default {
-  props: ['data'],
-  data() {
-    return {}
-  },
-  computed: {
-    extra_args: {
-      get() { return this.$props.data.extra_args?.join(',') },
-      set(v:string) { this.$props.data.extra_args = v.length > 0 ? v.split(',') : undefined }
-    },
-  },
-}
-</script>

frontend/src/components/protocols/Trojan.vue

@@ -1,24 +0,0 @@
-<template>
-  <v-card subtitle="Trojan">
-    <v-row>
-      <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>
-    </v-row>
-  </v-card>
-</template>
-
-<script lang="ts">
-import Network from '@/components/Network.vue'
-
-export default {
-  props: ['data'],
-  data() {
-    return {}
-  },
-  components: { Network }
-}
-</script>

frontend/src/components/protocols/Tuic.vue

@@ -1,59 +1,35 @@
 <template>
   <v-card subtitle="TUIC">
-    <v-row v-if="direction == 'out'">
-      <v-col cols="12" sm="6">
-        <v-text-field v-model="data.uuid" label="UUID" hide-details></v-text-field>
-      </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>
-      <v-col cols="12" sm="6" md="4">
-        <v-select
-          hide-details
-          label="UDP Relay Mode"
-          :items="['native', 'quic']"
-          clearable
-          @click:clear="delete data.udp_relay_mode"
-          v-model="data.udp_relay_mode">
-        </v-select>
-      </v-col>
-      <v-col cols="12" sm="6" md="4">
-        <v-switch color="primary" label="UDP Over Stream" v-model="data.udp_over_stream" hide-details></v-switch>
-      </v-col>
-    </v-row>
     <v-row>
       <v-col cols="12" sm="6" md="4">
         <v-select
           hide-details
-          :label="$t('types.tuic.congControl')"
+          label="Congestion Control"
           :items="congestion_controls"
-          v-model="data.congestion_control">
+          v-model="inbound.congestion_control">
         </v-select>
       </v-col>
       <v-col cols="12" sm="6" md="4">
-        <v-switch color="primary" label="Zero-RTT Handshake" v-model="data.zero_rtt_handshake" hide-details></v-switch>
+        <v-switch color="primary" label="Zero-RTT Handshake" v-model="inbound.zero_rtt_handshake" hide-details></v-switch>
       </v-col>
     </v-row>
     <v-row>
-      <v-col cols="12" sm="6" md="4" v-if="direction == 'in'">
+      <v-col cols="12" sm="6" md="4">
         <v-text-field
-        :label="$t('types.tuic.authTimeout')"
+        label="Authentication Timeout"
         hide-details
         type="number"
-        :suffix="$t('date.s')"
+        suffix="s"
         min="1"
         v-model.number="auth_timeout">
         </v-text-field>
       </v-col>
       <v-col cols="12" sm="6" md="4">
         <v-text-field
-        :label="$t('types.tuic.hb')"
+        label="Heartbeat"
         hide-details
         type="number"
-        :suffix="$t('date.s')"
+        suffix="s"
         min="1"
         v-model.number="heartbeat">
         </v-text-field>
@@ -63,10 +39,9 @@
 </template>
 
 <script lang="ts">
-import Network from '@/components/Network.vue'
+import { TUIC } from '@/types/inbounds'
-
 export default {
-  props: ['direction', 'data'],
+  props: ['inbound'],
   data() {
     return {
       congestion_controls: [
@@ -75,15 +50,17 @@ export default {
     }
   },
   computed: {
+    Inbound(): TUIC {
+      return <TUIC> this.$props.inbound
+    },
     auth_timeout: {
-      get() { return this.$props.data.auth_timeout ? parseInt(this.$props.data.auth_timeout.replace('s','')) : '' },
+      get() { return this.Inbound.auth_timeout ? parseInt(this.Inbound.auth_timeout.replace('s','')) : '' },
-      set(newValue:number) { this.$props.data.auth_timeout = newValue ? newValue + 's' : '' }
+      set(newValue:number) { this.$props.inbound.auth_timeout = newValue ? newValue + 's' : '' }
     },
     heartbeat: {
-      get() { return this.$props.data.heartbeat ? parseInt(this.$props.data.heartbeat.replace('s','')) : '' },
+      get() { return this.Inbound.heartbeat ? parseInt(this.Inbound.heartbeat.replace('s','')) : '' },
-      set(newValue:number) { this.$props.data.heartbeat = newValue ? newValue + 's' : '' }
+      set(newValue:number) { this.$props.inbound.heartbeat = newValue ? newValue + 's' : '' }
+    }
   }
-  },
-  components: { Network }
 }
 </script>

frontend/src/components/protocols/UrlTest.vue

@@ -1,121 +0,0 @@
-<template>
-  <v-card subtitle="URL Test">
-    <v-row>
-      <v-col cols="12" sm="6">
-        <v-combobox
-          v-model="data.outbounds"
-          :items="tags"
-          :label="$t('pages.outbounds')"
-          multiple
-          chips
-          hide-details
-        ></v-combobox>
-      </v-col>
-    </v-row>
-    <v-row>
-      <v-col cols="12" sm="6" v-if="optionUrl">
-        <v-text-field v-model="data.url" :label="$t('types.lb.testUrl')" hide-details></v-text-field>
-      </v-col>
-    </v-row>
-    <v-row>
-      <v-col cols="12" sm="6" md="4" v-if="optionInterval">
-        <v-text-field
-        :label="$t('types.lb.interval')"
-        hide-details
-        type="number"
-        min="3"
-        :suffix="$t('date.s')"
-        v-model.number="interval"></v-text-field>
-      </v-col>
-      <v-col cols="12" sm="6" md="4" v-if="optionTolerance">
-        <v-text-field
-        :label="$t('types.lb.tolerance')"
-        hide-details
-        type="number"
-        min="0"
-        :suffix="$t('date.ms')"
-        v-model.number="tolerance"></v-text-field>
-      </v-col>
-      <v-col cols="12" sm="6" md="4" v-if="optionIdle">
-        <v-text-field
-        :label="$t('transport.idleTimeout')"
-        hide-details
-        type="number"
-        min="0"
-        :suffix="$t('date.m')"
-        v-model.number="idle_timeout"></v-text-field>
-      </v-col>
-    </v-row>
-    <v-row>
-      <v-col cols="12" sm="6">
-        <v-switch v-model="data.interrupt_exist_connections" color="primary" :label="$t('types.lb.interruptConn')" hide-details></v-switch>
-      </v-col>
-    </v-row>
-    <v-card-actions>
-      <v-spacer></v-spacer>
-      <v-menu v-model="menu" :close-on-content-click="false" location="start">
-          <template v-slot:activator="{ props }">
-            <v-btn v-bind="props" hide-details variant="tonal">{{ $t('types.lb.urlTestOptions') }}</v-btn>
-          </template>
-          <v-card>
-            <v-list>
-              <v-list-item>
-                <v-switch v-model="optionUrl" color="primary" :label="$t('types.lb.testUrl')" hide-details></v-switch>
-              </v-list-item>
-              <v-list-item>
-                <v-switch v-model="optionInterval" color="primary" :label="$t('types.lb.interval')" hide-details></v-switch>
-              </v-list-item>
-              <v-list-item>
-                <v-switch v-model="optionTolerance" color="primary" :label="$t('types.lb.tolerance')" hide-details></v-switch>
-              </v-list-item>
-              <v-list-item>
-                <v-switch v-model="optionIdle" color="primary" :label="$t('transport.idleTimeout')" hide-details></v-switch>
-              </v-list-item>
-            </v-list>
-          </v-card>
-        </v-menu>
-    </v-card-actions>
-  </v-card>
-</template>
-
-<script lang="ts">
-
-export default {
-  props: ['data', 'tags'],
-  data() {
-    return {
-      menu: false,
-    }
-  },
-  computed: {
-    optionUrl: {
-      get(): boolean { return this.$props.data.url != undefined },
-      set(v:boolean) { this.$props.data.url = v ? 'https://www.gstatic.com/generate_204' : undefined }
-    },
-    optionInterval: {
-      get(): boolean { return this.$props.data.interval != undefined },
-      set(v:boolean) { this.$props.data.interval = v ? '3s' : undefined }
-    },
-    optionTolerance: {
-      get(): boolean { return this.$props.data.tolerance != undefined },
-      set(v:boolean) { this.$props.data.tolerance = v ? 50 : undefined }
-    },
-    optionIdle: {
-      get(): boolean { return this.$props.data.idle_timeout != undefined },
-      set(v:boolean) { this.$props.data.idle_timeout = v ? '30m' : undefined }
-    },
-    interval: {
-      get() { return this.$props.data.interval ? parseInt(this.$props.data.interval.replace('s','')) : 3 },
-      set(v:number) { this.$props.data.interval = v > 0 ? v + 's' : '3s' }
-    },
-    tolerance: {
-      get() { return this.$props.data.tolerance ? parseInt(this.$props.data.tolerance) : 0 },
-      set(v:number) { this.$props.data.tolerance = v > 0 ? v : 0 }
-    },
-    idle_timeout: {
-      get() { return this.$props.data.idle_timeout ? parseInt(this.$props.data.idle_timeout.replace('m','')) : 30 },
-      set(v:number) { this.$props.data.idle_timeout = v > 0 ? v + 'm' : '0m' }
-    }
-  },
-}
-</script>

frontend/src/components/protocols/Vless.vue

@@ -1,48 +0,0 @@
-<template>
-  <v-card subtitle="VLESS">
-    <v-row>
-      <v-col cols="12" sm="6">
-        <v-text-field v-model="data.uuid" label="UUID" hide-details></v-text-field>
-      </v-col>
-      <v-col cols="12" sm="6" md="4">
-        <v-select
-          hide-details
-          :label="$t('types.vless.flow')"
-          :items="['','xtls-rprx-vision']"
-          v-model="data.flow">
-        </v-select>
-      </v-col>
-    </v-row>
-    <v-row>
-      <v-col cols="12" sm="6" md="4">
-        <v-select
-          hide-details
-          :label="$t('types.vless.udpEnc')"
-          :items="['none','packetaddr','xudp']"
-          v-model="packet_encoding">
-        </v-select>
-      </v-col>
-      <v-col cols="12" sm="6" md="4">
-        <Network :data="data" />
-      </v-col>
-    </v-row>
-  </v-card>
-</template>
-
-<script lang="ts">
-import Network from '@/components/Network.vue'
-
-export default {
-  props: ['data'],
-  data() {
-    return {}
-  },
-  computed: {
-    packet_encoding: {
-      get() { return this.$props.data.packet_encoding != undefined ? this.$props.data.packet_encoding : 'none'; },
-      set(newValue:string) { this.$props.data.packet_encoding = newValue != "none" ? newValue : undefined }
-    },
-  },
-  components: { Network }
-}
-</script>

frontend/src/components/protocols/Vmess.vue

@@ -1,72 +0,0 @@
-<template>
-  <v-card subtitle="VMESS">
-    <v-row>
-      <v-col cols="12" sm="6">
-        <v-text-field v-model="data.uuid" label="UUID" hide-details></v-text-field>
-      </v-col>
-      <v-col cols="12" sm="6" md="4">
-        <v-text-field
-          label="Alter ID"
-          hide-details
-          type="number"
-          min=0
-          v-model.number="data.alter_id">
-        </v-text-field>
-      </v-col>
-    </v-row>
-    <v-row>
-      <v-col cols="12" sm="6" md="4">
-        <v-select
-          hide-details
-          :label="$t('types.vmess.security')"
-          :items="securities"
-          v-model="data.security">
-        </v-select>
-      </v-col>
-      <v-col cols="12" sm="6" md="4">
-        <v-select
-          hide-details
-          :label="$t('types.vless.udpEnc')"
-          :items="['none','packetaddr','xudp']"
-          v-model="packet_encoding">
-        </v-select>
-      </v-col>
-      <v-col cols="12" sm="6" md="4">
-        <Network :data="data" />
-      </v-col>
-      <v-col cols="12" sm="6" md="4">
-        <v-switch v-model="data.global_padding" color="primary" :label="$t('types.vmess.globalPadding')" hide-details></v-switch>
-      </v-col>
-      <v-col cols="12" sm="6" md="4">
-        <v-switch v-model="data.authenticated_length" color="primary" :label="$t('types.vmess.authLen')" hide-details></v-switch>
-      </v-col>
-    </v-row>
-  </v-card>
-</template>
-
-<script lang="ts">
-import Network from '@/components/Network.vue'
-
-export default {
-  props: ['data'],
-  data() {
-    return {
-      securities: [
-        "auto",
-        "none",
-        "zero",
-        "aes-128-gcm",
-        "aes-128-ctr",
-        "chacha20-poly1305",
-      ]
-    }
-  },
-  computed: {
-    packet_encoding: {
-      get() { return this.$props.data.packet_encoding != undefined ? this.$props.data.packet_encoding : 'none'; },
-      set(newValue:string) { this.$props.data.packet_encoding = newValue != "none" ? newValue : undefined }
-    },
-  },
-  components: { Network }
-}
-</script>

frontend/src/components/protocols/Wireguard.vue

@@ -1,163 +0,0 @@
-<template>
-  <v-card subtitle="Wireguard">
-    <v-row>
-      <v-col cols="12" sm="8">
-        <v-text-field v-model="data.private_key" :label="$t('types.wg.privKey')" hide-details></v-text-field>
-      </v-col>
-      <v-col cols="12" sm="8">
-        <v-text-field v-model="data.peer_public_key" :label="$t('types.wg.pubKey')" hide-details></v-text-field>
-      </v-col>
-      <v-col cols="12" sm="8" v-if="data.pre_shared_key != undefined">
-        <v-text-field v-model="data.pre_shared_key" :label="$t('types.wg.psk')" hide-details></v-text-field>
-      </v-col>
-      <v-col cols="12" sm="8">
-        <v-text-field v-model="local_ips" :label="$t('types.wg.localIp') + ' ' + $t('commaSeparated')" hide-details></v-text-field>
-      </v-col>
-    </v-row>
-    <v-row>
-      <v-col cols="12" sm="6" md="4" v-if="data.reserved != undefined">
-        <v-text-field v-model="reserved" :label="'Reserved ' + $t('commaSeparated')" hide-details></v-text-field>
-      </v-col>
-      <v-col cols="12" sm="6" md="4" v-if="data.workers != undefined">
-        <v-text-field
-        :label="$t('types.wg.worker')"
-          hide-details
-          type="number"
-          min=1
-          v-model.number="data.workers">
-        </v-text-field>
-      </v-col>
-      <v-col cols="12" sm="6" md="4" v-if="data.mtu != undefined">
-        <v-text-field
-          label="MTU"
-          hide-details
-          type="number"
-          min=0
-          v-model.number="data.mtu">
-        </v-text-field>
-      </v-col>
-    </v-row>
-    <v-row>
-      <v-col cols="12" sm="6" md="4">
-        <Network :data="data" />
-      </v-col>
-      <v-col cols="12" sm="6" md="4" v-if="data.interface_name != undefined">
-        <v-text-field
-          :label="$t('types.wg.ifName')"
-          hide-details
-          v-model.number="data.interface_name">
-        </v-text-field>
-      </v-col>
-    </v-row>
-    <v-row>
-      <v-col cols="12" sm="6" md="4">
-        <v-switch v-model="data.system_interface" color="primary" :label="$t('types.wg.sysIf')" hide-details></v-switch>
-      </v-col>
-      <v-col cols="12" sm="6" md="4">
-        <v-switch v-model="data.gso" color="primary" :label="$t('types.wg.gso')" hide-details></v-switch>
-      </v-col>
-    </v-row>
-    <v-card-actions>
-      <v-spacer></v-spacer>
-      <v-menu v-model="menu" :close-on-content-click="false" location="start">
-        <template v-slot:activator="{ props }">
-          <v-btn v-bind="props" hide-details variant="tonal">{{ $t('types.wg.options') }}</v-btn>
-        </template>
-        <v-card>
-          <v-list>
-            <v-list-item>
-              <v-switch v-model="optionPsk" color="primary" :label="$t('types.wg.psk')" hide-details></v-switch>
-            </v-list-item>
-            <v-list-item>
-              <v-switch v-model="optionRsrv" color="primary" label="Reserved" hide-details></v-switch>
-            </v-list-item>
-            <v-list-item>
-              <v-switch v-model="optionWorker" color="primary" :label="$t('types.wg.worker')" hide-details></v-switch>
-            </v-list-item>
-            <v-list-item>
-              <v-switch v-model="optionMtu" color="primary" label="MTU" hide-details></v-switch>
-            </v-list-item>
-            <v-list-item>
-              <v-switch v-model="optionInterface" color="primary" :label="$t('types.wg.ifName')" hide-details></v-switch>
-            </v-list-item>
-            <v-list-item>
-              <v-switch v-model="optionPeers" color="primary" :label="$t('types.wg.multiPeer')" hide-details></v-switch>
-            </v-list-item>
-          </v-list>
-        </v-card>
-      </v-menu>
-    </v-card-actions>
-  </v-card>
-  <v-card v-if="data.peers != undefined">
-    <v-card-subtitle>
-      {{ $t('types.wg.peers') }} <v-icon @click="addPeer" icon="mdi-plus" />
-    </v-card-subtitle>
-    <template v-for="(p, index) in data.peers">
-      <v-card style="margin-top: 1rem;">
-        <v-card-subtitle>
-          {{ $t('types.wg.peer') + ' ' + (index+1) }} <v-icon icon="mdi-delete" @click="data.peers.splice(index,1)" />
-        </v-card-subtitle>
-        <Peer :data="p" />
-      </v-card>
-    </template>
-  </v-card>
-</template>
-
-<script lang="ts">
-import Network from '@/components/Network.vue'
-import Peer from '@/components/WgPeer.vue'
-import { WgPeer } from '@/types/outbounds'
-
-export default {
-  props: ['data'],
-  data() {
-    return {
-      menu: false,
-    }
-  },
-  methods: {
-    addPeer() { 
-      this.$props.data.peers.push({server: '', port: ''})
-    }
-  },
-  computed: {
-    optionPsk: {
-      get(): boolean { return this.$props.data.pre_shared_key != undefined },
-      set(v:boolean) { this.$props.data.pre_shared_key = v ? "" : undefined }
-    },
-    optionRsrv: {
-      get(): boolean { return this.$props.data.reserved != undefined },
-      set(v:boolean) { this.$props.data.reserved = v ? [0,0,0] : undefined }
-    },
-    optionWorker: {
-      get(): boolean { return this.$props.data.workers != undefined },
-      set(v:boolean) { this.$props.data.workers = v ? 2 : undefined }
-    },
-    optionMtu: {
-      get(): boolean { return this.$props.data.mtu != undefined },
-      set(v:boolean) { this.$props.data.mtu = v ? 1408 : undefined }
-    },
-    optionInterface: {
-      get(): boolean { return this.$props.data.interface_name != undefined },
-      set(v:boolean) { this.$props.data.interface_name = v ? "" : undefined }
-    },
-    optionPeers: {
-      get(): boolean { return this.$props.data.peers != undefined },
-      set(v:boolean) { this.$props.data.peers = v ? <WgPeer[]>[] : undefined }
-    },
-    local_ips: {
-      get() { return this.$props.data.local_address?.join(',') },
-      set(v:string) { this.$props.data.local_address = v.length > 0 ? v.split(',') : undefined }
-    },
-    reserved: {
-      get() { return this.$props.data.reserved?.join(',') },
-      set(v:string) { 
-        if(!v.endsWith(',')) {
-          this.$props.data.reserved = v.length > 0 ? v.split(',').map(str => parseInt(str, 10)) : []
-        }
-      }
-    },
-  },
-  components: { Network, Peer }
-}
-</script>

frontend/src/components/tiles/Gauge.vue

@@ -49,7 +49,8 @@ const gaugeColor = computed(() => {
           background: `rgb(var(--v-theme-${gaugeColor}))`
           }">
       </div>
-      <div class="gauge__cover"><span dir="ltr" v-html="data.text"></span></div>
+      <span class="gauge__cover" dir="ltr" v-html="data.text">
+      </span>
     </div>
   </div>
 </template>

frontend/src/components/tls/Acme.vue

@@ -1,252 +0,0 @@
-<template>
-  <v-card subtitle="ACME" style="background-color: inherit;">
-    <v-row>
-      <v-col cols="12" sm="6" md="4">
-        <v-switch color="primary" :label="$t('enable')" v-model="enabled" hide-details></v-switch>
-      </v-col>
-      <v-col cols="12" md="8" v-if="enabled">
-        <v-text-field
-          :label="$t('rule.domain') + ' ' + $t('commaSeparated')"
-          hide-details
-          v-model="domains">
-        </v-text-field>
-      </v-col>
-    </v-row>
-    <template v-if="enabled">
-      <v-row>
-        <v-col cols="12" sm="6" md="4" v-if="optionDir">
-          <v-text-field
-            :label="$t('tls.acme.dataDir')"
-            hide-details
-            v-model="acme.data_directory">
-          </v-text-field>
-        </v-col>
-        <v-col cols="12" sm="6" md="4" v-if="optionDefault">
-          <v-combobox
-            v-model="acme.default_server_name"
-            :items="acme.domain"
-            :label="$t('tls.acme.defaultDomain')"
-            hide-details
-          ></v-combobox>
-        </v-col>
-        <v-col cols="12" sm="6" md="4" v-if="optionEmail">
-          <v-text-field
-            :label="$t('email')"
-            hide-details
-            v-model="acme.email">
-          </v-text-field>
-        </v-col>
-      </v-row>
-      <v-row v-if="optionChallenge">
-        <v-col cols="12" sm="6" md="4">
-          <v-switch color="primary" :label="$t('tls.acme.httpChallenge')" v-model="acme.disable_http_challenge" hide-details></v-switch>
-        </v-col>
-        <v-col cols="12" sm="6" md="4">
-          <v-switch color="primary" :label="$t('tls.acme.tlsChallenge')" v-model="acme.disable_tls_alpn_challenge" hide-details></v-switch>
-        </v-col>
-      </v-row>
-      <v-row v-if="optionPorts">
-        <v-col cols="12" sm="6" md="4">
-          <v-text-field
-          :label="$t('tls.acme.altHport')"
-          hide-details
-          type="number"
-          min=1
-          max="65532"
-          v-model.number="acme.alternative_http_port">
-          </v-text-field>
-        </v-col>
-        <v-col cols="12" sm="6" md="4">
-          <v-text-field
-          :label="$t('tls.acme.altTport')"
-          hide-details
-          type="number"
-          min=1
-          max="65532"
-          v-model.number="acme.alternative_tls_port">
-          </v-text-field>
-        </v-col>
-      </v-row>
-      <v-row v-if="optionProvider">
-        <v-col cols="12" sm="6" md="4">
-          <v-select
-            v-model="caProvider"
-            :items="providerList"
-            :label="$t('tls.acme.caProvider')"
-            hide-details
-          ></v-select>
-        </v-col>
-        <v-col cols="12" md="8" v-if="caProvider == ''">
-          <v-text-field
-            :label="$t('tls.acme.customCa')"
-            hide-details
-            v-model="acme.provider">
-          </v-text-field>
-        </v-col>
-      </v-row>
-      <v-row v-if="acme.external_account != undefined">
-        <v-col cols="12" sm="6" md="4">
-          <v-text-field
-          label="Key ID"
-          hide-details
-          v-model="acme.external_account.key_id">
-          </v-text-field>
-        </v-col>
-        <v-col cols="12" sm="6" md="4">
-          <v-text-field
-          label="MAC Key"
-          hide-details
-          v-model="acme.external_account.mac_key">
-          </v-text-field>
-        </v-col>
-      </v-row>
-      <v-row v-if="acme.dns01_challenge != undefined">
-        <v-col cols="12" sm="6" md="4">
-          <v-select
-          :label="$t('tls.acme.dns01Provider')"
-          hide-details
-          :items="dnsProviders.map(d => d.provider)"
-          @update:model-value="acme.dns01_challenge = { provider: $event }"
-          v-model="acme.dns01_challenge.provider">
-          </v-select>
-        </v-col>
-        <v-col cols="12" sm="6" md="4"
-        v-for="item in dnsProviders.filter(d => d.provider == acme.dns01_challenge?.provider)[0]?.params"
-        :key="item">
-          <v-text-field
-          :label="item"
-          hide-details
-          v-model="acme.dns01_challenge[item]">
-          </v-text-field>
-        </v-col>
-      </v-row>
-      <v-card-actions>
-        <v-spacer></v-spacer>
-        <v-menu v-model="menu" :close-on-content-click="false" location="start">
-          <template v-slot:activator="{ props }">
-            <v-btn v-bind="props" hide-details variant="tonal">{{ $t('tls.acme.options') }}</v-btn>
-          </template>
-          <v-card>
-            <v-list>
-              <v-list-item>
-                <v-switch v-model="optionDir" color="primary" :label="$t('tls.acme.dataDir')" hide-details></v-switch>
-              </v-list-item>
-              <v-list-item>
-                <v-switch v-model="optionDefault" color="primary" :label="$t('tls.acme.defaultDomain')" hide-details></v-switch>
-              </v-list-item>
-              <v-list-item>
-                <v-switch v-model="optionEmail" color="primary" :label="$t('email')" hide-details></v-switch>
-              </v-list-item>
-              <v-list-item>
-                <v-switch v-model="optionChallenge" color="primary" :label="$t('tls.acme.disableChallenges')" hide-details></v-switch>
-              </v-list-item>
-              <v-list-item>
-                <v-switch v-model="optionPorts" color="primary" :label="$t('tls.acme.altPorts')" hide-details></v-switch>
-              </v-list-item>
-              <v-list-item>
-                <v-switch v-model="optionProvider" color="primary" :label="$t('tls.acme.caProvider')" hide-details></v-switch>
-              </v-list-item>
-              <v-list-item>
-                <v-switch v-model="optionExt" color="primary" :label="$t('tls.acme.extAcc')" hide-details></v-switch>
-              </v-list-item>
-              <v-list-item>
-                <v-switch v-model="optionDns01" color="primary" :label="$t('tls.acme.dns01')" hide-details></v-switch>
-              </v-list-item>
-            </v-list>
-          </v-card>
-        </v-menu>
-      </v-card-actions>
-    </template>
-  </v-card>
-</template>
-
-<script lang="ts">
-import { acme } from '@/types/inTls'
-
-export default {
-  props: ['tls'],
-  data() {
-    return {
-      menu: false,
-      providerList: [
-        { title: "Let's Encrypt", value: "letsencrypt" },
-        { title: "ZeroSSL", value: "zerossl" },
-        { title: "Custom", value: "" }
-      ],
-      dnsProviders: [
-        { provider: "cloudflare", params: [ "api_token" ] },
-        { provider: "alidns", params: [ "access_key_id","access_key_secret","region_id" ] }
-      ]
-    }
-  },
-  computed: {
-    acme() {
-      return <acme>this.$props.tls.acme
-    },
-    enabled: {
-      get() { return this.acme != undefined },
-      set(v: boolean) { this.$props.tls.acme = v ? { domain: [] } : undefined }
-    },
-    domains: {
-      get() { return this.acme?.domain ? this.acme.domain.join(',') : "" },
-      set(v: string) {
-        if(!v.endsWith(',')) {
-          this.acme.domain = v.length > 0 ? v.split(',') : []
-        }
-      }
-    },
-    caProvider: {
-      get() { return this.acme?.provider && ['letsencrypt','zerossl'].includes(this.acme.provider) ? this.acme?.provider : '' },
-      set(v: string) { this.acme.provider = ['letsencrypt','zerossl'].includes(v) ? v : 'https://' }
-    },
-    optionDir: {
-      get(): boolean { return this.acme?.data_directory != undefined },
-      set(v:boolean) { this.acme.data_directory = v ? '' : undefined }
-    },
-    optionDefault: {
-      get(): boolean { return this.acme?.default_server_name != undefined },
-      set(v:boolean) { this.acme.default_server_name = v ? this.domains.length>0 ? this.domains[0] : '' : undefined }
-    },
-    optionEmail: {
-      get(): boolean { return this.acme?.email != undefined },
-      set(v:boolean) { this.acme.email = v ? '' : undefined }
-    },
-    optionChallenge: {
-      get(): boolean { return this.acme?.disable_http_challenge != undefined || this.acme?.disable_tls_alpn_challenge != undefined },
-      set(v:boolean) { 
-        if (v) {
-          this.acme.disable_http_challenge = false
-          this.acme.disable_tls_alpn_challenge = false
-        } else {
-          delete this.acme.disable_http_challenge
-          delete this.acme.disable_tls_alpn_challenge
-        }
-      }
-    },
-    optionPorts: {
-      get(): boolean { return this.acme?.alternative_http_port != undefined || this.acme?.alternative_tls_port != undefined },
-      set(v:boolean) { 
-        if (v) {
-          this.acme.alternative_http_port = 80
-          this.acme.alternative_tls_port = 443
-        } else {
-          delete this.acme.alternative_http_port
-          delete this.acme.alternative_tls_port
-        }
-      }
-    },
-    optionProvider: {
-      get(): boolean { return this.acme?.provider != undefined },
-      set(v:boolean) { this.acme.provider = v ? 'letsencrypt' : undefined }
-    },
-    optionExt: {
-      get(): boolean { return this.acme?.external_account != undefined },
-      set(v:boolean) { this.acme.external_account = v ? { key_id: '', mac_key: '' } : undefined }
-    },
-    optionDns01: {
-      get(): boolean { return this.acme?.dns01_challenge != undefined },
-      set(v:boolean) { this.acme.dns01_challenge = v ? { provider: 'cloudflare' } : undefined }
-    },
-  }
-}
-</script>

frontend/src/components/tls/Ech.vue

@@ -1,160 +0,0 @@
-<template>
-  <v-card subtitle="ECH" style="background-color: inherit;">
-    <v-row>
-      <v-col cols="12" sm="6" md="4">
-        <v-switch color="primary" :label="$t('enable')" v-model="enabled" hide-details></v-switch>
-      </v-col>
-    </v-row>
-    <template v-if="enabled">
-      <v-row>
-        <v-col cols="12" sm="6" md="4">
-          <v-switch color="primary" label="Post-Quantum Schemes" v-model="ech.pq_signature_schemes_enabled" hide-details></v-switch>
-        </v-col>
-        <v-col cols="12" sm="6" md="4">
-          <v-switch color="primary" label="Disable Adaptive Size" v-model="ech.dynamic_record_sizing_disabled" hide-details></v-switch>
-        </v-col>
-      </v-row>
-      <v-row>
-        <v-col cols="auto">
-          <v-btn-toggle v-model="useEchPath"
-          class="rounded-xl"
-          density="compact"
-          variant="outlined"
-          shaped
-          mandatory>
-            <v-btn
-              @click="delete ech.key"
-            >{{ $t('tls.usePath') }}</v-btn>
-            <v-btn
-              @click="delete ech.key_path"
-            >{{ $t('tls.useText') }}</v-btn>
-          </v-btn-toggle>
-        </v-col>
-        <v-spacer></v-spacer>
-        <v-col cols="auto">
-          <v-btn
-            variant="tonal"
-            density="compact"
-            icon="mdi-key-star"
-            @click="genECH"
-            :loading="loading">
-            <v-icon />
-            <v-tooltip activator="parent" location="top">
-              {{ $t('actions.generate') }}
-            </v-tooltip>
-          </v-btn>
-        </v-col>
-      </v-row>
-      <v-row v-if="useEchPath == 0">
-        <v-col cols="12">
-          <v-text-field
-            :label="$t('tls.keyPath')"
-            hide-details
-            v-model="ech.key_path">
-          </v-text-field>
-        </v-col>
-      </v-row>
-      <v-row v-else>
-        <v-col cols="12">
-          <v-textarea
-            :label="$t('tls.key')"
-            hide-details
-            v-model="echKeyText">
-          </v-textarea>
-        </v-col>
-      </v-row>
-      <v-row>
-        <v-col cols="12">
-          <v-textarea
-            :label="$t('tls.cert')"
-            hide-details
-            v-model="echConfigText">
-          </v-textarea>
-        </v-col>
-      </v-row>
-    </template>
-  </v-card>
-</template>
-
-<script lang="ts">
-import { i18n } from '@/locales'
-import HttpUtils from '@/plugins/httputil'
-import { ech } from '@/types/inTls'
-import { push } from 'notivue'
-
-export default {
-  props: ['iTls','oTls'],
-  data() {
-    return {
-      useEchPath: this.$props.iTls?.ech?.key? 1:0,
-      loading: false,
-    }
-  },
-  methods: {
-    async genECH(){
-      this.loading = true
-      const msg = await HttpUtils.get('api/keypairs', { k: "ech", o: this.iTls.server_name?? "''" })
-      this.loading = false
-      if (msg.success && this.iTls.ech && this.oTls.ech) {
-        this.iTls.ech.key_path=undefined
-        this.useEchPath = 1
-        if (msg.obj.length>0){
-          let config = <string[]>[]
-          let key = <string[]>[]
-          let isConfig = false
-          let isKey = false
-
-          msg.obj.forEach((line:string) => {
-            if (line === "-----BEGIN ECH CONFIGS-----") {
-              isConfig = true
-              isKey = false
-              config.push(line)
-            } else if (line === "-----END ECH CONFIGS-----") {
-              isConfig = false
-              config.push(line)
-            } else if (line === "-----BEGIN ECH KEYS-----") {
-              isKey = true
-              isConfig = false
-              key.push(line)
-            } else if (line === "-----END ECH KEYS-----") {
-              isKey = false
-              key.push(line)
-            } else if (isConfig) {
-              config.push(line)
-            } else if (isKey) {
-              key.push(line)
-            }
-          })
-          this.iTls.ech.key = key?? undefined
-          this.oTls.ech.config = config?? undefined
-
-        } else {
-          push.error({
-            message: i18n.global.t('error') + ": " + msg.obj
-          })
-        }
-      }
-    },
-  },
-  computed: {
-    ech() {
-      return <ech>this.$props.iTls.ech
-    },
-    enabled: {
-      get() { return this.ech?.enabled?? false },
-      set(v: boolean) { 
-        this.$props.iTls.ech = v ? { enabled: true } : undefined
-        this.$props.oTls.ech = v ? {} : undefined
-      }
-    },
-    echKeyText: {
-      get(): string { return this.ech?.key ? this.ech.key.join('\n') : '' },
-      set(newValue:string) { this.ech.key = newValue.split('\n') }
-    },
-    echConfigText: {
-      get(): string { return this.oTls.ech?.config ? this.oTls.ech.config.join('\n') : '' },
-      set(newValue:string) { this.oTls.ech.config = newValue.split('\n') }
-    },
-  }
-}
-</script>

frontend/src/components/tls/OutTLS.vue

@@ -1,341 +0,0 @@
-<template>
-  <v-card :subtitle="$t('objects.tls')">
-    <v-row v-if="tlsOptional">
-      <v-col cols="12" sm="6" md="4">
-        <v-switch color="primary" :label="$t('tls.enable')" v-model="tlsEnable" hide-details></v-switch>
-      </v-col>
-    </v-row>
-    <template v-if="tls.enabled">
-      <v-row>
-        <v-col cols="12" sm="6" md="4">
-          <v-switch color="primary" :label="$t('tls.disableSni')" v-model="disable_sni" hide-details></v-switch>
-        </v-col>
-        <v-col cols="12" sm="6" md="4">
-          <v-switch color="primary" :label="$t('tls.insecure')" v-model="insecure" hide-details></v-switch>
-        </v-col>
-      </v-row>
-      <template v-if="optionCert">
-        <v-row>
-          <v-col cols="auto">
-            <v-btn-toggle v-model="usePath"
-            class="rounded-xl"
-            density="compact"
-            variant="outlined"
-            shaped
-            mandatory>
-              <v-btn
-                @click="tls.certificate=undefined; tls.certificate_path=''"
-              >{{ $t('tls.usePath') }}</v-btn>
-              <v-btn
-                @click="tls.certificate_path=undefined; tls.certificate=''"
-              >{{ $t('tls.useText') }}</v-btn>
-            </v-btn-toggle>
-          </v-col>
-        </v-row>
-        <v-row v-if="usePath == 0">
-          <v-col cols="12" sm="6">
-            <v-text-field
-              :label="$t('tls.certPath')"
-              hide-details
-              v-model="tls.certificate_path">
-            </v-text-field>
-          </v-col>
-        </v-row>
-        <v-row v-else>
-          <v-col cols="12" sm="6">
-            <v-textarea
-              :label="$t('tls.cert')"
-              hide-details
-              v-model="tls.certificate">
-            </v-textarea>
-          </v-col>
-        </v-row>
-      </template>
-      <v-row>
-        <v-col cols="12" sm="6" md="4" v-if="tls.server_name != undefined">
-          <v-text-field
-            label="SNI"
-            hide-details
-            v-model="tls.server_name">
-          </v-text-field>
-        </v-col>
-        <v-col cols="12" sm="6" md="4" v-if="tls.alpn">
-          <v-select
-            hide-details
-            label="ALPN"
-            multiple
-            :items="alpn"
-            v-model="tls.alpn">
-          </v-select>
-        </v-col>
-      </v-row>
-      <v-row>
-        <v-col cols="12" sm="6" md="4" v-if="tls.min_version">
-          <v-select
-            hide-details
-            :label="$t('tls.minVer')"
-            :items="tlsVersions"
-            v-model="tls.min_version">
-          </v-select>
-        </v-col>
-        <v-col cols="12" sm="6" md="4" v-if="tls.max_version">
-          <v-select
-            hide-details
-            :label="$t('tls.maxVer')"
-            :items="tlsVersions"
-            v-model="tls.max_version">
-          </v-select>
-        </v-col>
-      </v-row>
-      <v-row v-if="tls.cipher_suites != undefined">
-        <v-col cols="12" md="8">
-          <v-select
-            hide-details
-            :label="$t('tls.cs')"
-            multiple
-            :items="cipher_suites"
-            v-model="tls.cipher_suites">
-          </v-select>
-        </v-col>
-      </v-row>
-      <v-row v-if="tls.utls != undefined">
-        <v-col cols="12" md="6">
-          <v-select
-            hide-details
-            label="Fingerprint"
-            :items="fingerprints"
-            v-model="tls.utls.fingerprint">
-          </v-select>
-        </v-col>
-      </v-row>
-      <v-row v-if="tls.reality != undefined">
-        <v-col cols="12" md="6">
-          <v-text-field
-          :label="$t('tls.pubKey')"
-            hide-details
-            v-model="tls.reality.public_key">
-          </v-text-field>
-        </v-col>
-        <v-col cols="12" md="4">
-          <v-text-field
-            label="Short ID"
-            hide-details
-            v-model="tls.reality.short_id">
-          </v-text-field>
-        </v-col>
-      </v-row>
-      <template v-if="tls.ech != undefined">
-        <v-row>
-          <v-col class="v-card-subtitle">ECH</v-col>
-        </v-row>
-        <v-row>
-          <v-col cols="12" sm="6" md="4">
-            <v-switch color="primary" label="Post-Quantum Schemes" v-model="tls.ech.pq_signature_schemes_enabled" hide-details></v-switch>
-          </v-col>
-          <v-col cols="12" sm="6" md="4">
-            <v-switch color="primary" label="Disable Adaptive Size" v-model="tls.ech.dynamic_record_sizing_disabled" hide-details></v-switch>
-          </v-col>
-        </v-row>
-        <v-row>
-          <v-col cols="auto">
-            <v-btn-toggle v-model="useEchPath"
-            class="rounded-xl"
-            density="compact"
-            variant="outlined"
-            shaped
-            mandatory>
-              <v-btn
-                @click="delete tls.ech?.config"
-              >{{ $t('tls.usePath') }}</v-btn>
-              <v-btn
-                @click="delete tls.ech?.config_path"
-              >{{ $t('tls.useText') }}</v-btn>
-            </v-btn-toggle>
-          </v-col>
-        </v-row>
-        <v-row v-if="useEchPath == 0">
-          <v-col cols="12" sm="6">
-            <v-text-field
-              :label="$t('tls.certPath')"
-              hide-details
-              v-model="tls.ech.config_path">
-            </v-text-field>
-          </v-col>
-        </v-row>
-        <v-row v-else>
-          <v-col cols="12" sm="6">
-            <v-textarea
-              :label="$t('tls.cert')"
-              hide-details
-              v-model="echConfigText">
-            </v-textarea>
-          </v-col>
-        </v-row>
-      </template>
-    </template>
-    <v-card-actions v-if="tls.enabled">
-      <v-spacer></v-spacer>
-      <v-menu v-model="menu" :close-on-content-click="false" location="start">
-          <template v-slot:activator="{ props }">
-            <v-btn v-bind="props" hide-details variant="tonal">{{ $t('tls.options') }}</v-btn>
-          </template>
-          <v-card>
-            <v-list>
-              <v-list-item>
-                <v-switch v-model="optionCert" color="primary" :label="$t('tls.cert')" hide-details></v-switch>
-              </v-list-item>
-              <v-list-item>
-                <v-switch v-model="optionSNI" color="primary" label="SNI" hide-details></v-switch>
-              </v-list-item>
-              <v-list-item>
-                <v-switch v-model="optionALPN" color="primary" label="ALPN" hide-details></v-switch>
-              </v-list-item>
-              <v-list-item>
-                <v-switch v-model="optionMinV" color="primary" :label="$t('tls.minVer')" hide-details></v-switch>
-              </v-list-item>
-              <v-list-item>
-                <v-switch v-model="optionMaxV" color="primary" :label="$t('tls.maxVer')" hide-details></v-switch>
-              </v-list-item>
-              <v-list-item>
-                <v-switch v-model="optionCS" color="primary" :label="$t('tls.cs')" hide-details></v-switch>
-              </v-list-item>
-              <v-list-item>
-                <v-switch v-model="optionFP" color="primary" label="UTLS" hide-details></v-switch>
-              </v-list-item>
-              <v-list-item>
-                <v-switch v-model="optionReality" color="primary" label="Reality" hide-details></v-switch>
-              </v-list-item>
-              <v-list-item>
-                <v-switch v-model="optionEch" color="primary" label="ECH" hide-details></v-switch>
-              </v-list-item>
-            </v-list>
-          </v-card>
-        </v-menu>
-    </v-card-actions>
-  </v-card>
-</template>
-
-<script lang="ts">
-import { oTls, defaultOutTls } from '@/types/outTls'
-export default {
-  props: ['outbound'],
-  data() {
-    return {
-      menu: false,
-      usePath: 0,
-      useEchPath: 0,
-      defaults: defaultOutTls,
-      alpn: [
-        { title: "H3", value: 'h3' },
-        { title: "H2", value: 'h2' },
-        { title: "Http/1.1", value: 'http/1.1' },
-      ],
-      tlsVersions: [ '1.0', '1.1', '1.2', '1.3' ],
-      cipher_suites: [
-        { title: "RSA-AES128-CBC-SHA", value: "TLS_RSA_WITH_AES_128_CBC_SHA" },
-        { title: "RSA-AES256-CBC-SHA", value: "TLS_RSA_WITH_AES_256_CBC_SHA" },
-        { title: "RSA-AES128-GCM-SHA256", value: "TLS_RSA_WITH_AES_128_GCM_SHA256" },
-        { title: "RSA-AES256-GCM-SHA384", value: "TLS_RSA_WITH_AES_256_GCM_SHA384" },
-        { title: "AES128-GCM-SHA256", value: "TLS_AES_128_GCM_SHA256" },
-        { title: "AES256-GCM-SHA384", value: "TLS_AES_256_GCM_SHA384" },
-        { title: "CHACHA20-POLY1305-SHA256", value: "TLS_CHACHA20_POLY1305_SHA256" },
-        { title: "ECDHE-ECDSA-AES128-CBC-SHA", value: "TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA" },
-        { title: "ECDHE-ECDSA-AES256-CBC-SHA", value: "TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA" },
-        { title: "ECDHE-RSA-AES128-CBC-SHA", value: "TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA" },
-        { title: "ECDHE-RSA-AES256-CBC-SHA", value: "TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA" },
-        { title: "ECDHE-ECDSA-AES128-GCM-SHA256", value: "TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256" },
-        { title: "ECDHE-ECDSA-AES256-GCM-SHA384", value: "TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384" },
-        { title: "ECDHE-RSA-AES128-GCM-SHA256", value: "TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256" },
-        { title: "ECDHE-RSA-AES256-GCM-SHA384", value: "TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384" },
-        { title: "ECDHE-ECDSA-CHACHA20-POLY1305-SHA256", value: "TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305_SHA256" },
-        { title: "ECDHE-RSA-CHACHA20-POLY1305-SHA256", value: "TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305_SHA256" }
-      ],
-      fingerprints: [
-        { title: "Chrome", value: "chrome" },
-        { title: "Chrome PSK", value: "chrome_psk" },
-        { title: "Chrome PSK Shuffle", value: "chrome_psk_shuffle" },
-        { title: "Chrome Padding PSK Shuffle", value: "chrome_padding_psk_shuffle" },
-        { title: "Chrome Post-Quantum", value: "chrome_pq" },
-        { title: "Chrome Post-Quantum PSK", value: "chrome_pq_psk" },
-        { title: "Firefox", value: "firefox" },
-        { title: "Microsoft Edge", value: "edge" },
-        { title: "Apple Safari", value: "safari" },
-        { title: "360", value: "360" },
-        { title: "QQ", value: "qq" },
-        { title: "Apple IOS", value: "ios" },
-        { title: "Android", value: "android" },
-        { title: "Random", value: "random" },
-        { title: "Randomized", value: "randomized" },
-      ]
-    }
-  },
-  computed: {
-    tls(): oTls {
-      return <oTls> this.$props.outbound.tls
-    },
-    tlsEnable: {
-      get() { return Object.hasOwn(this.tls, 'enabled') ? this.tls.enabled : false },
-      set(newValue: boolean) { this.$props.outbound.tls = newValue ? { enabled: true } : {} }
-    },
-    disable_sni: {
-      get() { return this.tls.disable_sni ?? false },
-      set(newValue: boolean) { this.$props.outbound.tls.disable_sni = newValue ? true : undefined }
-    },
-    insecure: {
-      get() { return this.tls.insecure ?? false },
-      set(newValue: boolean) { this.$props.outbound.tls.insecure = newValue ? true : undefined }
-    },
-    tlsOptional(): boolean {
-      return !['hysteria','hysteria2','tuic','shadowtls'].includes(this.$props.outbound.type)
-    },
-    echConfigText: {
-      get(): string { return this.tls.ech?.config ? this.tls.ech.config.join('\n') : '' },
-      set(newValue:string) { if (this.tls.ech) this.tls.ech.config = newValue.split('\n') }
-    },
-    optionCert: {
-      get(): boolean { return this.tls.certificate != undefined || this.tls.certificate_path != undefined },
-      set(v:boolean) {
-        this.usePath = 0
-        if (v) {
-          this.$props.outbound.tls.certificate_path = ""
-        } else {
-          delete this.$props.outbound.tls.certificate_path
-          delete this.$props.outbound.tls.certificate
-        }
-      }
-    },
-    optionSNI: {
-      get(): boolean { return this.tls.server_name != undefined },
-      set(v:boolean) { this.$props.outbound.tls.server_name = v ? '' : undefined }
-    },
-    optionALPN: {
-      get(): boolean { return this.tls.alpn != undefined },
-      set(v:boolean) { this.$props.outbound.tls.alpn = v ? defaultOutTls.alpn : undefined }
-    },
-    optionMinV: {
-      get(): boolean { return this.tls.min_version != undefined },
-      set(v:boolean) { this.$props.outbound.tls.min_version = v ? defaultOutTls.min_version : undefined }
-    },
-    optionMaxV: {
-      get(): boolean { return this.tls.max_version != undefined },
-      set(v:boolean) { this.$props.outbound.tls.max_version = v ? defaultOutTls.max_version : undefined }
-    },
-    optionCS: {
-      get(): boolean { return this.tls.cipher_suites != undefined },
-      set(v:boolean) { this.$props.outbound.tls.cipher_suites = v ? defaultOutTls.cipher_suites : undefined }
-    },
-    optionFP: {
-      get(): boolean { return this.tls.utls != undefined },
-      set(v:boolean) { this.$props.outbound.tls.utls = v ? defaultOutTls.utls : undefined }
-    },
-    optionReality: {
-      get(): boolean { return this.tls.reality != undefined },
-      set(v:boolean) { this.$props.outbound.tls.reality = v ? defaultOutTls.reality : undefined }
-    },
-    optionEch: {
-      get(): boolean { return this.tls.ech != undefined },
-      set(v:boolean) { this.$props.outbound.tls.ech = v ? defaultOutTls.ech : undefined }
-    }
-  }
-}
-</script>

frontend/src/components/transports/Http.vue

@@ -15,20 +15,17 @@
       </v-text-field>
     </v-col>
     <v-col cols="12" sm="6" md="4">
-      <v-select
+      <v-text-field
-      :label="$t('transport.httpMethod')"
+      label="Method"
       hide-details
-      clearable
-      @click:clear="delete transport.method"
-      :items="methodList"
       v-model="transport.method">
-      </v-select>
+      </v-text-field>
     </v-col>
   </v-row>
   <v-row>
     <v-col cols="12" sm="6" md="4">
       <v-text-field
-      :label="$t('transport.idleTimeout')"
+      label="Idle Timeout"
       hide-details
       type="number"
       suffix="s"
@@ -38,7 +35,7 @@
     </v-col>
     <v-col cols="12" sm="6" md="4">
       <v-text-field
-      :label="$t('transport.pingTimeout')"
+      label="Ping Timeout"
       hide-details
       type="number"
       suffix="s"
@@ -47,17 +44,14 @@
       </v-text-field>
     </v-col>
   </v-row>
-  <Headers :data="transport" />
 </template>
 
 <script lang="ts">
 import { HTTP } from '../../types/transport'
-import Headers from '../Headers.vue'
 export default {
   props: ['transport'],
   data() {
     return {
-      methodList: ['POST', 'GET', 'PUT', 'PATCH', 'DELETE']
     }
   },
   computed: {
@@ -76,7 +70,6 @@ export default {
       get() { return this.Http.ping_timeout ? parseInt(this.Http.ping_timeout.replace('s','')) : '' },
       set(newValue:number) { this.$props.transport.ping_timeout = newValue ? newValue + 's' : '' }
     }
-  },
+  }
-  components: { Headers }
 }
 </script>

frontend/src/components/transports/HttpUpgrade.vue

@@ -15,17 +15,14 @@
       </v-text-field>
     </v-col>
   </v-row>
-  <Headers :data="transport" />
 </template>
 
 <script lang="ts">
-import Headers from '../Headers.vue';
 export default {
   props: ['transport'],
   data() {
     return {
     }
-  },
+  }
-  components: { Headers }
 }
 </script>

frontend/src/components/transports/WebSocket.vue

@@ -33,12 +33,10 @@
       </v-text-field>
     </v-col>
   </v-row>
-  <Headers :data="transport" />
 </template>
 
 <script lang="ts">
 import { WebSocket } from '../../types/transport'
-import Headers from '../Headers.vue'
 export default {
   props: ['transport'],
   data() {
@@ -63,7 +61,6 @@ export default {
   mounted() {
     this.WS.early_data_header_name ??= 'Sec-WebSocket-Protocol'
     this.WS.path ??= '/'
-  },
+  }
-  components: { Headers }
 }
 </script>

frontend/src/components/transports/gRPC.vue

@@ -2,7 +2,7 @@
   <v-row>
     <v-col cols="12" sm="6" md="4">
       <v-text-field
-      :label="$t('transport.grpcServiceName')"
+      label="Service Name"
       hide-details
       v-model="transport.service_name">
       </v-text-field>
@@ -11,7 +11,7 @@
       <v-switch
         color="primary"
         v-model="transport.permit_without_stream"
-        :label="$t('transport.grpcPws')"
+        label="Permit Without Stream"
         hide-details>
       </v-switch>
     </v-col>
@@ -19,7 +19,7 @@
   <v-row>
     <v-col cols="12" sm="6" md="4">
       <v-text-field
-      :label="$t('transport.idleTimeout')"
+      label="Idle Timeout"
       hide-details
       type="number"
       suffix="s"
@@ -29,7 +29,7 @@
     </v-col>
     <v-col cols="12" sm="6" md="4">
       <v-text-field
-      :label="$t('transport.pingTimeout')"
+      label="Ping Timeout"
       hide-details
       type="number"
       suffix="s"

frontend/src/layouts/default/AppBar.vue

@@ -9,7 +9,7 @@
 </template>
 
 <script lang="ts" setup>
-import { computed, ref } from "vue"
+import { computed, onMounted, ref,watch } from "vue"
 import { useTheme } from "vuetify"
 import { FindDiff } from "@/plugins/utils"
 import Data from "@/store/modules/data"
@@ -32,11 +32,11 @@ const saveChanges = () => {
 }
 
 const oldData = computed((): any => {
-  return {config: store.oldData.config, clients: store.oldData.clients, tls: store.oldData.tlsConfigs, inData: store.oldData.inData}
+  return {config: store.oldData.config, clients: store.oldData.clients}
 })
 
 const newData = computed((): any => {
-  return {config: store.config, clients: store.clients, tls: store.tlsConfigs, inData: store.inData}
+  return {config: store.config, clients: store.clients}
 })
 
 const stateChange = computed((): any => {

frontend/src/layouts/default/Default.vue

@@ -30,6 +30,5 @@ const isMobile = computed( ():boolean =>{
 .v-card-subtitle {
   text-align: center;
   border-bottom: 1px solid gray;
-  min-height: 20px;
 }
 </style>

frontend/src/layouts/default/Drawer.vue

@@ -54,7 +54,6 @@ const menu = [
   { title: 'pages.clients', icon: 'mdi-account-multiple',  path: '/clients' },
   { title: 'pages.outbounds', icon: 'mdi-cloud-upload',  path: '/outbounds' },
   { title: 'pages.rules', icon: 'mdi-routes',  path: '/rules' },
-  { title: 'pages.tls', icon: 'mdi-certificate',  path: '/tls' },
   { title: 'pages.basics', icon: 'mdi-application-cog',  path: '/basics' },
   { title: 'pages.admins', icon: 'mdi-account-tie',  path: '/admins' },
   { title: 'pages.settings', icon: 'mdi-cog',  path: '/settings' },

frontend/src/layouts/modals/Admin.vue

@@ -87,8 +87,7 @@ export default {
     },
   },
   watch: {
-    visible(newValue) {
+      visible(newValue) { if (newValue) {
-      if (newValue) {
         this.resetData()
       }
     },

frontend/src/layouts/modals/Changes.vue

@@ -1,145 +0,0 @@
-<template>
-  <v-dialog transition="dialog-bottom-transition" width="90%" max-width="800" :loading="loading">
-    <v-card class="rounded-lg">
-      <v-card-title>
-        <v-row>
-          <v-col>{{ $t('admin.changes') }}</v-col>
-          <v-spacer></v-spacer>
-          <v-col cols="auto"><v-icon icon="mdi-close-box" @click="$emit('close')" /></v-col>
-        </v-row>
-      </v-card-title>
-      <v-divider></v-divider>
-      <v-card-text>
-        <v-row>
-          <v-col cols="12" sm="4" md="3">
-            <v-select
-            hide-details
-            :label="$t('admin.actor')"
-            :items="['', 'DepleteJob', ...admins]"
-            v-model="user"
-            @update:model-value="loadData">
-            </v-select>
-          </v-col>
-          <v-col cols="12" sm="4" md="3">
-            <v-select
-            hide-details
-            :label="$t('admin.key')"
-            :items="['', 'inbounds', 'outbounds', 'clients', 'route', 'tls', 'experimental']"
-            v-model="key"
-            @update:model-value="loadData">
-            </v-select>
-          </v-col>
-          <v-col cols="6" sm="4" md="3">
-            <v-select
-            hide-details
-            :label="$t('count')"
-            :items="[10,20,30,50,100]"
-            v-model.number="chngCount"
-            @update:model-value="loadData">
-            </v-select>
-          </v-col>
-          <v-col cols="auto" align="center" justify="center">
-            <v-btn
-              icon="mdi-refresh"
-              variant="tonal"
-              :loading="loading"
-              @click="loadData">
-              <v-icon />
-            </v-btn>
-          </v-col>
-        </v-row>
-        <v-data-table
-          :headers="changesHeaders"
-          :items="changes"
-          item-value="id"
-          density="compact"
-          show-expand
-          items-per-page="10"
-        >
-          <template v-slot:item.dateTime="{ value }">
-            <v-chip variant="text" dir="ltr" density="compact">
-              {{ dateFormatted(value) }}
-            </v-chip>
-          </template>
-          <template v-slot:item.action="{ value }">
-            <v-chip density="compact">
-              {{ $t('actions.' + value) }}
-            </v-chip>
-          </template>
-          <template v-slot:expanded-row="{ columns, item }">
-            <tr>
-              <td :colspan="columns.length">
-                <v-card dir="ltr" v-if="item.index>0">Index: {{ item.index }}</v-card>
-                <v-card style="background-color: background" dir="ltr"><pre>{{ item.obj }}</pre></v-card>
-              </td>
-            </tr>
-          </template>
-        </v-data-table>
-      </v-card-text>
-    </v-card>
-  </v-dialog>
-</template>
-
-<script lang="ts">
-import { i18n } from '@/locales'
-import HttpUtils from '@/plugins/httputil'
-
-export default {
-  props: ['admins', 'actor', 'visible'],
-  data() {
-    return {
-      loading: false,
-      changes: <any[]>[],
-      user: '',
-      key: '',
-      chngCount: 10,
-      expanded: [],
-      changesHeaders: [
-        { title: 'ID', key: 'id' },
-        { title: i18n.global.t('admin.date') + '-' + i18n.global.t('admin.time'), key: 'dateTime' },
-        { title: i18n.global.t('admin.actor'), key: 'Actor' },
-        { title: i18n.global.t('admin.key'), key: 'key' },
-        { title: i18n.global.t('admin.action'), key: 'action' },
-      ],
-    }
-  },
-  methods: {
-    async loadData() {
-      this.loading = true
-      const data = await HttpUtils.get('api/changes',{ a: this.user, k: this.key, c: this.chngCount })
-      if (data.success) {
-        this.changes = data.obj?? []
-        this.loading = false
-      }
-    },
-    dateFormatted(dt: number): string {
-      const date = new Date(dt*1000)
-      return date.toLocaleString(this.locale)
-    },
-  },
-  computed: {
-    locale() {
-      const l = i18n.global.locale.value
-      switch (l) {
-        case "zhHans":
-          return "zh-cn"
-        case "zhHant":
-          return "zh-tw"
-        default:
-          return l
-      }
-    },
-  },
-  watch: {
-    visible(newValue) {
-      this.changes = []
-      this.user = this.$props.actor
-      this.key = ''
-      this.chngCount = 10
-      if (newValue) {
-        this.loadData()
-      }
-    },
-  },
-}
-</script>

frontend/src/layouts/modals/Client.vue

@@ -5,7 +5,7 @@
         {{ $t('actions.' + title) + " " + $t('objects.client') }}
       </v-card-title>
       <v-divider></v-divider>
-      <v-card-text style="padding: 0 16px; overflow-y: scroll;">
+      <v-card-text style="padding: 0 16px;">
         <v-container style="padding: 0;">
           <v-tabs
             v-model="tab"
@@ -26,9 +26,6 @@
                 <v-col cols="12" sm="6" md="4">
                   <v-text-field v-model="client.name" :label="$t('client.name')" hide-details></v-text-field>
                 </v-col>
-                <v-col cols="12" sm="6" md="4">
-                  <v-text-field v-model="client.desc" :label="$t('client.desc')" hide-details></v-text-field>
-                </v-col>
               </v-row>
               <v-row>
                 <v-col cols="12" sm="6" md="4">
@@ -38,33 +35,6 @@
                   <DatePick :expiry="expDate" @submit="setDate" />
                 </v-col>
               </v-row>
-              <v-row v-if="index != -1">
-                <v-col cols="12" sm="6" md="4" class="d-flex flex-column">
-                  <div class="d-flex justify-space-between align-center">
-                    <div>
-                      {{ $t('stats.usage') }}: {{ total }}<sup dir="ltr" v-if="percent>0">({{ percent }}%)</sup>
-                    </div>
-                    <v-btn density="compact" variant="text" icon="mdi-restore" @click="client.up=0;client.down=0">
-                      <v-tooltip activator="parent" location="top">
-                        {{ $t('reset') }}
-                      </v-tooltip>
-                      <v-icon />
-                    </v-btn>
-                  </div>
-                  <v-progress-linear
-                    v-model="percent"
-                    :color="percentColor"
-                    v-if="client.volume>0"
-                    bottom
-                  >
-                  </v-progress-linear>
-                </v-col>
-                <v-col cols="12" sm="6" md="4">
-                  <v-icon icon="mdi-upload" color="orange" /><span class="text-orange">{{ up }}</span>
-                  / 
-                  <v-icon icon="mdi-download" color="success" /><span class="text-success">{{ down }}</span>
-                </v-col>
-              </v-row>
               <v-row>
                 <v-col>
                   <v-combobox
@@ -169,7 +139,6 @@
         <v-btn
           color="blue-darken-1"
           variant="tonal"
-          :loading="loading"
           @click="saveChanges"
         >
           {{ $t('actions.save') }}
@@ -183,7 +152,6 @@
 import { Link } from '@/plugins/link'
 import { createClient, randomConfigs, updateConfigs } from '@/types/clients'
 import DatePick from '@/components/DateTime.vue'
-import { HumanReadable } from '@/plugins/utils'
 
 export default {
   props: ['visible', 'data', 'index', 'inboundTags', 'stats'],
@@ -192,7 +160,6 @@ export default {
     return {
       client: createClient(),
       title: "add",
-      loading: false,
       clientStats: false,
       tab: "t1",
       clientConfig: <any>[],
@@ -207,7 +174,7 @@ export default {
         const newData = JSON.parse(this.$props.data)
         this.client = createClient(newData)
         this.title = "edit"
-        this.clientConfig = this.client.config
+        this.clientConfig = JSON.parse(this.client.config)
       }
       else {
         this.client = createClient()
@@ -215,9 +182,10 @@ export default {
         this.clientConfig = randomConfigs('client')
       }
       this.clientStats = this.$props.stats
-      this.links = this.client.links.filter(l => l.type == 'local')
+      const allLinks = <Link[]>JSON.parse(this.client.links)
-      this.extLinks = this.client.links.filter(l => l.type == 'external')
+      this.links = allLinks.filter(l => l.type == 'local')
-      this.subLinks = this.client.links.filter(l => l.type == 'sub')
+      this.extLinks = allLinks.filter(l => l.type == 'external')
+      this.subLinks = allLinks.filter(l => l.type == 'sub')
       this.tab = "t1"
     },
     closeModal() {
@@ -225,14 +193,12 @@ export default {
       this.$emit('close')
     },
     saveChanges() {
-      this.loading = true
+      this.client.config = updateConfigs(JSON.stringify(this.clientConfig), this.client.name)
-      this.client.config = updateConfigs(this.clientConfig, this.client.name)
+      this.client.links = JSON.stringify([
-      this.client.links = [
                             ...this.links,
                             ...this.extLinks.filter(l => l.uri != ''),
-                        ...this.subLinks.filter(l => l.uri != '')]
+                            ...this.subLinks.filter(l => l.uri != '')])
       this.$emit('save', this.client, this.clientStats)
-      this.loading = false
     },
     setDate(newDate:number){
       this.client.expiry = newDate
@@ -240,8 +206,8 @@ export default {
   },
   computed: {
     clientInbounds: {
-      get() { return this.client.inbounds.length>0 ? this.client.inbounds.filter(i => this.inboundTags.includes(i)) : [] },
+      get() { return this.client.inbounds == "" ? [] : this.client.inbounds.split(',') },
-      set(newValue:string[]) { this.client.inbounds = newValue.length == 0 ?  [] : newValue }
+      set(newValue:string[]) { this.client.inbounds = newValue.length == 0 ?  "" : newValue.join(',') }
     },
     expDate: {
       get() { return this.client.expiry},
@@ -250,16 +216,10 @@ export default {
     Volume: {
       get() { return this.client.volume == 0 ? 0 : (this.client.volume / (1024 ** 3)) },
       set(v:number) { this.client.volume = v > 0 ? v*(1024 ** 3) : 0 }
-    },
+    }
-    up() :string { return HumanReadable.sizeFormat(this.client.up) },
-    down() :string { return HumanReadable.sizeFormat(this.client.down) },
-    total() :string { return HumanReadable.sizeFormat(this.client.down + this.client.up) },
-    percent() :number { return this.client.volume>0 ? Math.round((this.client.up + this.client.down) *100 / this.client.volume) : 0 },
-    percentColor() :string { return (this.client.up+this.client.down) >= this.client.volume ? 'error' : this.percent>90 ? 'warning' : 'success' },
   },
   watch: {
-    visible(newValue) {
+      visible(newValue) { if (newValue) {
-      if (newValue) {
           this.updateData()
       }
     },

frontend/src/layouts/modals/Inbound.vue

@@ -5,12 +5,12 @@
         {{ $t('actions.' + title) + " " + $t('objects.inbound') }}
       </v-card-title>
       <v-divider></v-divider>
-      <v-card-text style="padding: 0 16px; overflow-y: scroll;">
+      <v-card-text>
-        <v-container style="padding: 0;">
         <v-row>
           <v-col cols="12" sm="6" md="4">
             <v-select
             hide-details
+            width="100"
             :label="$t('type')"
             :items="Object.keys(inTypes).map((key,index) => ({title: key, value: Object.values(inTypes)[index]}))"
             v-model="inbound.type"
@@ -18,51 +18,23 @@
             </v-select>
           </v-col>
           <v-col cols="12" sm="6" md="4">
-              <v-text-field v-model="inbound.tag" :label="$t('objects.tag')" hide-details></v-text-field>
+            <v-text-field v-model="inbound.tag" :label="$t('in.tag')" hide-details></v-text-field>
           </v-col>
         </v-row>
-          <v-tabs
+        <Listen :inbound="inbound" />
-            v-if="HasInData.includes(inbound.type)"
+        <Direct v-if="inbound.type == inTypes.Direct" :inbound="inbound" />
-            v-model="side"
+        <Shadowsocks v-if="inbound.type == inTypes.Shadowsocks" :inbound="inbound" />
-            density="compact"
+        <Hysteria v-if="inbound.type == inTypes.Hysteria" :inbound="inbound" />
-            fixed-tabs
+        <Hysteria2 v-if="inbound.type == inTypes.Hysteria2" :inbound="inbound" />
-            align-tabs="center"
-          >
-            <v-tab value="s">{{ $t('in.sSide') }}</v-tab>
-            <v-tab value="c">{{ $t('in.cSide') }}</v-tab>
-          </v-tabs>
-          <v-window v-model="side" style="margin-top: 10px;">
-            <v-window-item value="s">
-              <Listen :inbound="inbound" :inTags="inTags" />
-              <Direct v-if="inbound.type == inTypes.Direct" direction="in" :data="inbound" />
-              <Shadowsocks v-if="inbound.type == inTypes.Shadowsocks" direction="in" :data="inbound" />
-              <Hysteria v-if="inbound.type == inTypes.Hysteria" direction="in" :data="inbound" />
-              <Hysteria2 v-if="inbound.type == inTypes.Hysteria2" direction="in" :data="inbound" />
         <Naive v-if="inbound.type == inTypes.Naive" :inbound="inbound" />
-              <ShadowTls v-if="inbound.type == inTypes.ShadowTLS" direction="in" :data="inbound" :outTags="outTags" />
+        <ShadowTls v-if="inbound.type == inTypes.ShadowTLS" :inbound="inbound" />
-              <Tuic v-if="inbound.type == inTypes.TUIC" direction="in" :data="inbound" />
+        <Tuic v-if="inbound.type == inTypes.TUIC" :inbound="inbound" />
         <TProxy v-if="inbound.type == inTypes.TProxy" :inbound="inbound" />
-              <Transport v-if="Object.hasOwn(inbound,'transport')" :data="inbound" />
+        <Transport v-if="Object.hasOwn(inbound,'transport')" :inbound="inbound" />
-              <Users v-if="HasOptionalUser.includes(inbound.type)" :inbound="inbound" />
+        <Users v-if="HasOptionalUser.includes(inbound.type)" :inbound="inbound" :id="id" />
-              <InTls v-if="Object.hasOwn(inbound,'tls')"  :inbound="inbound" :tlsConfigs="tlsConfigs" :tls_id="tls_id" />
+        <InTls v-if="Object.hasOwn(inbound,'tls')"  :inbound="inbound" />
-              <Multiplex v-if="Object.hasOwn(inbound,'multiplex')" direction="in" :data="inbound" />
+        <InMulitiplex v-if="Object.hasOwn(inbound,'multiplex')"  :inbound="inbound" />
         <v-switch v-model="inboundStats" color="primary" :label="$t('stats.enable')" hide-details></v-switch>
-            </v-window-item>
-            <v-window-item value="c">
-              <OutJsonVue :inData="inData" :type="inbound.type" />
-              <v-card>
-                <v-card-subtitle>{{ $t('in.multiDomain') }}
-                  <v-icon @click="add_addr" icon="mdi-plus"></v-icon>
-                </v-card-subtitle>
-                <template v-for="addr,index in inData.addrs">
-                  {{ $t('in.addr') }} #{{ (index+1) }} <v-icon icon="mdi-delete" @click="inData.addrs.splice(index,1)" />
-                  <v-divider></v-divider>
-                  <AddrVue :addr="addr" :hasTls="Object.hasOwn(inbound,'tls')" />
-                </template>
-              </v-card>
-            </v-window-item>
-          </v-window>
-        </v-container>
       </v-card-text>
       <v-card-actions>
         <v-spacer></v-spacer>
@@ -76,7 +48,6 @@
         <v-btn
           color="blue-darken-1"
           variant="text"
-          :loading="loading"
           @click="saveChanges"
         >
           {{ $t('actions.save') }}
@@ -86,11 +57,9 @@
   </v-dialog>
 </template>
 
+
 <script lang="ts">
 import { InTypes, createInbound } from '@/types/inbounds'
-import { Addr, InData } from '@/plugins/inData'
-import RandomUtil from '@/plugins/randomUtil'
-
 import Listen from '@/components/Listen.vue'
 import Direct from '@/components/protocols/Direct.vue'
 import Users from '@/components/Users.vue'
@@ -100,92 +69,47 @@ 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 InTls from '@/components/tls/InTLS.vue'
+import InTls from '@/components/InTLS.vue'
 import TProxy from '@/components/protocols/TProxy.vue'
-import Multiplex from '@/components/Multiplex.vue'
+import RandomUtil from '@/plugins/randomUtil'
+import InMulitiplex from '@/components/InMulitiplex.vue'
 import Transport from '@/components/Transport.vue'
-import AddrVue from '@/components/Addr.vue'
-import OutJsonVue from '@/components/OutJson.vue'
 export default {
-  props: ['visible', 'data', 'cData', 'index', 'stats', 'inTags', 'outTags', 'tlsConfigs'],
+    props: ['visible', 'data', 'id', 'stats'],
     emits: ['close', 'save'],
     data() {
         return {
             inbound: createInbound("direct",{ "tag": "" }),
-      inData: <InData>{},
             title: "add",
-      loading: false,
-      side: "s",
             inTypes: InTypes,
             inboundStats: false,
-      tls_id: { value: 0 },
             HasOptionalUser: [InTypes.Mixed,InTypes.SOCKS,InTypes.HTTP,InTypes.Shadowsocks],
-      HasInData: [
-        InTypes.SOCKS,
-        InTypes.HTTP,
-        InTypes.Shadowsocks,
-        InTypes.VMess,
-        InTypes.ShadowTLS,
-        InTypes.Trojan,
-        InTypes.Hysteria,
-        InTypes.VLESS,
-        InTypes.TUIC,
-        InTypes.Hysteria2,
-        InTypes.Naive,
-      ]
         }
     },
     methods: {
       updateData() {
-      if (this.$props.index != -1) {
+        if (this.$props.id != -1) {
             const newData = JSON.parse(this.$props.data)
             this.inbound = createInbound(newData.type, newData)
-        this.tls_id.value = this.$props.tlsConfigs?.findLast((t:any) => t.inbounds?.includes(this.inbound.tag))?.id?? 0
-        if (this.HasInData.includes(this.inbound.type)){
-          this.inData = this.$props.cData?.length> 0 ? <InData>JSON.parse(this.$props.cData) : <InData>{id: 0, tag: this.inbound.tag, addrs: [], outJson: {}}
-        } else {
-          this.inData = <InData>{id: -1}
-        }
             this.title = "edit"
         }
         else {
             const port = RandomUtil.randomIntRange(10000, 60000)
-        this.inbound = createInbound("direct",{ tag: "direct-"+port ,listen: "::", listen_port: port })
+            this.inbound = createInbound("mixed",{ tag: "in-"+port ,listen: "::", listen_port: port })
-        this.tls_id.value = 0
-        if (this.HasInData.includes(this.inbound.type)){
-          this.inData = <InData>{id: 0, tag: this.inbound.tag, addrs: [], outJson: {}}
-        } else {
-          this.inData = <InData>{id: -1}
-        }
             this.title = "add"
         }
         this.inboundStats = this.$props.stats
-      this.side = "s"
       },
       changeType() {
-      // Tag change only in add outbound
+        const prevConfig = { tag: this.inbound.tag ,listen: this.inbound.listen, listen_port: this.inbound.listen_port }
-      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 }
         this.inbound = createInbound(this.inbound.type, prevConfig)
-      if (this.HasInData.includes(this.inbound.type)){
-        this.inData = <InData>{id: 0, tag: this.inbound.tag, addrs: [], outJson: {}}
-      } else {
-        this.inData = <InData>{id: -1}
-      }
-      this.side = "s"
-    },
-    add_addr() {
-      this.inData.addrs.push(<Addr>{ server: location.hostname, server_port: this.inbound.listen_port })
       },
       closeModal() {
         this.updateData() // reset
         this.$emit('close')
       },
       saveChanges() {
-      this.loading = true
+        this.$emit('save', this.inbound, this.inboundStats)
-      this.$emit('save', this.inbound, this.inboundStats, this.tls_id.value, this.inData)
-      this.loading = false
       },
     },
     watch: {
@@ -195,10 +119,13 @@ export default {
         }
       },
     },
-  components: {
+    components: { Listen, InTls, Hysteria2, Naive, Direct, Shadowsocks, Users, Hysteria, ShadowTls, TProxy, InMulitiplex, Tuic, Transport }
-    Listen, InTls, Hysteria2, Naive, Direct, Shadowsocks,
-    Users, Hysteria, ShadowTls, TProxy, Multiplex, Tuic, Transport,
-    AddrVue, OutJsonVue
-  }
 }
 </script>
+
+<style>
+.v-card-subtitle {
+  text-align: center;
+  border-bottom: 1px solid gray;
+}
+</style>

frontend/src/layouts/modals/Logs.vue

@@ -1,90 +0,0 @@
-<template>
-  <v-dialog transition="dialog-bottom-transition" width="90%" max-width="1200" :loading="loading">
-    <v-card class="rounded-lg">
-      <v-card-title>
-        <v-row>
-          <v-col>{{ $t('basic.log.title') + " - " + (logType == 's-ui'? "S-UI" : "Sing-Box") }}</v-col>
-          <v-spacer></v-spacer>
-          <v-col cols="auto">
-            <v-icon icon="mdi-close" @click="$emit('close')" />
-          </v-col>
-        </v-row>
-      </v-card-title>
-      <v-divider></v-divider>
-      <v-card-text>
-        <v-row>
-          <v-col cols="12" sm="6" md="4">
-            <v-select
-            hide-details
-            :label="$t('basic.log.level')"
-            :items="logLevels"
-            v-model="logLevel"
-            @update:model-value="loadData">
-            </v-select>
-          </v-col>
-          <v-col cols="12" sm="6" md="4">
-            <v-select
-            hide-details
-            :label="$t('count')"
-            :items="[10,20,30,50,100]"
-            v-model.number="logCount"
-            @update:model-value="loadData">
-            </v-select>
-          </v-col>
-          <v-col cols="auto" align="center" justify="center">
-            <v-btn
-              icon="mdi-refresh"
-              variant="tonal"
-              :loading="loading"
-              @click="loadData">
-              <v-icon  />
-            </v-btn>
-          </v-col>
-        </v-row>
-        <v-card style="background-color: background" dir="ltr" v-html="lines.join('<br />')"></v-card>
-      </v-card-text>
-    </v-card>
-  </v-dialog>
-</template>
-
-<script lang="ts">
-import HttpUtils from '@/plugins/httputil';
-
-export default {
-  props: ['logType', 'visible'],
-  data() {
-    return {
-      loading: false,
-      lines: [],
-      logLevel: 'info',
-      logLevels: [
-        { title: 'DEBUG', value: 'debug' },
-        { title: 'INFO', value: 'info' },
-        { title: 'WARNING', value: 'warning' },
-        { title: 'ERROR', value: 'err' },
-      ],
-      logCount: 10,
-    }
-  },
-  methods: {
-    async loadData() {
-      this.loading = true
-      const data = await HttpUtils.get('api/logs',{ s: this.$props.logType, c: this.logCount, l: this.logLevel })
-      if (data.success) {
-        this.lines = data.obj?? []
-        this.loading = false
-      }
-    }
-  },
-  watch: {
-    visible(newValue) {
-      this.lines = []
-      this.logLevel = 'info'
-      this.logCount = 10
-      if (newValue) {
-        this.loadData()
-      }
-    },
-  },
-}
-</script>

frontend/src/layouts/modals/Outbound.vue

@@ -1,204 +0,0 @@
-<template>
-  <v-dialog transition="dialog-bottom-transition" width="800">
-    <v-card class="rounded-lg">
-      <v-card-title>
-        {{ $t('actions.' + title) + " " + $t('objects.outbound') }}
-      </v-card-title>
-      <v-divider></v-divider>
-      <v-card-text style="padding: 0 16px; overflow-y: scroll;">
-        <v-container style="padding: 0;">
-          <v-tabs
-            v-model="tab"
-            align-tabs="center"
-          >
-            <v-tab value="t1">{{ $t('client.basics') }}</v-tab>
-            <v-tab value="t2">{{ $t('client.external') }}</v-tab>
-          </v-tabs>
-          <v-window v-model="tab">
-            <v-window-item value="t1">
-              <v-row>
-                <v-col cols="12" sm="6" md="4">
-                  <v-select
-                  hide-details
-                  :label="$t('type')"
-                  :items="Object.keys(outTypes).map((key,index) => ({title: key, value: Object.values(outTypes)[index]}))"
-                  v-model="outbound.type"
-                  @update:modelValue="changeType">
-                  </v-select>
-                </v-col>
-                <v-col cols="12" sm="6" md="4">
-                  <v-text-field v-model="outbound.tag" :label="$t('objects.tag')" hide-details></v-text-field>
-                </v-col>
-              </v-row>
-              <v-row v-if="!NoServer.includes(outbound.type)">
-                <v-col cols="12" sm="6" md="4">
-                  <v-text-field
-                  :label="$t('out.addr')"
-                  hide-details
-                  v-model="outbound.server">
-                  </v-text-field>
-                </v-col>
-                <v-col cols="12" sm="6" md="4">
-                  <v-text-field
-                  :label="$t('out.port')"
-                  type="number"
-                  min="0"
-                  hide-details
-                  v-model.number="outbound.server_port">
-                  </v-text-field>
-                </v-col>
-              </v-row>
-              <Direct v-if="outbound.type == outTypes.Direct" direction="out" :data="outbound" />
-              <Socks v-if="outbound.type == outTypes.SOCKS" :data="outbound" />
-              <Http v-if="outbound.type == outTypes.HTTP" :data="outbound" />
-              <Shadowsocks v-if="outbound.type == outTypes.Shadowsocks" direction="out" :data="outbound" />
-              <Vmess v-if="outbound.type == outTypes.VMess" :data="outbound" />
-              <Trojan v-if="outbound.type == outTypes.Trojan" :data="outbound" />
-              <Wireguard v-if="outbound.type == outTypes.Wireguard" :data="outbound" />
-              <Hysteria v-if="outbound.type == outTypes.Hysteria" direction="out" :data="outbound" />
-              <ShadowTls v-if="outbound.type == outTypes.ShadowTLS" :data="outbound" />
-              <Vless v-if="outbound.type == outTypes.VLESS" :data="outbound" />
-              <Tuic v-if="outbound.type == outTypes.TUIC" direction="out" :data="outbound" />
-              <Hysteria2 v-if="outbound.type == outTypes.Hysteria2" direction="out" :data="outbound" />
-              <Tor v-if="outbound.type == outTypes.Tor" :data="outbound" />
-              <Ssh v-if="outbound.type == outTypes.SSH" :data="outbound" />
-              <Selector v-if="outbound.type == outTypes.Selector" :data="outbound" :tags="tags" />
-              <UrlTest v-if="outbound.type == outTypes.URLTest" :data="outbound" :tags="tags" />
-
-              <Transport v-if="Object.hasOwn(outbound,'transport')" :data="outbound" />
-              <OutTLS v-if="Object.hasOwn(outbound,'tls')" :outbound="outbound" />
-              <Multiplex v-if="Object.hasOwn(outbound,'multiplex')" direction="out" :data="outbound" />
-              <Dial v-if="!NoDial.includes(outbound.type)" :dial="outbound" :outTags="tags" />
-              <v-switch v-model="outboundStats" color="primary" :label="$t('stats.enable')" hide-details></v-switch>
-            </v-window-item>
-            <v-window-item value="t2">
-              <v-row>
-                <v-col cols="12">
-                  <v-text-field v-model="link" :label="$t('client.external')" hide-details />
-                </v-col>
-                <v-col cols="12" align="center">
-                  <v-btn hide-details variant="tonal" :loading="loading" @click="linkConvert">{{ $t('submit') }}</v-btn>
-                </v-col>
-              </v-row>
-            </v-window-item>
-          </v-window>
-        </v-container>
-      </v-card-text>
-      <v-card-actions>
-        <v-spacer></v-spacer>
-        <v-btn
-          color="blue-darken-1"
-          variant="text"
-          @click="closeModal"
-        >
-          {{ $t('actions.close') }}
-        </v-btn>
-        <v-btn
-          color="blue-darken-1"
-          variant="text"
-          :loading="loading"
-          @click="saveChanges"
-        >
-          {{ $t('actions.save') }}
-        </v-btn>
-      </v-card-actions>
-    </v-card>
-  </v-dialog>
-</template>
-
-<script lang="ts">
-import { OutTypes, createOutbound } from '@/types/outbounds'
-import RandomUtil from '@/plugins/randomUtil'
-import Dial from '@/components/Dial.vue'
-import Multiplex from '@/components/Multiplex.vue'
-import Transport from '@/components/Transport.vue'
-import OutTLS from '@/components/tls/OutTLS.vue'
-import Direct from '@/components/protocols/Direct.vue'
-import Socks from '@/components/protocols/Socks.vue'
-import Http from '@/components/protocols/Http.vue'
-import Shadowsocks from '@/components/protocols/Shadowsocks.vue'
-import Vmess from '@/components/protocols/Vmess.vue'
-import Trojan from '@/components/protocols/Trojan.vue'
-import Wireguard from '@/components/protocols/Wireguard.vue'
-import Hysteria from '@/components/protocols/Hysteria.vue'
-import ShadowTls from '@/components/protocols/OutShadowTls.vue'
-import Vless from '@/components/protocols/Vless.vue'
-import Tuic from '@/components/protocols/Tuic.vue'
-import Hysteria2 from '@/components/protocols/Hysteria2.vue'
-import Tor from '@/components/protocols/Tor.vue'
-import Ssh from '@/components/protocols/Ssh.vue'
-import Selector from '@/components/protocols/Selector.vue'
-import UrlTest from '@/components/protocols/UrlTest.vue'
-import HttpUtils from '@/plugins/httputil'
-export default {
-  props: ['visible', 'data', 'id', 'stats', 'tags'],
-  emits: ['close', 'save'],
-  data() {
-    return {
-      outbound: createOutbound("direct",{ "tag": "" }),
-      title: "add",
-      tab: "t1",
-      link: "",
-      loading: false,
-      outTypes: OutTypes,
-      outboundStats: false,
-      NoDial: [OutTypes.Block, OutTypes.DNS, OutTypes.Selector, OutTypes.URLTest],
-      NoServer: [OutTypes.Direct, OutTypes.Block, OutTypes.DNS, OutTypes.Selector, OutTypes.URLTest, OutTypes.Tor],
-    }
-  },
-  methods: {
-    updateData() {
-      if (this.$props.id != -1) {
-        const newData = JSON.parse(this.$props.data)
-        this.outbound = createOutbound(newData.type, newData)
-        this.title = "edit"
-      }
-      else {
-        this.outbound = createOutbound("direct",{ tag: "direct-" + RandomUtil.randomSeq(3) })
-        this.title = "add"
-      }
-      this.tab = "t1"
-      this.outboundStats = this.$props.stats
-    },
-    changeType() {
-      // Tag change only in add outbound
-      const tag = this.$props.id != -1 ? this.outbound.tag : this.outbound.type + "-" + RandomUtil.randomSeq(3)
-      // Use previous data
-      const prevConfig = { tag: tag ,listen: this.outbound.listen, listen_port: this.outbound.listen_port }
-      this.outbound = createOutbound(this.outbound.type, prevConfig)
-    },
-    closeModal() {
-      this.updateData() // reset
-      this.$emit('close')
-    },
-    saveChanges() {
-      this.loading = true
-      this.$emit('save', this.outbound, this.outboundStats)
-      this.loading = false
-    },
-    async linkConvert() {
-      if (this.link.length>0){
-        this.loading = true
-        const msg = await HttpUtils.post('api/linkConvert', { link: this.link })
-        this.loading = false
-        if (msg.success) {
-          this.outbound = msg.obj
-          this.tab = "t1"
-          this.link = ""
-        }
-      }
-    }
-  },
-  watch: {
-    visible(newValue) {
-      if (newValue) {
-        this.updateData()
-      }
-    },
-  },
-  components: { Dial, Multiplex, Transport, OutTLS,
-    Direct, Socks, Http, Shadowsocks, Vmess, Trojan,
-    Wireguard, Hysteria, ShadowTls, Vless, Tuic,
-    Hysteria2, Tor, Ssh, Selector, UrlTest }
-}
-</script>

frontend/src/layouts/modals/QrCode.vue

@@ -1,54 +1,27 @@
 <template>
   <v-dialog transition="dialog-bottom-transition" width="400">
-    <v-card class="rounded-lg" id="qrcode-modal">
+    <v-card class="rounded-lg">
       <v-card-title>
         <v-row>
           <v-col>QrCode</v-col>
           <v-spacer></v-spacer>
-          <v-col cols="auto"><v-icon icon="mdi-close-box" @click="$emit('close')" /></v-col>
+          <v-col cols="1"><v-icon icon="mdi-close-box" @click="$emit('close')" ></v-icon></v-col>
         </v-row>
       </v-card-title>
       <v-divider></v-divider>
-      <v-card-text style="overflow-y: auto; padding: 0">
+      <v-card-text>
-        <v-tabs
-          v-model="tab"
-          density="compact"
-          fixed-tabs
-          align-tabs="center"
-        >
-          <v-tab value="sub">{{ $t('setting.sub') }}</v-tab>
-          <v-tab value="link">{{ $t('client.links') }}</v-tab>
-        </v-tabs>
-        <v-window v-model="tab" style="margin-top: 10px;">
-          <v-window-item value="sub">
         <v-row>
-              <v-col style="text-align: center;">
+          <v-col style="text-align: center;" @click="copyToClipboard(clientSub)">
-                <v-chip>{{ $t('setting.sub') }}</v-chip><br />
+            <v-chip>{{ $t('setting.sub') }}</v-chip>
-                <QrcodeVue :value="clientSub" :size="size" @click="copyToClipboard(clientSub)" :margin="1" style="border-radius: 1rem;" />
+            <QrcodeVue :value="clientSub" :size="300" :margin="1" style="border-radius: 1rem;" />
           </v-col>
         </v-row>
-            <v-row>
-              <v-col style="text-align: center;">
-                <v-chip>{{ $t('setting.jsonSub') }}</v-chip><br />
-                <QrcodeVue :value="clientSub + '?format=json'" :size="size" @click="copyToClipboard(clientSub + '?format=json')" :margin="1" style="border-radius: 1rem;" />
-              </v-col>
-            </v-row>
-            <v-row>
-              <v-col style="text-align: center;">
-                <v-chip>SING-BOX</v-chip><br />
-                <QrcodeVue :value="singbox" :size="size" @click="copyToClipboard(singbox)" :margin="1" style="border-radius: .8rem;" />
-              </v-col>
-            </v-row>
-          </v-window-item>
-          <v-window-item value="link">
         <v-row v-for="l in clientLinks">
-              <v-col style="text-align: center;">
+          <v-col style="text-align: center;" @click="copyToClipboard(l.uri)">
-                <v-chip>{{ l.remark?? $t('client.' + l.type) }}</v-chip><br />
+            <v-chip>{{ l.remark }}</v-chip><br />
-                <QrcodeVue :value="l.uri" :size="size" @click="copyToClipboard(l.uri)" :margin="1" style="border-radius: .5rem;" />
+            <QrcodeVue :value="l.uri" :size="300" :margin="1" style="border-radius: 1rem;" />
           </v-col>
         </v-row>
-          </v-window-item>
-        </v-window>
       </v-card-text>
     </v-card>
   </v-dialog>
@@ -58,46 +31,39 @@
 import QrcodeVue from 'qrcode.vue'
 import Data from '@/store/modules/data'
 import Clipboard from 'clipboard'
+import Message from '@/store/modules/message'
 import { i18n } from '@/locales'
-import { push } from 'notivue'
 
 export default {
-  props: ['index', 'visible'],
+  props: ['index'],
   data() {
     return {
-      tab: "sub",
+      msg: Message(),
     }
   },
   methods: {
     copyToClipboard(txt:string) {
-      const hiddenButton = document.createElement('button')
-      hiddenButton.className = 'clipboard-btn'
-      document.body.appendChild(hiddenButton)
 
       const clipboard = new Clipboard('.clipboard-btn', {
-        text: () => txt,
+        text: () => txt
-        container: document.getElementById('qrcode-modal')?? undefined
       });
 
       clipboard.on('success', () => {
         clipboard.destroy()
-        push.success({
+        this.msg.showMessage(i18n.global.t('copyToClipboard') + " : " + i18n.global.t('success'),'success',5000)
-          message: i18n.global.t('success') + ": " + i18n.global.t('copyToClipboard'),
-          duration: 5000,
-        })
       })
 
       clipboard.on('error', () => {
         clipboard.destroy()
-        push.error({
+        this.msg.showMessage(i18n.global.t('copyToClipboard') + " : " + i18n.global.t('failed'),'error',5000)
-          message: i18n.global.t('failed') + ": " + i18n.global.t('copyToClipboard'),
-          duration: 5000,
-        })
       })
 
       // Perform click on hidden button to trigger copy
-      hiddenButton.click()
+      const hiddenButton = document.createElement('button');
-      document.body.removeChild(hiddenButton)
+      hiddenButton.className = 'clipboard-btn';
+      document.body.appendChild(hiddenButton);
+      hiddenButton.click();
+      document.body.removeChild(hiddenButton);
     }
   },
   computed: {
@@ -109,26 +75,10 @@ export default {
     clientSub() {
       return Data().subURI + this.client.name
     },
-    singbox() {
-      const url = Data().subURI + this.client.name + "?format=json"
-      return "sing-box://import-remote-profile?url=" +  encodeURIComponent(url) + "#" + this.client.name
-    },
     clientLinks() {
-      return this.client.links?? []
+      return JSON.parse(this.client.links?? "[]")
-    },
-    size() {
-      if (window.innerWidth > 380) return 300
-      if (window.innerWidth > 330) return 280
-      return 250
     }
   },
-  watch: {
-    visible(v) {
-      if (v) {
-        this.tab = "sub"
-      }
-    },
-  },
   components: { QrcodeVue }
 }
 </script>

frontend/src/layouts/modals/Rule.vue

@@ -1,169 +0,0 @@
-<template>
-  <v-dialog transition="dialog-bottom-transition" width="800">
-    <v-card class="rounded-lg">
-      <v-card-title>
-        {{ $t('actions.' + title) + " " + $t('objects.rule') }}
-      </v-card-title>
-      <v-divider></v-divider>
-      <v-card-text style="padding: 0 16px;">
-        <v-row>
-          <v-col cols="12" sm="6" md="4">
-            <v-switch color="primary" v-model="logical" :label="$t('rule.logical')" hide-details></v-switch>
-          </v-col>
-          <v-spacer></v-spacer>
-          <v-col cols="auto" v-if="logical" justify="center" align="center">
-            <v-btn color="primary" @click="ruleData.rules.push({})" hide-details>{{ $t('actions.add') + " " + $t('objects.rule') }}</v-btn>
-          </v-col>
-        </v-row>
-        <v-card style="background-color: inherit; margin-bottom: 5px;" v-for="(r, index) in ruleData.rules" v-if="ruleData.type == 'logical'">
-          <v-card-subtitle>{{ $t('objects.rule') + ' ' + (index+1) }}
-            <v-icon @click="ruleData.rules.splice(index,1)" icon="mdi-delete" v-if="ruleData.rules.length>1" />
-          </v-card-subtitle>
-          <v-card-text style="padding: 0;">
-            <RuleOptions
-              :rule="r"
-              :clients="clients"
-              :inTags="inTags"
-              :rsTags="rsTags" />
-          </v-card-text>
-        </v-card>
-        <RuleOptions
-          v-else
-          :rule="ruleData.rules[0]"
-          :clients="clients"
-          :inTags="inTags"
-          :rsTags="rsTags" />
-        <v-row>
-          <v-col cols="12" sm="6" md="4">
-            <v-combobox
-              v-model="ruleData.outbound"
-              :items="outTags"
-              :label="$t('objects.outbound')"
-              hide-details
-            ></v-combobox>
-          </v-col>
-          <v-col cols="12" sm="6" md="4" v-if="logical">
-            <v-combobox
-              v-model="ruleData.mode"
-              :items="['and', 'or']"
-              :label="$t('rule.mode')"
-              hide-details
-            ></v-combobox>
-          </v-col>
-          <v-col cols="12" sm="6" md="4">
-            <v-switch color="primary" v-model="ruleData.invert" :label="$t('rule.invert')" hide-details></v-switch>
-          </v-col>
-        </v-row>
-      </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 { logicalRule, rule } from '@/types/rules'
-import RuleOptions from '@/components/Rule.vue'
-export default {
-  props: ['visible', 'data', 'index', 'clients', 'inTags', 'outTags', 'rsTags'],
-  emits: ['close', 'save'],
-  data() {
-    return {
-      title: 'add',
-      loading: false,
-      ruleData: <logicalRule>{
-        type: 'logical',
-        mode: 'and',
-        rules: <rule[]>[{}],
-        invert: false,
-        outbound: 'direct',
-      }
-    }
-  },
-  methods: {
-    updateData() {
-      if (this.$props.index != -1) {
-        const newData = JSON.parse(this.$props.data)
-        if (newData.type) {
-          this.ruleData = newData
-        } else {
-          this.ruleData = <logicalRule>{
-            type: 'simple',
-            mode: 'and',
-            rules: <rule[]>[{...newData}],
-            invert: newData.invert,
-            outbound: newData.outbound,
-          }
-        }
-        this.title = 'edit'
-      }
-      else {
-        this.ruleData = <logicalRule>{
-            type: 'simple',
-            mode: 'and',
-            rules: <rule[]>[{}],
-            invert: false,
-            outbound: this.$props.outTags[0]?? 'direct',
-          }
-        this.title = 'add'
-      }
-    },
-    closeModal() {
-      this.updateData() // reset
-      this.$emit('close')
-    },
-    saveChanges() {
-      this.loading = true
-      if (this.ruleData.type == 'simple'){
-        this.ruleData.rules[0].outbound = this.ruleData.outbound
-        this.ruleData.rules[0].invert = this.ruleData.invert
-      }
-      this.$emit('save', this.ruleData)
-      this.loading = false
-    },
-    deleteRule(index:number) {
-      this.ruleData.rules.splice(index,1)
-    }
-  },
-  computed: {
-    logical: {
-      get() { return this.ruleData.type == 'logical' },
-      set(v:boolean) {
-        if (v) {
-          this.ruleData.type = 'logical'
-          this.ruleData.outbound = this.ruleData.rules[0].outbound?? this.$props.outTags[0]
-          delete this.ruleData.rules[0].outbound
-        } else {
-          this.ruleData.type = 'simple'
-          this.ruleData.rules[0].outbound = this.ruleData.outbound
-        }
-      }
-    }
-  },
-  watch: {
-    visible(newValue) {
-      if (newValue) {
-        this.updateData()
-      }
-    },
-  },
-  components: { RuleOptions }
-}
-
-</script>

frontend/src/layouts/modals/Ruleset.vue

@@ -1,133 +0,0 @@
-<template>
-  <v-dialog transition="dialog-bottom-transition" width="800">
-    <v-card class="rounded-lg">
-      <v-card-title>
-        {{ $t('actions.' + title) + " Ruleset" }}
-      </v-card-title>
-      <v-divider></v-divider>
-      <v-card-text style="padding: 0 16px;">
-        <v-row>
-          <v-col cols="12" sm="6" md="4">
-            <v-select
-              hide-details
-              :label="$t('type')"
-              :items="[{title: $t('ruleset.local'), value: 'local'},{ title: $t('ruleset.remote'), value: 'remote'}]"
-              @update:model-value="updateType($event)"
-              v-model="rule_set.type">
-            </v-select>
-          </v-col>
-          <v-col cols="12" sm="6" md="4">
-            <v-text-field v-model="rule_set.tag" :label="$t('objects.tag')" hide-details></v-text-field>
-          </v-col>
-          <v-col cols="12" sm="6" md="4">
-            <v-select
-              hide-details
-              :label="$t('ruleset.format')"
-              :items="['source', 'binary']"
-              v-model="rule_set.format">
-            </v-select>
-          </v-col>
-        </v-row>
-        <v-row v-if="rule_set.type == 'local'">
-          <v-col cols="12">
-            <v-text-field v-model="rule_set.path" :label="$t('transport.path')" hide-details></v-text-field>
-          </v-col>
-        </v-row>
-        <v-row v-else>
-          <v-col cols="12">
-            <v-text-field v-model="rule_set.url" label="URL" hide-details></v-text-field>
-          </v-col>
-          <v-col cols="12" sm="6" md="4">
-            <v-select
-              hide-details
-              :label="$t('objects.outbound')"
-              :items="outTags"
-              clearable
-              @click:clear="delete rule_set.download_detour"
-              v-model="rule_set.download_detour">
-            </v-select>
-          </v-col>
-          <v-col cols="12" sm="6" md="4">
-            <v-text-field v-model.number="update_intervals" :suffix="$t('date.d')" type="number" min="0" :label="$t('ruleset.interval')" hide-details></v-text-field>
-          </v-col>
-        </v-row>
-      </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 RandomUtil from '@/plugins/randomUtil'
-import { ruleset } from '@/types/rules'
-export default {
-  props: ['visible', 'data', 'index', 'outTags'],
-  emits: ['close', 'save'],
-  data() {
-    return {
-      title: "add",
-      loading: false,
-      rule_set: <ruleset>{},
-    }
-  },
-  methods: {
-    updateData() {
-      if (this.$props.index != -1) {
-        this.title = "edit"
-        this.rule_set = <ruleset>JSON.parse(this.$props.data)
-      }
-      else {
-        this.title = "add"
-        this.rule_set = <ruleset>{type: 'local', tag: "rs-" + RandomUtil.randomSeq(3), format: 'binary'}
-      }
-    },
-    updateType(t:string) {
-      if (t == 'local') {
-        delete this.rule_set.url
-        delete this.rule_set.download_detour
-        delete this.rule_set.update_interval
-      } else {
-        delete this.rule_set.path
-      }
-    },
-    closeModal() {
-      this.$emit('close')
-    },
-    saveChanges() {
-      this.loading = true
-      this.$emit('save', this.rule_set)
-      this.loading = false
-    }
-  },
-  computed: {
-    update_intervals: {
-      get() { return this.rule_set.update_interval != undefined ? parseInt(this.rule_set.update_interval.replace('d','')) : 0 },
-      set(v:number) { this.rule_set.update_interval = v>0 ?  v + 'd' : undefined }
-    },
-  },
-  watch: {
-    visible(newValue) {
-      if (newValue) {
-        this.updateData()
-      }
-    },
-  },
-}
-</script>

frontend/src/layouts/modals/Stats.vue

@@ -3,8 +3,8 @@
     <v-card class="rounded-lg" :loading="loading" color="background">
       <v-card-title>
         <v-row>
-          <v-col cols="auto">
+          <v-col>
-            {{ $t('stats.graphTitle') }}
+            {{ $t('stats.graphTitle') + " - " + $t('objects.' + resource) + " : " + tag }}
           </v-col>
           <v-spacer></v-spacer>
           <v-col cols="auto"><v-icon icon="mdi-close" @click="$emit('close')"></v-icon></v-col>
@@ -12,13 +12,7 @@
       </v-card-title>
       <v-divider></v-divider>
       <v-card-text style="padding: 0 16px;">
-        <div style="text-align: center; margin: 5px;">
+        <v-container id="container">
-          {{ $t('objects.' + resource) + " : " + tag }}
-        </div>
-        <v-radio-group v-model="limit" @change="loadData" density="compact" :loading="loading" inline hide-details>
-          <v-radio v-for="p in periods" :label="p.title" :value="p.value"></v-radio>
-        </v-radio-group>
-        <v-container id="container" style="height:40vh;">
           <v-alert :text="$t('noData')" type="warning" variant="outlined" v-if="alert"></v-alert>
           <Line v-if="loaded" :data="usage" :options="<any>options" />
         </v-container>
@@ -66,29 +60,13 @@ export default {
       loaded: false,
       alert: false,
       intervalId: <any>0,
-      limit: 1,
-      periods: [
-        { value: 1, title: i18n.global.n(1) + i18n.global.t('date.h')},
-        { value: 6, title: i18n.global.n(6) + i18n.global.t('date.h')},
-        { value: 12, title: i18n.global.n(12) + i18n.global.t('date.h')},
-        { value: 24, title: i18n.global.n(1) + i18n.global.t('date.d')},
-        { value: 48, title: i18n.global.n(2) + i18n.global.t('date.d')},
-        { value: 240, title: i18n.global.n(10) + i18n.global.t('date.d')},
-        { value: 480, title: i18n.global.n(20) + i18n.global.t('date.d')},
-        { value: 720, title: i18n.global.n(30) + i18n.global.t('date.d')},
-        { value: 1440, title: i18n.global.n(60) + i18n.global.t('date.d')},
-        { value: 2160, title: i18n.global.n(90) + i18n.global.t('date.d')},
-      ],
       options: {
         responsive: true,
-        maintainAspectRatio: false,
+        maintainAspectRatio: true,
         interaction: {
           intersect: false,
           mode: 'index',
         },
-        elements: {
-          point: { pointStyle: 'crossRot' }
-        },
         plugins: {
           tooltip: {
             callbacks: {
@@ -121,13 +99,13 @@ export default {
     }
   },
   methods: {
-    async loadData() {
+    async loadData(limit: number) {
       this.loading = true
-      const data = await HttpUtils.get('api/stats', { resource: this.resource, tag: this.tag, limit: this.limit })
+      const data = await HttpUtils.get('api/stats', { resource: this.resource, tag: this.tag, limit: limit })
       if (data.success && data.obj) {
         const obj = <any[]>data.obj
         const l = String(i18n.global.locale) == 'fa' ? "fa-IR" : "en-US"
-        const oneStep = this.limit * 3600 * 1000 / 360 // Each 10 sec
+        const oneStep = limit * 3600 * 1000 / 360 // Each 10 sec
         const now = new Date().getTime()
         const steps = <number[]>[]
         for (let i = 360; i >= 0; i--) {
@@ -167,10 +145,8 @@ export default {
           ],
         }
         this.loaded = true
-        this.alert = false
       } else {
         this.alert = true
-        this.loaded = false
       }
       this.loading = false
     },
@@ -187,10 +163,10 @@ export default {
   watch: {
     visible(v) {
       if (v) {
-        this.limit = 1
+        const limit = 1
-        this.loadData()
+        this.loadData(limit)
         this.intervalId = setInterval(() => {
-          this.loadData()
+          this.loadData(limit)
         }, 10000)
       } else {
         this.loaded = false

frontend/src/layouts/modals/Tls.vue

@@ -1,551 +0,0 @@
-<template>
-  <v-dialog transition="dialog-bottom-transition" width="800">
-    <v-card class="rounded-lg">
-      <v-card-title>
-        {{ $t('actions.' + title) + " " + $t('objects.tls') }}
-      </v-card-title>
-      <v-divider></v-divider>
-      <v-card-text style="padding: 0 16px; overflow-y: scroll;">
-        <v-card class="rounded-lg">
-          <v-row>
-            <v-col cols="12" sm="6" md="4">
-              <v-text-field
-                :label="$t('client.name')"
-                hide-details
-                v-model="tls.name">
-              </v-text-field>
-            </v-col>
-            <v-col align="end">
-              <v-btn-toggle v-model="tlsType"
-              class="rounded-xl"
-              density="compact"
-              variant="outlined"
-              @update:model-value="changeTlsType"
-              shaped
-              mandatory>
-                <v-btn>TLS</v-btn>
-                <v-btn>Reality</v-btn>
-              </v-btn-toggle>
-            </v-col>
-          </v-row>
-          <v-row>
-            <v-col cols="12" sm="6" md="4" v-if="inTls.server_name != undefined">
-              <v-text-field
-                label="SNI"
-                hide-details
-                v-model="inTls.server_name">
-              </v-text-field>
-            </v-col>
-            <template v-if="tlsType == 0">
-              <v-col cols="12" sm="6" md="4" v-if="inTls.min_version">
-                <v-select
-                  hide-details
-                  :label="$t('tls.minVer')"
-                  :items="tlsVersions"
-                  v-model="inTls.min_version">
-                </v-select>
-              </v-col>
-              <v-col cols="12" sm="6" md="4" v-if="inTls.max_version">
-                <v-select
-                  hide-details
-                  :label="$t('tls.maxVer')"
-                  :items="tlsVersions"
-                  v-model="inTls.max_version">
-                </v-select>
-              </v-col>
-              <v-col cols="12" sm="6" md="4" v-if="inTls.alpn">
-                <v-select
-                  hide-details
-                  label="ALPN"
-                  multiple
-                  :items="alpn"
-                  v-model="inTls.alpn">
-                </v-select>
-              </v-col>
-              <v-col cols="12" md="8" v-if="inTls.cipher_suites != undefined">
-                <v-select
-                  hide-details
-                  :label="$t('tls.cs')"
-                  multiple
-                  :items="cipher_suites"
-                  v-model="inTls.cipher_suites">
-                </v-select>
-              </v-col>
-            </template>
-          </v-row>
-          <template v-if="tlsType == 0">
-            <v-row>
-              <v-col>
-                <v-btn-toggle v-model="usePath"
-                class="rounded-xl"
-                density="compact"
-                variant="outlined"
-                shaped
-                mandatory>
-                  <v-btn
-                    @click="inTls.key=undefined; inTls.certificate=undefined"
-                  >{{ $t('tls.usePath') }}</v-btn>
-                  <v-btn
-                    @click="inTls.key_path=undefined; inTls.certificate_path=undefined"
-                  >{{ $t('tls.useText') }}</v-btn>
-                </v-btn-toggle>
-              </v-col>
-              <v-spacer></v-spacer>
-              <v-col cols="auto">
-                <v-btn
-                  variant="tonal"
-                  density="compact"
-                  icon="mdi-key-star"
-                  @click="genSelfSigned"
-                  :loading="loading">
-                  <v-icon />
-                  <v-tooltip activator="parent" location="top">
-                    {{ $t('actions.generate') }}
-                  </v-tooltip>
-                </v-btn>
-              </v-col>
-            </v-row>
-            <v-row v-if="usePath == 0">
-              <v-col cols="12" sm="6">
-                <v-text-field
-                  :label="$t('tls.certPath')"
-                  hide-details
-                  v-model="inTls.certificate_path">
-                </v-text-field>
-              </v-col>
-              <v-col cols="12" sm="6">
-                <v-text-field
-                  :label="$t('tls.keyPath')"
-                  hide-details
-                  v-model="inTls.key_path">
-                </v-text-field>
-              </v-col>
-            </v-row>
-            <v-row v-else>
-              <v-col cols="12">
-                <v-textarea
-                  :label="$t('tls.cert')"
-                  hide-details
-                  v-model="certText">
-                </v-textarea>
-              </v-col>
-              <v-col cols="12">
-                <v-textarea
-                  :label="$t('tls.key')"
-                  hide-details
-                  v-model="keyText">
-                </v-textarea>
-              </v-col>
-            </v-row>
-            <v-row>
-              <v-col cols="12" sm="6" md="4">
-                <v-switch color="primary" :label="$t('tls.disableSni')" v-model="disableSni" hide-details></v-switch>
-              </v-col>
-              <v-col cols="12" sm="6" md="4">
-                <v-switch color="primary" :label="$t('tls.insecure')" v-model="insecure" hide-details></v-switch>
-              </v-col>
-            </v-row>
-          </template>
-          <template v-if="outTls.reality && inTls.reality">
-            <v-row>
-              <v-col cols="12" sm="6" md="4">
-                <v-text-field
-                :label="$t('types.shdwTls.hs')"
-                hide-details
-                v-model="inTls.reality.handshake.server">
-                </v-text-field>
-              </v-col>
-              <v-col cols="12" sm="6" md="4">
-                <v-text-field
-                :label="$t('out.port')"
-                type="number"
-                min="0"
-                hide-details
-                v-model="server_port">
-                </v-text-field>
-              </v-col>
-              <v-spacer></v-spacer>
-              <v-col cols="auto">
-                <v-btn
-                  variant="tonal"
-                  density="compact"
-                  icon="mdi-key-star"
-                  @click="genRealityKey"
-                  :loading="loading">
-                  <v-icon />
-                  <v-tooltip activator="parent" location="top">
-                    {{ $t('actions.generate') }}
-                  </v-tooltip>
-                </v-btn>
-              </v-col>
-            </v-row>
-            <v-row>
-              <v-col cols="12">
-                <v-text-field
-                  :label="$t('tls.privKey')"
-                  hide-details
-                  v-model="inTls.reality.private_key">
-                </v-text-field>
-              </v-col>
-              <v-col cols="12">
-                <v-text-field
-                  :label="$t('tls.pubKey')"
-                  hide-details
-                  v-model="outTls.reality.public_key">
-                </v-text-field>
-              </v-col>
-              <v-col cols="12">
-                <v-text-field
-                  label="Short IDs"
-                  hide-details
-                  append-icon="mdi-refresh"
-                  @click:append="randomSID"
-                  v-model="short_id">
-                </v-text-field>
-              </v-col>
-              <v-col cols="12" sm="6" md="4" v-if="optionTime">
-                <v-text-field
-                label="Max Time Diference"
-                type="number"
-                min="1"
-                :suffix="$t('date.m')"
-                hide-details
-                v-model="max_time">
-                </v-text-field>
-              </v-col>
-            </v-row>
-          </template>
-          <v-row v-if="outTls.utls != undefined">
-            <v-col cols="12" sm="6" md="4">
-              <v-select
-                hide-details
-                label="Fingerprint"
-                :items="fingerprints"
-                v-model="outTls.utls.fingerprint">
-              </v-select>
-            </v-col>
-          </v-row>
-          <v-card-actions>
-            <v-spacer></v-spacer>
-            <v-menu v-model="menu" :close-on-content-click="false" location="start">
-              <template v-slot:activator="{ props }">
-                <v-btn v-bind="props" hide-details variant="tonal">{{ $t('tls.options') }}</v-btn>
-              </template>
-              <v-card>
-                <v-list>
-                  <template v-if="tlsType == 0">
-                    <v-list-item>
-                      <v-switch v-model="optionSNI" color="primary" label="SNI" hide-details></v-switch>
-                    </v-list-item>
-                    <v-list-item>
-                      <v-switch v-model="optionALPN" color="primary" label="ALPN" hide-details></v-switch>
-                    </v-list-item>
-                    <v-list-item>
-                      <v-switch v-model="optionMinV" color="primary" :label="$t('tls.minVer')" hide-details></v-switch>
-                    </v-list-item>
-                    <v-list-item>
-                      <v-switch v-model="optionMaxV" color="primary" :label="$t('tls.maxVer')" hide-details></v-switch>
-                    </v-list-item>
-                    <v-list-item>
-                      <v-switch v-model="optionCS" color="primary" :label="$t('tls.cs')" hide-details></v-switch>
-                    </v-list-item>
-                  </template>
-                  <template v-else>
-                    <v-list-item>
-                      <v-switch v-model="optionTime" color="primary" label="Max Time Difference" hide-details></v-switch>
-                    </v-list-item>
-                  </template>
-                  <v-list-item>
-                    <v-switch v-model="optionFP" color="primary" label="UTLS" hide-details></v-switch>
-                  </v-list-item>
-                </v-list>
-              </v-card>
-            </v-menu>
-          </v-card-actions>
-        </v-card>
-        <AcmeVue :tls="inTls" />
-        <EchVue :iTls="inTls" :oTls="outTls" />
-      </v-card-text>
-      <v-card-actions>
-        <v-spacer></v-spacer>
-        <v-btn
-          color="blue-darken-1"
-          variant="text"
-          @click="closeModal"
-        >
-          {{ $t('actions.close') }}
-        </v-btn>
-        <v-btn
-          color="blue-darken-1"
-          variant="text"
-          :loading="loading"
-          @click="saveChanges"
-        >
-          {{ $t('actions.save') }}
-        </v-btn>
-      </v-card-actions>
-    </v-card>
-  </v-dialog>
-</template>
-
-<script lang="ts">
-import { iTls, defaultInTls } from '@/types/inTls'
-import { oTls, defaultOutTls } from '@/types/outTls'
-import AcmeVue from '@/components/tls/Acme.vue'
-import EchVue from '@/components/tls/Ech.vue'
-import HttpUtils from '@/plugins/httputil'
-import { push } from 'notivue'
-import { i18n } from '@/locales'
-import RandomUtil from '@/plugins/randomUtil'
-export default {
-  props: ['visible', 'data', 'index'],
-  emits: ['close', 'save'],
-  data() {
-    return {
-      tls: { id: -1, name: '', inbounds: [], server: <iTls>{ enabled: true }, client: <oTls>{} },
-      title: "add",
-      loading: false,
-      menu: false,
-      tlsType: 0,
-      usePath: 0,
-      alpn: [
-        { title: "H3", value: 'h3' },
-        { title: "H2", value: 'h2' },
-        { title: "Http/1.1", value: 'http/1.1' },
-      ],
-      tlsVersions: [ '1.0', '1.1', '1.2', '1.3' ],
-      cipher_suites: [
-        { title: "RSA-AES128-CBC-SHA", value: "TLS_RSA_WITH_AES_128_CBC_SHA" },
-        { title: "RSA-AES256-CBC-SHA", value: "TLS_RSA_WITH_AES_256_CBC_SHA" },
-        { title: "RSA-AES128-GCM-SHA256", value: "TLS_RSA_WITH_AES_128_GCM_SHA256" },
-        { title: "RSA-AES256-GCM-SHA384", value: "TLS_RSA_WITH_AES_256_GCM_SHA384" },
-        { title: "AES128-GCM-SHA256", value: "TLS_AES_128_GCM_SHA256" },
-        { title: "AES256-GCM-SHA384", value: "TLS_AES_256_GCM_SHA384" },
-        { title: "CHACHA20-POLY1305-SHA256", value: "TLS_CHACHA20_POLY1305_SHA256" },
-        { title: "ECDHE-ECDSA-AES128-CBC-SHA", value: "TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA" },
-        { title: "ECDHE-ECDSA-AES256-CBC-SHA", value: "TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA" },
-        { title: "ECDHE-RSA-AES128-CBC-SHA", value: "TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA" },
-        { title: "ECDHE-RSA-AES256-CBC-SHA", value: "TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA" },
-        { title: "ECDHE-ECDSA-AES128-GCM-SHA256", value: "TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256" },
-        { title: "ECDHE-ECDSA-AES256-GCM-SHA384", value: "TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384" },
-        { title: "ECDHE-RSA-AES128-GCM-SHA256", value: "TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256" },
-        { title: "ECDHE-RSA-AES256-GCM-SHA384", value: "TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384" },
-        { title: "ECDHE-ECDSA-CHACHA20-POLY1305-SHA256", value: "TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305_SHA256" },
-        { title: "ECDHE-RSA-CHACHA20-POLY1305-SHA256", value: "TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305_SHA256" }
-      ],
-      fingerprints: [
-        { title: "Chrome", value: "chrome" },
-        { title: "Chrome PSK", value: "chrome_psk" },
-        { title: "Chrome PSK Shuffle", value: "chrome_psk_shuffle" },
-        { title: "Chrome Padding PSK Shuffle", value: "chrome_padding_psk_shuffle" },
-        { title: "Chrome Post-Quantum", value: "chrome_pq" },
-        { title: "Chrome Post-Quantum PSK", value: "chrome_pq_psk" },
-        { title: "Firefox", value: "firefox" },
-        { title: "Microsoft Edge", value: "edge" },
-        { title: "Apple Safari", value: "safari" },
-        { title: "360", value: "360" },
-        { title: "QQ", value: "qq" },
-        { title: "Apple IOS", value: "ios" },
-        { title: "Android", value: "android" },
-        { title: "Random", value: "random" },
-        { title: "Randomized", value: "randomized" },
-      ]
-    }
-  },
-  methods: {
-    updateData() {
-      if (this.$props.index != -1) {
-        const newData = JSON.parse(this.$props.data)
-        this.tls = newData
-        this.tlsType = newData.server?.reality == undefined ? 0 : 1
-        this.usePath = newData.server?.key == undefined ? 0 : 1
-        this.title = "edit"
-      }
-      else {
-        this.tls = { id: 0, name: '', inbounds: [], server: {enabled: true}, client: {} }
-        this.tlsType = 0
-        this.usePath = 0
-        this.title = "add"
-      }
-    },
-    changeTlsType(){
-      if (this.tlsType) {
-        this.tls.server = <iTls>{
-          enabled: true,
-          reality: { enabled: true, handshake: { server_port: 443 }, short_id: RandomUtil.randomShortId() },
-          server_name: "" }
-        this.tls.client = <oTls>{ reality: { public_key: "" } }
-      } else {
-        this.tls.server = <iTls>{ enabled: true }
-        this.tls.client = <oTls>{}
-      }
-    },
-    closeModal() {
-      this.updateData() // reset
-      this.$emit('close')
-    },
-    saveChanges() {
-      this.loading = true
-      this.$emit('save', this.tls)
-      this.loading = false
-    },
-    async genSelfSigned(){
-      this.loading = true
-      const msg = await HttpUtils.get('api/keypairs', { k: "tls", o: this.inTls.server_name?? "''" })
-      this.loading = false
-      if (msg.success) {
-        this.inTls.key_path=undefined
-        this.inTls.certificate_path=undefined
-        this.usePath = 1
-        if (msg.obj.length>0){
-          let privateKey = <string[]>[]
-          let publicKey = <string[]>[]
-          let isPrivateKey = false
-          let isPublicKey = false
-
-          msg.obj.forEach((line:string) => {
-              if (line === "-----BEGIN PRIVATE KEY-----") {
-                  isPrivateKey = true
-                  isPublicKey = false
-                  privateKey.push(line)
-              } else if (line === "-----END PRIVATE KEY-----") {
-                  isPrivateKey = false
-                  privateKey.push(line)
-              } else if (line === "-----BEGIN CERTIFICATE-----") {
-                  isPublicKey = true
-                  isPrivateKey = false
-                  publicKey.push(line)
-              } else if (line === "-----END CERTIFICATE-----") {
-                  isPublicKey = false
-                  publicKey.push(line)
-              } else if (isPrivateKey) {
-                  privateKey.push(line)
-              } else if (isPublicKey) {
-                  publicKey.push(line)
-              }
-          })
-          this.inTls.key = privateKey?? undefined
-          this.inTls.certificate = publicKey?? undefined
-
-        } else {
-          push.error({
-            message: i18n.global.t('error') + ": " + msg.obj
-          })
-        }
-      }
-    },
-    async genRealityKey(){
-      this.loading = true
-      const msg = await HttpUtils.get('api/keypairs', { k: "reality" })
-      this.loading = false
-      if (msg.success) {
-        msg.obj.forEach((line:string) => {
-          if (this.inTls.reality && this.outTls.reality){
-            if (line.startsWith("PrivateKey")){
-              this.inTls.reality.private_key = line.substring(12)
-            }
-            if (line.startsWith("PublicKey")){
-              this.outTls.reality.public_key = line.substring(11)
-            }
-          }
-        })
-      } else {
-        push.error({
-          message: i18n.global.t('error') + ": " + msg.obj
-        })
-      }
-    },
-    randomSID(){
-      this.short_id = RandomUtil.randomShortId().join(',')
-    }
-  },
-  computed: {
-    inTls(): iTls {
-      return <iTls> this.tls.server
-    },
-    outTls(): oTls {
-      return <oTls> this.tls.client
-    },
-    certText: {
-      get(): string { return this.inTls.certificate ? this.inTls.certificate.join('\n') : '' },
-      set(v:string) { this.inTls.certificate = v.split('\n') }
-    },
-    keyText: {
-      get(): string { return this.inTls.key ? this.inTls.key.join('\n') : '' },
-      set(v:string) { this.inTls.key = v.split('\n') }
-    },
-    disableSni: {
-      get() { return this.outTls.disable_sni ?? false },
-      set(v: boolean) { this.outTls.disable_sni = v ? true : undefined }
-    },
-    insecure: {
-      get() { return this.outTls.insecure ?? false },
-      set(v: boolean) { this.outTls.insecure = v ? true : undefined }
-    },
-    server_port: {
-      get() { return this.inTls.reality?.handshake?.server_port ? this.inTls.reality.handshake.server_port : 443 },
-      set(v: any) {
-        if (this.inTls.reality){
-          this.inTls.reality.handshake.server_port = v.length == 0 || v == 0 ? 443 : parseInt(v)
-        }
-      }
-    },
-    short_id: {
-      get() { return this.inTls.reality?.short_id ? this.inTls.reality.short_id.join(',') : undefined },
-      set(v: string) {
-        if (this.inTls.reality){
-          this.inTls.reality.short_id = v.length > 0 ? v.split(',') : []
-        }
-      }
-    },
-    max_time: {
-      get() { return this.inTls?.reality?.max_time_difference ? this.inTls.reality.max_time_difference.replace('m','') : 1 },
-      set(v: number) {
-        if (this.inTls.reality){
-          this.inTls.reality.max_time_difference = v > 0 ? v + 'm' : '1m'
-        }
-      }
-    },
-    optionSNI: {
-      get(): boolean { return this.inTls.server_name != undefined },
-      set(v:boolean) { this.inTls.server_name = v ? '' : undefined }
-    },
-    optionALPN: {
-      get(): boolean { return this.inTls.alpn != undefined },
-      set(v:boolean) { this.inTls.alpn = v ? defaultInTls.alpn : undefined }
-    },
-    optionMinV: {
-      get(): boolean { return this.inTls.min_version != undefined },
-      set(v:boolean) { this.inTls.min_version = v ? defaultInTls.min_version : undefined }
-    },
-    optionMaxV: {
-      get(): boolean { return this.inTls.max_version != undefined },
-      set(v:boolean) { this.inTls.max_version = v ? defaultInTls.max_version : undefined }
-    },
-    optionCS: {
-      get(): boolean { return this.inTls.cipher_suites != undefined },
-      set(v:boolean) { this.inTls.cipher_suites = v ? defaultInTls.cipher_suites : undefined }
-    },
-    optionFP: {
-      get(): boolean { return this.outTls.utls != undefined },
-      set(v:boolean) { this.outTls.utls = v ? defaultOutTls.utls : undefined }
-    },
-    optionEch: {
-      get(): boolean { return this.outTls.ech != undefined },
-      set(v:boolean) { this.outTls.ech = v ? defaultOutTls.ech : undefined }
-    },
-    optionTime: {
-      get(): boolean { return this.inTls?.reality?.max_time_difference != undefined },
-      set(v:boolean) { if (this.inTls.reality) this.inTls.reality.max_time_difference = v ? "1m" : undefined }
-    }
-  },
-  watch: {
-    visible(v) {
-      if (v) {
-        this.updateData()
-      }
-    },
-  },
-  components: { AcmeVue, EchVue }
-}
-</script>

frontend/src/locales/en.ts

@@ -4,9 +4,6 @@ export default {
   failed: "failed",
   enable: "Enable",
   disable: "Disable",
-  none: "None",
-  all: "All",
-  filter: "Filter",
   loading: "Loading...",
   confirm: "Are you sure ?",
   yes: "yes",
@@ -14,7 +11,6 @@ export default {
   unlimited: "infinite",
   remained: "Remained",
   type: "Type",
-  protocol: "Protocol",
   submit: "Submit",
   reset: "Reset",
   now: "Now",
@@ -23,15 +19,6 @@ export default {
   noData: "No data!",
   invalidLogin: "Invalid Login!",
   online: "Online",
-  version: "Version",
-  email: "Email",
-  commaSeparated: "(comma separated)",
-  count: "Count",
-  template: "Template",
-  error: {
-    dplData: "Duplicate Data",
-    core: "Sing-Box Error",
-  },
   pages: {
     login: "Login",
     home: "Home",
@@ -39,7 +26,6 @@ export default {
     outbounds: "Outbounds",
     clients: "Clients",
     rules: "Rules",
-    tls: "TLS Settings",
     basics: "Basics",
     admins: "Admins",
     settings: "Settings",
@@ -77,30 +63,15 @@ export default {
     outbound: "Outbound",
     rule: "Rule",
     user: "User",
-    tag: "Tag",
-    listen: "Listen",
-    dial: "Dial",
-    tls: "TLS",
-    multiplex: "Multiplex",
-    transport: "Transport",
-    method: "Method",
-    headers: "Headers",
-    key: "Key",
-    value: "Value",
   },
   actions: {
     action: "Action",
     add: "Add",
-    new: "New",
     edit: "Edit",
     del: "Delete",
-    clone: "Clone",
     save: "Save",
     update: "Update",
     submit: "Submit",
-    set: "Set",
-    generate: "Generate",
-    disable: "Disable",
     close: "Close",
     restartApp: "Restart App",
   },
@@ -119,13 +90,6 @@ export default {
     oldPass: "Current Password",
     newUname: "New Username",
     newPass: "New Password",
-    lastLogin: "Last login",
-    date: "Date",
-    time: "Time",
-    changes: "Changes",
-    actor: "Actor",
-    key: "Key",
-    action: "Action",
   },
   setting: {
     interface: "Interface",
@@ -138,25 +102,15 @@ export default {
     sslCert: "SSL Certificate Path",
     webUri: "Panel URI",
     sessionAge: "Session Maximum Age",
-    trafficAge: "Traffic Maximum Age",
     timeLoc: "Timezone Location",
     subEncode: "Enable Encoding",
     subInfo: "Enable Client Info",
     path: "Default Path",
     update: "Automatic Update Time",
     subUri: "Subscription URI",
-    jsonSub: "JSON Subscription",
-    toDirect: "Route to Direct",
-    toBlock: "Route to Block",
-    timestamp: "Timestamp",
-    globalDns: "Global DNS",
-    directDns: "Direct DNS",
-    toDirectDns: "Route to Direct DNS",
-    jsonSubOptions: "Other Options",
   },
   client: {
     name: "Name",
-    desc: "Description",
     inboundTags: "Inbound Tags",
     basics: "Basics",
     config: "Config",
@@ -164,185 +118,21 @@ export default {
     external: "External Link",
     sub: "External Subscription",
   },
-  types: {
-    un: "Username",
-    pw: "Password",
-    direct: {
-      overrideAddr: "Override Address",
-      overridePort: "Override Port",
-    },
-    hy: {
-      obfs: "Obfuscated Password",
-      auth: "Authentication Password",
-      hyOptions: "Hysteria Options",
-      hy2Options: "Hysteria2 Options",
-      ignoreBw: "Ignore Client Bandwidth",
-    },
-    shdwTls: {
-      hs: "Handshake Server",
-      addHS: "Add Handshake Server",
-    },
-    ssh: {
-      passphrase: "Passphrase",
-      hostKey: "Host Keys",
-      algorithm: "Key Algorithms",
-      clientVer: "Client Version",
-      options: "SSH Options",
-    },
-    tor: {
-      execPath: "Executable File Path",
-      dataDir: "Data Directory",
-      extArgs: "Extra Args",
-    },
-    tuic: {
-      congControl: "Congestion Control",
-      authTimeout: "Authentication Timeout",
-      hb: "Heartbeat",
-    },
-    vless: {
-      flow: "Flow",
-      udpEnc: "UDP Packet Encoding",
-    },
-    vmess: {
-      security: "Security",
-      globalPadding: "Global Padding",
-      authLen: "Encryptrd Length",
-    },
-    wg: {
-      privKey: "Private Key",
-      pubKey: "Peer Public Key",
-      psk: "Pre-Shared Key",
-      localIp: "Local IPs",
-      worker: "Workers",
-      ifName: "Interface Name",
-      sysIf: "System Interface",
-      gso: "Segmentation Offload",
-      options: "Wireguard Options",
-      multiPeer: "Multi Peer",
-      allowedIp: "Allowed IPs",
-      peer: "Peer",
-      peers: "Peers",
-    },
-    lb: {
-      defaultOut: "Default Outbound",
-      interruptConn: "Interrupt exist connections",
-      testUrl: "Test URL",
-      interval: "Interval",
-      tolerance: "Tolerance",
-      urlTestOptions: "URLTest Options"
-    }
-  },
   in: {
+    tag: "Tag",
     addr: "Address",
     port: "Port",
-    clients: "Enable Clients",
-    ssMethod: "Method",
-    sSide: "Server Side",
-    cSide: "Client Side",
-    multiDomain: "Multi Domain",
-    remark: "Remark",
-    mdOption: "Multi Domain Options",
-  },
-  listen: {
     sniffing: "Sniffing",
-    sniffingTimeout: "Sniffing Timeout",
+    tls: "TLS",
-    sniffingOverride: "Override Destation",
+    clients: "Enable Clients",
-    options: "Listen Options",
+    multiplex: "Multiplex",
-    tcpOptions: "TCP Options",
+    transport: "Transport",
-    udpOptions: "UDP Options",
-    detour: "Detour",
-    detourText: "Forward to inbound",
-    domainStrategy: "Domain Strategy",
-  },
-  dial: {
-    bindIf: "Bind to Network Interface",
-    bindIp4: "Bind to IPv4",
-    bindIp6: "Bind to IPv6",
-    reuseAddr: "Reuse Listener Address",
-    connTimeout: "Connection Timeout",
-    fbTimeout: "Fallback Timeout",
-    options: "Dial Options",
-    detourText: "Forward to outbound",
   },
   transport: {
     enable: "Enable Transport",
     host: "Host",
     hosts: "Hosts",
     path: "Path",
-    httpMethod: "Request Method",
-    idleTimeout: "Idle Timeout",
-    pingTimeout: "Ping Timeout",
-    grpcServiceName: "Service Name",
-    grpcPws: "Permit Without Stream",
-  },
-  mux: {
-    enable: "Enable Multiplex",
-    maxConn: "Max Connections",
-    minStr: "Min Streams",
-    maxStr: "Max Streams",
-    padding: "Only padding",
-    enableBrutal: "Enable Brutal",
-  },
-  out: {
-    addr: "Server Address",
-    port: "Server Port",
-  },
-  rule: {
-    add: "Add Rule",
-    simple: "Simple",
-    logical: "Logical",
-    mode: "Mode",
-    invert: "Invert",
-    ipVer: "IP Version",
-    domain: "Domains",
-    domainSufix: "Domain Suffixes",
-    domainKw: "Domain Keywords",
-    domainRgx: "Domain Regexes",
-    ip: "IP CIDRs",
-    privateIp: "Invalid IP Ranges",
-    port: "Ports",
-    portRange: "Port Ranges",
-    srcCidr: "Source IP CIDRs",
-    srcPrivateIp: "Invalid Source IPs",
-    srcPort: "Source Ports",
-    srcPortRange: "Source Port Ranges",
-    ruleset: "Rulesets",
-    rulesetMatchSrc: "Ruleset IPcidr Match Source",
-    options: "Rule Options",
-    domainRules: "Domain/IP",
-    srcIpRules: "Source IP",
-    srcPortRules: "Source Port",
-  },
-  ruleset: {
-    add: "Add Ruleset",
-    format: "Data Format",
-    interval: "Update Intervals",
-    remote: "Remote",
-    local: "Local",
-  },
-  basic: {
-    log: {
-      title: "Logs",
-      level: "Level",
-      output: "Output",
-      timestamp: "Enable Timestamp",
-    },
-    dns: {
-      final: "Final",
-      server: "Server",
-      firstServer: "First Server",
-      addrResolver: "Address Resolver",
-    },
-    routing: {
-      title: "Routing",
-      defaultOut: "Default Outbound",
-      defaultIf: "Default NIC",
-      defaultRm: "Default Routing Mark",
-      autoBind: "Auto Bind NIC",
-    },
-    exp: {
-      storeFakeIp: "Store Fake IP",
-    },
   },
   tls : {
     enable: "Enable TLS",
@@ -352,30 +142,6 @@ export default {
     keyPath: "Key File Path",
     cert: "Certificate",
     key: "Key",
-    options: "TLS Options",
-    minVer: "Minimum Version",
-    maxVer: "Maximum Version",
-    cs: "Cipher suits",
-    privKey: "Private Key",
-    pubKey: "Public Key",
-    disableSni: "Disable SNI",
-    insecure: "Allow Insecure",
-    acme: {
-      options: "ACME Options",
-      dataDir: "Data Directory",
-      defaultDomain: "Default Domain",
-      disableChallenges: "Disable Challenges",
-      httpChallenge: "Disable HTTP Challenge",
-      tlsChallenge: "Disable TLS Challenge",
-      altPorts: "Alternative Ports",
-      altHport: "Alternative HTTP Port",
-      altTport: "Alternative TLS Port",
-      caProvider: "CA Provider",
-      customCa: "Custom CA Provider",
-      extAcc: "External Account",
-      dns01: "DNS01 Challenge",
-      dns01Provider: "DNS01 Challenge Provider",
-    },
   },
   stats: {
     upload: "Upload",
@@ -394,9 +160,6 @@ export default {
     Kp: "Kp",
     Mp: "Mp",
     Gb: "Gb",
-    bps: "bps",
-    Kbps: "Kbps",
-    Mbps: "Mbps",
   },
   date: {
     expiry: "Expiry",
@@ -405,6 +168,5 @@ export default {
     h: "h",
     m: "m",
     s: "s",
-    ms: "ms",
+  }
-  },
 }

frontend/src/locales/fa.ts

@@ -4,9 +4,6 @@ export default {
   failed: "خطا",
   enable: "فعال",
   disable: "غیرفعال",
-  none: "هیچ",
-  all: "همه",
-  filter: "فیلتر",
   loading: "در حال بارگذاری...",
   confirm: "آیا مطمئن هستید ؟",
   yes: "بله",
@@ -14,7 +11,6 @@ export default {
   unlimited: "نامحدود",
   remained: "باقیمانده",
   type: "مدل",
-  protocol: "پروتکل",
   submit: "تایید",
   reset: "ریست",
   now: "اکنون",
@@ -23,15 +19,6 @@ export default {
   noData: "بدون داده!",
   invalidLogin: "ورود نامعتبر!",
   online: "آنلاین",
-  version: "نسخه",
-  email: "ایمیل",
-  commaSeparated: "(جداشده با کاما)",
-  count: "تعداد",
-  template: "الگو",
-  error: {
-    dplData: "داده تکراری",
-    core: "خطا در سینگ‌باکس",
-  },
   pages: {
     login: "ورود",
     home: "خانه",
@@ -39,7 +26,6 @@ export default {
     outbounds: "خروجی‌ها",
     clients: "کاربران",
     rules: "قوانین",
-    tls: "رمزنگاری‌ها",
     basics: "ترازها",
     admins: "ادمین‌ها",
     settings: "پیکربندی",
@@ -77,29 +63,15 @@ export default {
     outbound: "خروجی‌",
     rule: "قانون",
     user: "کاربر",
-    tag: "برچسب",
-    listen: "گوش‌دادن",
-    dial: "تماس",
-    tls: "رمزنگاری",
-    multiplex: "تسهیم",
-    transport: "انتقال",
-    headers: "سربرگ‌ها",
-    key: "نام",
-    value: "مقدار",
   },
   actions: {
     action: "فرمان",
     add: "ایجاد",
-    new: "جدید",
     edit: "ویرایش",
     del: "حذف",
-    clone: "شبیه‌سازی",
     save: "ذخیره",
     update: "بروزرسانی",
     submit: "ارسال",
-    set: "تنظیم",
-    generate: "تولید",
-    disable: "غیرفعال",
     close: "بستن",
     restartApp: "ریستارت پنل",
   },
@@ -118,13 +90,6 @@ export default {
     oldPass: "رمز کنونی",
     newUname: "نام کاربری جدید",
     newPass: "رمز جدید",
-    lastLogin: "آخرین ورود",
-    date: "تاریخ",
-    time: "ساعت",
-    changes: "تغییرات",
-    actor: "مجری",
-    key: "کلید",
-    action: "عمل",
   },
   setting: {
     interface: "نما",
@@ -137,25 +102,15 @@ export default {
     sslCert: "مسیر فایل گواهی",
     webUri: "آدرس نهایی پنل",
     sessionAge: "بیشینه زمان لاگین ماندن",
-    trafficAge: "بیشینه زمان ذخیره ترافیک",
     timeLoc: "منطقه زمانی",
     subEncode: "رمزگذاری",
     subInfo: "نمایش اطلاعات کاربر",
     path: "مسیر پیشفرض",
     update: "زمان بروزرسانی خودکار",
     subUri: "آدرس نهایی سابسکریپشن",
-    jsonSub: "سابسکریپشن JSON",
-    toDirect: "هدایت مستقیم",
-    toBlock: "بستن مسیر",
-    timestamp: "نمایش زمان",
-    globalDns: "DNS کلی",
-    directDns: "DNS مستقیم",
-    toDirectDns: "هدایت به DNS مستقیم",
-    jsonSubOptions: "گزینه‌های دیگر",
   },
   client: {
     name: "نام",
-    desc: "شرح",
     inboundTags: "برچسب‌های ورودی",
     basics: "پایه",
     config: "تنظیم",
@@ -163,185 +118,21 @@ export default {
     external: "لینک‌ خارجی",
     sub: "سابسکریپشن خارجی",
   },
-  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: "ضربان قلب",
-    },
-    vless: {
-      flow: "جریان",
-      udpEnc: "کدگذاری بسته UDP",
-    },
-    vmess: {
-      security: "امنیت",
-      globalPadding: "لایه بندی کلی",
-      authLen: "رمزگذاری اندازه بسته",
-    },
-    wg: {
-      privKey: "کلید خصوصی",
-      pubKey: "کلید عمومی همتا",
-      psk: "کلید مشترک",
-      localIp: "آدرس‌های محلی",
-      worker: "عملگرها",
-      ifName: "نام اینترفیس",
-      sysIf: "استفاده از اینترفیس سیستم",
-      gso: "بارگذاری تقسیم‌بندی عمومی",
-      options: "گزینه‌های Wireguard",
-      multiPeer: "چند همتایی",
-      allowedIp: "آدرس‌های مجاز",
-      peer: "همتا",
-      peers: "همتاها",
-    },
-    lb: {
-      defaultOut: "خروجی پیش‌فرض",
-      interruptConn: "قطع ارتباط موجود",
-      testUrl: "URL تست",
-      interval: "فاصله زمانی",
-      tolerance: "تحمل",
-      urlTestOptions: "گزینه‌های URLTest"
-    }
-  },
   in: {
+    tag: "برچسب",
     addr: "آدرس",
     port: "پورت",
+    sniffing: "مبدل آدرس",
+    tls: "رمزنگاری",
     clients: "فعال‌سازی کاربران",
-    ssMethod: "روش",
+    multiplex: "تسهیم",
-    sSide: "سمت سرور",
+    transport: "انتقال",
-    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: "فعال‌سازی شدت",
-  },
-  out: {
-    addr: "آدرس سرور",
-    port: "پورت سرور",
-  },
-  rule: {
-    add: "ایجاد قانون",
-    simple: "ساده",
-    logical: "منطقی",
-    mode: "حالت",
-    invert: "برعکس",
-    ipVer: "نسخه IP",
-    domain: "دامنه‌ها",
-    domainSufix: "پسوند‌های دامنه",
-    domainKw: "کلمات کلیدی دامنه",
-    domainRgx: "رجکس دامنه",
-    ip: "محدوده‌های IP",
-    privateIp: "آدرس های IP نامعتبر",
-    port: "پورت‌ها",
-    portRange: "محدوده‌های پورت",
-    srcIp: "محدوده‌های آدرس IP مبدا",
-    srcPrivateIp: "آدرس‌های IP مبدا نامعتبر",
-    srcPort: "پورت‌های مبدا",
-    srcPortRange: "محدوده پورتهای منبع",
-    ruleset: "مجموعه‌ها",
-    rulesetMatchSrc: "تطابق آدرس‌های مبدا با مجموعه قوانین",
-    options: "گزینه‌های قوانین",
-    domainRules: "دامنه/آدرس",
-    srcIpRules: "آدرس مبدا",
-    srcPortRules: "پورت مبدا",
-  },
-  ruleset: {
-    add: "ایجاد مجموعه",
-    format: "فرمت داده‌ها",
-    interval: "بازه بروزرسانی‌ها",
-    remote: "راه دور",
-    local: "محلی",
-  },
-  basic: {
-    log: {
-      title: "گزارش‌ها",
-      level: "سطح",
-      output: "خروجی",
-      timestamp: "فعال‌سازی ثبت زمان",
-    },
-    dns: {
-      final: "سرور نهایی",
-      server: "سرور",
-      firstServer: "سرور نخست",
-      addrResolver: "حل کننده دامنه",
-    },
-    routing: {
-      title: "مسیریابی",
-      defaultOut: "خروجی پیش‌فرض",
-      defaultIf: "کارت شبکه پیش‌فرض",
-      defaultRm: "Routing Mark پیش‌فرض",
-      autoBind: "انتخاب اتوماتیک کارت شبکه",
-    },
-    exp: {
-      storeFakeIp: "ذخیره آدرس‌های نامعتبر",
-    },
   },
   tls : {
     enable: "فعالسازی رمزنگاری",
@@ -351,30 +142,6 @@ export default {
     keyPath: "مسیر فایل کلید",
     cert: "گواهی",
     key: "کلید",
-    options: "گزینه‌های رمز‌نگاری",
-    minVer: "کمینه نسخه",
-    maxVer: "بیشینه نسخه",
-    cs: "مدل‌های رمزنگاری",
-    privKey: "کلید خصوصی",
-    pubKey: "کلید عمومی",
-    disableSni: "غیرفعال‌سازی SNI",
-    insecure: "تایید ارتباط ناامن",
-    acme: {
-      options: "گزینه‌های ACME",
-      dataDir: "مسیر داده‌ها",
-      defaultDomain: "دامنه پیش‌فرض",
-      disableChallenges: "بستن چالش‌ها",
-      httpChallenge: "بستن چالش HTTP",
-      tlsChallenge: "بستن چالش TLS",
-      altPorts: "پورت‌های جایگزین",
-      altHport: "پورت جایگزین HTTP",
-      altTport: "پورت جایگزین TLS",
-      caProvider: "فراهم کننده گواهی",
-      customCa: "فراهم کننده دیگر",
-      extAcc: "حساب خارجی",
-      dns01: "چالش DNS01",
-      dns01Provider: "فراهم کننده چالش DNS01",
-    },
   },
   stats: {
     upload: "آپلود",
@@ -393,9 +160,6 @@ export default {
     Kp: "ک‌پ",
     Mp: "م‌پ",
     Gp: "گ‌پ",
-    bps: "ب/ث",
-    Kbps: "ک‌ب/ث",
-    Mbps: "م‌ب/ث",
   },
   date: {
     expiry: "انقضا",
@@ -404,6 +168,5 @@ export default {
     h: "س",
     m: "د",
     s: "ث",
-    ms: "م‌ث",
   }
 }

frontend/src/locales/index.ts

@@ -1,27 +1,22 @@
 import { createI18n } from 'vue-i18n'
 import en from './en'
 import fa from './fa'
-import vi from './vi'
 import zhcn from './zhcn'
-import zhtw from './zhtw'
+
 
 export const i18n = createI18n({
   legacy: false,
   locale: localStorage.getItem("locale") ?? 'en',
   fallbackLocale: 'en',
   messages: {
-    en: en,
+    en,
-    fa: fa,
+    fa,
-    vi: vi,
+    zhcn
-    zhHans: zhcn,
-    zhHant: zhtw
   },
 })
 
 export const languages = [
   { title: 'English', value: 'en' },
   { title: 'فارسی', value: 'fa' },
-  { title: 'Tiếng Việt', value: 'vi' },
+  { title: '简体中文', value: 'zhcn' },
-  { title: '简体中文', value: 'zhHans' },
-  { title: '繁體中文', value: 'zhHant' },
 ]

frontend/src/locales/vi.ts

@@ -1,411 +0,0 @@
-export default {
-  message: "Chào mừng OHB",
-  success: "Thành công",
-  failed: "Thất bại",
-  enable: "Kích hoạt",
-  disable: "Vô hiệu hóa",
-  none: "Không",
-  all: "Tất cả",
-  filter: "Bộ lọc",
-  loading: "Đang tải...",
-  confirm: "Bạn chắc chắn chứ?",
-  yes: "có",
-  no: "không",
-  unlimited: "vô hạn",
-  remained: "Còn lại",
-  type: "Loại",
-  protocol: "Giao thức",
-  submit: "Gửi",
-  reset: "Đặt lại",
-  now: "Hiện tại",
-  network: "Mạng",
-  copyToClipboard: "Sao chép vào clipboard",
-  noData: "Không có dữ liệu!",
-  invalidLogin: "Đăng nhập không hợp lệ!",
-  online: "Trực tuyến",
-  version: "Phiên bản",
-  email: "Email",
-  commaSeparated: "(được phân tách bằng dấu phẩy)",
-  count: "Đếm",
-  template: "Mẫu",
-  error: {
-    dplData: "Dữ liệu trùng lặp",
-    core: "Lỗi Sing-Box",
-  },
-  pages: {
-    login: "Đăng nhập",
-    home: "Trang chủ",
-    inbounds: "Đầu Vào",
-    outbounds: "Đầu ra",
-    clients: "Khách hàng",
-    rules: "Quy tắc",
-    tls: "Cài đặt TLS",
-    basics: "Cơ bản",
-    admins: "Quản trị viên",
-    settings: "Cài đặt",
-  },
-  main: {
-    tiles: "OHB",
-    gauges: "Đồng hồ đo",
-    charts: "Biểu đồ",
-    infos: "Thông tin",
-    gauge: {
-      cpu: "Đồng hồ CPU",
-      mem: "Đồng hồ RAM",
-    },
-    chart: {
-      cpu: "Máy theo dõi CPU",
-      mem: "Máy theo dõi RAM",
-      net: "Băng thông mạng",
-      pnet: "Gói mạng",
-    },
-    info: {
-      sys: "Thông tin hệ thống",
-      sbd: "Thông tin Sing-Box",
-      host: "Máy chủ",
-      cpu: "CPU",
-      core: "Nhân",
-      uptime: "Thời gian hoạt động",
-      threads: "Luồng",
-      memory: "Bộ nhớ",
-      running: "Đang chạy"
-    }
-  },
-  objects: {
-    inbound: "Đầu Vào",
-    client: "Máy Khách hàng",
-    outbound: "Đầu Ra",
-    rule: "Quy tắc",
-    user: "Người dùng",
-    tag: "Thẻ",
-    listen: "Nghe",
-    dial: "Quay số",
-    tls: "TLS",
-    multiplex: "Ghép đa truyền thông ",
-    transport: "Giao thông",
-    method: "Phương pháp",
-    headers: "Tiêu đề",
-    key: "Chìa khóa",
-    value: "Giá trị",
-  },
-  actions: {
-    action: "Hành động",
-    add: "Thêm",
-    new: "Mới",
-    edit: "Chỉnh sửa",
-    del: "Xóa",
-    clone: "Nhân bản",
-    save: "Lưu",
-    update: "Cập nhật",
-    submit: "Gửi",
-    set: "Đặt",
-    generate: "Tạo ra",
-    disable: "Vô hiệu hóa",
-    close: "Đóng",
-    restartApp: "Khởi động lại ứng dụng",
-  },
-  login: {
-    title: "Đăng nhập",
-    username: "Tên người dùng",
-    unRules: "Tên người dùng không thể trống",
-    password: "Mật khẩu",
-    pwRules: "Mật khẩu không thể trống",
-  },
-  menu: {
-    logout: "Đăng xuất",
-  },
-  admin: {
-    changeCred: "Thay đổi thông tin đăng nhập",
-    oldPass: "Mật khẩu hiện tại",
-    newUname: "Tên người dùng mới",
-    newPass: "Mật khẩu mới",
-    lastLogin: "Lân đăng nhập cuôi",
-    date: "Ngày",
-    time: "Thời gian",
-    changes: "Thay đổi",
-    actor: "Diễn viên",
-    key: "Khóa",
-    action: "Hành động",
-  },
-  setting: {
-    interface: "Giao diện",
-    sub: "Đăng ký",
-    addr: "Địa chỉ",
-    port: "Cổng",
-    webPath: "Đường dẫn gốc",
-    domain: "Miền",
-    sslKey: "Đường dẫn khóa SSL",
-    sslCert: "Đường dẫn chứng chỉ SSL",
-    webUri: "URI bảng điều khiển",
-    sessionAge: "Tuổi tối đa của phiên",
-    trafficAge: "Tuổi lưu thông tối đa",
-    timeLoc: "Vị trí múi giờ",
-    subEncode: "Kích hoạt mã hóa",
-    subInfo: "Kích hoạt thông tin khách hàng",
-    path: "Đường dẫn mặc định",
-    update: "Thời gian cập nhật tự động",
-    subUri: "URI đăng ký",
-    jsonSub: "Đăng ký JSON",
-    toDirect: "Chuyển hướng tới Trực tiếp",
-    toBlock: "Chuyển hướng tới Chặn",
-    timestamp: "Dấu thời gian",
-    globalDns: "DNS Toàn cầu",
-    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",
-  },
-  client: {
-    name: "Tên",
-    desc: "Mô tả",
-    inboundTags: "Thẻ đầu vào",
-    basics: "Cơ bản",
-    config: "Cấu hình",
-    links: "Liên kết",
-    external: "Liên kết bên ngoài",
-    sub: "Đăng ký bên ngoài",
-  },
-  types: {
-    un: "Tên người dùng",
-    pw: "Mật khẩu",
-    direct: {
-      overrideAddr: "Ghi đè Địa chỉ",
-      overridePort: "Ghi đè Cổng",
-    },
-    hy: {
-      obfs: "Mật khẩu đã được Ẩn",
-      auth: "Mật khẩu Xác thực",
-      hyOptions: "Tùy chọn Hysteria",
-      hy2Options: "Tùy chọn Hysteria2",
-      ignoreBw: "Bỏ qua Băng thông của Client",
-    },
-    shdwTls: {
-      hs: "Máy chủ Handshake",
-      addHS: "Thêm Máy chủ Handshake",
-    },
-    ssh: {
-      passphrase: "Cụm từ mật khẩu",
-      hostKey: "Khóa Máy chủ",
-      algorithm: "Thuật toán Khóa",
-      clientVer: "Phiên bản Client",
-      options: "Tùy chọn SSH",
-    },
-    tor: {
-      execPath: "Đường dẫn File thực thi",
-      dataDir: "Thư mục Dữ liệu",
-      extArgs: "Đối số Bổ sung",
-    },
-    tuic: {
-      congControl: "Kiểm soát Tắc nghẽn",
-      authTimeout: "Thời gian chờ Xác thực",
-      hb: "Nhịp tim",
-    },
-    vless: {
-      flow: "Luồng",
-      udpEnc: "Mã hóa Gói UDP",
-    },
-    vmess: {
-      security: "Bảo mật",
-      globalPadding: "Đệm Toàn cầu",
-      authLen: "Chiều dài Mã hóa",
-    },
-    wg: {
-      privKey: "Khóa Riêng tư",
-      pubKey: "Khóa Công khai của Đối tác",
-      psk: "Khóa được Chia sẻ trước",
-      localIp: "IPs Cục bộ",
-      worker: "Công nhân",
-      ifName: "Tên Giao diện",
-      sysIf: "Giao diện Hệ thống",
-      gso: "Giao Thức GSO",
-      options: "Tùy chọn Wireguard",
-      multiPeer: "Nhiều Đối tác",
-      allowedIp: "IPs được Phép",
-      peer: "Đối tác",
-      peers: "Đối tác",
-    },
-    lb: {
-      defaultOut: "Đầu ra Mặc định",
-      interruptConn: "Ngắt kết nối hiện tại",
-      testUrl: "URL Kiểm tra",
-      interval: "Khoảng thời gian",
-      tolerance: "Sự dung hòa",
-      urlTestOptions: "Tùy chọn Kiểm tra URL",
-    }
-  },
-  in: {
-    addr: "Địa chỉ",
-    port: "Cổng",
-    sniffing: "Đang Sniffing",
-    clients: "Kích hoạt khách hàng",
-    ssMethod: "Phương thức",
-    sSide: "Phía Máy chủ",
-    cSide: "Phía Khách hàng",
-    multiDomain: "Nhiều Tên miền",
-    remark: "Ghi chú",
-    mdOption: "Tùy chọn Nhiều Tên miền",
-  },
-  listen: {
-    sniffing: "Đang Sniffing",
-    sniffingTimeout: "Thời gian Chờ Sniffing",
-    sniffingOverride: "Ghi đè Đích",
-    options: "Tùy chọn Nghe",
-    tcpOptions: "Tùy chọn TCP",
-    udpOptions: "Tùy chọn UDP",
-    detour: "Lạc đạo",
-    detourText: "Chuyển tiếp tới đầu vào",
-    domainStrategy: "Chiến lược Domain",
-  },
-  dial: {
-    bindIf: "Ràng buộc tới Giao diện Mạng",
-    bindIp4: "Ràng buộc tới IPv4",
-    bindIp6: "Ràng buộc tới IPv6",
-    reuseAddr: "Sử dụng lại Địa chỉ Nghe",
-    connTimeout: "Thời gian Chờ Kết nối",
-    fbTimeout: "Thời gian Chờ Fallback",
-    options: "Tùy chọn Gọi",
-    detourText: "Chuyển tiếp tới thư đi",
-  },
-  transport: {
-    enable: "Kích hoạt vận chuyển",
-    host: "Máy chủ",
-    hosts: "Máy chủ",
-    path: "Đường dẫn",
-    httpMethod: "Phương thức Yêu cầu",
-    idleTimeout: "Thời gian Chờ Chờ đợi",
-    pingTimeout: "Thời gian Chờ Ping",
-    grpcServiceName: "Tên Dịch vụ",
-    grpcPws: "Cho phép mà không Có Luồng",
-  },
-  mux: {
-    enable: "Bật Multiplex",
-    maxConn: "Số kết nối Tối đa",
-    minStr: "Số Luồng Tối thiểu",
-    maxStr: "Số Luồng Tối đa",
-    padding: "Chỉ đệm",
-    enableBrutal: "Bật Brutal",
-  },
-  out: {
-    addr: "Địa chỉ Máy chủ",
-    port: "Cổng Máy chủ",
-  },
-  rule: {
-    add: "Thêm Quy tắc",
-    simple: "Đơn giản",
-    logical: "Logic",
-    mode: "Chế độ",
-    invert: "Nghịch đảo",
-    ipVer: "Phiên bản IP",
-    domain: "Tên miền",
-    domainSufix: "Hậu tố Miền",
-    domainKw: "Từ khóa Miền",
-    domainRgx: "Regex Miền",
-    ip: "CIDRs IP",
-    privateIp: "Dải IP Không hợp lệ",
-    port: "Cổng",
-    portRange: "Dải Cổng",
-    srcCidr: "CIDRs IP Nguồn",
-    srcPrivateIp: "IP Nguồn Không hợp lệ",
-    srcPort: "Cổng Nguồn",
-    srcPortRange: "Dải Cổng Nguồn",
-    ruleset: "Bộ quy tắc",
-    rulesetMatchSrc: "Bộ quy tắc IPcidr Phù hợp Nguồn",
-    options: "Tùy chọn Quy tắc",
-    domainRules: "Tên miền/IP",
-    srcIpRules: "IP Nguồn",
-    srcPortRules: "Cổng Nguồn",
-  },
-  ruleset: {
-    add: "Thêm Bộ quy tắc",
-    format: "Định dạng Dữ liệu",
-    interval: "Khoảng cách Cập nhật",
-    remote: "Xa",
-    local: "Cục bộ",
-  },
-  basic: {
-    log: {
-      title: "Nhật ký",
-      level: "Mức độ",
-      output: "Đầu ra",
-      timestamp: "Bật Dấu thời gian",
-    },
-    dns: {
-      final: "Cuối cùng",
-      server: "Máy chủ",
-      firstServer: "Máy chủ Đầu tiên",
-      addrResolver: "Trình phân giải địa chỉ",
-    },
-    routing: {
-      title: "Định tuyến",
-      defaultOut: "Ra ngoài Mặc định",
-      defaultIf: "NIC Mặc định",
-      defaultRm: "Đánh dấu Định tuyến Mặc định",
-      autoBind: "Tự động Ràng buộc NIC",
-    },
-    exp: {
-      storeFakeIp: "Lưu IP Giả mạo",
-    },
-  },
-  tls : {
-    enable: "Kích hoạt TLS",
-    usePath: "Sử dụng đường dẫn",
-    useText: "Sử dụng văn bản",
-    certPath: "Đường dẫn tệp chứng chỉ",
-    keyPath: "Đường dẫn tệp khóa",
-    cert: "Chứng chỉ",
-    key: "Khóa",
-    options: "Tùy chọn TLS",
-    minVer: "Phiên bản Tối thiểu",
-    maxVer: "Phiên bản Tối đa",
-    cs: "Các bộ mã hóa",
-    privKey: "Khóa riêng",
-    pubKey: "Khóa Công khai",
-    disableSni: "Tắt SNI",
-    insecure: "Cho phép Không an toàn",
-    acme: {
-      options: "Tùy chọn ACME",
-      dataDir: "Thư mục Dữ liệu",
-      defaultDomain: "Tên miền Mặc định",
-      disableChallenges: "Vô hiệu hóa Thách thức",
-      httpChallenge: "Vô hiệu hóa Thách thức HTTP",
-      tlsChallenge: "Vô hiệu hóa Thách thức TLS",
-      altPorts: "Cổng Thay thế",
-      altHport: "Cổng HTTP Thay thế",
-      altTport: "Cổng TLS Thay thế",
-      caProvider: "Nhà cung cấp CA",
-      customCa: "Nhà cung cấp CA Tùy chỉnh",
-      extAcc: "Tài khoản Bên ngoài",
-      dns01: "Thách thức DNS01",
-      dns01Provider: "Nhà cung cấp Thách thức DNS01"
-    },
-  },
-  stats: {
-    upload: "Tải lên",
-    download: "Tải xuống",
-    volume: "Thể tích",
-    usage: "Sử dụng",
-    enable: "Kích hoạt thống kê",
-    graphTitle: "Biểu đồ lưu lượng",
-    B: "B",
-    KB: "KB",
-    MB: "MB",
-    GB: "GB",
-    TB: "TB",
-    PB: "PB",
-    p: "ph",
-    Kp: "Kph",
-    Mp: "Mph",
-    Gb: "Gb",
-    bps: "bps",
-    Kbps: "Kbps",
-    Mbps: "Mbps",
-  },
-  date: {
-    expiry: "Hết hạn",
-    expired: "Đã hết hạn",
-    d: "ng",
-    h: "g",
-    m: "p",
-    s: "s",
-    ms: "ms",
-  },
-}