refactor: migrate to fiber http driver

app/http/controllers/asset_controller.go

@@ -0,0 +1,63 @@
+package controllers
+
+import (
+	"os"
+	"strings"
+
+	"github.com/goravel/framework/contracts/http"
+	"panel/app/models"
+	"panel/app/services"
+	"panel/pkg/tools"
+)
+
+type AssetController struct {
+	setting services.Setting
+}
+
+func NewAssetController() *AssetController {
+	return &AssetController{
+		setting: services.NewSettingImpl(),
+	}
+}
+
+func (r *AssetController) Index(ctx http.Context) http.Response {
+	entrance := r.setting.Get(models.SettingKeyEntrance)
+	path := strings.TrimPrefix(ctx.Request().Path(), entrance)
+
+	// 自动纠正 URL 格式
+	if ctx.Request().Path() == entrance && ctx.Request().Path() != "/" {
+		return ctx.Response().Redirect(http.StatusMovedPermanently, ctx.Request().Path()+"/")
+	}
+
+	if !tools.Exists("public" + path) {
+		return ctx.Response().Status(http.StatusNotFound).String(http.StatusText(http.StatusNotFound))
+	}
+
+	file, err := os.Open("public" + path)
+	if err != nil {
+		return ctx.Response().Status(http.StatusInternalServerError).String(http.StatusText(http.StatusInternalServerError))
+	}
+
+	stat, err := file.Stat()
+	if err != nil {
+		return ctx.Response().Status(http.StatusInternalServerError).String(http.StatusText(http.StatusInternalServerError))
+	}
+
+	if stat.IsDir() {
+		return ctx.Response().Status(http.StatusForbidden).String(http.StatusText(http.StatusForbidden))
+	}
+
+	return ctx.Response().Header("Cache-Control", "no-cache").File("public" + path)
+}
+
+func (r *AssetController) Favicon(ctx http.Context) http.Response {
+	return ctx.Response().File("public/favicon.ico")
+}
+
+func (r *AssetController) Robots(ctx http.Context) http.Response {
+	return ctx.Response().File("public/robots.txt")
+}
+
+func (r *AssetController) NotFound(ctx http.Context) http.Response {
+	return ctx.Response().Status(http.StatusNotFound).String(http.StatusText(http.StatusNotFound))
+}

app/http/controllers/ssh_controller.go

