refactor(global): move config to global package and consolidate handlers
- Move Config struct and related functions to global package - Consolidate handler utilities into utils package - Remove deprecated handlers and instance packages - Add new handlers package with settings and proxy functionality - Update config.json to include watchdog enabled flag
This commit is contained in:
@@ -4,11 +4,10 @@ import (
|
||||
"fmt"
|
||||
"net/http"
|
||||
"super-frpc/frpLogger"
|
||||
"super-frpc/handlers"
|
||||
"super-frpc/instance"
|
||||
"super-frpc/utils"
|
||||
"super-frpc/postLog"
|
||||
"super-frpc/session"
|
||||
"super-frpc/user"
|
||||
"super-frpc/handlers"
|
||||
)
|
||||
|
||||
func setupRoutes() {
|
||||
@@ -17,33 +16,33 @@ func setupRoutes() {
|
||||
systemLogHandler := postLog.NewLogSocketHandler(postLog.GetLogBroadcaster())
|
||||
http.HandleFunc("/system/getLogs", systemLogHandler.Handle)
|
||||
|
||||
http.HandleFunc("/register", user.RegisterHandler)
|
||||
http.HandleFunc("/login", user.LoginHandler)
|
||||
http.HandleFunc("/logout", user.LogoutHandler)
|
||||
http.HandleFunc("/register", handlers.RegisterHandler)
|
||||
http.HandleFunc("/login", handlers.LoginHandler)
|
||||
http.HandleFunc("/logout", handlers.LogoutHandler)
|
||||
|
||||
http.HandleFunc("/userMgr/create", user.CreateUserHandler)
|
||||
http.HandleFunc("/userMgr/remove", user.RemoveUserHandler)
|
||||
http.HandleFunc("/userMgr/list", user.ListUserHandler)
|
||||
http.HandleFunc("/userMgr/modify", user.ModifyUserHandler)
|
||||
http.HandleFunc("/userMgr/modifyType", user.ModifyUserTypeHandler)
|
||||
http.HandleFunc("/userMgr/create", handlers.CreateUserHandler)
|
||||
http.HandleFunc("/userMgr/remove", handlers.RemoveUserHandler)
|
||||
http.HandleFunc("/userMgr/list", handlers.ListUserHandler)
|
||||
http.HandleFunc("/userMgr/modify", handlers.ModifyUserHandler)
|
||||
http.HandleFunc("/userMgr/modifyType", handlers.ModifyUserTypeHandler)
|
||||
|
||||
http.HandleFunc("/sessionMgr/list", user.ListActiveSessionsHandler)
|
||||
http.HandleFunc("/sessionMgr/remove", user.RemoveSessionHandler)
|
||||
http.HandleFunc("/sessionMgr/list", handlers.ListActiveSessionsHandler)
|
||||
http.HandleFunc("/sessionMgr/remove", handlers.RemoveSessionHandler)
|
||||
|
||||
http.HandleFunc("/frpcAct/instanceMgr/create", instance.CreateInstanceHandler)
|
||||
http.HandleFunc("/frpcAct/instanceMgr/delete", instance.DeleteInstanceHandler)
|
||||
http.HandleFunc("/frpcAct/instanceMgr/modify", instance.ModifyInstanceHandler)
|
||||
http.HandleFunc("/frpcAct/instanceMgr/list", instance.ListInstancesHandler)
|
||||
http.HandleFunc("/frpcAct/instanceMgr/start", instance.StartInstanceHandler)
|
||||
http.HandleFunc("/frpcAct/instanceMgr/stop", instance.StopInstanceHandler)
|
||||
http.HandleFunc("/frpcAct/instanceMgr/restart", instance.RestartInstanceHandler)
|
||||
http.HandleFunc("/frpcAct/instanceMgr/status", instance.GetInstanceStatusHandler)
|
||||
http.HandleFunc("/frpcAct/instanceMgr/getInfo", instance.GetInstanceInfoHandler)
|
||||
http.HandleFunc("/frpcAct/instanceMgr/create", handlers.CreateInstanceHandler)
|
||||
http.HandleFunc("/frpcAct/instanceMgr/delete", handlers.DeleteInstanceHandler)
|
||||
http.HandleFunc("/frpcAct/instanceMgr/modify", handlers.ModifyInstanceHandler)
|
||||
http.HandleFunc("/frpcAct/instanceMgr/list", handlers.ListInstancesHandler)
|
||||
http.HandleFunc("/frpcAct/instanceMgr/start", handlers.StartInstanceHandler)
|
||||
http.HandleFunc("/frpcAct/instanceMgr/stop", handlers.StopInstanceHandler)
|
||||
http.HandleFunc("/frpcAct/instanceMgr/restart", handlers.RestartInstanceHandler)
|
||||
http.HandleFunc("/frpcAct/instanceMgr/status", handlers.GetInstanceStatusHandler)
|
||||
http.HandleFunc("/frpcAct/instanceMgr/getInfo", handlers.GetInstanceInfoHandler)
|
||||
http.HandleFunc("/frpcAct/instanceMgr/logs", frpLogger.NewInstanceLogHandler(session.ValidateTokenFromMap).ServeHTTP)
|
||||
http.HandleFunc("/frpcAct/proxyMgr/create", instance.CreateProxyHandler)
|
||||
http.HandleFunc("/frpcAct/proxyMgr/modify", instance.ModifyProxyHandler)
|
||||
http.HandleFunc("/frpcAct/proxyMgr/delete", instance.DeleteProxyHandler)
|
||||
http.HandleFunc("/frpcAct/proxyMgr/list", instance.ListProxiesHandler)
|
||||
http.HandleFunc("/frpcAct/proxyMgr/create", handlers.CreateProxyHandler)
|
||||
http.HandleFunc("/frpcAct/proxyMgr/modify", handlers.ModifyProxyHandler)
|
||||
http.HandleFunc("/frpcAct/proxyMgr/delete", handlers.DeleteProxyHandler)
|
||||
http.HandleFunc("/frpcAct/proxyMgr/list", handlers.ListProxiesHandler)
|
||||
|
||||
http.HandleFunc("/", NotFoundHandler)
|
||||
|
||||
@@ -53,5 +52,5 @@ func setupRoutes() {
|
||||
|
||||
func NotFoundHandler(w http.ResponseWriter, r *http.Request) {
|
||||
postLog.Error(fmt.Sprintf("Route not found: %s %s", r.Method, r.URL.Path))
|
||||
handlers.SendErrorResponse(w, http.StatusNotFound, "Invalid request path")
|
||||
utils.SendErrorResponse(w, http.StatusNotFound, "Invalid request path")
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user