X-Git-Url: https://git.r.bdr.sh/rbdr/mobius/blobdiff_plain/d9bc63a10d0978d9a5222cf7be74044e55f409b7..3e4a52ed34b130743164d6d77f31a1fc67f161c8:/cmd/mobius-hotline-server/main.go diff --git a/cmd/mobius-hotline-server/main.go b/cmd/mobius-hotline-server/main.go index 878b425..6b82764 100644 --- a/cmd/mobius-hotline-server/main.go +++ b/cmd/mobius-hotline-server/main.go @@ -3,34 +3,22 @@ package main import ( "context" "embed" - "encoding/json" "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" - "runtime" + "path/filepath" "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" @@ -45,33 +33,22 @@ func main() { 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.") - statsPort := flag.String("stats-port", "", "Enable stats HTTP endpoint on address and port") - configDir := flag.String("config", defaultConfigPath(), "Path to config root") + basePort := flag.Int("bind", 5500, "Base Hotline server port. File transfer port is base port + 1.") + apiAddr := flag.String("api-addr", "", "Enable HTTP API endpoint on address and port") + 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() if *printVersion { - fmt.Printf("mobius-hotline-server %s, commit %s, built at %s", version, commit, date) + fmt.Printf("mobius-hotline-server %s, commit %s, built on %s\n", version, commit, date) os.Exit(0) } - slogger := slog.New( - slog.NewTextHandler( - io.MultiWriter(os.Stdout, &lumberjack.Logger{ - Filename: *logFile, - MaxSize: 100, // MB - MaxBackups: 3, - MaxAge: 365, // days - }), - &slog.HandlerOptions{Level: logLevels[*logLevel]}, - ), - ) + slogger := mobius.NewLogger(logLevel, logFile) // 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 @@ -91,18 +68,18 @@ func main() { } } - if _, err := os.Stat(*configDir); os.IsNotExist(err) { - slogger.Error("Configuration directory not found. Correct the path or re-run with -init to generate initial config.") - os.Exit(1) - } - 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(*config, *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) @@ -126,17 +103,47 @@ func main() { os.Exit(1) } - sh := statHandler{hlServer: srv} - if *statsPort != "" { - http.HandleFunc("/", sh.RenderStats) + srv.AccountManager, err = mobius.NewYAMLAccountManager(filepath.Join(*configDir, "Users/")) + if err != nil { + slogger.Error(fmt.Sprintf("Error loading accounts: %v", err)) + os.Exit(1) + } - go func(srv *hotline.Server) { - // Use the default DefaultServeMux. - err = http.ListenAndServe(":"+*statsPort, nil) - if err != nil { - log.Fatal(err) - } - }(srv) + 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) + } + } + + if *apiAddr != "" { + sh := mobius.NewAPIServer(srv, reloadFunc, slogger) + go sh.Serve(*apiAddr) } go func() { @@ -146,17 +153,7 @@ func main() { case syscall.SIGHUP: slogger.Info("SIGHUP received. Reloading configuration.") - 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) - } + reloadFunc() default: signal.Stop(sigChan) cancel() @@ -166,48 +163,23 @@ func main() { } }() - slogger.Info("Hotline server started", - "version", version, - "API port", fmt.Sprintf("%s:%v", *netInterface, *basePort), - "Transfer port", fmt.Sprintf("%s:%v", *netInterface, *basePort+1), - ) + slogger.Info("Hotline server started", "version", version, "config", *configDir) + + // Assign functions to handle specific Hotline transaction types + mobius.RegisterHandlers(srv) // Serve Hotline requests until program exit log.Fatal(srv.ListenAndServe(ctx)) } -type statHandler struct { - hlServer *hotline.Server -} - -func (sh *statHandler) RenderStats(w http.ResponseWriter, _ *http.Request) { - u, err := json.Marshal(sh.hlServer.CurrentStats()) - if err != nil { - panic(err) - } - - _, _ = io.WriteString(w, string(u)) -} - -func defaultConfigPath() string { - var 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" } // copyDir recursively copies a directory tree, attempting to preserve permissions. @@ -236,7 +208,7 @@ func copyDir(src, dst string) error { if err != nil { return err } - f.Close() + _ = f.Close() } } else { f, err := os.Create(path.Join(dst, dirEntry.Name())) @@ -252,7 +224,7 @@ func copyDir(src, dst string) error { if err != nil { return err } - f.Close() + _ = f.Close() } }