Merge pull request #406 from alireza0/consolidation

Consolidation

Author: alireza0

.github/workflows/docker-core.yml

@@ -60,7 +60,7 @@ jobs:
           cd ..
           mv frontend/dist backend/web/html
 
-      - name: Build s-ui & singbox
+      - name: Build s-ui
         run: |
           export CGO_ENABLED=1
           export GOOS=linux
@@ -88,27 +88,15 @@ jobs:
             export CC=s390x-linux-gnu-gcc
           fi
 
-          #### Build Sing-Box
-          export VERSION=v1.10.1
-          git clone -b $VERSION https://github.com/SagerNet/sing-box
-          cd sing-box
-          go build -tags with_quic,with_grpc,with_wireguard,with_ech,with_utls,with_reality_server,with_acme,with_v2ray_api,with_clash_api,with_gvisor \
-          -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
           cd backend
-          go build -o ../sui main.go
+          go build -ldflags="-w -s" -tags "with_quic,with_grpc,with_ech,with_utls,with_reality_server,with_acme,with_gvisor" -o ../sui main.go
           cd ..
 
           mkdir s-ui
           cp sui s-ui/
           cp s-ui.service s-ui/
-          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 s-ui.sh s-ui/
 
       - name: Package
         run: tar -zcvf s-ui-linux-${{ matrix.platform }}.tar.gz s-ui

.github/workflows/release.yml

@@ -12,7 +12,7 @@ ENV GOARCH=$TARGETARCH
 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 -ldflags="-w -s" -tags "with_quic,with_grpc,with_ech,with_utls,with_reality_server,with_acme,with_gvisor" -o sui main.go
 
 FROM --platform=$TARGETPLATFORM alpine
 LABEL org.opencontainers.image.authors="alireza7@gmail.com"

Dockerfile

