refactor: project structure

main.go

@@ -1,74 +1,36 @@
 package main
 
 import (
-	"flag"
+    "flag"
-	"fmt"
+    "fmt"
-	"github.com/0xJacky/Nginx-UI/server/analytic"
+    "github.com/0xJacky/Nginx-UI/server"
-	"github.com/0xJacky/Nginx-UI/server/model"
+    "github.com/0xJacky/Nginx-UI/server/service"
-	"github.com/0xJacky/Nginx-UI/server/pkg/cert"
+    "github.com/0xJacky/Nginx-UI/server/settings"
-	"github.com/0xJacky/Nginx-UI/server/pkg/nginx"
+    "github.com/gin-gonic/gin"
-	"github.com/0xJacky/Nginx-UI/server/query"
+    "github.com/jpillora/overseer"
-	"github.com/0xJacky/Nginx-UI/server/router"
+    "github.com/jpillora/overseer/fetcher"
-	"github.com/0xJacky/Nginx-UI/server/service"
+    "log"
-	"github.com/0xJacky/Nginx-UI/server/settings"
-	"github.com/gin-gonic/gin"
-	"github.com/go-co-op/gocron"
-	"github.com/jpillora/overseer"
-	"github.com/jpillora/overseer/fetcher"
-	"log"
-	"mime"
-	"net/http"
-	"time"
 )
 
 func main() {
-	var confPath string
+    var confPath string
-	flag.StringVar(&confPath, "config", "app.ini", "Specify the configuration file")
+    flag.StringVar(&confPath, "config", "app.ini", "Specify the configuration file")
-	flag.Parse()
+    flag.Parse()
 
-	settings.Init(confPath)
+    settings.Init(confPath)
 
-	gin.SetMode(settings.ServerSettings.RunMode)
+    gin.SetMode(settings.ServerSettings.RunMode)
 
-	r, err := service.GetRuntimeInfo()
+    r, err := service.GetRuntimeInfo()
 
-	if err != nil {
+    if err != nil {
-		log.Fatalln(err)
+        log.Fatalln(err)
-	}
+    }
 
-	overseer.Run(overseer.Config{
+    overseer.Run(overseer.Config{
-		Program:          prog,
+        Program:          server.Program,
-		Address:          fmt.Sprintf(":%s", settings.ServerSettings.HttpPort),
+        Address:          fmt.Sprintf(":%s", settings.ServerSettings.HttpPort),
-		Fetcher:          &fetcher.File{Path: r.ExPath},
+        Fetcher:          &fetcher.File{Path: r.ExPath},
-		TerminateTimeout: 0,
+        TerminateTimeout: 0,
-	})
+    })
-}
-
-func prog(state overseer.State) {
-	// Hack: fix wrong Content Type of .js file on some OS platforms
-	// See https://github.com/golang/go/issues/32350
-	_ = mime.AddExtensionType(".js", "text/javascript; charset=utf-8")
-
-	log.Printf("Nginx config dir path: %s", nginx.GetConfPath())
-	if "" != settings.ServerSettings.JwtSecret {
-		db := model.Init()
-		query.Init(db)
-	}
-
-	s := gocron.NewScheduler(time.UTC)
-	job, err := s.Every(30).Minute().SingletonMode().Do(cert.AutoObtain)
-
-	if err != nil {
-		log.Fatalf("AutoCert Job: %v, Err: %v\n", job, err)
-	}
-
-	s.StartAsync()
-
-	go analytic.RecordServerAnalytic()
-
-	err = http.Serve(state.Listener, router.InitRouter())
-	if err != nil {
-		log.Fatalln(err)
-	}
-	log.Println("[Nginx UI] server exiting")
 }

server/api/cert.go

