iridium/neko
2
2
Fork 0
mirror of https://github.com/m1k1o/neko.git synced 2024-07-24 14:40:50 +12:00
Code Issues Packages Projects Releases Wiki Activity

http use config.

Browse Source
This commit is contained in:
Miroslav Šedivý 2021-08-29 15:40:58 +02:00
parent 8bb77166e8
commit 530cc04805
1 changed files with 14 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
internal/http/manager.go
View File

@ -18,19 +18,19 @@ import (
type HttpManagerCtx struct { type HttpManagerCtx struct {
logger zerolog.Logger logger zerolog.Logger
config *config.Server
router *chi.Mux router *chi.Mux
http *http.Server http *http.Server
conf *config.Server
} }
func New(WebSocketManager types.WebSocketManager, ApiManager types.ApiManager, conf *config.Server) *HttpManagerCtx { func New(WebSocketManager types.WebSocketManager, ApiManager types.ApiManager, config *config.Server) *HttpManagerCtx {
logger := log.With().Str("module", "http").Logger() logger := log.With().Str("module", "http").Logger()
router := chi.NewRouter() router := chi.NewRouter()
router.Use(middleware.Recoverer) // Recover from panics without crashing server router.Use(middleware.Recoverer) // Recover from panics without crashing server
router.Use(cors.Handler(cors.Options{ router.Use(cors.Handler(cors.Options{
AllowOriginFunc: func(r *http.Request, origin string) bool { AllowOriginFunc: func(r *http.Request, origin string) bool {
return conf.AllowOrigin(origin) return config.AllowOrigin(origin)
}, },
AllowedMethods: []string{"GET", "POST", "DELETE", "OPTIONS"}, AllowedMethods: []string{"GET", "POST", "DELETE", "OPTIONS"},
AllowedHeaders: []string{"Accept", "Authorization", "Content-Type", "X-CSRF-Token"}, AllowedHeaders: []string{"Accept", "Authorization", "Content-Type", "X-CSRF-Token"},
@ -45,14 +45,14 @@ func New(WebSocketManager types.WebSocketManager, ApiManager types.ApiManager, c
router.Get("/api/ws", func(w http.ResponseWriter, r *http.Request) { router.Get("/api/ws", func(w http.ResponseWriter, r *http.Request) {
WebSocketManager.Upgrade(w, r, func(r *http.Request) bool { WebSocketManager.Upgrade(w, r, func(r *http.Request) bool {
return conf.AllowOrigin(r.Header.Get("Origin")) return config.AllowOrigin(r.Header.Get("Origin"))
}) })
}) })
if conf.Static != "" { if config.Static != "" {
fs := http.FileServer(http.Dir(conf.Static)) fs := http.FileServer(http.Dir(config.Static))
router.Get("/*", func(w http.ResponseWriter, r *http.Request) { router.Get("/*", func(w http.ResponseWriter, r *http.Request) {
if _, err := os.Stat(conf.Static + r.URL.Path); !os.IsNotExist(err) { if _, err := os.Stat(config.Static + r.URL.Path); !os.IsNotExist(err) {
fs.ServeHTTP(w, r) fs.ServeHTTP(w, r)
} else { } else {
utils.HttpNotFound(w) utils.HttpNotFound(w)
@ -64,23 +64,21 @@ func New(WebSocketManager types.WebSocketManager, ApiManager types.ApiManager, c
utils.HttpNotFound(w) utils.HttpNotFound(w)
})) }))
http := &http.Server{
Addr: conf.Bind,
Handler: router,
}
return &HttpManagerCtx{ return &HttpManagerCtx{
logger: logger, logger: logger,
config: config,
router: router, router: router,
http: http, http: &http.Server{
conf: conf, Addr: config.Bind,
Handler: router,
},
} }
} }
func (manager *HttpManagerCtx) Start() { func (manager *HttpManagerCtx) Start() {
if manager.conf.Cert != "" && manager.conf.Key != "" { if manager.config.Cert != "" && manager.config.Key != "" {
go func() { go func() {
if err := manager.http.ListenAndServeTLS(manager.conf.Cert, manager.conf.Key); err != http.ErrServerClosed { if err := manager.http.ListenAndServeTLS(manager.config.Cert, manager.config.Key); err != http.ErrServerClosed {
manager.logger.Panic().Err(err).Msg("unable to start https server") manager.logger.Panic().Err(err).Msg("unable to start https server")
} }
}() }()