@@ -1,10 +1,11 @@
 package api
 
 import (
+	"encoding/json"
 	"s-ui/logger"
 	"s-ui/service"
-	"s-ui/singbox"
 	"s-ui/util"
+	"s-ui/util/common"
 	"strconv"
 	"strings"
 
@@ -17,11 +18,12 @@ type APIHandler struct {
 	service.ConfigService
 	service.ClientService
 	service.TlsService
-	service.InDataService
+	service.InboundService
+	service.OutboundService
+	service.EndpointService
 	service.PanelService
 	service.StatsService
 	service.ServerService
-	singbox.Controller
 }
 
 func NewAPIHandler(g *gin.RouterGroup) {
@@ -45,6 +47,8 @@ func (a *APIHandler) postHandler(c *gin.Context) {
 	var err error
 	action := c.Param("postAction")
 	remoteIP := getRemoteIp(c)
+	loginUser := GetLoginUser(c)
+	hostname := getHostname(c)
 
 	switch action {
 	case "login":
@@ -81,25 +85,31 @@ func (a *APIHandler) postHandler(c *gin.Context) {
 			jsonMsg(c, "", err)
 		}
 	case "save":
-		loginUser := GetLoginUser(c)
-		data := map[string]string{}
-		err = c.ShouldBind(&data)
-		if err == nil {
-			err = a.ConfigService.SaveChanges(data, loginUser)
+		obj := c.Request.FormValue("object")
+		act := c.Request.FormValue("action")
+		data := c.Request.FormValue("data")
+		objs, err := a.ConfigService.Save(obj, act, json.RawMessage(data), loginUser, hostname)
+		if err != nil {
+			jsonMsg(c, "save", err)
+			return
 		}
-		jsonMsg(c, "save", err)
+		err = a.loadPartialData(c, objs)
+		if err != nil {
+			jsonMsg(c, obj, err)
+		}
+		return
 	case "restartApp":
 		err = a.PanelService.RestartPanel(3)
 		jsonMsg(c, "restartApp", err)
 	case "restartSb":
-		err = a.Controller.Restart()
+		err = a.ConfigService.RestartCore()
 		jsonMsg(c, "restartSb", err)
 	case "linkConvert":
 		link := c.Request.FormValue("link")
 		result, _, err := util.GetOutbound(link, 0)
 		jsonObj(c, result, err)
 	default:
-		jsonMsg(c, "API call", nil)
+		jsonMsg(c, "failed", common.NewError("unknown action: ", action))
 	}
 }
 
@@ -121,6 +131,12 @@ func (a *APIHandler) getHandler(c *gin.Context) {
 			return
 		}
 		jsonObj(c, data, nil)
+	case "inbounds", "outbounds", "endpoints", "tls", "clients", "config":
+		err := a.loadPartialData(c, []string{action})
+		if err != nil {
+			jsonMsg(c, action, err)
+		}
+		return
 	case "users":
 		users, err := a.UserService.GetUsers()
 		if err != nil {
@@ -156,10 +172,9 @@ func (a *APIHandler) getHandler(c *gin.Context) {
 		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)
+		logs := a.ServerService.GetLogs(count, level)
 		jsonObj(c, logs, nil)
 	case "changes":
 		actor := c.Query("a")
@@ -173,7 +188,7 @@ func (a *APIHandler) getHandler(c *gin.Context) {
 		keypair := a.ServerService.GenKeypair(kType, options)
 		jsonObj(c, keypair, nil)
 	default:
-		jsonMsg(c, "API call", nil)
+		jsonMsg(c, "failed", common.NewError("unknown action: ", action))
 	}
 }
 
@@ -188,7 +203,7 @@ func (a *APIHandler) loadData(c *gin.Context) (interface{}, error) {
 
 	sysInfo := a.ServerService.GetSingboxInfo()
 	if sysInfo["running"] == false {
-		logs := a.ServerService.GetLogs("sing-box", "1", "debug")
+		logs := a.ServerService.GetLogs("1", "debug")
 		if len(logs) > 0 {
 			data["lastLog"] = logs[0]
 		}
@@ -198,7 +213,7 @@ func (a *APIHandler) loadData(c *gin.Context) (interface{}, error) {
 		return "", err
 	}
 	if isUpdated {
-		config, err := a.ConfigService.GetConfig()
+		config, err := a.SettingService.GetConfig()
 		if err != nil {
 			return "", err
 		}
@@ -210,18 +225,28 @@ func (a *APIHandler) loadData(c *gin.Context) (interface{}, error) {
 		if err != nil {
 			return "", err
 		}
-		inData, err := a.InDataService.GetAll()
+		inbounds, err := a.InboundService.GetAll()
+		if err != nil {
+			return "", err
+		}
+		outbounds, err := a.OutboundService.GetAll()
+		if err != nil {
+			return "", err
+		}
+		endpoints, err := a.EndpointService.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["config"] = json.RawMessage(config)
 		data["clients"] = clients
 		data["tls"] = tlsConfigs
-		data["inData"] = inData
+		data["inbounds"] = inbounds
+		data["outbounds"] = outbounds
+		data["endpoints"] = endpoints
 		data["subURI"] = subURI
 		data["onlines"] = onlines
 	} else {
@@ -230,3 +255,61 @@ func (a *APIHandler) loadData(c *gin.Context) (interface{}, error) {
 
 	return data, nil
 }
+
+func (a *APIHandler) loadPartialData(c *gin.Context, objs []string) error {
+	data := make(map[string]interface{}, 0)
+
+	for _, obj := range objs {
+		switch obj {
+		case "inbounds":
+			id := c.Query("id")
+			inbounds, err := a.InboundService.Get(id)
+			if err != nil {
+				return err
+			}
+			data[obj] = inbounds
+		case "outbounds":
+			outbounds, err := a.OutboundService.GetAll()
+			if err != nil {
+				return err
+			}
+			data[obj] = outbounds
+		case "endpoints":
+			endpoints, err := a.EndpointService.GetAll()
+			if err != nil {
+				return err
+			}
+			data[obj] = endpoints
+		case "tls":
+			tlsConfigs, err := a.TlsService.GetAll()
+			if err != nil {
+				return err
+			}
+			data[obj] = tlsConfigs
+		case "clients":
+			clients, err := a.ClientService.GetAll()
+			if err != nil {
+				return err
+			}
+			data[obj] = clients
+		case "config":
+			config, err := a.SettingService.GetConfig()
+			if err != nil {
+				return err
+			}
+			data[obj] = json.RawMessage(config)
+		}
+	}
+
+	jsonObj(c, data, nil)
+	return nil
+}
+
+func (a *APIHandler) postActions(c *gin.Context) (string, json.RawMessage, error) {
+	var data map[string]json.RawMessage
+	err := c.ShouldBind(&data)
+	if err != nil {
+		return "", nil, err
+	}
+	return string(data["action"]), data["data"], nil
+}

backend/api/api.go

@@ -27,6 +27,14 @@ func getRemoteIp(c *gin.Context) string {
 	}
 }
 
+func getHostname(c *gin.Context) string {
+	host := c.Request.Host
+	if colonIndex := strings.LastIndex(host, ":"); colonIndex != -1 {
+		host, _, _ = net.SplitHostPort(c.Request.Host)
+	}
+	return host
+}
+
 func jsonMsg(c *gin.Context, msg string, err error) {
 	jsonMsgObj(c, msg, nil, err)
 }
@@ -46,7 +54,7 @@ func jsonMsgObj(c *gin.Context, msg string, obj interface{}, err error) {
 		}
 	} else {
 		m.Success = false
-		m.Msg = msg + err.Error()
+		m.Msg = msg + ": " + err.Error()
 		logger.Warning("failed :", err)
 	}
 	c.JSON(http.StatusOK, m)