@@ -3,14 +3,15 @@ package controllers
 import (
 	"bytes"
 	"context"
-	nethttp "net/http"
 	"sync"
 	"time"
 
+	"github.com/fasthttp/websocket"
+	"github.com/goravel/fiber"
 	"github.com/goravel/framework/contracts/http"
 	"github.com/goravel/framework/facades"
-	"github.com/gorilla/websocket"
 	"github.com/spf13/cast"
+	"github.com/valyala/fasthttp"
 
 	"panel/app/models"
 	"panel/app/services"
@@ -92,71 +93,72 @@ func (r *SshController) UpdateInfo(ctx http.Context) http.Response {
 
 // Session SSH 会话
 func (r *SshController) Session(ctx http.Context) http.Response {
-	upGrader := websocket.Upgrader{
+	upGrader := websocket.FastHTTPUpgrader{
 		ReadBufferSize:  4096,
 		WriteBufferSize: 4096,
-		CheckOrigin: func(r *nethttp.Request) bool {
+		CheckOrigin: func(ctx *fasthttp.RequestCtx) bool {
 			return true
 		},
 		Subprotocols: []string{ctx.Request().Header("Sec-WebSocket-Protocol")},
 	}
 
-	ws, err := upGrader.Upgrade(ctx.Response().Writer(), ctx.Request().Origin(), nil)
-	if err != nil {
-		facades.Log().Error("[面板][SSH] 建立连接失败 ", err)
-		return ErrorSystem(ctx)
-	}
-	defer ws.Close()
-
 	config := ssh.SSHClientConfigPassword(
 		r.setting.Get(models.SettingKeySshHost)+":"+r.setting.Get(models.SettingKeySshPort),
 		r.setting.Get(models.SettingKeySshUser),
 		r.setting.Get(models.SettingKeySshPassword),
 	)
 	client, err := ssh.NewSSHClient(config)
+
+	err = upGrader.Upgrade(ctx.(*fiber.Context).Instance().Context(), func(conn *websocket.Conn) {
+		if err != nil {
+			_ = conn.WriteControl(websocket.CloseMessage,
+				[]byte(err.Error()), time.Now().Add(time.Second))
+			return
+		}
+
+		defer client.Close()
+
+		turn, err := ssh.NewTurn(conn, client)
+		if err != nil {
+			_ = conn.WriteControl(websocket.CloseMessage,
+				[]byte(err.Error()), time.Now().Add(time.Second))
+			return
+		}
+		defer turn.Close()
+
+		var bufPool = sync.Pool{
+			New: func() any {
+				return new(bytes.Buffer)
+			},
+		}
+		var logBuff = bufPool.Get().(*bytes.Buffer)
+		logBuff.Reset()
+		defer bufPool.Put(logBuff)
+
+		ctx2, cancel := context.WithCancel(context.Background())
+		wg := sync.WaitGroup{}
+		wg.Add(2)
+		go func() {
+			defer wg.Done()
+			err := turn.LoopRead(logBuff, ctx2)
+			if err != nil {
+				facades.Log().Error("[面板][SSH] 读取数据失败 ", err.Error())
+			}
+		}()
+		go func() {
+			defer wg.Done()
+			err := turn.SessionWait()
+			if err != nil {
+				facades.Log().Error("[面板][SSH] 会话失败 ", err.Error())
+			}
+			cancel()
+		}()
+		wg.Wait()
+	})
 	if err != nil {
-		_ = ws.WriteControl(websocket.CloseMessage,
-			[]byte(err.Error()), time.Now().Add(time.Second))
+		facades.Log().Error("[面板][SSH] 建立连接失败 ", err)
 		return ErrorSystem(ctx)
 	}
-	defer client.Close()
 
-	turn, err := ssh.NewTurn(ws, client)
-	if err != nil {
-		_ = ws.WriteControl(websocket.CloseMessage,
-			[]byte(err.Error()), time.Now().Add(time.Second))
-		return ErrorSystem(ctx)
-	}
-	defer turn.Close()
-
-	var bufPool = sync.Pool{
-		New: func() interface{} {
-			return new(bytes.Buffer)
-		},
-	}
-	var logBuff = bufPool.Get().(*bytes.Buffer)
-	logBuff.Reset()
-	defer bufPool.Put(logBuff)
-
-	ctx2, cancel := context.WithCancel(context.Background())
-	wg := sync.WaitGroup{}
-	wg.Add(2)
-	go func() {
-		defer wg.Done()
-		err := turn.LoopRead(logBuff, ctx2)
-		if err != nil {
-			facades.Log().Error("[面板][SSH] 读取数据失败 ", err.Error())
-		}
-	}()
-	go func() {
-		defer wg.Done()
-		err := turn.SessionWait()
-		if err != nil {
-			facades.Log().Error("[面板][SSH] 会话失败 ", err.Error())
-		}
-		cancel()
-	}()
-	wg.Wait()
-
-	return Success(ctx, logBuff.String())
+	return nil
 }

app/http/controllers/swagger_controller.go

@@ -0,0 +1,188 @@
+package controllers
+
+import (
+	"html/template"
+	"io"
+	"path/filepath"
+	"regexp"
+	"strings"
+
+	"github.com/goravel/framework/contracts/http"
+	swaggerFiles "github.com/swaggo/files/v2"
+	"github.com/swaggo/swag"
+)
+
+type SwaggerController struct {
+	// Dependent services
+}
+
+// Config stores fiberSwagger configuration variables.
+type Config struct {
+	URL                  string
+	InstanceName         string
+	DocExpansion         string
+	DomID                string
+	DeepLinking          bool
+	PersistAuthorization bool
+}
+
+func NewSwaggerController() *SwaggerController {
+	return &SwaggerController{
+		// Inject services
+	}
+}
+
+// Index
+// @Summary Swagger UI
+// @Description Swagger UI
+// @Tags Swagger
+// @Success 200
+// @Failure 500
+// @Router /swagger [get]
+func (r *SwaggerController) Index(ctx http.Context) http.Response {
+	config := Config{
+		URL:          "swagger.json",
+		DocExpansion: "list",
+		DomID:        "swagger-ui",
+		InstanceName: swag.Name,
+		DeepLinking:  true,
+	}
+
+	// create a template with name
+	index, _ := template.New("swagger_index.html").Parse(indexTemplate)
+
+	var re = regexp.MustCompile(`^(.*/)([^?].*)?[?|.]*$`)
+
+	matches := re.FindStringSubmatch(ctx.Request().Path())
+	path := matches[2]
+
+	fileExt := filepath.Ext(path)
+
+	switch path {
+	case "":
+		return ctx.Response().Redirect(http.StatusMovedPermanently, filepath.Join(matches[1], "index.html"))
+
+	case "index.html":
+		var builder strings.Builder
+		err := index.Execute(&builder, config)
+		if err != nil {
+			return ctx.Response().Status(http.StatusInternalServerError).String(http.StatusText(http.StatusInternalServerError))
+		}
+
+		return ctx.Response().Success().String("html", builder.String())
+	case "swagger.json":
+		return ctx.Response().File("docs/swagger.json")
+	}
+
+	file, err := swaggerFiles.FS.Open(path)
+	if err != nil {
+		return ctx.Response().Status(http.StatusInternalServerError).String(http.StatusText(http.StatusInternalServerError))
+	}
+
+	defer file.Close()
+
+	content, err := io.ReadAll(file)
+	if err != nil {
+		return ctx.Response().Status(http.StatusInternalServerError).String(http.StatusText(http.StatusInternalServerError))
+	}
+
+	return ctx.Response().Success().String(fileExt[0:], string(content))
+}
+
+const indexTemplate = `<!-- HTML for static distribution bundle build -->
+<!DOCTYPE html>
+<html lang="en">
+<head>
+  <meta charset="UTF-8">
+  <title>Swagger UI</title>
+  <link href="https://gfont.cdn.haozi.net/css?family=Open+Sans:400,700|Source+Code+Pro:300,600|Titillium+Web:400,600,700" rel="stylesheet">
+  <link rel="stylesheet" type="text/css" href="./swagger-ui.css" >
+  <link rel="icon" type="image/png" href="./favicon-32x32.png" sizes="32x32" />
+  <link rel="icon" type="image/png" href="./favicon-16x16.png" sizes="16x16" />
+  <style>
+    html
+    {
+        box-sizing: border-box;
+        overflow: -moz-scrollbars-vertical;
+        overflow-y: scroll;
+    }
+    *,
+    *:before,
+    *:after
+    {
+        box-sizing: inherit;
+    }
+
+    body {
+      margin:0;
+      background: #fafafa;
+    }
+  </style>
+</head>
+
+<body>
+
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" style="position:absolute;width:0;height:0">
+  <defs>
+    <symbol viewBox="0 0 20 20" id="unlocked">
+          <path d="M15.8 8H14V5.6C14 2.703 12.665 1 10 1 7.334 1 6 2.703 6 5.6V6h2v-.801C8 3.754 8.797 3 10 3c1.203 0 2 .754 2 2.199V8H4c-.553 0-1 .646-1 1.199V17c0 .549.428 1.139.951 1.307l1.197.387C5.672 18.861 6.55 19 7.1 19h5.8c.549 0 1.428-.139 1.951-.307l1.196-.387c.524-.167.953-.757.953-1.306V9.199C17 8.646 16.352 8 15.8 8z"></path>
+    </symbol>
+
+    <symbol viewBox="0 0 20 20" id="locked">
+      <path d="M15.8 8H14V5.6C14 2.703 12.665 1 10 1 7.334 1 6 2.703 6 5.6V8H4c-.553 0-1 .646-1 1.199V17c0 .549.428 1.139.951 1.307l1.197.387C5.672 18.861 6.55 19 7.1 19h5.8c.549 0 1.428-.139 1.951-.307l1.196-.387c.524-.167.953-.757.953-1.306V9.199C17 8.646 16.352 8 15.8 8zM12 8H8V5.199C8 3.754 8.797 3 10 3c1.203 0 2 .754 2 2.199V8z"/>
+    </symbol>
+
+    <symbol viewBox="0 0 20 20" id="close">
+      <path d="M14.348 14.849c-.469.469-1.229.469-1.697 0L10 11.819l-2.651 3.029c-.469.469-1.229.469-1.697 0-.469-.469-.469-1.229 0-1.697l2.758-3.15-2.759-3.152c-.469-.469-.469-1.228 0-1.697.469-.469 1.228-.469 1.697 0L10 8.183l2.651-3.031c.469-.469 1.228-.469 1.697 0 .469.469.469 1.229 0 1.697l-2.758 3.152 2.758 3.15c.469.469.469 1.229 0 1.698z"/>
+    </symbol>
+
+    <symbol viewBox="0 0 20 20" id="large-arrow">
+      <path d="M13.25 10L6.109 2.58c-.268-.27-.268-.707 0-.979.268-.27.701-.27.969 0l7.83 7.908c.268.271.268.709 0 .979l-7.83 7.908c-.268.271-.701.27-.969 0-.268-.269-.268-.707 0-.979L13.25 10z"/>
+    </symbol>
+
+    <symbol viewBox="0 0 20 20" id="large-arrow-down">
+      <path d="M17.418 6.109c.272-.268.709-.268.979 0s.271.701 0 .969l-7.908 7.83c-.27.268-.707.268-.979 0l-7.908-7.83c-.27-.268-.27-.701 0-.969.271-.268.709-.268.979 0L10 13.25l7.418-7.141z"/>
+    </symbol>
+
+
+    <symbol viewBox="0 0 24 24" id="jump-to">
+      <path d="M19 7v4H5.83l3.58-3.59L8 6l-6 6 6 6 1.41-1.41L5.83 13H21V7z"/>
+    </symbol>
+
+    <symbol viewBox="0 0 24 24" id="expand">
+      <path d="M10 18h4v-2h-4v2zM3 6v2h18V6H3zm3 7h12v-2H6v2z"/>
+    </symbol>
+
+  </defs>
+</svg>
+
+<div id="swagger-ui"></div>
+
+<script src="./swagger-ui-bundle.js"> </script>
+<script src="./swagger-ui-standalone-preset.js"> </script>
+<script>
+window.onload = function() {
+  // Build a system
+  const ui = SwaggerUIBundle({
+    url: "{{.URL}}",
+    deepLinking: {{.DeepLinking}},
+    docExpansion: "{{.DocExpansion}}",
+    dom_id: "#{{.DomID}}",
+    persistAuthorization: {{.PersistAuthorization}},
+    validatorUrl: null,
+    presets: [
+      SwaggerUIBundle.presets.apis,
+      SwaggerUIStandalonePreset
+    ],
+    plugins: [
+      SwaggerUIBundle.plugins.DownloadUrl
+    ],
+    layout: "StandaloneLayout"
+  })
+  window.ui = ui
+}
+</script>
+</body>
+
+</html>
+`

app/http/kernel.go

@@ -2,8 +2,6 @@ package http
 
 import (
 	"github.com/goravel/framework/contracts/http"
-
-	"panel/app/http/middleware"
 )
 
 type Kernel struct {
@@ -12,7 +10,5 @@ type Kernel struct {
 // The application's global HTTP middleware stack.
 // These middleware are run during every request to your application.
 func (kernel Kernel) Middleware() []http.Middleware {
-	return []http.Middleware{
-		middleware.Static(),
-	}
+	return []http.Middleware{}
 }

app/http/middleware/static.go

@@ -1,30 +0,0 @@
-package middleware
-
-import (
-	"fmt"
-
-	"github.com/gin-contrib/static"
-	"github.com/goravel/framework/contracts/http"
-	"github.com/goravel/gin"
-
-	"panel/app/services"
-)
-
-func Static() http.Middleware {
-	return func(ctx http.Context) {
-		// 自动纠正 URL 格式
-		if ctx.Request().Path() == services.NewSettingImpl().Get("entrance", "/") && ctx.Request().Path() != "/" {
-			// ctx.Response().Redirect(http.StatusFound, ctx.Request().Path()+"/")
-			ctx.Response().Writer().WriteHeader(http.StatusFound)
-			_, err := ctx.Response().Writer().Write([]byte(fmt.Sprintf(`<html><head><meta http-equiv="refresh" content="0;url=%s/"></head></html>`, ctx.Request().Path())))
-			if err != nil {
-				return
-			}
-			ctx.Response().Flush()
-			return
-		}
-
-		static.Serve(services.NewSettingImpl().Get("entrance", "/"), static.LocalFile("public", false))(ctx.(*gin.Context).Instance())
-		ctx.Request().Next()
-	}
-}