alex/GoSally
2
0
Fork 0
mirror of https://github.com/akyaiy/GoSally-mvp.git synced 2026-01-03 15:12:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Refactor server structure: migrate v1 functionality to sv1 module, remove deprecated files, and update command handling

Browse Source
This commit is contained in:
alex
2025-06-22 22:11:14 +03:00
parent 114fc82b90
commit 03195dca59
12 changed files with 33 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
cmd/main/node.go → cmd/node/node.go
View File

@@ -7,15 +7,13 @@ import (
"github.com/akyaiy/GoSally-mvp/config"
"github.com/akyaiy/GoSally-mvp/logs"
//"github.com/akyaiy/GoSally-mvp/v1"
"github.com/akyaiy/GoSally-mvp/sv1"
"github.com/go-chi/chi/v5"
)
var allowedCmd = regexp.MustCompile(`^[a-zA-Z0-9]+$`)
var log *slog.Logger
var cfg *config.ConfigConf
var listAllowedCmd = regexp.MustCompile(`^[a-zA-Z0-9_-]+$`) // allowed symbols after first symbol
func init() {
cfg = config.MustLoadConfig()
@@ -28,17 +26,22 @@ func init() {
}
func main() {
serverv1 := sv1.InitV1Server(&sv1.HandlerV1InitStruct{
Log: *logs.SetupLogger(cfg.Mode),
Config: cfg,
AllowedCmd: regexp.MustCompile(`^[a-zA-Z0-9]+$`),
ListAllowedCmd: regexp.MustCompile(`^[a-zA-Z0-9_-]+$`),
})
r := chi.NewRouter()
r.Route("/v1/com", func(r chi.Router) {
r.Get("/", handleV1ComList)
r.Get("/{cmd}", handleV1)
r.Get("/", serverv1.HandleList)
r.Get("/{cmd}", serverv1.Handle)
})
// r.Route("/v2/com", func(r chi.Router) {
// r.Get("/", handleV1ComList)
// r.Get("/{cmd}", handleV1)
// })
r.NotFound(notFound)
r.NotFound(serverv1.ErrNotFound)
log.Info("Server started", slog.String("address", cfg.Address))
http.ListenAndServe(cfg.Address, r)