X-Git-Url: https://git.r.bdr.sh/rbdr/mobius/blobdiff_plain/f6f1d88969e12eadb7013397cdad3c4c5625988c..fd740bc499ebc6d3a381479316f74cdc736d02de:/cmd/mobius-hotline-server/main.go diff --git a/cmd/mobius-hotline-server/main.go b/cmd/mobius-hotline-server/main.go index 66566cd..04b3c57 100644 --- a/cmd/mobius-hotline-server/main.go +++ b/cmd/mobius-hotline-server/main.go @@ -7,27 +7,29 @@ import ( "flag" "fmt" "github.com/jhalter/mobius/hotline" + "github.com/jhalter/mobius/internal/mobius" "gopkg.in/natefinch/lumberjack.v2" "io" "log" "log/slog" "net/http" "os" + "os/signal" + "path" "path/filepath" - "runtime" + "syscall" ) //go:embed mobius/config var cfgTemplate embed.FS -const defaultPort = 5500 - var logLevels = map[string]slog.Level{ "debug": slog.LevelDebug, "info": slog.LevelInfo, "error": slog.LevelError, } +// Values swapped in by go-releaser at build time var ( version = "dev" commit = "none" @@ -37,29 +39,16 @@ var ( func main() { ctx, cancel := context.WithCancel(context.Background()) - // TODO: implement graceful shutdown by closing context - // c := make(chan os.Signal, 1) - // signal.Notify(c, os.Interrupt) - // defer func() { - // signal.Stop(c) - // cancel() - // }() - // go func() { - // select { - // case <-c: - // cancel() - // case <-ctx.Done(): - // } - // }() + sigChan := make(chan os.Signal, 1) + signal.Notify(sigChan, syscall.SIGTERM, syscall.SIGHUP, syscall.SIGINT, os.Interrupt) netInterface := flag.String("interface", "", "IP addr of interface to listen on. Defaults to all interfaces.") - basePort := flag.Int("bind", defaultPort, "Base Hotline server port. File transfer port is base port + 1.") + basePort := flag.Int("bind", 5500, "Base Hotline server port. File transfer port is base port + 1.") statsPort := flag.String("stats-port", "", "Enable stats HTTP endpoint on address and port") - configDir := flag.String("config", defaultConfigPath(), "Path to config root") - printVersion := flag.Bool("version", false, "print version and exit") + configDir := flag.String("config", configSearchPaths(), "Path to config root") + printVersion := flag.Bool("version", false, "Print version and exit") logLevel := flag.String("log-level", "info", "Log level") logFile := flag.String("log-file", "", "Path to log file") - init := flag.Bool("init", false, "Populate the config dir with default configuration") flag.Parse() @@ -81,14 +70,15 @@ func main() { ), ) + // It's important for Windows compatibility to use path.Join and not filepath.Join for the config dir initialization. + // https://github.com/golang/go/issues/44305 if *init { - if _, err := os.Stat(filepath.Join(*configDir, "/config.yaml")); os.IsNotExist(err) { + if _, err := os.Stat(path.Join(*configDir, "/config.yaml")); os.IsNotExist(err) { if err := os.MkdirAll(*configDir, 0750); err != nil { slogger.Error(fmt.Sprintf("error creating config dir: %s", err)) os.Exit(1) } - - if err := copyDir("mobius/config", *configDir); err != nil { + if err := copyDir(path.Join("mobius", "config"), *configDir); err != nil { slogger.Error(fmt.Sprintf("error copying config dir: %s", err)) os.Exit(1) } @@ -98,23 +88,94 @@ func main() { } } - if _, err := os.Stat(*configDir); os.IsNotExist(err) { - slogger.Error(fmt.Sprintf("Configuration directory not found. Correct the path or re-run with -init to generate initial config.")) + config, err := mobius.LoadConfig(path.Join(*configDir, "config.yaml")) + if err != nil { + slogger.Error(fmt.Sprintf("Error loading config: %v", err)) os.Exit(1) } - srv, err := hotline.NewServer(*configDir, *netInterface, *basePort, slogger, &hotline.OSFileStore{}) + srv, err := hotline.NewServer( + hotline.WithInterface(*netInterface), + hotline.WithLogger(slogger), + hotline.WithPort(*basePort), + hotline.WithConfig(*config), + ) if err != nil { slogger.Error(fmt.Sprintf("Error starting server: %s", err)) os.Exit(1) } - sh := statHandler{hlServer: srv} + srv.MessageBoard, err = mobius.NewFlatNews(path.Join(*configDir, "MessageBoard.txt")) + if err != nil { + slogger.Error(fmt.Sprintf("Error loading message board: %v", err)) + os.Exit(1) + } + + srv.BanList, err = mobius.NewBanFile(path.Join(*configDir, "Banlist.yaml")) + if err != nil { + slogger.Error(fmt.Sprintf("Error loading ban list: %v", err)) + os.Exit(1) + } + + srv.ThreadedNewsMgr, err = mobius.NewThreadedNewsYAML(path.Join(*configDir, "ThreadedNews.yaml")) + if err != nil { + slogger.Error(fmt.Sprintf("Error loading news: %v", err)) + os.Exit(1) + } + + srv.AccountManager, err = mobius.NewYAMLAccountManager(filepath.Join(*configDir, "Users/")) + if err != nil { + slogger.Error(fmt.Sprintf("Error loading accounts: %v", err)) + os.Exit(1) + } + + srv.Agreement, err = mobius.NewAgreement(*configDir, "\r") + if err != nil { + slogger.Error(fmt.Sprintf("Error loading agreement: %v", err)) + os.Exit(1) + } + + bannerPath := filepath.Join(*configDir, config.BannerFile) + srv.Banner, err = os.ReadFile(bannerPath) + if err != nil { + slogger.Error(fmt.Sprintf("Error loading accounts: %v", err)) + os.Exit(1) + } + + reloadFunc := func() { + if err := srv.MessageBoard.(*mobius.FlatNews).Reload(); err != nil { + slogger.Error("Error reloading news", "err", err) + } + + if err := srv.BanList.(*mobius.BanFile).Load(); err != nil { + slogger.Error("Error reloading ban list", "err", err) + } + + if err := srv.ThreadedNewsMgr.(*mobius.ThreadedNewsYAML).Load(); err != nil { + slogger.Error("Error reloading threaded news list", "err", err) + } + + if err := srv.Agreement.(*mobius.Agreement).Reload(); err != nil { + slogger.Error(fmt.Sprintf("Error reloading agreement: %v", err)) + os.Exit(1) + } + } + + reloadHandler := func(reloadFunc func()) func(w http.ResponseWriter, _ *http.Request) { + return func(w http.ResponseWriter, _ *http.Request) { + reloadFunc() + + _, _ = io.WriteString(w, `{ "msg": "config reloaded" }`) + } + } + + sh := APIHandler{hlServer: srv} if *statsPort != "" { http.HandleFunc("/", sh.RenderStats) + http.HandleFunc("/api/v1/stats", sh.RenderStats) + http.HandleFunc("/api/v1/reload", reloadHandler(reloadFunc)) go func(srv *hotline.Server) { - // Use the default DefaultServeMux. err = http.ListenAndServe(":"+*statsPort, nil) if err != nil { log.Fatal(err) @@ -122,21 +183,42 @@ func main() { }(srv) } + go func() { + for { + sig := <-sigChan + switch sig { + case syscall.SIGHUP: + slogger.Info("SIGHUP received. Reloading configuration.") + + reloadFunc() + default: + signal.Stop(sigChan) + cancel() + os.Exit(0) + } + + } + }() + slogger.Info("Hotline server started", "version", version, + "config", *configDir, "API port", fmt.Sprintf("%s:%v", *netInterface, *basePort), "Transfer port", fmt.Sprintf("%s:%v", *netInterface, *basePort+1), ) + // Assign functions to handle specific Hotline transaction types + mobius.RegisterHandlers(srv) + // Serve Hotline requests until program exit - log.Fatal(srv.ListenAndServe(ctx, cancel)) + log.Fatal(srv.ListenAndServe(ctx)) } -type statHandler struct { +type APIHandler struct { hlServer *hotline.Server } -func (sh *statHandler) RenderStats(w http.ResponseWriter, _ *http.Request) { +func (sh *APIHandler) RenderStats(w http.ResponseWriter, _ *http.Request) { u, err := json.Marshal(sh.hlServer.CurrentStats()) if err != nil { panic(err) @@ -145,26 +227,17 @@ func (sh *statHandler) RenderStats(w http.ResponseWriter, _ *http.Request) { _, _ = io.WriteString(w, string(u)) } -func defaultConfigPath() (cfgPath string) { - switch runtime.GOOS { - case "windows": - cfgPath = "config/" - case "darwin": - if _, err := os.Stat("/usr/local/var/mobius/config/"); err == nil { - cfgPath = "/usr/local/var/mobius/config/" - } else if _, err := os.Stat("/opt/homebrew/var/mobius/config"); err == nil { - cfgPath = "/opt/homebrew/var/mobius/config/" +func configSearchPaths() string { + for _, cfgPath := range mobius.ConfigSearchOrder { + if _, err := os.Stat(cfgPath); err == nil { + return cfgPath } - case "linux": - cfgPath = "/usr/local/var/mobius/config/" - default: - cfgPath = "./config/" } - return cfgPath + return "config" } -// TODO: Simplify this mess. Why is it so difficult to recursively copy a directory? +// copyDir recursively copies a directory tree, attempting to preserve permissions. func copyDir(src, dst string) error { entries, err := cfgTemplate.ReadDir(src) if err != nil { @@ -172,33 +245,33 @@ func copyDir(src, dst string) error { } for _, dirEntry := range entries { if dirEntry.IsDir() { - if err := os.MkdirAll(filepath.Join(dst, dirEntry.Name()), 0777); err != nil { + if err := os.MkdirAll(path.Join(dst, dirEntry.Name()), 0777); err != nil { panic(err) } - subdirEntries, _ := cfgTemplate.ReadDir(filepath.Join(src, dirEntry.Name())) + subdirEntries, _ := cfgTemplate.ReadDir(path.Join(src, dirEntry.Name())) for _, subDirEntry := range subdirEntries { - f, err := os.Create(filepath.Join(dst, dirEntry.Name(), subDirEntry.Name())) + f, err := os.Create(path.Join(dst, dirEntry.Name(), subDirEntry.Name())) if err != nil { return err } - srcFile, err := cfgTemplate.Open(filepath.Join(src, dirEntry.Name(), subDirEntry.Name())) + srcFile, err := cfgTemplate.Open(path.Join(src, dirEntry.Name(), subDirEntry.Name())) if err != nil { - return err + return fmt.Errorf("error copying srcFile: %w", err) } _, err = io.Copy(f, srcFile) if err != nil { return err } - f.Close() + _ = f.Close() } } else { - f, err := os.Create(filepath.Join(dst, dirEntry.Name())) + f, err := os.Create(path.Join(dst, dirEntry.Name())) if err != nil { return err } - srcFile, err := cfgTemplate.Open(filepath.Join(src, dirEntry.Name())) + srcFile, err := cfgTemplate.Open(path.Join(src, dirEntry.Name())) if err != nil { return err } @@ -206,7 +279,7 @@ func copyDir(src, dst string) error { if err != nil { return err } - f.Close() + _ = f.Close() } }