doesnm/quickshare
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix(server): clean up handlers initing

Browse source
This commit is contained in:
hexxa 2022-09-24 11:54:35 +08:00 • committed by Hexxa
parent 81e97bdd55
commit becfa688aa
3 changed files with 221 additions and 197 deletions
Download patch file Download diff file Expand all files Collapse all files

120
src/server/server.go
View file

@ -2,8 +2,7 @@ package server
import (
"context"
"crypto/rand"
"errors"
"fmt"
"net/http"
"os"
@ -12,17 +11,12 @@ import (
"syscall"
"time"
"github.com/gin-contrib/static"
"github.com/gin-gonic/gin"
"github.com/ihexxa/gocfg"
"github.com/ihexxa/quickshare/src/depidx"
"github.com/ihexxa/quickshare/src/fs"
"github.com/ihexxa/quickshare/src/handlers/fileshdr"
"github.com/ihexxa/quickshare/src/handlers/multiusers"
"github.com/ihexxa/quickshare/src/handlers/settings"
"github.com/ihexxa/quickshare/src/kvstore"
qsstatic "github.com/ihexxa/quickshare/static"
)
type Server struct {
@ -38,9 +32,7 @@ func NewServer(cfg gocfg.ICfg) (*Server, error) {
}
deps := initDeps(cfg)
router := gin.Default()
adminName := cfg.GrabString("ENV.DEFAULTADMIN")
router, err := initHandlers(router, adminName, cfg, deps)
router, err := initHandlers(cfg, deps)
if err != nil {
return nil, fmt.Errorf("init handlers error: %w", err)
}
@ -50,10 +42,11 @@ func NewServer(cfg gocfg.ICfg) (*Server, error) {
if ok && portStr != "" {
port, err = strconv.Atoi(portStr)
if err != nil {
panic(fmt.Sprintf("invalid port: %s", portStr))
deps.Log().Fatalf("invalid port: %s", portStr)
}
cfg.SetInt("Server.Port", port)
}
srv := &http.Server{
Addr: fmt.Sprintf("%s:%d", cfg.GrabString("Server.Host"), port),
Handler: router,
@ -69,111 +62,6 @@ func NewServer(cfg gocfg.ICfg) (*Server, error) {
}, nil
}
func initHandlers(router *gin.Engine, adminName string, cfg gocfg.ICfg, deps *depidx.Deps) (*gin.Engine, error) {
// handlers
userHdrs, err := multiusers.NewMultiUsersSvc(cfg, deps)
if err != nil {
return nil, fmt.Errorf("new users svc error: %w", err)
}
_, err = userHdrs.Init(context.TODO(), adminName)
if err != nil {
return nil, fmt.Errorf("failed to init user handlers: %w", err)
}
fileHdrs, err := fileshdr.NewFileHandlers(cfg, deps)
if err != nil {
return nil, fmt.Errorf("new files service error: %w", err)
}
settingsSvc, err := settings.NewSettingsSvc(cfg, deps)
if err != nil {
return nil, fmt.Errorf("new setting service error: %w", err)
}
// middlewares
router.Use(userHdrs.AuthN())
router.Use(userHdrs.APIAccessControl())
publicPath, ok := cfg.String("Server.PublicPath")
if !ok || publicPath == "" {
return nil, errors.New("publicPath not found or empty")
}
if cfg.BoolOr("Server.Debug", false) {
router.Use(static.Serve("/", static.LocalFile(publicPath, false)))
} else {
embedFs, err := qsstatic.NewEmbedStaticFS()
if err != nil {
return nil, err
}
router.Use(static.Serve("/", embedFs))
}
// handlers
v1 := router.Group("/v1")
usersAPI := v1.Group("/users")
usersAPI.POST("/login", userHdrs.Login)
usersAPI.POST("/logout", userHdrs.Logout)
usersAPI.GET("/isauthed", userHdrs.IsAuthed)
usersAPI.PATCH("/pwd", userHdrs.SetPwd)
usersAPI.PATCH("/pwd/force-set", userHdrs.ForceSetPwd)
usersAPI.POST("/", userHdrs.AddUser)
usersAPI.DELETE("/", userHdrs.DelUser)
usersAPI.GET("/list", userHdrs.ListUsers)
usersAPI.GET("/self", userHdrs.Self)
usersAPI.PATCH("/", userHdrs.SetUser)
usersAPI.PATCH("/preferences", userHdrs.SetPreferences)
usersAPI.PUT("/used-space", userHdrs.ResetUsedSpace)
rolesAPI := v1.Group("/roles")
// rolesAPI.POST("/", userHdrs.AddRole)
// rolesAPI.DELETE("/", userHdrs.DelRole)
rolesAPI.GET("/list", userHdrs.ListRoles)
captchaAPI := v1.Group("/captchas")
captchaAPI.GET("/", userHdrs.GetCaptchaID)
captchaAPI.GET("/imgs", userHdrs.GetCaptchaImg)
filesAPI := v1.Group("/fs")
filesAPI.POST("/files", fileHdrs.Create)
filesAPI.DELETE("/files", fileHdrs.Delete)
filesAPI.GET("/files", fileHdrs.Download)
filesAPI.PATCH("/files/chunks", fileHdrs.UploadChunk)
filesAPI.GET("/files/chunks", fileHdrs.UploadStatus)
filesAPI.PATCH("/files/copy", fileHdrs.Copy)
filesAPI.PATCH("/files/move", fileHdrs.Move)
filesAPI.GET("/dirs", fileHdrs.List)
filesAPI.GET("/dirs/home", fileHdrs.ListHome)
filesAPI.POST("/dirs", fileHdrs.Mkdir)
// files.POST("/dirs/copy", fileHdrs.CopyDir)
filesAPI.GET("/uploadings", fileHdrs.ListUploadings)
filesAPI.DELETE("/uploadings", fileHdrs.DelUploading)
filesAPI.POST("/sharings", fileHdrs.AddSharing)
filesAPI.DELETE("/sharings", fileHdrs.DelSharing)
filesAPI.GET("/sharings", fileHdrs.ListSharings)
filesAPI.GET("/sharings/ids", fileHdrs.ListSharingIDs)
filesAPI.GET("/sharings/exist", fileHdrs.IsSharing)
filesAPI.GET("/sharings/dirs", fileHdrs.GetSharingDir)
filesAPI.GET("/metadata", fileHdrs.Metadata)
filesAPI.GET("/search", fileHdrs.SearchItems)
filesAPI.PUT("/reindex", fileHdrs.Reindex)
filesAPI.POST("/hashes/sha1", fileHdrs.GenerateHash)
settingsAPI := v1.Group("/settings")
settingsAPI.OPTIONS("/health", settingsSvc.Health)
settingsAPI.GET("/client", settingsSvc.GetClientCfg)
settingsAPI.PATCH("/client", settingsSvc.SetClientCfg)
settingsAPI.POST("/errors", settingsSvc.ReportErrors)
settingsAPI.GET("/workers/queue-len", settingsSvc.WorkerQueueLen)
return router, nil
}
func (s *Server) Start() error {
s.signalChan = make(chan os.Signal, 4)
signal.Notify(s.signalChan, syscall.SIGINT, syscall.SIGTERM)