@@ -1,10 +1,10 @@
 package api
 
 import (
+	"github.com/0xJacky/Nginx-UI/server/internal/cert"
+	"github.com/0xJacky/Nginx-UI/server/internal/cert/dns"
+	"github.com/0xJacky/Nginx-UI/server/internal/nginx"
 	"github.com/0xJacky/Nginx-UI/server/model"
-	"github.com/0xJacky/Nginx-UI/server/pkg/cert"
-	"github.com/0xJacky/Nginx-UI/server/pkg/cert/dns"
-	"github.com/0xJacky/Nginx-UI/server/pkg/nginx"
 	"github.com/gin-gonic/gin"
 	"github.com/gorilla/websocket"
 	"github.com/spf13/cast"

server/api/config.go

@@ -1,8 +1,8 @@
 package api
 
 import (
-	"github.com/0xJacky/Nginx-UI/server/pkg/config_list"
+	"github.com/0xJacky/Nginx-UI/server/internal/config_list"
-	"github.com/0xJacky/Nginx-UI/server/pkg/nginx"
+	"github.com/0xJacky/Nginx-UI/server/internal/nginx"
 	"github.com/0xJacky/Nginx-UI/server/query"
 	"github.com/gin-gonic/gin"
 	"log"

server/api/dns_credential.go

@@ -1,8 +1,8 @@
 package api
 
 import (
+    "github.com/0xJacky/Nginx-UI/server/internal/cert/dns"
     "github.com/0xJacky/Nginx-UI/server/model"
-    "github.com/0xJacky/Nginx-UI/server/pkg/cert/dns"
     "github.com/0xJacky/Nginx-UI/server/query"
     "github.com/gin-gonic/gin"
     "github.com/spf13/cast"

server/api/domain.go

@@ -1,11 +1,11 @@
 package api
 
 import (
+	"github.com/0xJacky/Nginx-UI/server/internal/cert"
+	"github.com/0xJacky/Nginx-UI/server/internal/config_list"
+	"github.com/0xJacky/Nginx-UI/server/internal/helper"
+	"github.com/0xJacky/Nginx-UI/server/internal/nginx"
 	"github.com/0xJacky/Nginx-UI/server/model"
-	"github.com/0xJacky/Nginx-UI/server/pkg/cert"
-	"github.com/0xJacky/Nginx-UI/server/pkg/config_list"
-	"github.com/0xJacky/Nginx-UI/server/pkg/helper"
-	"github.com/0xJacky/Nginx-UI/server/pkg/nginx"
 	"github.com/0xJacky/Nginx-UI/server/query"
 	"github.com/gin-gonic/gin"
 	"log"

server/api/nginx_log.go

@@ -2,8 +2,8 @@ package api
 
 import (
 	"encoding/json"
-	"github.com/0xJacky/Nginx-UI/server/pkg/helper"
+	"github.com/0xJacky/Nginx-UI/server/internal/helper"
-	"github.com/0xJacky/Nginx-UI/server/pkg/nginx"
+	"github.com/0xJacky/Nginx-UI/server/internal/nginx"
 	"github.com/0xJacky/Nginx-UI/server/settings"
 	"github.com/gin-gonic/gin"
 	"github.com/gorilla/websocket"

server/api/ngx.go

@@ -1,90 +1,90 @@
 package api
 
 import (
-    "github.com/0xJacky/Nginx-UI/server/pkg/nginx"
+	"github.com/0xJacky/Nginx-UI/server/internal/nginx"
-    "github.com/gin-gonic/gin"
+	"github.com/gin-gonic/gin"
-    "net/http"
+	"net/http"
-    "os"
+	"os"
 )
 
 func BuildNginxConfig(c *gin.Context) {
-    var ngxConf nginx.NgxConfig
+	var ngxConf nginx.NgxConfig
-    if !BindAndValid(c, &ngxConf) {
+	if !BindAndValid(c, &ngxConf) {
-        return
+		return
-    }
+	}
-    c.Set("maybe_error", "nginx_config_syntax_error")
+	c.Set("maybe_error", "nginx_config_syntax_error")
-    c.JSON(http.StatusOK, gin.H{
+	c.JSON(http.StatusOK, gin.H{
-        "content": ngxConf.BuildConfig(),
+		"content": ngxConf.BuildConfig(),
-    })
+	})
 }
 
 func TokenizeNginxConfig(c *gin.Context) {
-    var json struct {
+	var json struct {
-        Content string `json:"content" binding:"required"`
+		Content string `json:"content" binding:"required"`
-    }
+	}
 
-    if !BindAndValid(c, &json) {
+	if !BindAndValid(c, &json) {
-        return
+		return
-    }
+	}
 
-    c.Set("maybe_error", "nginx_config_syntax_error")
+	c.Set("maybe_error", "nginx_config_syntax_error")
-    ngxConfig := nginx.ParseNgxConfigByContent(json.Content)
+	ngxConfig := nginx.ParseNgxConfigByContent(json.Content)
 
-    c.JSON(http.StatusOK, ngxConfig)
+	c.JSON(http.StatusOK, ngxConfig)
 
 }
 
 func FormatNginxConfig(c *gin.Context) {
-    var json struct {
+	var json struct {
-        Content string `json:"content" binding:"required"`
+		Content string `json:"content" binding:"required"`
-    }
+	}
 
-    if !BindAndValid(c, &json) {
+	if !BindAndValid(c, &json) {
-        return
+		return
-    }
+	}
 
-    c.Set("maybe_error", "nginx_config_syntax_error")
+	c.Set("maybe_error", "nginx_config_syntax_error")
-    c.JSON(http.StatusOK, gin.H{
+	c.JSON(http.StatusOK, gin.H{
-        "content": nginx.FmtCode(json.Content),
+		"content": nginx.FmtCode(json.Content),
-    })
+	})
 }
 
 func NginxStatus(c *gin.Context) {
-    pidPath := nginx.GetNginxPIDPath()
+	pidPath := nginx.GetNginxPIDPath()
 
-    running := true
+	running := true
-    if _, err := os.Stat(pidPath); err != nil {
+	if _, err := os.Stat(pidPath); err != nil {
-        running = false
+		running = false
-    }
+	}
 
-    c.JSON(http.StatusOK, gin.H{
+	c.JSON(http.StatusOK, gin.H{
-        "running": running,
+		"running": running,
-    })
+	})
 }
 
 func ReloadNginx(c *gin.Context) {
-    output := nginx.Reload()
+	output := nginx.Reload()
 
-    c.JSON(http.StatusOK, gin.H{
+	c.JSON(http.StatusOK, gin.H{
-        "message": output,
+		"message": output,
-        "level":   nginx.GetLogLevel(output),
+		"level":   nginx.GetLogLevel(output),
-    })
+	})
 }
 
 func TestNginx(c *gin.Context) {
-    output := nginx.TestConf()
+	output := nginx.TestConf()
 
-    c.JSON(http.StatusOK, gin.H{
+	c.JSON(http.StatusOK, gin.H{
-        "message": output,
+		"message": output,
-        "level":   nginx.GetLogLevel(output),
+		"level":   nginx.GetLogLevel(output),
-    })
+	})
 }
 
 func RestartNginx(c *gin.Context) {
-    output := nginx.Restart()
+	output := nginx.Restart()
 
-    c.JSON(http.StatusOK, gin.H{
+	c.JSON(http.StatusOK, gin.H{
-        "message": output,
+		"message": output,
-        "level":   nginx.GetLogLevel(output),
+		"level":   nginx.GetLogLevel(output),
-    })
+	})
 }

server/api/pty.go

@@ -1,7 +1,7 @@
 package api
 
 import (
-	"github.com/0xJacky/Nginx-UI/server/pkg/pty"
+	"github.com/0xJacky/Nginx-UI/server/internal/pty"
 	"github.com/gin-gonic/gin"
 	"github.com/gorilla/websocket"
 	"log"

server/api/template.go

@@ -1,7 +1,7 @@
 package api
 
 import (
-	"github.com/0xJacky/Nginx-UI/server/pkg/nginx"
+	"github.com/0xJacky/Nginx-UI/server/internal/nginx"
 	"github.com/0xJacky/Nginx-UI/server/service"
 	"github.com/gin-gonic/gin"
 	"net/http"

server/internal/cert/cert.go

@@ -6,8 +6,8 @@ import (
 	"crypto/elliptic"
 	"crypto/rand"
 	"crypto/tls"
-	dns2 "github.com/0xJacky/Nginx-UI/server/pkg/cert/dns"
+	dns2 "github.com/0xJacky/Nginx-UI/server/internal/cert/dns"
-	"github.com/0xJacky/Nginx-UI/server/pkg/nginx"
+	"github.com/0xJacky/Nginx-UI/server/internal/nginx"
 	"github.com/0xJacky/Nginx-UI/server/query"
 	"github.com/0xJacky/Nginx-UI/server/settings"
 	"github.com/go-acme/lego/v4/certcrypto"