enhance: node analytic init

frontend/.yarnrc.yml

@@ -1 +1,3 @@
 nodeLinker: node-modules
+
+yarnPath: .yarn/releases/yarn-1.22.19.cjs

frontend/package.json

@@ -50,5 +50,6 @@
         "vite-plugin-html": "^3.2.0",
         "vite-svg-loader": "^4.0.0",
         "vue-tsc": "^1.6.1"
-    }
+    },
+    "packageManager": "yarn@1.22.19"
 }

frontend/src/version.json

@@ -1 +1 @@
-{"version":"1.9.9","build_id":127,"total_build":197}
+{"version":"1.9.9","build_id":129,"total_build":199}

frontend/version.json

@@ -1 +1 @@
-{"version":"1.9.9","build_id":127,"total_build":197}
+{"version":"1.9.9","build_id":129,"total_build":199}

main.go

@@ -4,7 +4,6 @@ import (
 	"flag"
 	"fmt"
 	"github.com/0xJacky/Nginx-UI/server"
-	"github.com/0xJacky/Nginx-UI/server/service"
 	"github.com/0xJacky/Nginx-UI/server/settings"
 	"github.com/gin-gonic/gin"
 	"github.com/jpillora/overseer"
@@ -21,7 +20,7 @@ func main() {
 
 	gin.SetMode(settings.ServerSettings.RunMode)
 
-	r, err := service.GetRuntimeInfo()
+	r, err := server.GetRuntimeInfo()
 
 	if err != nil {
 		log.Fatalln(err)

server/api/analytic.go

@@ -230,13 +230,13 @@ func GetIntroAnalytic(c *gin.Context) {
 
 	for {
 		// write
-		err = ws.WriteJSON(analytic.GetNodeAnalyticIntro())
+		err = ws.WriteJSON(analytic.GetNodeStat())
 		if err != nil {
 			logger.Error(err)
 			break
 		}
 
-		time.Sleep(5 * time.Second)
+		time.Sleep(10 * time.Second)
 	}
 }
 

server/api/environment.go

@@ -1,9 +1,9 @@
 package api
 
 import (
+	"github.com/0xJacky/Nginx-UI/server/internal/environment"
 	"github.com/0xJacky/Nginx-UI/server/model"
 	"github.com/0xJacky/Nginx-UI/server/query"
-	"github.com/0xJacky/Nginx-UI/server/service"
 	"github.com/gin-gonic/gin"
 	"github.com/spf13/cast"
 	"net/http"
@@ -24,7 +24,7 @@ func GetEnvironment(c *gin.Context) {
 }
 
 func GetEnvironmentList(c *gin.Context) {
-	data, err := service.RetrieveEnvironmentList()
+	data, err := environment.RetrieveEnvironmentList()
 	if err != nil {
 		ErrHandler(c, err)
 		return

server/api/node.go

@@ -2,7 +2,7 @@ package api
 
 import (
 	"github.com/0xJacky/Nginx-UI/server/internal/analytic"
-	"github.com/0xJacky/Nginx-UI/server/service"
+	"github.com/0xJacky/Nginx-UI/server/internal/upgrader"
 	"github.com/dustin/go-humanize"
 	"github.com/gin-gonic/gin"
 	"github.com/shirou/gopsutil/v3/cpu"
@@ -18,28 +18,28 @@ func GetCurrentNode(c *gin.Context) {
 		return
 	}
 
-	runtimeInfo, err := service.GetRuntimeInfo()
+	runtimeInfo, err := upgrader.GetRuntimeInfo()
 	if err != nil {
 		ErrHandler(c, err)
 		return
 	}
-
 	cpuInfo, _ := cpu.Info()
 	memory, _ := getMemoryStat()
-	ver, _ := service.GetCurrentVersion()
+	ver, _ := upgrader.GetCurrentVersion()
 	diskUsage, _ := disk.Usage(".")
 
-	intro := analytic.GetNodeAnalyticIntro()
-
-	nodeInfo := service.NodeInfo{
-		RequestNodeSecret: c.MustGet("NodeSecret").(string),
-		NodeRuntimeInfo:   runtimeInfo,
-		CPUNum:            len(cpuInfo),
-		MemoryTotal:       memory.Total,
-		DiskTotal:         humanize.Bytes(diskUsage.Total),
-		Version:           ver.Version,
-		Node:              intro,
+	nodeInfo := analytic.NodeInfo{
+		NodeRuntimeInfo: runtimeInfo,
+		CPUNum:          len(cpuInfo),
+		MemoryTotal:     memory.Total,
+		DiskTotal:       humanize.Bytes(diskUsage.Total),
+		Version:         ver.Version,
 	}
 
-	c.JSON(http.StatusOK, nodeInfo)
+	stat := analytic.GetNodeStat()
+
+	c.JSON(http.StatusOK, analytic.Node{
+		NodeInfo: nodeInfo,
+		NodeStat: stat,
+	})
 }

server/api/template.go

@@ -2,7 +2,7 @@ package api
 
 import (
 	"github.com/0xJacky/Nginx-UI/server/internal/nginx"
-	"github.com/0xJacky/Nginx-UI/server/service"
+	"github.com/0xJacky/Nginx-UI/server/internal/template"
 	"github.com/gin-gonic/gin"
 	"net/http"
 )
@@ -45,7 +45,7 @@ func GetTemplate(c *gin.Context) {
 }
 
 func GetTemplateConfList(c *gin.Context) {
-	configList, err := service.GetTemplateList("conf")
+	configList, err := template.GetTemplateList("conf")
 
 	if err != nil {
 		ErrHandler(c, err)
@@ -58,7 +58,7 @@ func GetTemplateConfList(c *gin.Context) {
 }
 
 func GetTemplateBlockList(c *gin.Context) {
-	configList, err := service.GetTemplateList("block")
+	configList, err := template.GetTemplateList("block")
 
 	if err != nil {
 		ErrHandler(c, err)
@@ -72,18 +72,18 @@ func GetTemplateBlockList(c *gin.Context) {
 
 func GetTemplateBlock(c *gin.Context) {
 	type resp struct {
-		service.ConfigInfoItem
-		service.ConfigDetail
+		template.ConfigInfoItem
+		template.ConfigDetail
 	}
-	var bindData map[string]service.TVariable
+	var bindData map[string]template.TVariable
 	_ = c.ShouldBindJSON(&bindData)
-	info := service.GetTemplateInfo("block", c.Param("name"))
+	info := template.GetTemplateInfo("block", c.Param("name"))
 
 	if bindData == nil {
 		bindData = info.Variables
 	}
 
-	detail, err := service.ParseTemplate("block", c.Param("name"), bindData)
+	detail, err := template.ParseTemplate("block", c.Param("name"), bindData)
 	if err != nil {
 		ErrHandler(c, err)
 		return

server/api/upgrade.go

@@ -2,35 +2,35 @@ package api
 
 import (
 	"github.com/0xJacky/Nginx-UI/server/internal/logger"
-	"github.com/0xJacky/Nginx-UI/server/service"
+	"github.com/0xJacky/Nginx-UI/server/internal/upgrader"
 	"github.com/gin-gonic/gin"
 	"github.com/gorilla/websocket"
 	"net/http"
 	"os"
 )
 
 func GetRelease(c *gin.Context) {
-	data, err := service.GetRelease(c.Query("channel"))
+	data, err := upgrader.GetRelease(c.Query("channel"))
 	if err != nil {
 		ErrHandler(c, err)
 		return
 	}
-	runtimeInfo, err := service.GetRuntimeInfo()
+	runtimeInfo, err := upgrader.GetRuntimeInfo()
 	if err != nil {
 		ErrHandler(c, err)
 		return
 	}
 	type resp struct {
-		service.TRelease
-		service.RuntimeInfo
+		upgrader.TRelease
+		upgrader.RuntimeInfo
 	}
 	c.JSON(http.StatusOK, resp{
 		data, runtimeInfo,
 	})
 }
 
 func GetCurrentVersion(c *gin.Context) {
-	curVer, err := service.GetCurrentVersion()
+	curVer, err := upgrader.GetCurrentVersion()
 	if err != nil {
 		ErrHandler(c, err)
 		return
@@ -70,7 +70,7 @@ func PerformCoreUpgrade(c *gin.Context) {
 		"message": "Initialing core upgrader",
 	})
 
-	u, err := service.NewUpgrader(control.Channel)
+	u, err := upgrader.NewUpgrader(control.Channel)
 
 	if err != nil {
 		_ = ws.WriteJSON(gin.H{